@deephaven-enterprise/query-utils 2026.1.48 → 2026.1.49

package/dist/DraftQuery.d.ts

@@ -16,12 +16,14 @@ export interface DefaultDraftQuery extends Omit<DraftQuery, 'id' | 'defaults'> {
 export type IDraftQuery = PlainEditableQueryInfo & {
     isClientSide: boolean;
     draftOwner: string;
+    /** @deprecated Thread counts are stored directly in jvmArguments. */
     initializationThreads?: string;
+    /** @deprecated Thread counts are stored directly in jvmArguments. */
     updateThreads?: string;
     defaults?: DefaultDraftQuery;
     isModified: boolean;
 };
-export type DraftQueryConstructorObject = Partial<IDraftQuery> & Pick<IDraftQuery, 'name' | 'owner' | 'draftOwner' | 'dbServerName' | 'initializationThreads' | 'updateThreads'>;
+export type DraftQueryConstructorObject = Partial<IDraftQuery> & Pick<IDraftQuery, 'name' | 'owner' | 'draftOwner' | 'dbServerName'>;
 /**
  * A Draft Query is a client side object that contains mutable data for a Peristent Query along with some metadata.
  */
@@ -69,8 +71,6 @@ export declare class DraftQuery implements IDraftQuery {
         readonly SPARE_COUNT: "spareCount";
         readonly ASSIGNMENT_POLICY: "assignmentPolicy";
         readonly ASSIGNMENT_POLICY_PARAMS: "assignmentPolicyParams";
-        readonly INITIALIZATION_THREADS: "initializationThreads";
-        readonly UPDATE_THREADS: "updateThreads";
         readonly DEFAULTS: "defaults";
         readonly ENV_VAR_ENTRIES: "envVarEntries";
         readonly JVM_ARGUMENTS: "jvmArguments";
@@ -146,14 +146,6 @@ export declare class DraftQuery implements IDraftQuery {
     spareCount: number;
     assignmentPolicy: string | null;
     assignmentPolicyParams: string | null;
-    /**
-     * initialiZationThreads and updateThreads are thread counts only used for Core workers.
-     * Additionally, they are not part of a Query object. These values are in Extra JVM Args.
-     * When a draft is created, they will be parsed and removed from JVM args.
-     * When the query is saved, they will be written to JVM args.
-     */
-    initializationThreads: string;
-    updateThreads: string;
     defaults?: DefaultDraftQuery;
     updateSchedule(): void;
     /**
@@ -169,14 +161,6 @@ export declare class DraftQuery implements IDraftQuery {
      * @param editableQuery the Editable Query from the Server
      */
     saveDraftToQuery<T extends PlainEditableQueryInfo>(editableQuery: Partial<T> & Pick<T, 'serial'>): T;
-    /**
-     * Updates the JVM args to include the thread count for initialization and update threads.
-     * It is safe to call from saveDraftToQuery because the the thead counts will be set to
-     * system defaults for Legacy workers, which will not affect the JVM args.
-     * However, saving a new draft does not call saveDraftToQuery, so this method should be called
-     * manually in that case.
-     */
-    addThreadCountToJVMArgs(): void;
     /**
      * Get a PlainEditableQueryInfo object populated from this DraftQuery
      */

package/dist/DraftQuery.js

@@ -105,15 +105,15 @@ export class DraftQuery {
         this.spareCount = spareCount;
         this.assignmentPolicy = assignmentPolicy;
         this.assignmentPolicyParams = assignmentPolicyParams;
-        // If the thread counts are not provided, they are read from the JVM args
-        // And they need to be removed from the JVM args
+        // Thread counts live in jvmArguments. If old persisted data supplied them as
+        // separate fields, migrate them in so they are not lost.
         const jvmArgsArray = jvmArguments !== null && jvmArguments !== void 0 ? jvmArguments : tokenizeArgs(jvmArgs);
-        this.initializationThreads =
-            initializationThreads !== null && initializationThreads !== void 0 ? initializationThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgsArray, WorkerThreadUtils.INITIALIZATION_THREADS_ARG);
-        this.updateThreads =
-            updateThreads !== null && updateThreads !== void 0 ? updateThreads : WorkerThreadUtils.getDisplayStringFromJvmArgs(jvmArgsArray, WorkerThreadUtils.UPDATE_THREADS_ARG);
-        // The thread count args should always be removed from the JVM args as they are stored in the DraftQuery
-        this.jvmArguments = WorkerThreadUtils.removeArgs(jvmArgsArray);
+        if (initializationThreads !== undefined || updateThreads !== undefined) {
+            this.jvmArguments = WorkerThreadUtils.migrateThreadArgs(jvmArgsArray, initializationThreads, updateThreads);
+        }
+        else {
+            this.jvmArguments = jvmArgsArray;
+        }
         // The scheduling array is parsed into a scheduler object
         this.scheduling = [];
         this.scheduler = new QueryScheduler(scheduling);
@@ -175,7 +175,6 @@ export class DraftQuery {
      * @param editableQuery the Editable Query from the Server
      */
     saveDraftToQuery(editableQuery) {
-        this.addThreadCountToJVMArgs();
         // Type check to make sure none of the required fields are missing
         const completeQuery = {
             serial: editableQuery.serial,
@@ -213,17 +212,6 @@ export class DraftQuery {
         Object.assign(editableQuery, completeQuery);
         return editableQuery;
     }
-    /**
-     * Updates the JVM args to include the thread count for initialization and update threads.
-     * It is safe to call from saveDraftToQuery because the the thead counts will be set to
-     * system defaults for Legacy workers, which will not affect the JVM args.
-     * However, saving a new draft does not call saveDraftToQuery, so this method should be called
-     * manually in that case.
-     */
-    addThreadCountToJVMArgs() {
-        const { initializationThreads, updateThreads } = this;
-        this.jvmArguments = WorkerThreadUtils.addArgs(this.jvmArguments, initializationThreads, updateThreads);
-    }
     /**
      * Get a PlainEditableQueryInfo object populated from this DraftQuery
      */
@@ -304,8 +292,6 @@ DraftQuery.FIELDS = Object.freeze({
     SPARE_COUNT: 'spareCount',
     ASSIGNMENT_POLICY: `assignmentPolicy`,
     ASSIGNMENT_POLICY_PARAMS: `assignmentPolicyParams`,
-    INITIALIZATION_THREADS: 'initializationThreads',
-    UPDATE_THREADS: 'updateThreads',
     DEFAULTS: 'defaults',
     ENV_VAR_ENTRIES: 'envVarEntries',
     JVM_ARGUMENTS: 'jvmArguments',

package/dist/QueryUtils.d.ts

@@ -88,12 +88,10 @@ export declare function createQueryConfigViewportSubscription({ columnNames, cor
  * @param config.heapSize JVM heap size multiplier (default: 0.5)
  * @param config.isClientSide Whether this is a client-side query (default: true)
  * @param config.isCommunityWorker Whether this is a Community (Core+) worker (default: false)
- * @param config.initializationThreads Number of threads for initialization (Core+ only)
- * @param config.updateThreads Number of threads for updates (Core+ only)
  * @param config.timeout Timeout in milliseconds before auto-deletion (default: 60000)
  * @returns A configured DraftQuery instance ready to be created
  */
-export declare function createTemporaryDraftQuery({ additionalMemory, engine, heapSize, isClientSide, isCommunityWorker, initializationThreads, updateThreads, timeout, ...config }: TemporaryDraftQueryConfig): DraftQuery;
+export declare function createTemporaryDraftQuery({ additionalMemory, engine, heapSize, isClientSide, isCommunityWorker, timeout, ...config }: TemporaryDraftQueryConfig): DraftQuery;
 /**
  * Fetch the WebClientData QueryInfo table from the WebClientTableFactory widget.
  * @param corePlusManager CorePlus manager for worker connections

package/dist/QueryUtils.js

@@ -131,13 +131,11 @@ export async function createQueryConfigViewportSubscription({ columnNames, coreP
  * @param config.heapSize JVM heap size multiplier (default: 0.5)
  * @param config.isClientSide Whether this is a client-side query (default: true)
  * @param config.isCommunityWorker Whether this is a Community (Core+) worker (default: false)
- * @param config.initializationThreads Number of threads for initialization (Core+ only)
- * @param config.updateThreads Number of threads for updates (Core+ only)
  * @param config.timeout Timeout in milliseconds before auto-deletion (default: 60000)
  * @returns A configured DraftQuery instance ready to be created
  */
 export function createTemporaryDraftQuery(_a) {
-    var { additionalMemory = 0, engine, heapSize = 0.5, isClientSide = true, isCommunityWorker = false, initializationThreads, updateThreads, timeout = DEFAULT_TEMPORARY_QUERY_TIMEOUT_MS } = _a, config = __rest(_a, ["additionalMemory", "engine", "heapSize", "isClientSide", "isCommunityWorker", "initializationThreads", "updateThreads", "timeout"]);
+    var { additionalMemory = 0, engine, heapSize = 0.5, isClientSide = true, isCommunityWorker = false, timeout = DEFAULT_TEMPORARY_QUERY_TIMEOUT_MS } = _a, config = __rest(_a, ["additionalMemory", "engine", "heapSize", "isClientSide", "isCommunityWorker", "timeout"]);
     const scheduling = QueryScheduler.makeTemporaryScheduling({
         autoDelete: true,
         queueName: INTERACTIVE_CONSOLE_TEMPORARY_QUEUE_NAME,
@@ -146,10 +144,7 @@ export function createTemporaryDraftQuery(_a) {
         heapSize,
         isClientSide,
         scheduling,
-        timeout, workerKind: engine, initializationThreads: isCommunityWorker
-            ? initializationThreads
-            : undefined, updateThreads: isCommunityWorker ? updateThreads : undefined }));
-    draftQuery.addThreadCountToJVMArgs();
+        timeout, workerKind: engine }));
     draftQuery.updateSchedule();
     return draftQuery;
 }

package/dist/WorkerThreadUtils.d.ts

@@ -34,14 +34,31 @@ export declare abstract class WorkerThreadUtils {
      */
     static removeArgs(jvmArgs: string[]): string[];
     /**
-     * Adds the thread count arguments to the provided jvmArgs array.
+     * Sets a single thread-count argument in the provided jvmArgs array.
+     * If `displayValue` is `SYSTEM_DEFAULT_STRING`, any existing entry for
+     * `argName` is removed.  Otherwise the entry is replaced if it already exists
+     * or appended if it does not.
      *
      * @param jvmArgs the array of JVM arguments
-     * @param initializationThreads the display string for the initialization threads
-     * @param updateThreads the display string for the update threads
-     * @returns a new array with the thread count arguments added
+     * @param argName the argument name (without the leading `-D` or `=value`)
+     * @param displayValue the display string for the thread count
+     * @returns a new array with the argument set or removed
      */
-    static addArgs(jvmArgs: string[], initializationThreads: string, updateThreads: string): string[];
+    static setArg(jvmArgs: string[], argName: string, displayValue: string): string[];
+    /**
+     * Migrates separately-stored thread-count fields into the jvmArguments array.
+     * Used for backward compat when loading old persisted data that stored
+     * `initializationThreads` / `updateThreads` as independent fields instead of
+     * inside `jvmArguments`.
+     *
+     * Pass `undefined` for either count to leave that arg unchanged.
+     *
+     * @param jvmArgs the current JVM arguments array
+     * @param initializationThreads the old initializationThreads display string, or undefined
+     * @param updateThreads the old updateThreads display string, or undefined
+     * @returns a new array with the thread counts set (or cleared when undefined)
+     */
+    static migrateThreadArgs(jvmArgs: string[], initializationThreads: string | undefined, updateThreads: string | undefined): string[];
     /**
      * Gets the display string for the provided value.
      *

package/dist/WorkerThreadUtils.js

@@ -22,7 +22,9 @@ export class WorkerThreadUtils {
      * @returns the display string or the system default string if not found
      */
     static getDisplayStringFromJvmArgs(jvmArgs, argName) {
-        for (let i = 0; i < jvmArgs.length; i += 1) {
+        // Iterate in reverse — when duplicate -D args are present the JVM uses the
+        // last one, so the UI should reflect the same winning value.
+        for (let i = jvmArgs.length - 1; i >= 0; i -= 1) {
             if (jvmArgs[i].startsWith(`-D${argName}=`)) {
                 return WorkerThreadUtils.getDisplayString(jvmArgs[i].split('=')[1]);
             }
@@ -40,23 +42,48 @@ export class WorkerThreadUtils {
         return jvmArgs.filter(arg => !WorkerThreadUtils.ALL_ARGS.some(argName => arg.startsWith(`-D${argName}=`)));
     }
     /**
-     * Adds the thread count arguments to the provided jvmArgs array.
+     * Sets a single thread-count argument in the provided jvmArgs array.
+     * If `displayValue` is `SYSTEM_DEFAULT_STRING`, any existing entry for
+     * `argName` is removed.  Otherwise the entry is replaced if it already exists
+     * or appended if it does not.
      *
      * @param jvmArgs the array of JVM arguments
-     * @param initializationThreads the display string for the initialization threads
-     * @param updateThreads the display string for the update threads
-     * @returns a new array with the thread count arguments added
+     * @param argName the argument name (without the leading `-D` or `=value`)
+     * @param displayValue the display string for the thread count
+     * @returns a new array with the argument set or removed
      */
-    static addArgs(jvmArgs, initializationThreads, updateThreads) {
-        const result = [...jvmArgs];
-        // The default value means "do not set an extra JVM arg"
-        if (WorkerThreadUtils.isValidThreadCount(initializationThreads) &&
-            initializationThreads !== WorkerThreadUtils.SYSTEM_DEFAULT_STRING) {
-            result.push(`-D${WorkerThreadUtils.INITIALIZATION_THREADS_ARG}=${WorkerThreadUtils.getValue(initializationThreads)}`);
+    static setArg(jvmArgs, argName, displayValue) {
+        const prefix = `-D${argName}=`;
+        const filtered = jvmArgs.filter(arg => !arg.startsWith(prefix));
+        if (displayValue === WorkerThreadUtils.SYSTEM_DEFAULT_STRING ||
+            !WorkerThreadUtils.isValidThreadCount(displayValue)) {
+            return filtered;
         }
-        if (WorkerThreadUtils.isValidThreadCount(updateThreads) &&
-            updateThreads !== WorkerThreadUtils.SYSTEM_DEFAULT_STRING) {
-            result.push(`-D${WorkerThreadUtils.UPDATE_THREADS_ARG}=${WorkerThreadUtils.getValue(updateThreads)}`);
+        return [
+            ...filtered,
+            `${prefix}${WorkerThreadUtils.getValue(displayValue)}`,
+        ];
+    }
+    /**
+     * Migrates separately-stored thread-count fields into the jvmArguments array.
+     * Used for backward compat when loading old persisted data that stored
+     * `initializationThreads` / `updateThreads` as independent fields instead of
+     * inside `jvmArguments`.
+     *
+     * Pass `undefined` for either count to leave that arg unchanged.
+     *
+     * @param jvmArgs the current JVM arguments array
+     * @param initializationThreads the old initializationThreads display string, or undefined
+     * @param updateThreads the old updateThreads display string, or undefined
+     * @returns a new array with the thread counts set (or cleared when undefined)
+     */
+    static migrateThreadArgs(jvmArgs, initializationThreads, updateThreads) {
+        let result = jvmArgs;
+        if (initializationThreads != null) {
+            result = WorkerThreadUtils.setArg(result, WorkerThreadUtils.INITIALIZATION_THREADS_ARG, initializationThreads);
+        }
+        if (updateThreads != null) {
+            result = WorkerThreadUtils.setArg(result, WorkerThreadUtils.UPDATE_THREADS_ARG, updateThreads);
         }
         return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deephaven-enterprise/query-utils",
-  "version": "2026.1.48",
+  "version": "2026.1.49",
   "description": "Deephaven Enterprise Query Utils",
   "author": "Deephaven Data Labs LLC",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -17,8 +17,8 @@
     "build": "tsc --build"
   },
   "dependencies": {
-    "@deephaven-enterprise/client-utils": "2026.1.48",
-    "@deephaven-enterprise/jsapi-types": "2026.1.48",
+    "@deephaven-enterprise/client-utils": "2026.1.49",
+    "@deephaven-enterprise/jsapi-types": "2026.1.49",
     "@deephaven/jsapi-types": "1.0.0-dev0.40.5",
     "@deephaven/log": "^0.97.0",
     "@deephaven/utils": "^0.97.0",