Refactor 1

There's a problem with how it refactored map->WriteHashMapCursor!

Author: codeboost

src/xitdb/array_list.clj

@@ -1,14 +1,14 @@
 (ns xitdb.array-list
   (:require
     [xitdb.common :as common]
-    [xitdb.xitdb-util :as util])
+    [xitdb.util.operations :as operations])
   (:import
     (io.github.radarroark.xitdb ReadArrayList ReadCursor WriteArrayList WriteCursor)))
 
 (defn array-seq
   [^ReadArrayList ral]
   "The cursors used must implement the IReadFromCursor protocol."
-  (util/array-seq ral #(common/-read-from-cursor %)))
+  (operations/array-seq ral #(common/-read-from-cursor %)))
 
 (deftype XITDBArrayList [^ReadArrayList ral]
   clojure.lang.IPersistentCollection
@@ -89,7 +89,7 @@
 
   clojure.core.protocols/IKVReduce
   (kv-reduce [this f init]
-    (util/array-kv-reduce ral #(common/-read-from-cursor %) f init))
+    (operations/array-kv-reduce ral #(common/-read-from-cursor %) f init))
 
   java.util.Collection
   (^objects toArray [this]
@@ -133,11 +133,11 @@
 
   (cons [this o]
     ;;TODO: Figure out if it is correct to append to the end
-    (util/array-list-assoc-value! wal (.count wal) (common/unwrap o))
+    (operations/array-list-append-value! wal (common/unwrap o))
     this)
 
   (empty [this]
-    (util/array-list-empty! wal)
+    (operations/array-list-empty! wal)
     this)
 
   (equiv [this other]
@@ -158,7 +158,7 @@
 
   clojure.lang.IPersistentVector
   (assocN [this i val]
-    (util/array-list-assoc-value! wal i (common/unwrap val))
+    (operations/array-list-assoc-value! wal i (common/unwrap val))
     this)
 
   (length [this]
@@ -168,7 +168,7 @@
   (assoc [this k v]
     (when-not (integer? k)
       (throw (IllegalArgumentException. "Key must be integer")))
-    (util/array-list-assoc-value! wal k (common/unwrap v))
+    (operations/array-list-assoc-value! wal k (common/unwrap v))
     this)
 
   (containsKey [this k]
@@ -191,7 +191,7 @@
 
   clojure.core.protocols/IKVReduce
   (kv-reduce [this f init]
-    (util/array-kv-reduce wal #(common/-read-from-cursor %) f init))
+    (operations/array-kv-reduce wal #(common/-read-from-cursor %) f init))
 
   clojure.lang.IObj
   (withMeta [this _]
@@ -207,7 +207,7 @@
 
   clojure.lang.ITransientCollection
   (conj [this val]
-    (util/array-list-append-value! wal (common/unwrap val))
+    (operations/array-list-append-value! wal (common/unwrap val))
     this)
 
   (persistent [this]
@@ -217,7 +217,7 @@
 
   (pop [this]
     (let [value (common/-read-from-cursor (-> wal .-cursor))]
-      (util/array-list-pop! wal)
+      (operations/array-list-pop! wal)
       value))
 
   common/ISlot

src/xitdb/common.clj

@@ -1,6 +1,4 @@
-(ns xitdb.common
-  (:require
-    [xitdb.xitdb-util :as util]))
+(ns xitdb.common)
 
 (defprotocol ISlot
   (-slot [this]))

src/xitdb/db.clj

@@ -1,11 +1,11 @@
 (ns xitdb.db
   (:require
-    [xitdb.xitdb-types :as xtypes]
-    [xitdb.xitdb-util :as util])
+    [xitdb.util.conversion :as conversion]
+    [xitdb.xitdb-types :as xtypes])
   (:import
     [io.github.radarroark.xitdb
-     CoreBufferedFile CoreFile CoreMemory Hasher Database Database$ContextFunction
-     RandomAccessBufferedFile RandomAccessMemory ReadArrayList WriteArrayList WriteHashMap Tag WriteCursor]
+     CoreBufferedFile CoreFile CoreMemory Database Database$ContextFunction Hasher
+     RandomAccessBufferedFile RandomAccessMemory ReadArrayList WriteArrayList WriteCursor]
     [java.io File RandomAccessFile]
     [java.security MessageDigest]
     [java.util.concurrent.locks ReentrantLock]))
@@ -37,7 +37,7 @@
   Returns new history index."
   [^WriteArrayList history new-value]
   (append-context! history nil (fn [^WriteCursor cursor]
-                                 (util/v->slot! cursor new-value))))
+                                 (conversion/v->slot! cursor new-value))))
 
 (defn open-database
   [filename ^String open-mode]
@@ -58,7 +58,7 @@
       (fn [^WriteCursor cursor]
         (let [obj (xtypes/read-from-cursor cursor true)]
           (let [retval (apply f (into [obj] args))]
-            (.write cursor (xtypes/slot-for-value! cursor retval))))))))
+            (.write cursor (conversion/v->slot! cursor retval))))))))
 
 (defn xitdb-swap-with-lock!
   "Performs the 'swap!' operation while locking `db.lock`.

src/xitdb/hash_map.clj

@@ -1,15 +1,15 @@
 (ns xitdb.hash-map
   (:require
     [xitdb.common :as common]
-    [xitdb.xitdb-util :as util])
+    [xitdb.util.conversion :as conversion]
+    [xitdb.util.operations :as operations])
   (:import
-    [clojure.core.protocols IKVReduce]
-    (io.github.radarroark.xitdb ReadCursor ReadHashMap WriteCursor WriteHashMap)))
+    [io.github.radarroark.xitdb ReadCursor ReadHashMap WriteCursor WriteHashMap]))
 
 (defn map-seq
   [rhm]
   "The cursors used must implement the IReadFromCursor protocol."
-  (util/map-seq rhm #(common/-read-from-cursor %)))
+  (operations/map-seq rhm #(common/-read-from-cursor %)))
 
 (deftype XITDBHashMap [^ReadHashMap rhm]
 
@@ -18,14 +18,14 @@
     (.valAt this key nil))
 
   (valAt [this key not-found]
-    (let [cursor (.getCursor rhm (util/db-key key))]
+    (let [cursor (.getCursor rhm (conversion/db-key key))]
       (if (nil? cursor)
         not-found
         (common/-read-from-cursor cursor))))
 
   clojure.lang.Associative
   (containsKey [this key]
-    (not (nil? (.getCursor rhm (util/db-key key)))))
+    (not (nil? (.getCursor rhm (conversion/db-key key)))))
 
   (entryAt [this key]
     (let [v (.valAt this key nil)]
@@ -40,7 +40,7 @@
     (throw (UnsupportedOperationException. "XITDBHashMap is read-only")))
 
   (count [this]
-    (util/map-item-count rhm))
+    (operations/map-item-count rhm))
 
   clojure.lang.IPersistentCollection
   (cons [_ _]
@@ -77,7 +77,7 @@
 
   clojure.core.protocols/IKVReduce
   (kv-reduce [this f init]
-    (util/map-kv-reduce rhm #(common/-read-from-cursor %) f init))
+    (operations/map-kv-reduce rhm #(common/-read-from-cursor %) f init))
 
   common/IUnwrap
   (-unwrap [this]
@@ -121,7 +121,7 @@
     this)
 
   (empty [this]
-    (util/map-empty! whm)
+    (operations/map-empty! whm)
     this)
 
   (equiv [this other]
@@ -130,41 +130,41 @@
                  (seq this))))
   clojure.lang.Associative
   (assoc [this k v]
-    (util/map-assoc-value! whm k (common/unwrap v))
+    (operations/map-assoc-value! whm k (common/unwrap v))
     this)
 
   (containsKey [this key]
-    (util/map-contains-key? whm key))
+    (operations/map-contains-key? whm key))
 
   (entryAt [this key]
     (when (.containsKey this key)
       (clojure.lang.MapEntry. key (.valAt this key))))
 
   clojure.lang.IPersistentMap
   (without [this key]
-    (util/map-dissoc-key! whm key)
+    (operations/map-dissoc-key! whm key)
     this)
 
   (count [this]
-    (util/map-item-count whm))
+    (operations/map-item-count whm))
 
   clojure.lang.ILookup
   (valAt [this key]
     (.valAt this key nil))
 
   (valAt [this key not-found]
-    (let [cursor (util/map-read-cursor whm key)]
+    (let [cursor (operations/map-read-cursor whm key)]
       (if (nil? cursor)
         not-found
-        (common/-read-from-cursor (util/map-write-cursor whm key)))))
+        (common/-read-from-cursor (operations/map-write-cursor whm key)))))
 
   clojure.lang.Seqable
   (seq [this]
     (map-seq whm))
 
   clojure.core.protocols/IKVReduce
   (kv-reduce [this f init]
-    (util/map-kv-reduce whm #(common/-read-from-cursor %) f init))
+    (operations/map-kv-reduce whm #(common/-read-from-cursor %) f init))
 
   common/ISlot
   (-slot [this]

src/xitdb/hash_set.clj

@@ -1,22 +1,23 @@
 (ns xitdb.hash-set
   (:require
     [xitdb.common :as common]
-    [xitdb.xitdb-util :as util])
+    [xitdb.util.conversion :as conversion]
+    [xitdb.util.operations :as operations])
   (:import
-    (io.github.radarroark.xitdb ReadCursor ReadHashMap WriteCursor WriteHashMap)))
+    [io.github.radarroark.xitdb ReadHashMap WriteCursor WriteHashMap]))
 
 (defn set-seq
   [rhm]
   "The cursors used must implement the IReadFromCursor protocol."
-  (map val (util/map-seq rhm #(common/-read-from-cursor %))))
+  (map val (operations/map-seq rhm #(common/-read-from-cursor %))))
 
 (deftype XITDBHashSet [^ReadHashMap rhm]
   clojure.lang.IPersistentSet
   (disjoin [_ k]
     (throw (UnsupportedOperationException. "XITDBHashSet is read-only")))
 
   (contains [this k]
-    (not (nil? (.getCursor rhm (util/db-key (if (nil? k) 0 (.hashCode k)))))))
+    (not (nil? (.getCursor rhm (conversion/db-key (if (nil? k) 0 (.hashCode k)))))))
 
   (get [this k]
     (when (.contains this k)
@@ -35,7 +36,7 @@
          (every? #(.contains this %) other)))
 
   (count [_]
-    (util/map-item-count rhm))
+    (operations/map-item-count rhm))
 
   clojure.lang.Seqable
   (seq [_]
@@ -86,23 +87,23 @@
 (deftype XITDBWriteHashSet [^WriteHashMap whm]
   clojure.lang.IPersistentSet
   (disjoin [this k]
-    (util/map-dissoc-key! whm (.hashCode k))
+    (operations/map-dissoc-key! whm (.hashCode k))
     this)
 
   (contains [this k]
-    (util/map-contains-key? whm (.hashCode k)))
+    (operations/map-contains-key? whm (.hashCode k)))
 
   (get [this k]
     (when (.contains this k)
       k))
 
   clojure.lang.IPersistentCollection
   (cons [this o]
-    (util/set-assoc-value! whm (common/unwrap o))
+    (operations/set-assoc-value! whm (common/unwrap o))
     this)
 
   (empty [this]
-    (util/set-empty! whm)
+    (operations/set-empty! whm)
     this)
 
   (equiv [this other]
@@ -111,7 +112,7 @@
          (every? #(.contains this %) other)))
 
   (count [_]
-    (util/map-item-count whm))
+    (operations/map-item-count whm))
 
   clojure.lang.Seqable
   (seq [_]
@@ -140,7 +141,7 @@
 
 ;; Constructor functions
 (defn xwrite-hash-set [^WriteCursor write-cursor]
-  (let [whm (util/init-hash-set! write-cursor)]
+  (let [whm (operations/init-hash-set! write-cursor)]
     (->XITDBWriteHashSet whm)))
 
 (defn xhash-set [^ReadHashMap read-cursor]

src/xitdb/linked_list.clj

@@ -1,15 +1,15 @@
 (ns xitdb.linked-list
   (:require
     [xitdb.common :as common]
-    [xitdb.xitdb-util :as util])
+    [xitdb.util.conversion :as conversion]
+    [xitdb.util.operations :as operations])
   (:import
-    [io.github.radarroark.xitdb ReadLinkedArrayList ReadCursor ReadHashMap Tag
-                                Slot WriteLinkedArrayList WriteCursor]))
+    [io.github.radarroark.xitdb ReadCursor ReadLinkedArrayList WriteCursor WriteLinkedArrayList]))
 
 (defn array-seq
   [^ReadLinkedArrayList rlal]
   "The cursors used must implement the IReadFromCursor protocol."
-  (util/linked-array-seq rlal #(common/-read-from-cursor %)))
+  (operations/linked-array-seq rlal #(common/-read-from-cursor %)))
 
 (deftype XITDBLinkedArrayList [^ReadLinkedArrayList rlal]
   clojure.lang.IPersistentCollection
@@ -112,13 +112,13 @@
 
   (cons [this o]
     ;; TODO: This should insert at position 0
-    (util/linked-array-list-insert-value! wlal 0 (common/unwrap o))
+    (operations/linked-array-list-insert-value! wlal 0 (common/unwrap o))
     this)
 
   (empty [this]
     ;; Assuming similar empty behavior as arrays
     (let [^WriteCursor cursor (-> wlal .cursor)]
-      (.write cursor (util/v->slot! cursor (list))))
+      (.write cursor (conversion/v->slot! cursor (list))))
     this)
 
   (equiv [this other]
@@ -178,7 +178,7 @@
 
   clojure.lang.ITransientCollection
   (conj [this val]
-    (util/linked-array-list-append-value! wlal (common/unwrap val))
+    (operations/linked-array-list-append-value! wlal (common/unwrap val))
     this)
 
   (persistent [this]
@@ -192,7 +192,7 @@
 
   (pop [this]
     (if (pos? (.count wlal))
-      (util/linked-array-list-pop! wlal)
+      (operations/linked-array-list-pop! wlal)
       (throw (IllegalStateException. "Can't pop empty list")))
     this)