Skip to content

Commit 14f5065

Browse files
alkatrivedialkatrivedi
committed
refactor
1 parent bdee99a commit 14f5065

File tree

8 files changed

+101
-130
lines changed

8 files changed

+101
-130
lines changed

‎src/database.ts‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,9 +2217,6 @@ class Database extends common.GrpcServiceObject {
22172217
? (optionsOrCallback as GetTransactionOptions)
22182218
: {};
22192219

2220-
// const defaultTransactionOptions =
2221-
// this._getSpanner().defaultTransactionOptions;
2222-
22232220
return startTrace('Database.getTransaction', this._traceConfig, span => {
22242221
this.pool_.getSession((err, session, transaction) => {
22252222
if (options.requestOptions) {
@@ -2229,21 +2226,6 @@ class Database extends common.GrpcServiceObject {
22292226
);
22302227
}
22312228
transaction?.setTransactionOptions(options);
2232-
// if (options.optimisticLock) {
2233-
// transaction!.useOptimisticLock();
2234-
// }
2235-
// if (options.excludeTxnFromChangeStreams) {
2236-
// transaction!.excludeTxnFromChangeStreams();
2237-
// }
2238-
2239-
// if (options.isolationLevel) {
2240-
// transaction!.setIsolationLevel(options.isolationLevel);
2241-
// }
2242-
// else if (defaultTransactionOptions) {
2243-
// transaction!.setIsolationLevel(
2244-
// defaultTransactionOptions.isolationLevel
2245-
// );
2246-
// }
22472229

22482230
if (!err) {
22492231
span.addEvent('Using Session', {'session.id': session?.id});
@@ -3269,9 +3251,6 @@ class Database extends common.GrpcServiceObject {
32693251
? (optionsOrRunFn as RunTransactionOptions)
32703252
: {};
32713253

3272-
// const defaultTransactionOptions =
3273-
// this._getSpanner().defaultTransactionOptions;
3274-
32753254
startTrace('Database.runTransaction', this._traceConfig, span => {
32763255
this.pool_.getSession((err, session?, transaction?) => {
32773256
if (err) {
@@ -3295,20 +3274,6 @@ class Database extends common.GrpcServiceObject {
32953274

32963275
transaction!._observabilityOptions = this._observabilityOptions;
32973276
transaction!.setTransactionOptions(options);
3298-
// if (options.optimisticLock) {
3299-
// transaction!.useOptimisticLock();
3300-
// }
3301-
// if (options.excludeTxnFromChangeStreams) {
3302-
// transaction!.excludeTxnFromChangeStreams();
3303-
// }
3304-
// if (options.isolationLevel) {
3305-
// transaction!.setIsolationLevel(options.isolationLevel);
3306-
// }
3307-
// else if (defaultTransactionOptions) {
3308-
// transaction!.setIsolationLevel(
3309-
// defaultTransactionOptions.isolationLevel
3310-
// );
3311-
// }
33123277

33133278
const release = () => {
33143279
this.pool_.release(session!);
@@ -3419,9 +3384,6 @@ class Database extends common.GrpcServiceObject {
34193384
? (optionsOrRunFn as RunTransactionOptions)
34203385
: {};
34213386

3422-
// const defaultTransactionOptions =
3423-
// this._getSpanner().defaultTransactionOptions;
3424-
34253387
let sessionId = '';
34263388
const getSession = this.pool_.getSession.bind(this.pool_);
34273389
return startTrace(
@@ -3439,20 +3401,6 @@ class Database extends common.GrpcServiceObject {
34393401
options.requestOptions
34403402
);
34413403
transaction!.setTransactionOptions(options);
3442-
// if (options.optimisticLock) {
3443-
// transaction.useOptimisticLock();
3444-
// }
3445-
// if (options.excludeTxnFromChangeStreams) {
3446-
// transaction.excludeTxnFromChangeStreams();
3447-
// }
3448-
// if (options.isolationLevel) {
3449-
// transaction!.setIsolationLevel(options.isolationLevel);
3450-
// }
3451-
// else if (defaultTransactionOptions) {
3452-
// transaction!.setIsolationLevel(
3453-
// defaultTransactionOptions.isolationLevel
3454-
// );
3455-
// }
34563404
sessionId = session?.id;
34573405
span.addEvent('Using Session', {'session.id': sessionId});
34583406
const runner = new AsyncTransactionRunner<T>(
@@ -3728,16 +3676,6 @@ class Database extends common.GrpcServiceObject {
37283676
this._releaseOnEnd(session!, transaction!, span);
37293677
try {
37303678
transaction!.setTransactionOptions(options);
3731-
// if (options.defaultTransactionOptions) {
3732-
// transaction!.setIsolationLevel(
3733-
// options.defaultTransactionOptions.isolationLevel
3734-
// );
3735-
// }
3736-
// else if (defaultIsolationLevelOptions) {
3737-
// transaction!.setIsolationLevel(
3738-
// defaultIsolationLevelOptions.isolationLevel
3739-
// );
3740-
// }
37413679
transaction?.setQueuedMutations(mutations.proto());
37423680
return transaction?.commit(options, (err, resp) => {
37433681
if (err) {

‎src/index.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,7 @@ class Spanner extends GrpcService {
248248
commonHeaders_: {[k: string]: string};
249249
routeToLeaderEnabled = true;
250250
directedReadOptions: google.spanner.v1.IDirectedReadOptions | null;
251-
// defaultTransactionOptions: RunTransactionOptions;
252251
defaultReadWriteOptionsProto: google.spanner.v1.ITransactionOptions;
253-
// defaultReadWriteTransactionProto: google.spanner.v1.ITransactionOptions;
254252
_observabilityOptions: ObservabilityOptions | undefined;
255253

256254
/**
@@ -302,8 +300,6 @@ class Spanner extends GrpcService {
302300
convertDefaultReadWriteOptionsToProto(
303301
defaultReadWriteTxnOptions: any
304302
): google.spanner.v1.TransactionOptions {
305-
// const ReadWriteTxnOptions: google.spanner.v1.TransactionOptions;
306-
307303
const ReadWriteTxnOptions = defaultReadWriteTxnOptions
308304
? defaultReadWriteTxnOptions
309305
: {
@@ -350,13 +346,6 @@ class Spanner extends GrpcService {
350346
: null;
351347
delete options.directedReadOptions;
352348

353-
// const defaultTransactionOptions = options.defaultTransactionOptions
354-
// ? options.defaultTransactionOptions
355-
// : {isolationLevel: google.spanner.v1.TransactionOptions.IsolationLevel.ISOLATION_LEVEL_UNSPECIFIED};
356-
// delete options.defaultTransactionOptions;
357-
358-
// defaultTransactionOptionsProto: google.spanner.v1.TransactionOptions = convertDefaultTxnOptionsToProto(options.defaultTransactionOptions);
359-
360349
const emulatorHost = Spanner.getSpannerEmulatorHost();
361350
if (
362351
emulatorHost &&
@@ -403,7 +392,6 @@ class Spanner extends GrpcService {
403392
this.projectIdReplaced_ = false;
404393
this.projectFormattedName_ = 'projects/' + this.projectId;
405394
this.directedReadOptions = directedReadOptions;
406-
// this.defaultTransactionOptions = defaultTransactionOptions;
407395
this.defaultReadWriteOptionsProto = defaultProtoReadWriteOption;
408396
this._observabilityOptions = options.observabilityOptions;
409397
this.commonHeaders_ = getCommonHeaders(

‎src/table.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
setSpanError,
3838
traceConfig,
3939
} from './instrument';
40+
import {protos} from '.';
4041

4142
export type Key = string | string[];
4243

@@ -53,6 +54,7 @@ export type DropTableCallback = UpdateSchemaCallback;
5354
interface MutateRowsOptions extends CommitOptions {
5455
requestOptions?: Omit<IRequestOptions, 'requestTag'>;
5556
excludeTxnFromChangeStreams?: boolean;
57+
isolationLevel?: protos.google.spanner.v1.TransactionOptions.IsolationLevel;
5658
}
5759

5860
export type DeleteRowsCallback = CommitCallback;
@@ -1100,10 +1102,17 @@ class Table {
11001102
? options.excludeTxnFromChangeStreams
11011103
: false;
11021104

1105+
const isolationLevel =
1106+
'isolationLevel' in options
1107+
? options.isolationLevel
1108+
: protos.google.spanner.v1.TransactionOptions.IsolationLevel
1109+
.ISOLATION_LEVEL_UNSPECIFIED;
1110+
11031111
this.database.runTransaction(
11041112
{
11051113
requestOptions: requestOptions,
11061114
excludeTxnFromChangeStreams: excludeTxnFromChangeStreams,
1115+
isolationLevel: isolationLevel,
11071116
},
11081117
(err, transaction) => {
11091118
if (err) {

‎src/transaction-runner.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,6 @@ export abstract class Runner<T> {
205205
(this.session.parent as Database).queryOptions_
206206
);
207207
transaction.setTransactionOptions(this.options);
208-
// if (this.options.optimisticLock) {
209-
// transaction.useOptimisticLock();
210-
// }
211-
// if (this.options.excludeTxnFromChangeStreams) {
212-
// transaction.excludeTxnFromChangeStreams();
213-
// }
214208
if (this.attempts > 0) {
215209
await transaction.begin();
216210
}

‎src/transaction.ts‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,6 @@ export class Snapshot extends EventEmitter {
427427
...this._getSpanner().defaultReadWriteOptionsProto,
428428
...this._options,
429429
};
430-
// const options = this._options;
431-
// const options = {
432-
// ...this._getSpanner().defaultTransactionOptionsProto,
433-
// ...this._options
434-
// }
435430
const reqOpts: spannerClient.spanner.v1.IBeginTransactionRequest = {
436431
session,
437432
options,
@@ -1650,10 +1645,6 @@ export class Snapshot extends EventEmitter {
16501645
protected _getSpanner(): Spanner {
16511646
return this.session.parent.parent.parent as Spanner;
16521647
}
1653-
1654-
// protected _getDatabase(): Database {
1655-
// return this.session.parent as Database;
1656-
// }
16571648
}
16581649

16591650
/*! Developer Documentation
@@ -1852,7 +1843,7 @@ export class Transaction extends Dml {
18521843
}
18531844

18541845
setTransactionOptions(options: any) {
1855-
if (options.optimisticLock || options.readLockMode) {
1846+
if (options.optimisticLock) {
18561847
this._options.readWrite!.readLockMode = ReadLockMode.OPTIMISTIC;
18571848
}
18581849
if (options.excludeTxnFromChangeStreams) {
@@ -2187,7 +2178,6 @@ export class Transaction extends Dml {
21872178
if (this.id) {
21882179
reqOpts.transactionId = this.id as Uint8Array;
21892180
} else if (!this._useInRunner) {
2190-
// reqOpts.singleUseTransaction = this._options;
21912181
reqOpts.singleUseTransaction = {
21922182
...this._getSpanner().defaultReadWriteOptionsProto,
21932183
...this._options,
@@ -2719,39 +2709,6 @@ export class Transaction extends Dml {
27192709
useInRunner(): void {
27202710
this._useInRunner = true;
27212711
}
2722-
2723-
/**
2724-
* Use optimistic concurrency control for the transaction.
2725-
*
2726-
* In this concurrency mode, operations during the execution phase, i.e.,
2727-
* reads and queries, are performed without acquiring locks, and transactional
2728-
* consistency is ensured by running a validation process in the commit phase
2729-
* (when any needed locks are acquired). The validation process succeeds only
2730-
* if there are no conflicting committed transactions (that committed
2731-
* mutations to the read data at a commit timestamp after the read timestamp).
2732-
*/
2733-
// useOptimisticLock(): void {
2734-
// this._options.readWrite!.readLockMode = ReadLockMode.OPTIMISTIC;
2735-
// }
2736-
2737-
/**
2738-
* Use option excludeTxnFromChangeStreams to exclude read/write transactions
2739-
* from being tracked in change streams.
2740-
*
2741-
* Enabling this options to true will effectively disable change stream tracking
2742-
* for a specified transaction, allowing read/write transaction to operate without being
2743-
* included in change streams.
2744-
*/
2745-
// excludeTxnFromChangeStreams(): void {
2746-
// this._options.excludeTxnFromChangeStreams = true;
2747-
// }
2748-
2749-
/**
2750-
* Use option isolationLevel to add the isolation level in the transaction.
2751-
*/
2752-
// setIsolationLevel(isolationLevel: any): void {
2753-
// this._options.isolationLevel = isolationLevel;
2754-
// }
27552712
}
27562713

27572714
/*! Developer Documentation

‎test/database.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ class FakeTransaction extends EventEmitter {
177177
setQueuedMutations(mutation) {
178178
this._queuedMutations = mutation;
179179
}
180-
// setIsolationLevel(isolationLevel) {
181-
// this._options.isolationLevel = isolationLevel;
182-
// }
183180
setTransactionOptions(options: any) {
184181
if (options.optimisticLock) {
185182
this._options.readWrite!.readLockMode =
@@ -3140,8 +3137,6 @@ describe('Database', () => {
31403137
callback(null, SESSION, TRANSACTION);
31413138
}
31423139
);
3143-
3144-
// (sandbox.stub(TRANSACTION, 'setTransactionOptions') as sinon.SinonStub)
31453140
});
31463141

31473142
it('should return any errors getting a session', done => {

0 commit comments

Comments
 (0)