os/kstore: fix collection_list ordering

It has the same key escaping bug as the blustore has, but we don't need to workaround it here because kstore is not in production use. Signed-off-by: Mykola Golub <[email protected]>
david-caro · Aug 29, 2020 · c1eff9f · c1eff9f
1 parent f2ccd54
commit c1eff9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
@@ -104,10 +104,10 @@ static void append_escaped(const string &in, string *out)
 {
   char hexbyte[8];
   for (string::const_iterator i = in.begin(); i != in.end(); ++i) {
-    if (*i <= '#') {
+    if ((unsigned char)*i <= '#') {
       snprintf(hexbyte, sizeof(hexbyte), "#%02x", (uint8_t)*i);
       out->append(hexbyte);
-    } else if (*i >= '~') {
+    } else if ((unsigned char)*i >= '~') {
       snprintf(hexbyte, sizeof(hexbyte), "~%02x", (uint8_t)*i);
       out->append(hexbyte);
     } else {

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
@@ -5027,9 +5027,6 @@ TEST_P(StoreTest, HashCollisionTest) {
 }
 
 TEST_P(StoreTest, HashCollisionSorting) {
-  if (string(GetParam()) == "kstore") // TODO: fix kstore
-    return;
-
   char buf121664318_1[] = {18, -119, -121, -111, 0};
   char buf121664318_2[] = {19, 127, -121, 32, 0};
   char buf121664318_3[] = {19, -118, 15, 19, 0};