Right address is now null for last leaf page.

Closes #473.
bigeasy · Feb 18, 2015 · d3f25e8 · d3f25e8
1 parent 66e238b
commit d3f25e8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/balancer.js b/balancer.js
@@ -21,7 +21,7 @@ Balancer.prototype._node = cadence(function (async, locker, page) {
         var node = {
             key: entry.key,
             address: page.address,
-            rightAddress: page.right._address,
+            rightAddress: page.right.address,
             length: page.items.length - page.ghosts
         }
         this.ordered[node.address] = node
@@ -290,7 +290,7 @@ Balancer.prototype.splitLeafAndUnlock = cadence(function (async, address, key, g
             }
 
             right = {
-                _address: page.address,
+                address: page.address,
                 key: page.items[0].key
             }
         }, function () {

diff --git a/cursor.js b/cursor.js
@@ -24,13 +24,13 @@ Cursor.prototype.get = function (index) {
 Cursor.prototype.next = cadence(function (async) {
     var next
 
-    if (this._page.right._address === null) {
+    if (this._page.right.address === null) {
         // return [ async, false ] <- return immediately!
         return [ false ]
     }
 
     async(function () {
-        this._locker.lock(this._page.right._address, this.exclusive, async())
+        this._locker.lock(this._page.right.address, this.exclusive, async())
     }, function (next) {
         this._locker.unlock(this._page)
 
@@ -51,7 +51,7 @@ Cursor.prototype.indexOf = function (key, index) {
     var unambiguous
     unambiguous = -1 < index // <- todo: ?
                || ~ index < this._page.items.length
-               || page.right._address === null
+               || page.right.address === null
     if (!unambiguous && this._sheaf.comparator(key, page.right.key) >= 0) {
         return [ ~(this._page.items.length + 1) ]
     }

diff --git a/logger.js b/logger.js
@@ -36,7 +36,7 @@ Logger.prototype.writeDelete = function (queue, page, index, callback) {
 }
 
 Logger.prototype.writeHeader = function (queue, page) {
-    var header = [ ++page.entries, 0, page.right._address || 0, page.ghosts || 0 ]
+    var header = [ ++page.entries, 0, page.right.address || 0, page.ghosts || 0 ]
     return this.writeEntry(queue, header, page.right.key, this.serializers.key)
 }
 

diff --git a/page.js b/page.js
@@ -12,7 +12,7 @@ function Page (sheaf, address, modulus) {
     this.queue = sequester.createQueue()
     this.cartridge = null
     if (modulus === 1) {
-        this.right = { _address: null, key: null }
+        this.right = { address: null, key: null }
         this.ghosts = 0
     }
 }

diff --git a/player.js b/player.js
@@ -68,7 +68,7 @@ Player.prototype._play = function (sheaf, slice, start, page) {
         if (header[1] === 0) {
             if (page.position === 0) {
                 page.right = {
-                    _address: header[2] || null,
+                    address: header[2] || null,
                     key: entry.body || null
                 }
                 if (header[3] === 0 && page.ghosts) {

diff --git a/t/basics/backward.t.js b/t/basics/backward.t.js
@@ -13,7 +13,7 @@ function prove (async, assert) {
         strata.mutator(strata.leftOf('c'), async())
     }, function (cursor) {
         assert(cursor.exclusive, 'exclusive')
-        right = cursor.right._address
+        right = cursor.right.address
         assert(cursor.get(0).record, 'a', 'go left')
         cursor.unlock(async())
     }, function () {

diff --git a/t/ghost/exorcise.t.js b/t/ghost/exorcise.t.js
@@ -33,7 +33,7 @@ function prove (async, assert) {
         strata.iterator('a', async())
     }, function (cursor) {
         async(function () {
-            assert(cursor.right, { key: 'd', _address: 5 }, 'referring leaf updated')
+            assert(cursor.right, { key: 'd', address: 5 }, 'referring leaf updated')
             cursor.next(async())
         }, function () {
             assert(cursor.get(0).key, 'd', 'key deleted')