feat: compare_ore_cllw_u64_8

Author: tobyhede

src/ore_cllw_u64_8/compare.sql

@@ -0,0 +1,54 @@
+-- REQUIRE: src/schema.sql
+-- REQUIRE: src/ore_cllw_u64_8/types.sql
+-- REQUIRE: src/ore_cllw_u64_8/functions.sql
+
+
+CREATE FUNCTION eql_v2.compare_ore_cllw_u64_8(a eql_v2_encrypted, b eql_v2_encrypted)
+  RETURNS integer
+  IMMUTABLE STRICT PARALLEL SAFE
+AS $$
+  DECLARE
+    a_term eql_v2.ore_cllw_u64_8;
+    b_term eql_v2.ore_cllw_u64_8;
+  BEGIN
+
+    -- PERFORM eql_v2.log('eql_v2.compare_ore_cllw_u64_8');
+    -- PERFORM eql_v2.log('a', a::text);
+    -- PERFORM eql_v2.log('b', b::text);
+
+    IF a IS NULL AND b IS NULL THEN
+      RETURN 0;
+    END IF;
+
+    IF a IS NULL THEN
+      RETURN -1;
+    END IF;
+
+    IF b IS NULL THEN
+      RETURN 1;
+    END IF;
+
+    IF eql_v2.has_ore_cllw_u64_8(a) THEN
+      a_term := eql_v2.ore_cllw_u64_8(a);
+    END IF;
+
+    IF eql_v2.has_ore_cllw_u64_8(a) THEN
+      b_term := eql_v2.ore_cllw_u64_8(b);
+    END IF;
+
+    IF a_term IS NULL AND b_term IS NULL THEN
+      RETURN 0;
+    END IF;
+
+    IF a_term IS NULL THEN
+      RETURN -1;
+    END IF;
+
+    IF b_term IS NULL THEN
+      RETURN 1;
+    END IF;
+
+    RETURN eql_v2.compare_ore_cllw_term_bytes(a_term.bytes, b_term.bytes);
+  END;
+$$ LANGUAGE plpgsql;
+

src/ore_cllw_u64_8/compare_test.sql

@@ -0,0 +1,29 @@
+\set ON_ERROR_STOP on
+
+DO $$
+  DECLARE
+   a eql_v2_encrypted;
+   b eql_v2_encrypted;
+   c eql_v2_encrypted;
+  BEGIN
+
+    -- {"number": {N}}
+    -- $.number: 3dba004f4d7823446e7cb71f6681b344
+    a := eql_v2.jsonb_path_query(create_encrypted_ste_vec_json(1), '3dba004f4d7823446e7cb71f6681b344');
+    b := eql_v2.jsonb_path_query(create_encrypted_ste_vec_json(5), '3dba004f4d7823446e7cb71f6681b344');
+    c := eql_v2.jsonb_path_query(create_encrypted_ste_vec_json(10), '3dba004f4d7823446e7cb71f6681b344');
+
+    ASSERT eql_v2.compare_ore_cllw_u64_8(a, a) = 0;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(a, b) = -1;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(a, c) = -1;
+
+    ASSERT eql_v2.compare_ore_cllw_u64_8(b, b) = 0;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(b, a) = 1;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(b, c) = -1;
+
+    ASSERT eql_v2.compare_ore_cllw_u64_8(c, c) = 0;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(c, b) = 1;
+    ASSERT eql_v2.compare_ore_cllw_u64_8(c, a) = 1;
+  END;
+$$ LANGUAGE plpgsql;
+

src/ore_cllw_u64_8/functions.sql

@@ -68,16 +68,24 @@ $$ LANGUAGE plpgsql;
 -- Used by both fixed and variable ore cllw variants
 --
 
-CREATE FUNCTION eql_v2.compare_ore_cllw(a bytea, b bytea)
+CREATE FUNCTION eql_v2.compare_ore_cllw_term_bytes(a bytea, b bytea)
 RETURNS int AS $$
 DECLARE
     len_a INT;
+    len_b INT;
     x BYTEA;
     y BYTEA;
     i INT;
-    differing RECORD;
+    differing boolean;
 BEGIN
+
+    -- Check if the lengths of the two bytea arguments are the same
     len_a := LENGTH(a);
+    len_b := LENGTH(b);
+
+    IF len_a != len_b THEN
+      RAISE EXCEPTION 'ore_cllw index terms are not the same length';
+    END IF;
 
     -- Iterate over each byte and compare them
     FOR i IN 1..len_a LOOP
@@ -86,13 +94,13 @@ BEGIN
 
         -- Check if there's a difference
         IF x != y THEN
-            differing := (x, y);
+            differing := true;
             EXIT;
         END IF;
     END LOOP;
 
     -- If a difference is found, compare the bytes as in Rust logic
-    IF differing IS NOT NULL THEN
+    IF differing THEN
         IF (get_byte(y, 0) + 1) % 256 = get_byte(x, 0) THEN
             RETURN 1;
         ELSE
@@ -105,27 +113,3 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-
-
-CREATE FUNCTION eql_v2.compare_ore_cllw_u64_8(a eql_v2.ore_cllw_u64_8, b eql_v2.ore_cllw_u64_8)
-RETURNS int AS $$
-DECLARE
-    len_a INT;
-    len_b INT;
-BEGIN
-    IF a IS NULL OR b IS NULL THEN
-      RETURN NULL;
-    END IF;
-
-    -- Check if the lengths of the two bytea arguments are the same
-    len_a := LENGTH(a.bytes);
-    len_b := LENGTH(b.bytes);
-
-    IF len_a != len_b THEN
-      RAISE EXCEPTION 'ore_cllw_u64_8 index terms are not the same length';
-    END IF;
-
-    RETURN eql_v2.compare_ore_cllw(a.bytes, b.bytes);
-END;
-$$ LANGUAGE plpgsql;
-

tasks/test.sh

@@ -38,22 +38,28 @@ fail_if_postgres_not_running
 mise run build --force
 mise run reset --force --postgres ${POSTGRES_VERSION}
 
+echo
+echo '###############################################'
+echo '# Installing release/cipherstash-encrypt.sql'
+echo '###############################################'
+echo
 
 # Install
-# cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-
-if cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f- | grep -q "ERROR"; then
-  echo
-  echo '******************************************************'
-  echo '* ❌ ERROR installing release/cipherstash-encrypt.sql'
-  echo '******************************************************'
-  echo
+cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+# if cat release/cipherstash-encrypt.sql | docker exec -i ${container_name} psql ${connection_url} -f- | grep -q "ERROR"; then
+#   echo
+#   echo '******************************************************'
+#   echo '* ❌ ERROR installing release/cipherstash-encrypt.sql'
+#   echo '******************************************************'
+#   echo
 
-  exit 1
-fi
+#   exit 1
+# fi
 
 
 cat tests/test_helpers.sql | docker exec -i ${container_name} psql ${connection_url} -f-
 cat tests/ore.sql | docker exec -i ${container_name} psql ${connection_url} -f-
+cat tests/ste_vec.sql | docker exec -i ${container_name} psql ${connection_url} -f-
 
 if [ $usage_test = "false" ]; then
   find src -type f -path "*_test.sql" | while read -r sql_file; do