Skip to content

Generate new event id rather than deriving it #137

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

Closed
tpaulshippy wants to merge 2 commits into from
Closed

Generate new event id rather than deriving it #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8846a1
generate new event id rather than deriving it
Feb 19, 2019
30c615a
update mongo methods to non-deprecated versions
Feb 19, 2019
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
24 changes: 12 additions & 12 deletions lib/databases/mongodb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,18 @@ _.extend(Mongo.prototype, {
var self = this;
async.parallel([
function (callback) {
self.events.remove({}, callback);
self.events.deleteOne({}, callback);
},
function (callback) {
self.snapshots.remove({}, callback);
self.snapshots.deleteOne({}, callback);
},
function (callback) {
self.transactions.remove({}, callback);
self.transactions.deleteOne({}, callback);
},
function (callback) {
if (!self.positions)
return callback(null);
self.positions.remove({}, callback);
self.positions.deleteOne({}, callback);
}
], function (err) {
if (err) {
Expand Down Expand Up @@ -351,7 +351,7 @@ _.extend(Mongo.prototype, {
}

if (events.length === 1) {
return self.events.insert(events, callback);
return self.events.insertOne(events[0], callback);
}

var tx = {
Expand All @@ -362,14 +362,14 @@ _.extend(Mongo.prototype, {
context: events[0].context
};

self.transactions.insert(tx, function (err) {
self.transactions.insertOne(tx, function (err) {
if (err) {
debug(err);
if (callback) callback(err);
return;
}

self.events.insert(events, function (err) {
self.events.insertMany(events, function (err) {
if (err) {
debug(err);
if (callback) callback(err);
Expand Down Expand Up @@ -546,7 +546,7 @@ _.extend(Mongo.prototype, {

setEventToDispatched: function (id, callback) {
var updateCommand = { '$unset' : { 'dispatched': null } };
this.events.update({'_id' : id}, updateCommand, callback);
this.events.updateOne({'_id' : id}, updateCommand, callback);
},

addSnapshot: function(snap, callback) {
Expand All @@ -558,7 +558,7 @@ _.extend(Mongo.prototype, {
}

snap._id = snap.id;
this.snapshots.insert(snap, callback);
this.snapshots.insertOne(snap, callback);
},

cleanSnapshots: function (query, callback) {
Expand Down Expand Up @@ -634,7 +634,7 @@ _.extend(Mongo.prototype, {
}

// the following is usually unnecessary
this.transactions.remove(findStatement, function (err) {
this.transactions.deleteMany(findStatement, function (err) {
if (err) {
debug(err);
}
Expand Down Expand Up @@ -677,7 +677,7 @@ _.extend(Mongo.prototype, {
return clb(null);
}

self.transactions.remove({ _id: tx._id }, clb);
self.transactions.deleteOne({ _id: tx._id }, clb);
});
}, function (err) {
if (err) {
Expand Down Expand Up @@ -742,7 +742,7 @@ _.extend(Mongo.prototype, {

var missingEvts = tx.events.slice(tx.events.length - lastEvt.restInCommitStream);

self.events.insert(missingEvts, function (err) {
self.events.insertMany(missingEvts, function (err) {
if (err) {
debug(err);
return callback(err);
Expand Down
6 changes: 5 additions & 1 deletion lib/eventstore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,12 @@ _.extend(Eventstore.prototype, {
return callback(err)

for (var i = 0, len = uncommittedEvents.length; i < len; i++) {
var evtId;
self.getNewId(function (_, generated) {
evtId = generated;
});
event = uncommittedEvents[i];
event.id = id + i.toString();
event.id = evtId;
event.commitId = id;
event.commitSequence = i;
event.restInCommitStream = len - 1 - i;
Expand Down