8000 use batched methods by jsteemann · Pull Request #10461 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

use batched methods #10461

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

Merged
merged 6 commits into from
Nov 20, 2019
Merged

use batched methods #10461

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
9cd6d63
use batched methods
jsteemann Nov 18, 2019
980f007
fix jslint error
jsteemann Nov 19, 2019
dbbb5ef
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/spe…
jsteemann Nov 19, 2019
5c2ef83
fix yet another test issue
jsteemann Nov 19, 2019
9b560ff
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/spe…
jsteemann Nov 20, 2019
4f8ac84
finally...
jsteemann Nov 20, 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
13 changes: 11 additions & 2 deletions tests/js/server/dump/dump-mmfiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,17 @@ function dumpTestSuite () {
assertEqual(100000, c.count());

// test all documents
for (var i = 0; i < 100000; ++i) {
var doc = c.document("test" + i);
let docs = [], results = [];
for (let i = 0; i < 100000; ++i) {
docs.push("test" + i);
if (docs.length === 10000) {
results = results.concat(c.document(docs));
docs = [];
}
}

for (let i = 0; i < 100000; ++i) {
let doc = results[i];
assertEqual(i, doc.value1);
assertEqual("this is a test", doc.value2);
assertEqual("test" + i, doc.value3);
Expand Down
21 changes: 14 additions & 7 deletions tests/js/server/dump/dump-multiple-rocksdb.js
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,17 @@ function dumpTestSuite () {
assertEqual(100000, c.count());

// test all documents
for (var i = 0; i < 100000; ++i) {
var doc = c.document("test" + i);
let docs = [], results = [];
for (let i = 0; i < 100000; ++i) {
docs.push("test" + i);
if (docs.length === 10000) {
results = results.concat(c.document(docs));
docs = [];
}
}

for (let i = 0; i < 100000; ++i) {
let doc = results[i];
assertEqual(i, doc.value1);
assertEqual("this is a test", doc.value2);
assertEqual("test" + i, doc.value3);
Expand Down Expand Up @@ -157,13 +166,11 @@ function dumpTestSuite () {
assertEqual("primary", c.getIndexes()[0].type);
assertEqual(9000, c.count());

var i;
for (i = 0; i < 10000; ++i) {
for (let i = 0; i < 10000; ++i) {
if (i % 10 === 0) {
assertFalse(c.exists("test" + i));
}
else {
var doc = c.document("test" + i);
} else {
let doc = c.document("test" + i);
assertEqual(i, doc.value1);

if (i < 1000) {
Expand Down
22 changes: 3 additions & 19 deletions tests/js/server/dump/dump-rocksdb-cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@ function dumpTestSuite () {

return {

////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////

setUp : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief tear down
////////////////////////////////////////////////////////////////////////////////

tearDown : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief test the empty collection
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -160,13 +146,11 @@ function dumpTestSuite () {
assertEqual("primary", c.getIndexes()[0].type);
assertEqual(9000, c.count());

var i;
for (i = 0; i < 10000; ++i) {
for (let i = 0; i < 10000; ++i) {
if (i % 10 === 0) {
assertFalse(c.exists("test" + i));
}
else {
var doc = c.document("test" + i);
} else {
let doc = c.document("test" + i);
assertEqual(i, doc.value1);

if (i < 1000) {
Expand Down
37 changes: 15 additions & 22 deletions tests/js/server/dump/dump-rocksdb-modified.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@ function dumpTestSuite () {

return {

////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////

setUp : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief tear down
////////////////////////////////////////////////////////////////////////////////

tearDown : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief test the empty collection
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -87,8 +73,18 @@ function dumpTestSuite () {
assertEqual(100000, c.count());

// test all documents
for (var i = 1; i < 200000; i += 2) {
var doc = c.document("test" + i);
let docs = [], results = [];
for (let i = 1; i < 200000; i += 2) {
docs.push("test" + i);
if (docs.length === 10000) {
results = results.concat(c.document(docs));
docs = [];
}
}

let j = 0;
for (let i = 1; i < 200000; i += 2) {
let doc = results[j++];
assertEqual(i, doc.value1);
assertEqual("this is a test", doc.value2);
assertEqual("test" + i, doc.value3);
Expand Down Expand Up @@ -156,12 +152,10 @@ function dumpTestSuite () {
assertEqual("primary", c.getIndexes()[0].type);
assertEqual(8001, c.count());

var i;
for (i = 0; i < 10000; ++i) {
for (let i = 0; i < 10000; ++i) {
if (i % 5 === 0) {
assertFalse(c.exists("test" + i));
}
else {
} else {
let doc = c.document("test" + i);
assertEqual(i, doc.value1);

Expand Down Expand Up @@ -367,8 +361,7 @@ function dumpTestSuite () {
assertEqual("this is a test", doc.value2);
if (i % 2 === 0) {
assertEqual(i, doc.value3);
}
else {
} else {
assertEqual("test" + i, doc.value3);
}
}
Expand Down
49 changes: 26 additions & 23 deletions tests/js/server/dump/dump-rocksdb-modify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@ function dumpTestSuite () {

return {

////////////////////////////////////////////////////////////////////////////////
/// @brief set up
////////////////////////////////////////////////////////////////////////////////

setUp : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief tear down
////////////////////////////////////////////////////////////////////////////////

tearDown : function () {
},

////////////////////////////////////////////////////////////////////////////////
/// @brief test the empty collection
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -83,30 +69,45 @@ function dumpTestSuite () {

assertEqual(100000, c.count());

// remove half of the documents
let l = [];
for (let i = 0; i < 100000; i+=2) {
var doc = c.document("test" + i);
let l = [], results = [];
for (let i = 0; i < 100000; i += 2) {
l.push("test" + i);
if (l.length === 10000) {
results = results.concat(c.document(l));
l = [];
}
}

let j = 0;
for (let i = 0; i < 100000; i += 2) {
let doc = results[j++];
assertEqual(i, doc.value1);
assertEqual("this is a test", doc.value2);
assertEqual("test" + i, doc.value3);
}

// remove half of the documents
j = 0;
for (let i = 0; i < 100000; i += 2) {
let doc = results[j++];
l.push(doc._key);
if (l.length === 10000) {
c.remove(l);
l = [];
}
}

// add another bunch of documents
l = [];
for (let i = 100001; i < 200000; i+=2) {
l.push({_key: 'test'+i ,
for (let i = 100001; i < 200000; i += 2) {
l.push({_key: 'test' + i ,
abc: i,
value1: i,
value2: "this is a test",
value3: "test" + i
});
if (l.length === 10000) {
c.save(l);
c.insert(l);
l = [];
}
}
Expand Down Expand Up @@ -183,9 +184,11 @@ function dumpTestSuite () {
assertEqual(9000, c.count());

c.ensureIndex({type: "hash", fields: ["abc"]});
for (var i = 5; i < 10000; i+=10) {
c.remove("test" + i);
let docs = [];
for (let i = 5; i < 10000; i += 10) {
docs.push("test" + i);
}
c.remove(docs);
c.save({ _key: "test" + 999999, value: 999999 });
},

Expand Down
20 changes: 13 additions & 7 deletions tests/js/server/dump/dump-rocksdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,16 @@ function dumpTestSuite () {
assertEqual(100000, c.count());

// test all documents
for (var i = 0; i < 100000; ++i) {
var doc = c.document("test" + i);
let docs = [], results = [];
for (let i = 0; i < 100000; ++i) {
docs.push("test" + i);
if (docs.length === 10000) {
results = results.concat(c.document(docs));
docs = [];
}
}
for (let i = 0; i < 100000; ++i) {
let doc = results[i];
assertEqual(i, doc.value1);
assertEqual("this is a test", doc.value2);
assertEqual("test" + i, doc.value3);
Expand Down Expand Up @@ -158,13 +166,11 @@ function dumpTestSuite () {
assertEqual("primary", c.getIndexes()[0].type);
assertEqual(9000, c.count());

var i;
for (i = 0; i < 10000; ++i) {
for (let i = 0; i < 10000; ++i) {
if (i % 10 === 0) {
assertFalse(c.exists("test" + i));
}
else {
var doc = c.document("test" + i);
} else {
let doc = c.document("test" + i);
assertEqual(i, doc.value1);

if (i < 1000) {
Expand Down
0