Prevent double unprefixing of keys in sequences

Incubaid · May 8, 2012 · d0f4afa · d0f4afa
1 parent 89a9bec
commit d0f4afa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/pylabs/test/server/quick/system_tests_basic.py b/pylabs/test/server/quick/system_tests_basic.py
@@ -255,7 +255,7 @@ def sequence_scenario( start_suffix ):
 
     cli.sequence( seq )
 
-    key_value_list = cli.range_entries( start_key, True, end_key, True )
+    key_value_list = cli.range_entries( start_key, True, end_key, True , 2*iter_size)
     C.assert_key_value_list(start_suffix, iter_size , key_value_list )
 
     seq = arakoon.ArakoonProtocol.Sequence()
@@ -264,7 +264,7 @@ def sequence_scenario( start_suffix ):
         seq.addDelete(k)
     cli.sequence( seq )
 
-    key_value_list = cli.range_entries( start_key, True, end_key, True )
+    key_value_list = cli.range_entries( start_key, True, end_key, True, 2*iter_size )
     assert_equal( len(key_value_list), 0, 
                   "Still keys in the store, should have been deleted" )
 
@@ -275,7 +275,7 @@ def sequence_scenario( start_suffix ):
 
     seq.addDelete( "non-existing" )
     assert_raises( ArakoonNotFound, cli.sequence, seq )
-    key_value_list = cli.range_entries( start_key, True, end_key, True )
+    key_value_list = cli.range_entries( start_key, True, end_key, True, 2*iter_size )
     assert_equal( len(key_value_list), 0, "There are keys in the store, should not be the case" )
 
     cli._dropConnections()

diff --git a/src/hope/bstore.ml b/src/hope/bstore.ml
@@ -89,7 +89,7 @@ module BStore = (struct
             (fun a u ->
               match a with
                 | OK SEQ_SUCCESS -> _inner tx u
-                | NOK k -> Lwt.return (NOK (unpref_key k)) 
+                | NOK k -> Lwt.return (NOK k) 
                 | a -> Lwt.return a
             )
             (OK SEQ_SUCCESS)

diff --git a/src/hope/c.ml b/src/hope/c.ml
@@ -66,8 +66,7 @@ module ProtocolHandler (S:Core.STORE) = struct
   open Baardskeerder
   let prologue (ic,oc) = 
     let check magic version = 
-      if magic = _MAGIC && 
-	version = _VERSION 
+      if magic = _MAGIC && version = _VERSION 
       then Lwt.return ()
       else Llio.lwt_failfmt "MAGIC %lx or VERSION %x mismatch" magic version
     in