Merge pull request #1 from noony/add-missing-functions-1

bd808 · bd808 · commit c59f0f7d97c2 · 2015-06-17T22:18:41.000-06:00
Implements missing functions firstKey / nextKey / exists
diff --git a/src/Reader.php b/src/Reader.php
@@ -82,4 +82,21 @@ abstract public function close();
 	 * @param string $key
 	 */
 	abstract public function get( $key );
+
+	/**
+	 * Check whether key exists
+	 *
+	 * @param string $key
+	 */
+	abstract public function exists( $key );
+
+	/**
+	 * Fetch first key
+	 */
+	abstract public function firstkey();
+
+	/**
+	 * Fetch next key
+	 */
+	abstract public function nextkey();
 }
diff --git a/src/Reader/DBA.php b/src/Reader/DBA.php
@@ -47,4 +47,16 @@ public function close() {
 	public function get( $key ) {
 		return dba_fetch( $key, $this->handle );
 	}
+
+	public function exists( $key ) {
+		return dba_exists( $key, $this->handle );
+	}
+
+	public function firstkey() {
+		return dba_firstkey( $this->handle );
+	}
+
+	public function nextkey() {
+		return dba_nextkey( $this->handle );
+	}
 }
diff --git a/src/Reader/PHP.php b/src/Reader/PHP.php
@@ -59,6 +59,9 @@ class PHP extends Reader {
 	/* initialized if cdb_findnext() returns 1 */
 	protected $dlen;
 
+	/* initialized in firstkey() and nextkey() */
+	protected $pos = 0;
+
 	/**
 	 * @param string $fileName
 	 * @throws Exception
@@ -217,5 +220,26 @@ protected function find( $key ) {
 
 		return $this->findNext( $key );
 	}
+
+	public function exists( $key ) {
+		if ( $this->find( strval( $key ) ) ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function firstkey() {
+		$this->pos = 2048;
+		return $this->nextkey();
+	}
+
+	public function nextkey() {
+		$buf = $this->read( 8, $this->pos );
+		$klen = $this->unpack31( substr( $buf, 0, 4 ) );
+		$dlen = $this->unpack31( substr( $buf, 4 ) );
+		$this->pos += 8 + $klen + $dlen;
+		return fread( $this->handle, $klen );
+	}
 }
 
diff --git a/test/CdbTest.php b/test/CdbTest.php
@@ -27,6 +27,12 @@ protected function setUp() {
 		$this->dbaCdbFile = tempnam( $temp, get_class( $this ) . '_' );
 	}
 
+	protected function tearDown() {
+		parent::tearDown();
+		unlink($this->phpCdbFile);
+		unlink($this->dbaCdbFile);
+	}
+
 	/**
 	 * Make a random-ish string
 	 * @return string
@@ -57,6 +63,8 @@ public function testCdbWrite() {
 			}
 		}
 
+		unset($data['']);
+
 		$w1->close();
 		$w2->close();
 
@@ -84,6 +92,31 @@ public function testCdbWrite() {
 			$this->cdbAssert( "PHP error", $key, $v1, $value );
 			$this->cdbAssert( "DBA error", $key, $v2, $value );
 		}
+
+		$r1->close();
+		$r2->close();
+
+		$r1 = new Reader\PHP( $this->phpCdbFile );
+		$r2 = new Reader\DBA( $this->dbaCdbFile );
+
+		$keys = array_keys($data);
+		$firstKey = array_shift($keys);
+
+		$this->assertTrue($r1->exists($firstKey), 'PHP entry exists');
+		$this->assertTrue($r2->exists($firstKey), 'DBA entry exists');
+		$this->assertFalse($r1->exists(-1), 'PHP entry doesn\'t exists');
+		$this->assertFalse($r2->exists(-1), 'DBA entry doesn\'t exists');
+
+		$firstKey1 = $r1->firstkey();
+		$firstKey2 = $r2->firstkey();
+
+		$this->assertEquals($firstKey1, $firstKey, 'PHP Match first key');
+		$this->assertEquals($firstKey2, $firstKey, 'DBA Match first key');
+
+		unset($data[$firstKey]);
+		for ($j = 0, $max = count($data); $j < $max; $j++) {
+			$this->assertEquals($r2->nextkey(), $r1->nextkey(), 'nextkey match');
+		}
 	}
 
 	private function cdbAssert( $msg, $key, $v1, $v2 ) {
