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

Do not compose create with op #213

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not compose create with op #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 7 deletions lib/client/doc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,6 @@ Doc.prototype._tryCompose = function(op) {
var last = this.pendingOps[this.pendingOps.length - 1];
if (!last) return;

// Compose an op into a create by applying it. This effectively makes the op
// invisible, as if the document were created including the op originally
if (last.create && op.op) {
last.create.data = this.type.apply(last.create.data, op.op);
return last;
}

// Compose two ops into a single op if supported by the type. Types that
// support compose must be able to compose any two ops together
if (last.op && op.op && this.type.compose) {
Expand Down
13 changes: 6 additions & 7 deletions test/client/submit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,25 +119,24 @@ describe('client submit', function() {

it('ops submitted sync get composed', function(done) {
var doc = this.backend.connect().get('dogs', 'fido');
doc.create({age: 3});
doc.submitOp({p: ['age'], na: 2});
doc.create({age: 5});
doc.submitOp({p: ['age'], na: 2}, function(err) {
if (err) return done(err);
expect(doc.data).eql({age: 7});
// Version is 1 instead of 3, because the create and ops got composed
expect(doc.version).eql(1);
// create DOES NOT get composed
expect(doc.version).eql(2);
doc.submitOp({p: ['age'], na: 2});
doc.submitOp({p: ['age'], na: 2}, function(err) {
if (err) return done(err);
expect(doc.data).eql({age: 11});
// Ops get composed
expect(doc.version).eql(2);
// Version is 3 instead of 4, because the ops got composed
expect(doc.version).eql(3);
doc.submitOp({p: ['age'], na: 2});
doc.del(function(err) {
if (err) return done(err);
expect(doc.data).eql(undefined);
// del DOES NOT get composed
expect(doc.version).eql(4);
expect(doc.version).eql(5);
done();
});
});
Expand Down