Batch transaction (#5849)
* Batch transaction boilerplate * Refactoring transaction boilerplate * Independent sessions test * Transactions - partial * Missing only one test * All tests passing for mongo db * Tests on Travis * Transactions on postgres * Fix travis to restart mongodb * Remove mongodb service and keep only mongodb runner * MongoDB service back * Initialize replicaset * Remove mongodb runner again * Again only with mongodb-runner and removing cache * Trying with pretest and posttest * WiredTiger * Pretest and posttest again * Removing inexistent scripts * wiredTiger * One more attempt * Trying another way to run mongodb-runner * Fixing tests * Include batch transaction on direct access * Add tests to direct access
This commit is contained in:
committed by
GitHub
parent
fe18fe0f61
commit
8b97c1380b
@@ -1223,7 +1223,12 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
}
|
||||
|
||||
// TODO: remove the mongo format dependency in the return value
|
||||
createObject(className: string, schema: SchemaType, object: any) {
|
||||
createObject(
|
||||
className: string,
|
||||
schema: SchemaType,
|
||||
object: any,
|
||||
transactionalSession: ?any
|
||||
) {
|
||||
debug('createObject', className, object);
|
||||
let columnsArray = [];
|
||||
const valuesArray = [];
|
||||
@@ -1351,7 +1356,10 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
const qs = `INSERT INTO $1:name (${columnsPattern}) VALUES (${valuesPattern})`;
|
||||
const values = [className, ...columnsArray, ...valuesArray];
|
||||
debug(qs, values);
|
||||
return this._client
|
||||
const promise = (transactionalSession
|
||||
? transactionalSession.t
|
||||
: this._client
|
||||
)
|
||||
.none(qs, values)
|
||||
.then(() => ({ ops: [object] }))
|
||||
.catch(error => {
|
||||
@@ -1371,6 +1379,10 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
}
|
||||
throw error;
|
||||
});
|
||||
if (transactionalSession) {
|
||||
transactionalSession.batch.push(promise);
|
||||
}
|
||||
return promise;
|
||||
}
|
||||
|
||||
// Remove all objects that match the given Parse Query.
|
||||
@@ -1379,7 +1391,8 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
deleteObjectsByQuery(
|
||||
className: string,
|
||||
schema: SchemaType,
|
||||
query: QueryType
|
||||
query: QueryType,
|
||||
transactionalSession: ?any
|
||||
) {
|
||||
debug('deleteObjectsByQuery', className, query);
|
||||
const values = [className];
|
||||
@@ -1391,7 +1404,10 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
}
|
||||
const qs = `WITH deleted AS (DELETE FROM $1:name WHERE ${where.pattern} RETURNING *) SELECT count(*) FROM deleted`;
|
||||
debug(qs, values);
|
||||
return this._client
|
||||
const promise = (transactionalSession
|
||||
? transactionalSession.t
|
||||
: this._client
|
||||
)
|
||||
.one(qs, values, a => +a.count)
|
||||
.then(count => {
|
||||
if (count === 0) {
|
||||
@@ -1409,18 +1425,27 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
}
|
||||
// ELSE: Don't delete anything if doesn't exist
|
||||
});
|
||||
if (transactionalSession) {
|
||||
transactionalSession.batch.push(promise);
|
||||
}
|
||||
return promise;
|
||||
}
|
||||
// Return value not currently well specified.
|
||||
findOneAndUpdate(
|
||||
className: string,
|
||||
schema: SchemaType,
|
||||
query: QueryType,
|
||||
update: any
|
||||
update: any,
|
||||
transactionalSession: ?any
|
||||
): Promise<any> {
|
||||
debug('findOneAndUpdate', className, query, update);
|
||||
return this.updateObjectsByQuery(className, schema, query, update).then(
|
||||
val => val[0]
|
||||
);
|
||||
return this.updateObjectsByQuery(
|
||||
className,
|
||||
schema,
|
||||
query,
|
||||
update,
|
||||
transactionalSession
|
||||
).then(val => val[0]);
|
||||
}
|
||||
|
||||
// Apply the update to all objects that match the given Parse Query.
|
||||
@@ -1428,7 +1453,8 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
className: string,
|
||||
schema: SchemaType,
|
||||
query: QueryType,
|
||||
update: any
|
||||
update: any,
|
||||
transactionalSession: ?any
|
||||
): Promise<[any]> {
|
||||
debug('updateObjectsByQuery', className, query, update);
|
||||
const updatePatterns = [];
|
||||
@@ -1685,7 +1711,14 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
where.pattern.length > 0 ? `WHERE ${where.pattern}` : '';
|
||||
const qs = `UPDATE $1:name SET ${updatePatterns.join()} ${whereClause} RETURNING *`;
|
||||
debug('update: ', qs, values);
|
||||
return this._client.any(qs, values);
|
||||
const promise = (transactionalSession
|
||||
? transactionalSession.t
|
||||
: this._client
|
||||
).any(qs, values);
|
||||
if (transactionalSession) {
|
||||
transactionalSession.batch.push(promise);
|
||||
}
|
||||
return promise;
|
||||
}
|
||||
|
||||
// Hopefully, we can get rid of this. It's only used for config and hooks.
|
||||
@@ -1693,16 +1726,28 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
className: string,
|
||||
schema: SchemaType,
|
||||
query: QueryType,
|
||||
update: any
|
||||
update: any,
|
||||
transactionalSession: ?any
|
||||
) {
|
||||
debug('upsertOneObject', { className, query, update });
|
||||
const createValue = Object.assign({}, query, update);
|
||||
return this.createObject(className, schema, createValue).catch(error => {
|
||||
return this.createObject(
|
||||
className,
|
||||
schema,
|
||||
createValue,
|
||||
transactionalSession
|
||||
).catch(error => {
|
||||
// ignore duplicate value errors as it's upsert
|
||||
if (error.code !== Parse.Error.DUPLICATE_VALUE) {
|
||||
throw error;
|
||||
}
|
||||
return this.findOneAndUpdate(className, schema, query, update);
|
||||
return this.findOneAndUpdate(
|
||||
className,
|
||||
schema,
|
||||
query,
|
||||
update,
|
||||
transactionalSession
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2323,6 +2368,37 @@ export class PostgresStorageAdapter implements StorageAdapter {
|
||||
updateEstimatedCount(className: string) {
|
||||
return this._client.none('ANALYZE $1:name', [className]);
|
||||
}
|
||||
|
||||
createTransactionalSession(): Promise<any> {
|
||||
return new Promise(resolve => {
|
||||
const transactionalSession = {};
|
||||
transactionalSession.result = this._client.tx(t => {
|
||||
transactionalSession.t = t;
|
||||
transactionalSession.promise = new Promise(resolve => {
|
||||
transactionalSession.resolve = resolve;
|
||||
});
|
||||
transactionalSession.batch = [];
|
||||
resolve(transactionalSession);
|
||||
return transactionalSession.promise;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
commitTransactionalSession(transactionalSession: any): Promise<void> {
|
||||
transactionalSession.resolve(
|
||||
transactionalSession.t.batch(transactionalSession.batch)
|
||||
);
|
||||
return transactionalSession.result;
|
||||
}
|
||||
|
||||
abortTransactionalSession(transactionalSession: any): Promise<void> {
|
||||
const result = transactionalSession.result.catch();
|
||||
transactionalSession.batch.push(Promise.reject());
|
||||
transactionalSession.resolve(
|
||||
transactionalSession.t.batch(transactionalSession.batch)
|
||||
);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
function convertPolygonToSQL(polygon) {
|
||||
|
||||
Reference in New Issue
Block a user