Drop byte-streams dependency.

greglook · Dec 16, 2020 · c962d44 · c962d44
1 parent 9cfe786
commit c962d44
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-...
+### Changed
+- Drop `byte-streams` dependency to avoid reflection issues which interfere
+  with Graal native-image compilation.
 
 
 ## [2.0.4] - 2020-04-20

diff --git a/dev/user.clj b/dev/user.clj
@@ -10,7 +10,6 @@
     [blocks.store.memory :refer [memory-block-store]]
     [blocks.store.replica :refer [replica-block-store]]
     [blocks.store.tests :as tests]
-    [byte-streams :as bytes :refer [bytes=]]
     [clojure.java.io :as io]
     [clojure.repl :refer :all]
     [clojure.stacktrace :refer [print-cause-trace]]

diff --git a/src/blocks/core.clj b/src/blocks/core.clj
@@ -10,7 +10,6 @@
     [blocks.meter :as meter]
     [blocks.store :as store]
     [blocks.summary :as sum]
-    [byte-streams :as bytes]
     [clojure.java.io :as io]
     [clojure.string :as str]
     [manifold.deferred :as d]
@@ -140,7 +139,7 @@
   "Write a block's content to an output stream."
   [block out]
   (with-open [stream (open block)]
-    (bytes/transfer stream out)))
+    (io/copy stream out)))
 
 
 (defn load!

diff --git a/src/blocks/data.clj b/src/blocks/data.clj
@@ -12,11 +12,13 @@
   demand. A block with in-memory content is considered a _loaded block_, while
   blocks with readers are _lazy blocks_."
   (:require
-    [byte-streams :as bytes]
+    [clojure.java.io :as io]
     [multiformats.hash :as multihash])
   (:import
     blocks.data.PersistentBytes
-    java.io.InputStream
+    (java.io
+      ByteArrayOutputStream
+      InputStream)
     java.time.Instant
     multiformats.hash.Multihash
     (org.apache.commons.io.input
@@ -200,6 +202,17 @@
   (Instant/now))
 
 
+(defn- to-byte-array
+  "Coerce the given source into a byte array."
+  ^bytes
+  [source]
+  (if (bytes? source)
+    source
+    (let [baos (ByteArrayOutputStream.)]
+      (io/copy source baos)
+      (.toByteArray baos))))
+
+
 (defn hasher
   "Return the hashing function for an algorithm keyword, or throw an exception
   if no supported function is available."
@@ -236,7 +249,7 @@
   "Create a block by reading the source into memory and hashing it."
   [algorithm source]
   (let [hash-fn (hasher algorithm)
-        content (PersistentBytes/wrap (bytes/to-byte-array source))
+        content (PersistentBytes/wrap (to-byte-array source))
         size (count content)]
     (when (pos? size)
       (create-block (hash-fn (read-all content)) size (now) content))))

diff --git a/test/blocks/bytes_test.clj b/test/blocks/bytes_test.clj
@@ -1,6 +1,5 @@
 (ns blocks.bytes-test
   (:require
-    [byte-streams :refer [bytes=]]
     [clojure.test :refer [deftest testing is]])
   (:import
     blocks.data.PersistentBytes))
@@ -44,7 +43,7 @@
     (is (not= (hash pb1) (hash pb3)))
     (is (= (.hasheq pb1) (.hasheq pb2)))
     (is (not= (.hasheq pb1) (.hasheq pb3)))
-    (is (bytes= (.open pb1) "foo"))))
+    (is (= "foo" (slurp (.open pb1))))))
 
 
 (deftest persistent-bytes-coll

diff --git a/test/blocks/core_test.clj b/test/blocks/core_test.clj
@@ -4,7 +4,6 @@
     [blocks.data :as data]
     [blocks.store :as store]
     [blocks.test-utils :refer [quiet-exception]]
-    [byte-streams :refer [bytes=]]
     [clojure.java.io :as io]
     [clojure.test :refer [deftest testing is]]
     [manifold.deferred :as d]
@@ -44,7 +43,7 @@
       (is (thrown? IllegalStateException
             (dosync (block/write! block baos))))
       (block/write! block baos)
-      (is (bytes= "frobblenitz" (.toByteArray baos)))))
+      (is (= "frobblenitz" (String. (.toByteArray baos))))))
   (testing "loading"
     (let [lazy-readme (block/from-file "README.md")
           loaded-readme (block/load! lazy-readme)]
@@ -54,8 +53,8 @@
           "load returns loaded block for lazy block")
       (is (identical? loaded-readme (block/load! loaded-readme))
           "load returns loaded block unchanged")
-      (is (bytes= (block/open loaded-readme)
-                  (block/open lazy-readme))
+      (is (= (slurp (block/open loaded-readme))
+             (slurp (block/open lazy-readme)))
           "loaded block content should match lazy block"))))