JSCO-14: Use cluster deserializer when deserializer not specified in …

…QueryOptions (#17) Changes ======= * Set a default deserializer in the cluster. * Use the cluster's default deserializer if a deserializer is not specified in QueryOptions. * Small change to CI
couchbaselabs · Sep 18, 2024 · b7a4f55 · b7a4f55
1 parent 685834b
commit b7a4f55
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/prebuilds.yml b/.github/workflows/prebuilds.yml
@@ -60,7 +60,7 @@ jobs:
           echo "SHA=${{ inputs.sha }}"
           echo "version=${{ inputs.version }}"
           echo "cxx_change=${{ inputs.cxx_change }}"
-          echo "DEFAULT_PYTHON=${{ env.DEFAULT_NODE }}"
+          echo "DEFAULT_NODE=${{ env.DEFAULT_NODE }}"
 
 
   validate-input:
@@ -206,22 +206,22 @@ jobs:
           name: ncbcc-platform-packagejson
           path: |
             ./platPkg.json
-      # - name: Create test requirements
-      #   run: |
-      #     mkdir ncbcc-lib
-      #     cd ncbcc-lib
-      #     cp ../tsconfig.json .
-      #     cp ../typedoc.json .
-      #     cp ../.npmignore .
-      #     cp -r ../lib .
-      #     ls -alh
-      # - name: Upload docs requirements
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     retention-days: 1
-      #     name: ncbcc-lib
-      #     path: |
-      #       ./ncbcc-lib
+      - name: Copy over lib/ and other requirements for pack, docs, etc.
+        run: |
+          mkdir ncbcc-lib
+          cd ncbcc-lib
+          cp ../tsconfig.json .
+          cp ../typedoc.json .
+          cp ../.npmignore .
+          cp -r ../lib .
+          ls -alh
+      - name: Upload requirements for pack, docs, etc.
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 1
+          name: ncbcc-lib
+          path: |
+            ./ncbcc-lib
 
 
   linux-prebuilds:

diff --git a/lib/cluster.ts b/lib/cluster.ts
@@ -200,6 +200,7 @@ export class Cluster {
   private _securityOptions: SecurityOptions
   private _conn: CppConnection
   private _dnsConfig: DnsConfig | null
+  private _deserializer: Deserializer
 
   /**
    * @internal
@@ -250,6 +251,13 @@ export class Cluster {
     return this._dispatchTimeout
   }
 
+  /**
+  @internal
+  */
+  get deserializer(): Deserializer {
+    return this._deserializer
+  }
+
   /**
   @internal
   @deprecated Use the static sdk-level {@link createInstance} method instead.
@@ -285,6 +293,7 @@ export class Cluster {
     this._bootstrapTimeout = options.timeoutOptions?.connectTimeout
     this._connectTimeout = options.timeoutOptions?.socketConnectTimeout
     this._resolveTimeout = options.timeoutOptions?.resolveTimeout
+    this._deserializer = options.deserializer || new JsonDeserializer()
 
     this._credential = credential
 

diff --git a/lib/queryexecutor.ts b/lib/queryexecutor.ts
@@ -24,7 +24,6 @@ import {
 } from './querytypes'
 import { errorFromCpp, queryScanConsistencyToCpp } from './bindingutilities'
 import { Cluster } from './cluster'
-import { JsonDeserializer } from './deserializers'
 import { CppColumnarQueryResult, CppColumnarError } from './binding'
 import { OperationCanceledError } from './errors'
 
@@ -171,7 +170,7 @@ export class QueryExecutor {
    */
   query(statement: string, options: QueryOptions): Promise<QueryResult> {
     return new Promise((resolve, reject) => {
-      const deserializer = options.deserializer || new JsonDeserializer()
+      const deserializer = options.deserializer || this._cluster.deserializer
       const timeout = options.timeout || this._cluster.queryTimeout
 
       const { cppQueryErr, cppQueryResult } = this._cluster.conn.query(