Skip to content

Commit

Permalink
Remove getters from Strata.
Browse files Browse the repository at this point in the history
Closes #481.
  • Loading branch information
flatheadmill committed Nov 29, 2015
1 parent 4623500 commit 2ab7541
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 26 deletions.
9 changes: 1 addition & 8 deletions strata.js
Expand Up @@ -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()
Expand Down Expand Up @@ -277,6 +269,7 @@ Strata.prototype.purge = function (downTo) {
}

Strata.prototype.__defineGetter__('balanced', function () {
ok(false)
return ! Object.keys(this.sheaf.lengths).length
})

Expand Down
4 changes: 2 additions & 2 deletions t/basics/create.t.js
Expand Up @@ -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')
Expand All @@ -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())
})
Expand Down
2 changes: 1 addition & 1 deletion t/basics/delete.t.js
Expand Up @@ -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())
})
Expand Down
6 changes: 3 additions & 3 deletions t/basics/get.t.js
Expand Up @@ -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 () {
Expand All @@ -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())
})
Expand Down
4 changes: 2 additions & 2 deletions t/basics/insert.t.js
Expand Up @@ -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())
Expand All @@ -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())
})
Expand Down
4 changes: 2 additions & 2 deletions t/basics/open.t.js
Expand Up @@ -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')
})
}
4 changes: 2 additions & 2 deletions t/basics/split.t.js
Expand Up @@ -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())
})
Expand Down
4 changes: 2 additions & 2 deletions t/lock/purge-skip.t.js
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions t/lock/purge.t.js
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/split/branch.t.js
Expand Up @@ -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 })
Expand Down
2 changes: 1 addition & 1 deletion t/split/root-drain.t.js
Expand Up @@ -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 })
Expand Down

0 comments on commit 2ab7541

Please sign in to comment.