0
@@ -28,3 +28,4 @@ TokyoCabinet do(
0
   )
0
 )
0
 
0
+TokyoCabinetPrefixCursor prefix ::= nil
0
\ No newline at end of file

0
@@ -118,10 +118,16 @@ int IoTokyoCabinetPrefixCursor_keyBeginsWithPrefix_(IoObject *self, IoSeq *prefi
0
 {  
0
   int size;
0
   char *value = tcbdbcurkey(TokyoCabinetPrefixCursor(self), &size);
0
-	UArray o = UArray_stackAllocedWithData_type_size_(value, CTYPE_uint8_t, size);
0
-	UArray *p = IoSeq_rawUArray(prefix);
0
   
0
-	return UArray_beginsWith_(&o, p);
0
+	if(value)
0
+	{
0
+		UArray o = UArray_stackAllocedWithData_type_size_(value, CTYPE_uint8_t, size);
0
+		UArray *p = IoSeq_rawUArray(prefix);
0
+		
0
+		return UArray_beginsWith_(&o, p);
0
+	}
0
+	
0
+	return 0;
0
 }
0
 
0
 /*
0
@@ -195,7 +201,7 @@ IoObject *IoTokyoCabinetPrefixCursor_next(IoObject *self, IoObject *locals, IoMe
0
   */
0
 
0
   IoSeq *prefix = IoObject_getSlot_(self, IOSYMBOL("prefix"));
0
-IOASSERT(ISSEQ(prefix), "prefix must be a sequence");
0
+	IOASSERT(ISSEQ(prefix), "prefix must be a sequence");
0
   IOASSERT(TokyoCabinetPrefixCursor(self), "invalid TokyoCabinetPrefixCursor");
0
   tcbdbcurnext(TokyoCabinetPrefixCursor(self));
0
   return IOBOOL(self, IoTokyoCabinetPrefixCursor_keyBeginsWithPrefix_(self, prefix));
0
@@ -227,12 +233,16 @@ IoObject *IoTokyoCabinetPrefixCursor_key(IoObject *self, IoObject *locals, IoMes
0
   IOASSERT(TokyoCabinetPrefixCursor(self), "invalid TokyoCabinetPrefixCursor");
0
   ks = tcbdbcurkey(TokyoCabinetPrefixCursor(self), &size);
0
 
0
+	if (ks)
0
   {
0
     UArray *k = UArray_newWithData_type_size_copy_(ks, CTYPE_uint8_t, size, 1);
0
   
0
     if (UArray_beginsWith_(k, IoSeq_rawUArray(prefix)))
0
     {
0
+			//printf("before clip '%s'\n", UArray_bytes(k));
0
       UArray_clipBeforeEndOf_(k, IoSeq_rawUArray(prefix));
0
+			UArray_removeFirst(k); // remove separator
0
+			//printf("after clip  '%s'\n", UArray_bytes(k));
0
       return IoSeq_newWithUArray_copy_(IOSTATE, k, 0);
0
     }
0
 

0
@@ -13,32 +13,66 @@ TokyoCabinetTest := UnitTest clone do(
0
     assertEquals(nil, db at("foo"))
0
     
0
     db begin
0
-		db atPut("a", "1")
0
+		db atPut("001/a", "1")
0
     db commit
0
     
0
-		assertEquals("1", db at("a"))
0
+		assertEquals("1", db at("001/a"))
0
     
0
     db begin
0
-		db atPut("b", "2")
0
+		db atPut("001/b", "2")
0
     db commit
0
     
0
     db begin
0
-		db atPut("c", "3")
0
+		db atPut("001/c", "3")
0
     db commit
0
     
0
-		assertEquals("3", db at("c"))
0
-		assertEquals("2", db at("b"))
0
-		assertEquals("1", db at("a"))
0
+		assertEquals("3", db at("001/c"))
0
+		assertEquals("2", db at("001/b"))
0
+		assertEquals("1", db at("001/a"))
0
     
0
     db close
0
     db open("test.db")
0
     
0
-		assertEquals("1", db at("a"))
0
-		assertEquals("2", db at("b"))
0
-		assertEquals("3", db at("c"))
0
+		assertEquals("1", db at("001/a"))
0
+		assertEquals("2", db at("001/b"))
0
+		assertEquals("3", db at("001/c"))
0
     
0
     c := db cursor
0
     c first
0
+		assertEquals("001/a", c key)
0
+		assertEquals("1", c value)
0
+		
0
+		c next
0
+		assertEquals("001/b", c key)
0
+		assertEquals("2", c value)
0
+		
0
+		c next
0
+		assertEquals("001/c", c key)
0
+		assertEquals("3", c value)
0
+		c close
0
+		
0
+		/*
0
+		db begin
0
+		db removeAt("001/a")
0
+		db removeAt("001/b")
0
+		db commit
0
+		
0
+		assertEquals(nil, db at("001/a"))
0
+		assertEquals(nil, db at("001/b"))
0
+		
0
+		db close
0
+		db open("test.db")
0
+		
0
+		assertEquals(nil, db at("001/a"))
0
+		assertEquals(nil, db at("001/b"))
0
+		
0
+		db close
0
+		*/
0
+		
0
+		// --------------------------------
0
+		
0
+		c := db prefixCursor setPrefix("001")
0
+		c first
0
     assertEquals("a", c key)
0
     assertEquals("1", c value)
0
     
0
@@ -49,21 +83,25 @@ TokyoCabinetTest := UnitTest clone do(
0
     c next
0
     assertEquals("c", c key)
0
     assertEquals("3", c value)
0
+
0
+		c next
0
+		assertEquals(nil, c key)
0
+		assertEquals(nil, c value)
0
     c close
0
     
0
     db begin
0
-		db removeAt("a")
0
-		db removeAt("b")
0
+		db removeAt("001/a")
0
+		db removeAt("001/b")
0
     db commit
0
     
0
-		assertEquals(nil, db at("a"))
0
-		assertEquals(nil, db at("b"))
0
+		assertEquals(nil, db at("001/a"))
0
+		assertEquals(nil, db at("001/b"))
0
     
0
     db close
0
     db open("test.db")
0
     
0
-		assertEquals(nil, db at("a"))
0
-		assertEquals(nil, db at("b"))
0
+		assertEquals(nil, db at("001/a"))
0
+		assertEquals(nil, db at("001/b"))
0
     
0
     db close
0
   )