Skip to content

perf(Spanner): Eliminate extend overhead #8865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alkatrivedi wants to merge 4 commits into
base: main
Choose a base branch
from
Open

perf(Spanner): Eliminate extend overhead #8865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35414cd
perf: eliminate extend overhead
alkatrivedi Jul 13, 2026
2900512
tests
alkatrivedi Jul 13, 2026
dcae79f
refactor
alkatrivedi Jul 13, 2026
95afab7
Merge branch 'main' into eliminate-extend
surbhigarg92 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions handwritten/spanner/src/batch-transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import {PreciseDate} from '@google-cloud/precise-date';
import {promisifyAll} from '@google-cloud/promisify';
import * as extend from 'extend';
import {
ExecuteSqlRequest,
ReadCallback,
Expand Down Expand Up @@ -233,11 +232,11 @@ class BatchTransaction extends Snapshot {
'BatchTransaction.createPartitions_',
traceConfig,
span => {
const query = extend({}, config.reqOpts, {
const query = Object.assign({}, config.reqOpts, {
session: this.session.formattedName_,
transaction: {id: this.id},
});
config.reqOpts = extend({}, query);
config.reqOpts = Object.assign({}, query);
const headers = {
[CLOUD_RESOURCE_HEADER]: (this.session.parent as Database)
.formattedName_,
Expand All @@ -253,7 +252,7 @@ class BatchTransaction extends Snapshot {
}

const partitions = resp.partitions.map(partition => {
return extend({}, query, partition);
return Object.assign({}, query, partition);
});

if (resp.transaction) {
Expand Down
73 changes: 35 additions & 38 deletions handwritten/spanner/src/database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ class Database extends common.GrpcServiceObject {
typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;

const reqOpts = {
database: extend(
database: Object.assign(
{
name: this.formattedName_,
},
Expand Down Expand Up @@ -1027,7 +1027,7 @@ class Database extends common.GrpcServiceObject {
typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
const options =
typeof optionsOrCallback === 'object' && optionsOrCallback
? extend({}, optionsOrCallback)
? Object.assign({}, optionsOrCallback)
: ({} as CreateSessionOptions);

const reqOpts: google.spanner.v1.ICreateSessionRequest = {
Expand Down Expand Up @@ -1951,24 +1951,23 @@ class Database extends common.GrpcServiceObject {
? optionsOrCallback
: ({} as GetSessionsOptions);
const gaxOpts = extend(true, {}, options.gaxOptions);
let reqOpts = extend({}, options, {
const reqOpts = Object.assign({}, options, {
Comment thread
alkatrivedi marked this conversation as resolved.
database: this.formattedName_,
});
delete reqOpts.gaxOptions;

// Copy over pageSize and pageToken values from gaxOptions.
// However values set on options take precedence.
if (gaxOpts) {
reqOpts = extend(
{},
{
pageSize: (gaxOpts as GetSessionsOptions).pageSize,
pageToken: (gaxOpts as GetSessionsOptions).pageToken,
},
reqOpts,
);
delete (gaxOpts as GetSessionsOptions).pageSize;
delete (gaxOpts as GetSessionsOptions).pageToken;
const gax = gaxOpts as GetSessionsOptions;
if (gax.pageSize !== undefined) {
reqOpts.pageSize ??= gax.pageSize;
delete gax.pageSize;
}
if (gax.pageToken !== undefined) {
reqOpts.pageToken ??= gax.pageToken;
delete gax.pageToken;
}
}

const headers = this._metadataWithRequestId(
Expand Down Expand Up @@ -2004,7 +2003,7 @@ class Database extends common.GrpcServiceObject {
}
span.end();
const nextQuery = nextPageRequest!
? extend({}, options, nextPageRequest!)
? Object.assign({}, options, nextPageRequest!)
: null;
callback!(err, sessionInstances!, nextQuery, ...args);
},
Expand Down Expand Up @@ -2055,24 +2054,23 @@ class Database extends common.GrpcServiceObject {
getSessionsStream(options: GetSessionsOptions = {}): NodeJS.ReadableStream {
const gaxOpts = extend(true, {}, options.gaxOptions);

let reqOpts = extend({}, options, {
const reqOpts = Object.assign({}, options, {
database: this.formattedName_,
});
delete reqOpts.gaxOptions;

// Copy over pageSize and pageToken values from gaxOptions.
// However values set on options take precedence.
if (gaxOpts) {
reqOpts = extend(
{},
{
pageSize: (gaxOpts as GetSessionsOptions).pageSize,
pageToken: (gaxOpts as GetSessionsOptions).pageToken,
},
reqOpts,
);
delete (gaxOpts as GetSessionsOptions).pageSize;
delete (gaxOpts as GetSessionsOptions).pageToken;
const gax = gaxOpts as GetSessionsOptions;
if (gax.pageSize !== undefined) {
reqOpts.pageSize ??= gax.pageSize;
delete gax.pageSize;
}
if (gax.pageToken !== undefined) {
reqOpts.pageToken ??= gax.pageToken;
delete gax.pageToken;
}
}

return this.requestStream({
Expand Down Expand Up @@ -2476,23 +2474,22 @@ class Database extends common.GrpcServiceObject {
typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
const callback =
typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
let reqOpts = {
const reqOpts = {
parent: this.formattedName_,
};

// Copy over pageSize and pageToken values from gaxOptions.
// However, values set on options take precedence.
if (gaxOpts) {
reqOpts = extend(
{},
{
pageSize: (gaxOpts as GetDatabaseRolesOptions).pageSize,
pageToken: (gaxOpts as GetDatabaseRolesOptions).pageToken,
},
reqOpts,
);
delete (gaxOpts as GetDatabaseRolesOptions).pageSize;
delete (gaxOpts as GetDatabaseRolesOptions).pageToken;
const gax = gaxOpts as GetDatabaseRolesOptions;
if (gax.pageSize !== undefined) {
(reqOpts as any).pageSize ??= gax.pageSize;
delete gax.pageSize;
}
if (gax.pageToken !== undefined) {
(reqOpts as any).pageToken ??= gax.pageToken;
delete gax.pageToken;
}
}

this.request<
Expand All @@ -2508,7 +2505,7 @@ class Database extends common.GrpcServiceObject {
},
(err, roles, nextPageRequest, ...args) => {
const nextQuery = nextPageRequest!
? extend({}, gaxOpts, nextPageRequest!)
? Object.assign({}, gaxOpts, nextPageRequest!)
: null;

callback!(err, roles, nextQuery, ...args);
Expand Down Expand Up @@ -4051,7 +4048,7 @@ class Database extends common.GrpcServiceObject {
};
}
const reqOpts: databaseAdmin.spanner.admin.database.v1.IUpdateDatabaseDdlRequest =
extend(
Object.assign(
{
database: this.formattedName_,
},
Expand Down
Loading
Loading