Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed tests

This commit is contained in:
Jan Steemann 2014-06-13 20:18:55 +02:00
parent 5a53dc9f44
commit 713b69f1f5
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/server/tests/shell-compaction-noncluster.js
View File

@ -591,6 +591,7 @@ function CompactionSuite () {
c1.remove("test" + i); c1.remove("test" + i);
} }
internal.flushWal(true, true);
// this will create a barrier that will block compaction // this will create a barrier that will block compaction
var doc = c1.document("test1"); var doc = c1.document("test1");
@ -599,9 +600,9 @@ function CompactionSuite () {
var fig = c1.figures(); var fig = c1.figures();
assertEqual(n / 2, c1.count()); assertEqual(n / 2, c1.count());
assertEqual(n / 2, fig["alive"]["count"]); assertEqual(n / 2, fig["alive"]["count"]);
assertEqual(n / 2, fig["dead"]["count"]); assertEqual(0, fig["dead"]["count"]);
assertTrue(0 < fig["dead"]["size"]); assertEqual(0, fig["dead"]["size"]);
assertTrue(0 < fig["dead"]["deletion"]); assertTrue(200, fig["dead"]["deletion"]);
assertTrue(0 <= fig["journals"]["count"]); assertTrue(0 <= fig["journals"]["count"]);
assertTrue(0 < fig["datafiles"]["count"]); assertTrue(0 < fig["datafiles"]["count"]);
@ -656,13 +657,14 @@ function CompactionSuite () {
internal.wait(0); internal.wait(0);
c1.truncate(); c1.truncate();
internal.flushWal(true, true);
c1.rotate(); c1.rotate();
waited = 0; waited = 0;
while (waited < maxWait) { while (waited < maxWait) {
internal.wait(5); internal.wait(2);
waited += 5; waited += 2;
fig = c1.figures(); fig = c1.figures();
if (fig["dead"]["deletion"] == 0) { if (fig["dead"]["deletion"] == 0) {
@ -707,7 +709,9 @@ function CompactionSuite () {
c1.save({ value : i, payload : payload }); c1.save({ value : i, payload : payload });
} }
internal.flushWal(true, true);
var fig = c1.figures(); var fig = c1.figures();
assertEqual(n, c1.count()); assertEqual(n, c1.count());
assertEqual(n, fig["alive"]["count"]); assertEqual(n, fig["alive"]["count"]);
assertEqual(0, fig["dead"]["count"]); assertEqual(0, fig["dead"]["count"]);
@ -716,14 +720,16 @@ function CompactionSuite () {
assertTrue(0 < fig["datafiles"]["count"]); assertTrue(0 < fig["datafiles"]["count"]);
// truncation will go fully into the journal... // truncation will go fully into the journal...
internal.flushWal(true, true);
c1.rotate(); c1.rotate();
c1.truncate(); c1.truncate();
internal.flushWal(true, true);
fig = c1.figures(); fig = c1.figures();
assertEqual(0, c1.count());
assertEqual(0, fig["alive"]["count"]); assertEqual(0, fig["alive"]["count"]);
assertEqual(n, fig["dead"]["deletion"]); assertEqual(n, fig["dead"]["deletion"]);
assertEqual(0, c1.count());
// wait for compactor to run // wait for compactor to run
require("console").log("waiting for compactor to run"); require("console").log("waiting for compactor to run");
@ -739,15 +745,14 @@ function CompactionSuite () {
waited = 0; waited = 0;
while (waited < maxWait) { while (waited < maxWait) {
internal.wait(5); internal.wait(2);
waited += 5; waited += 2;
fig = c1.figures(); fig = c1.figures();
if (fig["dead"]["count"] == 0) { if (fig["dead"]["count"] == 0) {
break; break;
} }
} }
assertEqual(0, c1.count()); assertEqual(0, c1.count());
// all alive & dead markers should be gone // all alive & dead markers should be gone