feat: Databoostenabled for Query and Read partitions (#1784)

surbhigarg92 · web-flow · commit 66ff70cd377d · 2023-06-19T08:46:13.000Z
diff --git a/samples/batch.js b/samples/batch.js
@@ -40,8 +40,14 @@ async function createAndExecuteQueryPartitions(
   const database = instance.database(databaseId);
   const [transaction] = await database.createBatchTransaction();
 
-  const query = 'SELECT * FROM Singers';
+  const query = {
+    sql: 'SELECT * FROM Singers',
+    // DataBoost option is an optional parameter which can also be used for partition read
+    // and query to execute the request via spanner independent compute resources.
+    dataBoostEnabled: false,
+  };
 
+  // A Partition object is serializable and can be used from a different process.
   const [partitions] = await transaction.createQueryPartitions(query);
   console.log(`Successfully created ${partitions.length} query partitions.`);
 
diff --git a/src/transaction.ts b/src/transaction.ts
@@ -84,6 +84,7 @@ export interface ExecuteSqlRequest extends Statement, RequestOptions {
   seqno?: number;
   queryOptions?: IQueryOptions;
   requestOptions?: Omit<IRequestOptions, 'transactionTag'>;
+  dataBoostEnabled?: boolean | null;
 }
 
 export interface KeyRange {
@@ -104,6 +105,7 @@ export interface ReadRequest extends RequestOptions {
   resumeToken?: Uint8Array | null;
   partitionToken?: Uint8Array | null;
   requestOptions?: Omit<IRequestOptions, 'transactionTag'>;
+  dataBoostEnabled?: boolean | null;
 }
 
 export interface BatchUpdateError extends grpc.ServiceError {
diff --git a/system-test/spanner.ts b/system-test/spanner.ts
@@ -8358,6 +8358,94 @@ describe('Spanner', () => {
         deadlineErrorInsteadOfAbort(done, PG_DATABASE, postgreSqlTable);
       });
     });
+
+    describe('batch transactions', () => {
+      before(done => {
+        if (!IS_EMULATOR_ENABLED) {
+          DATABASE.runTransaction((err, transaction) => {
+            assert.ifError(err);
+
+            transaction!.runUpdate(
+              {
+                sql:
+                  'INSERT INTO ' +
+                  TABLE_NAME +
+                  ' (Key, StringValue) VALUES(@key, @str)',
+                params: {
+                  key: 'k998',
+                  str: 'abc',
+                },
+              },
+              err => {
+                assert.ifError(err);
+                transaction!.commit(done);
+              }
+            );
+          });
+        } else {
+          done();
+        }
+      });
+
+      it('should create and execute a query partition', function (done) {
+        if (IS_EMULATOR_ENABLED) {
+          this.skip();
+        }
+        const selectQuery = {
+          sql: 'SELECT * FROM TxnTable where Key = "k998"',
+        };
+
+        let row_count = 0;
+        DATABASE.createBatchTransaction((err, transaction) => {
+          assert.ifError(err);
+          transaction!.createQueryPartitions(selectQuery, (err, partitions) => {
+            assert.ifError(err);
+            assert.deepStrictEqual(partitions.length, 1);
+            partitions.forEach(partition => {
+              transaction!.execute(partition, (err, results) => {
+                assert.ifError(err);
+                row_count += results.map(row => row.toJSON()).length;
+                assert.deepStrictEqual(row_count, 1);
+                transaction!.close();
+                done();
+              });
+            });
+          });
+        });
+      });
+
+      it('should create and execute a read partition', function (done) {
+        if (IS_EMULATOR_ENABLED) {
+          this.skip();
+        }
+        const key = 'k998';
+        const QUERY = {
+          table: googleSqlTable.name,
+          // Set databoostenabled to true for enabling serveless analytics.
+          dataBoostEnabled: false,
+          keys: [key],
+          columns: ['Key'],
+        };
+
+        let read_row_count = 0;
+        DATABASE.createBatchTransaction((err, transaction) => {
+          assert.ifError(err);
+          transaction!.createReadPartitions(QUERY, (err, partitions) => {
+            assert.ifError(err);
+            assert.deepStrictEqual(partitions.length, 1);
+            partitions.forEach(partition => {
+              transaction!.execute(partition, (err, results) => {
+                assert.ifError(err);
+                read_row_count += results.map(row => row.toJSON()).length;
+                assert.deepStrictEqual(read_row_count, 1);
+                transaction!.close();
+                done();
+              });
+            });
+          });
+        });
+      });
+    });
   });
 });
 
diff --git a/test/batch-transaction.ts b/test/batch-transaction.ts
@@ -149,12 +149,14 @@ describe('BatchTransaction', () => {
       gaxOptions: GAX_OPTS,
       params: {},
       types: {},
+      dataBoostEnabled: true,
     };
 
     it('should make the correct request', () => {
       const fakeParams = {
         params: {a: 'b'},
         paramTypes: {a: 'string'},
+        dataBoostEnabled: true,
       };
 
       const expectedQuery = Object.assign({sql: QUERY.sql}, fakeParams);
@@ -304,13 +306,15 @@ describe('BatchTransaction', () => {
       keys: ['a', 'b'],
       ranges: [{}, {}],
       gaxOptions: GAX_OPTS,
+      dataBoostEnabled: true,
     };
 
     it('should make the correct request', () => {
       const fakeKeySet = {};
       const expectedQuery = {
         table: QUERY.table,
         keySet: fakeKeySet,
+        dataBoostEnabled: true,
       };
 
       const stub = sandbox.stub(batchTransaction, 'createPartitions_');
@@ -354,6 +358,30 @@ describe('BatchTransaction', () => {
       const query = stub.lastCall.args[0];
       assert.strictEqual(query, partition);
     });
+
+    it('should make read requests for read partitions with data boost enabled', () => {
+      const partition = {table: 'abc', dataBoostEnabled: true};
+      const stub = sandbox.stub(batchTransaction, 'read');
+
+      batchTransaction.execute(partition, assert.ifError);
+
+      const [table, options] = stub.lastCall.args;
+      assert.strictEqual(table, partition.table);
+      assert.strictEqual(options, partition);
+    });
+
+    it('should make query requests for non-read partitions with data boost enabled', () => {
+      const partition = {
+        sql: 'SELECT * FROM Singers',
+        dataBoostEnabled: true,
+      };
+      const stub = sandbox.stub(batchTransaction, 'run');
+
+      batchTransaction.execute(partition, assert.ifError);
+
+      const query = stub.lastCall.args[0];
+      assert.strictEqual(query, partition);
+    });
   });
 
   describe('executeStream', () => {

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ export interface ExecuteSqlRequest extends Statement, RequestOptions {`
`84`	`84`	`seqno?: number;`
`85`	`85`	`queryOptions?: IQueryOptions;`
`86`	`86`	`requestOptions?: Omit<IRequestOptions, 'transactionTag'>;`
	`87`	`+ dataBoostEnabled?: boolean \| null;`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`export interface KeyRange {`
`@@ -104,6 +105,7 @@ export interface ReadRequest extends RequestOptions {`
`104`	`105`	`resumeToken?: Uint8Array \| null;`
`105`	`106`	`partitionToken?: Uint8Array \| null;`
`106`	`107`	`requestOptions?: Omit<IRequestOptions, 'transactionTag'>;`
	`108`	`+ dataBoostEnabled?: boolean \| null;`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`export interface BatchUpdateError extends grpc.ServiceError {`