kv index search

Signed-off-by: Praneeth Bedapudi <praneethbedapudi@gmail.com>
notAI-tech · Jan 21, 2024 · d0ad74d · d0ad74d
1 parent e42360e
commit d0ad74d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/liteindex/kv_index.py b/liteindex/kv_index.py
@@ -474,10 +474,11 @@ def search(
 
         sort_by = "updated_at" if self.preserve_order else "ROWID"
 
-        if isinstance(params[0], (int, float)):
-            sort_by = "num_value"
-        else:
-            sort_by = "string_value"
+        if sort_by_value:
+            if isinstance(params[0], (int, float)):
+                sort_by = "num_value"
+            else:
+                sort_by = "string_value"
 
         sort_by = f"ORDER BY {sort_by} {'DESC' if reversed_sort else ''}"
 

diff --git a/liteindex/kv_index_utils.py b/liteindex/kv_index_utils.py
@@ -160,19 +160,25 @@ def create_where_clause(query):
             wheres.append("{} REGEXP ?".format(__get_column_name(value)))
             args.append(value)
         else:
-            column_name = __get_column_name(value)
-            if column_name == "pickled_value":
-                if not isinstance(value, bytes):
-                    value = pickle.dumps(value, protocol=pickle.HIGHEST_PROTOCOL)
-
-            if isinstance(value, bool):
+            if value is None:
+                # num_value, string_value, pickled_value all should be NULL
                 wheres.append(
-                    f"(pickled_value {op_map[op]} ? AND num_value = {int(value)})"
+                    "num_value IS NULL AND string_value IS NULL AND pickled_value IS NULL"
                 )
-                args.append(b"")
             else:
-                wheres.append(f"{column_name} {op_map[op]} ?")
-                args.append(value)
+                column_name = __get_column_name(value)
+                if column_name == "pickled_value":
+                    if not isinstance(value, bytes):
+                        value = pickle.dumps(value, protocol=pickle.HIGHEST_PROTOCOL)
+
+                if isinstance(value, bool):
+                    wheres.append(
+                        f"(pickled_value {op_map[op]} ? AND num_value = {int(value)})"
+                    )
+                    args.append(b"")
+                else:
+                    wheres.append(f"{column_name} {op_map[op]} ?")
+                    args.append(value)
 
     return " AND ".join(wheres), args
 

diff --git a/setup.py b/setup.py
@@ -18,14 +18,14 @@
 EMAIL = "praneeth@bpraneeth.com"
 AUTHOR = "BEDAPUDI PRANEETH"
 REQUIRES_PYTHON = ">=3.6.0"
-VERSION = "0.0.2.dev40"
+VERSION = "0.0.2.dev41"
 
 # What packages are required for this module to be executed?
 REQUIRED = []
 
 # What packages are optional?
 EXTRAS = {
-    'all': ['zstandard'],
+    "all": ["zstandard"],
 }
 
 # The rest you shouldn't have to touch too much :)

diff --git a/tests/kv_index_search_test.py b/tests/kv_index_search_test.py
@@ -32,7 +32,7 @@
 assert index.search("value1", n=10, offset=0) == {"key1": "value1"}
 assert index.search("value1", n=10, offset=1) == {}
 
-# assert index.search(None) == {"keyNone": None}
+assert index.search(None) == {"keyNone": None}
 assert index.search(True) == {"keyTrue": True}
 
 assert index.search({"$gt": 6}, n=10, offset=0) == {