Implement more efficient hashing

fluree · Feb 23, 2025 · bd83599 · bd83599
1 parent 20531fd
commit bd83599
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/clj/fluree/db/json_ld/iri.cljc b/src/clj/fluree/db/json_ld/iri.cljc
@@ -77,16 +77,19 @@
   #?@(:clj  [Object
              (equals [this sid]
                (sid-equiv? this sid))
-             (hashCode [this] (hash (seq this)))
+             (hashCode [_]
+               (clojure.lang.Util/hashCombine namespace-code (hash name)))
 
              clojure.lang.IHashEq
-             (hasheq [this] (hash (seq this)))
+             (hasheq [_]
+               (clojure.lang.Util/hashCombine namespace-code (hash name)))
 
              java.lang.Comparable
              (compareTo [this other] (compare-SIDs this other))]
 
-             (-hash [this] (hash (seq this)))
       :cljs [IHash
+             (-hash [_]
+                    (hash-combine namespace-code (hash name)))
 
              IEquiv
              (-equiv [this sid] (sid-equiv? this sid))
@@ -145,7 +148,7 @@
 ;            (.write w (str "#=" `(->sid ~ns-code ~nme))))))
 
 (defn compare-SIDs
-  [^SID sid1 ^SID sid2]
+  [sid1 sid2]
   (when-not (instance? SID sid2)
     (throw (ex-info "Can't compare an SID to another type"
                     {:status 500 :error :db/unexpected-error})))

diff --git a/test/fluree/db/query/property_test.clj b/test/fluree/db/query/property_test.clj
@@ -252,13 +252,13 @@
           loaded @(fluree/load conn ledger-id)
           dbl    (fluree/db loaded)]
       (testing "before load"
-        (is (= [{"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}
-                {"id" "ex:dan", "ex:givenName" "Dan"}]
+        (is (= [{"id" "ex:dan", "ex:givenName" "Dan"}
+                {"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}]
                @(fluree/query db2 {"@context" context
                                    "select"   {"?s" ["*"]}
                                    "where"    {"@id" "?s", "ex:givenName" "?o"}})))
-        (is (= [{"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}
-                {"id" "ex:dan", "ex:givenName" "Dan"}]
+        (is (= [{"id" "ex:dan", "ex:givenName" "Dan"}
+                {"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}]
                @(fluree/query db2 {"@context" context
                                    "select"   {"?s" ["*"]}
                                    "where"    {"@id" "?s", "ex:firstName" "?o"}})))
@@ -270,13 +270,13 @@
                                                "ex:fool" "?fool"}}))
             "handle list values"))
       (testing "after load"
-        (is (= [{"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}
-                {"id" "ex:dan", "ex:givenName" "Dan"}]
+        (is (= [{"id" "ex:dan", "ex:givenName" "Dan"}
+                {"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}]
                @(fluree/query dbl {"@context" context
                                    "select"   {"?s" ["*"]}
                                    "where"    {"@id" "?s", "ex:givenName" "?o"}})))
-        (is (= [{"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}
-                {"id" "ex:dan", "ex:givenName" "Dan"}]
+        (is (= [{"id" "ex:dan", "ex:givenName" "Dan"}
+                {"id" "ex:andrew", "ex:firstName" "Andrew", "ex:age" 35}]
                @(fluree/query dbl {"@context" context
                                    "select"   {"?s" ["*"]}
                                    "where"    {"@id" "?s", "ex:firstName" "?o"}})))

diff --git a/test/fluree/db/shacl/shacl_logical_test.clj b/test/fluree/db/shacl/shacl_logical_test.clj
@@ -583,7 +583,7 @@ Subject :ex/john violates constraint :sh/not of shape :ex/UserShape - :ex/john c
                    "sh:focusNode" "ex:Named",
                    "sh:constraintComponent" "sh:xone",
                    "sh:sourceShape" "ex:orShape",
-                   "sh:value" ["Washington" "George" "George Washington"],
+                   "sh:value" ["George" "George Washington" "Washington"],
                    "sh:resultMessage" "values conformed to 2 of the following sh:xone shapes: [\"ex:one-part\" \"ex:two-parts\"]; must only conform to one"}]}}
                (ex-data db2)))
         (is (= "Subject ex:Named violates constraint sh:xone of shape ex:orShape - values conformed to 2 of the following sh:xone shapes: [\"ex:one-part\" \"ex:two-parts\"]; must only conform to one."