Skip to content
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

Jump to bottom

feat: Nodejs transaction redesign feature branch #1235

Merged
merged 6 commits into from
Feb 26, 2024
+1,871 −147
Merged

feat: Nodejs transaction redesign feature branch #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7284d99
refactor: Break transaction.run into smaller pieces for use with asyn…
danieljbruce Nov 17, 2023
a603e63
refactor: Move commit logic and add tests that prepare for transactio…
danieljbruce Nov 22, 2023
d5704f5
feat: Begin transactions before each transaction read/write (#1205)
danieljbruce Feb 12, 2024
d96c0ab
Merge branch 'main' into nodejs-transaction-redesign-feature-branch
danieljbruce Feb 12, 2024
5565434
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Feb 12, 2024
b9bc954
Merge branch 'nodejs-transaction-redesign-feature-branch' of https://…
gcf-owl-bot[bot] Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@
"dependencies": {
"@google-cloud/promisify": "^4.0.0",
"arrify": "^2.0.1",
"async-mutex": "^0.4.0",
"concat-stream": "^2.0.0",
"extend": "^3.0.2",
"google-gax": "^4.0.5",
Expand Down
21 changes: 17 additions & 4 deletions src/request.ts
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
KeyProto,
ResponseResult,
Entities,
ValueProto,

Check warning on line 47 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

'ValueProto' is defined but never used

Check warning on line 47 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

'ValueProto' is defined but never used
} from './entity';
import {
Query,
Expand Down Expand Up @@ -79,7 +79,7 @@
* @class
*/
class DatastoreRequest {
id: string | undefined;
id: string | undefined | Uint8Array | null;
requests_:
| Entity
| {
Expand Down Expand Up @@ -546,6 +546,19 @@
);
}

/**
* Datastore allows you to run aggregate queries by supplying aggregate fields
* which will determine the type of aggregation that is performed.
*
* The query is run, and the results are returned in the second argument of
* the callback provided.
*
* @param {AggregateQuery} query AggregateQuery object.
* @param {RunQueryOptions} options Optional configuration
* @param {function} [callback] The callback function. If omitted, a promise is
* returned.
*
**/
runAggregationQuery(
query: AggregateQuery,
options?: RunQueryOptions
Expand Down Expand Up @@ -596,9 +609,9 @@
const results = res.batch.aggregationResults;
const finalResults = results
.map(
(aggregationResult: any) => aggregationResult.aggregateProperties

Check warning on line 612 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type

Check warning on line 612 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type
)
.map((aggregateProperties: any) =>

Check warning on line 614 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type

Check warning on line 614 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type
Object.fromEntries(
new Map(
Object.keys(aggregateProperties).map(key => [
Expand Down Expand Up @@ -933,7 +946,7 @@
callback?: SaveCallback
): void | Promise<CommitResponse> {
const transaction = this.datastore.transaction();
transaction.run(async (err: any) => {

Check warning on line 949 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type

Check warning on line 949 in src/request.ts

View workflow job for this annotation

GitHub Actions / lint 

Unexpected any. Specify a different type
if (err) {
try {
await transaction.rollback();
Expand Down Expand Up @@ -1157,7 +1170,7 @@
partitionId?: google.datastore.v1.IPartitionId | null;
readOptions?: {
readConsistency?: number;
transaction?: string;
transaction?: string | Uint8Array | null;
readTime?: ITimestamp;
};
}
Expand All @@ -1166,9 +1179,9 @@
keys?: Entity;
transactionOptions?: {
readOnly?: {};
readWrite?: {previousTransaction?: string};
readWrite?: {previousTransaction?: string | Uint8Array | null};
} | null;
transaction?: string | null;
transaction?: string | null | Uint8Array;
mode?: string;
query?: QueryProto;
filter?: string;
Expand Down