From 2ab754155789a9b010231ed37fb543f5849df162 Mon Sep 17 00:00:00 2001 From: Alan Gutierrez Date: Sun, 29 Nov 2015 10:52:20 -0600 Subject: [PATCH] Remove getters from Strata. Closes #481. --- strata.js | 9 +-------- t/basics/create.t.js | 4 ++-- t/basics/delete.t.js | 2 +- t/basics/get.t.js | 6 +++--- t/basics/insert.t.js | 4 ++-- t/basics/open.t.js | 4 ++-- t/basics/split.t.js | 4 ++-- t/lock/purge-skip.t.js | 4 ++-- t/lock/purge.t.js | 4 ++-- t/split/branch.t.js | 2 +- t/split/root-drain.t.js | 2 +- 11 files changed, 19 insertions(+), 26 deletions(-) diff --git a/strata.js b/strata.js index b8acace0..33a36510 100644 --- a/strata.js +++ b/strata.js @@ -42,14 +42,6 @@ function Strata (options) { this.logger = new Logger(options) } -Strata.prototype.__defineGetter__('size', function () { - return this.sheaf.magazine.heft -}) - -Strata.prototype.__defineGetter__('nextAddress', function () { - return this.sheaf.nextAddress -}) - // to user land Strata.prototype.create = cadence(function (async) { this.sheaf.createMagazine() @@ -277,6 +269,7 @@ Strata.prototype.purge = function (downTo) { } Strata.prototype.__defineGetter__('balanced', function () { + ok(false) return ! Object.keys(this.sheaf.lengths).length }) diff --git a/t/basics/create.t.js b/t/basics/create.t.js index 5c3f373c..9d90aa87 100755 --- a/t/basics/create.t.js +++ b/t/basics/create.t.js @@ -10,7 +10,7 @@ function prove (async, assert) { strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }) strata.create(async()) }, function () { - assert(strata.size, 0, 'total heft') + assert(strata.sheaf.magazine.heft, 0, 'total heft') strata.close(async()) }, function () { assert(1, 'created') @@ -32,7 +32,7 @@ function prove (async, assert) { cursor.unlock(async()) }, function () { strata.purge(0) - assert(strata.size, 0, 'purged') + assert(strata.sheaf.magazine.heft, 0, 'purged') strata.close(async()) }) diff --git a/t/basics/delete.t.js b/t/basics/delete.t.js index ab992cc7..15804a04 100755 --- a/t/basics/delete.t.js +++ b/t/basics/delete.t.js @@ -23,7 +23,7 @@ function prove (async, assert) { assert(records, [ 'a', 'd' ], 'records') strata.purge(0) - assert(strata.size, 0, 'purged') + assert(strata.sheaf.magazine.heft, 0, 'purged') strata.close(async()) }) diff --git a/t/basics/get.t.js b/t/basics/get.t.js index 08741a10..d769f702 100755 --- a/t/basics/get.t.js +++ b/t/basics/get.t.js @@ -10,7 +10,7 @@ function prove (async, assert) { strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }) strata.open(async()) }, function () { - assert(strata.size, 0, 'json size before read') + assert(strata.sheaf.magazine.heft, 0, 'json size before read') strata.iterator('a', async()) }, function (cursor) { async(function () { @@ -20,13 +20,13 @@ function prove (async, assert) { var item = cursor.page.items[cursor.offset] assert(item.record, 'a', 'get record') assert(item.key, 'a', 'get key') - assert(strata.size, 54, 'json size after read') + assert(strata.sheaf.magazine.heft, 54, 'json size after read') assert(item.heft, 54, 'record size') cursor.unlock(async()) }, function () { strata.purge(0) - assert(strata.size, 0, 'page') + assert(strata.sheaf.magazine.heft, 0, 'page') strata.close(async()) }) diff --git a/t/basics/insert.t.js b/t/basics/insert.t.js index 25ec7212..6a1f8c1a 100755 --- a/t/basics/insert.t.js +++ b/t/basics/insert.t.js @@ -14,7 +14,7 @@ function prove (async, assert) { cursor.insert('a', 'a', ~cursor.index) cursor.unlock(async()) }, function () { - assert(strata.size, 54, 'json size') + assert(strata.sheaf.magazine.heft, 54, 'json size') }, function () { vivify(tmp, async()) load(__dirname + '/fixtures/insert.json', async()) @@ -27,7 +27,7 @@ function prove (async, assert) { assert.say(expected.segment00000001) strata.purge(0) - assert(strata.size, 0, 'purged') + assert(strata.sheaf.magazine.heft, 0, 'purged') strata.close(async()) }) diff --git a/t/basics/open.t.js b/t/basics/open.t.js index 12b22a4c..2bad4c9b 100755 --- a/t/basics/open.t.js +++ b/t/basics/open.t.js @@ -13,7 +13,7 @@ function prove (async, assert) { strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }) strata.open(async()) }, function () { - assert(strata.size, 0, 'json size') - assert(strata.nextAddress, 2, 'next address') + assert(strata.sheaf.magazine.heft, 0, 'json size') + assert(strata.sheaf.nextAddress, 2, 'next address') }) } diff --git a/t/basics/split.t.js b/t/basics/split.t.js index dd1a8f03..495f134b 100755 --- a/t/basics/split.t.js +++ b/t/basics/split.t.js @@ -30,9 +30,9 @@ function prove (async, assert) { assert(actual, expected, 'split') strata.purge(0) - assert(strata.size, 0, 'purged') + assert(strata.sheaf.magazine.heft, 0, 'purged') - assert(!strata.balanced, 'not balanced') + assert(Object.keys(strata.sheaf.lengths).length, 'not balanced') strata.close(async()) }) diff --git a/t/lock/purge-skip.t.js b/t/lock/purge-skip.t.js index 0aee2272..bf6b22cb 100755 --- a/t/lock/purge-skip.t.js +++ b/t/lock/purge-skip.t.js @@ -12,9 +12,9 @@ function prove (async, assert) { }, function () { strata.mutator('h', async()) }, function (cursor) { - assert(strata.size, 277, 'before purge') + assert(strata.sheaf.magazine.heft, 277, 'before purge') strata.purge(0) - assert(strata.size, 108, 'after purge') + assert(strata.sheaf.magazine.heft, 108, 'after purge') cursor.unlock(async()) }, function() { strata.close(async()) diff --git a/t/lock/purge.t.js b/t/lock/purge.t.js index 84e865ca..70851eed 100755 --- a/t/lock/purge.t.js +++ b/t/lock/purge.t.js @@ -9,9 +9,9 @@ function prove (async, assert) { switch (type) { case 'reference': if (++count == 2) { - assert(strata.size > 2, 'unpurged') + assert(strata.sheaf.magazine.heft > 2, 'unpurged') strata.purge(0) - assert(strata.size, 0, 'purged') + assert(strata.sheaf.magazine.heft, 0, 'purged') } callback() break diff --git a/t/split/branch.t.js b/t/split/branch.t.js index 1825d4fc..0d418d9a 100755 --- a/t/split/branch.t.js +++ b/t/split/branch.t.js @@ -24,7 +24,7 @@ function prove (async, assert) { }, function (actual, expected) { assert(actual, expected, 'split') strata.purge(0) - assert(strata.size, 0, 'purge completely') + assert(strata.sheaf.magazine.heft, 0, 'purge completely') strata.close(async()) }, function () { strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 }) diff --git a/t/split/root-drain.t.js b/t/split/root-drain.t.js index b251384a..921a67c4 100755 --- a/t/split/root-drain.t.js +++ b/t/split/root-drain.t.js @@ -24,7 +24,7 @@ function prove (async, assert) { }, function (actual, expected) { assert(actual, expected, 'split') strata.purge(0) - assert(strata.size, 0, 'purged completely') + assert(strata.sheaf.magazine.heft, 0, 'purged completely') strata.close(async()) }, function () { strata = createStrata({ directory: tmp, leafSize: 3, branchSize: 3 })