From e7068b469d2449d41bd46fb9a9c081fa0336728c Mon Sep 17 00:00:00 2001 From: Aviad Reich Date: Fri, 19 Oct 2012 12:03:10 +0200 Subject: [PATCH 01/30] Issue #3: facilitate remote uris not ending with '.git' --- src/datomic/codeq/core.clj | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/datomic/codeq/core.clj b/src/datomic/codeq/core.clj index e39ed0c..d07541c 100644 --- a/src/datomic/codeq/core.clj +++ b/src/datomic/codeq/core.clj @@ -82,7 +82,7 @@ :db/cardinality :db.cardinality/many :db/doc "Associate repo with these git commits" :db.install/_attribute :db.part/db} - + {:db/id #db/id[:db.part/db] :db/ident :repo/uri :db/valueType :db.type/string @@ -250,11 +250,11 @@ :db.install/_attribute :db.part/db} ]) -(defn ^java.io.Reader exec-stream +(defn ^java.io.Reader exec-stream [^String cmd] (-> (Runtime/getRuntime) - (.exec cmd) - .getInputStream + (.exec cmd) + .getInputStream io/reader)) (defn ensure-schema [conn] @@ -303,8 +303,9 @@ noff (.lastIndexOf uri "/") noff (if (not (pos? noff)) (.lastIndexOf uri ":") noff) name (subs uri (inc noff)) - _ (assert (and (pos? (count name)) (.endsWith name ".git")) "Can't find remote origin") - name (subs name 0 (.indexOf name "."))] + _ (assert (pos? (count name)) "Can't find remote origin") + name (if (.endsWith name ".git") (subs name 0 (.indexOf name ".")) + name)] [uri name]))) (defn dir @@ -332,7 +333,7 @@ (seq (map second plines)) (vec (reverse (first xs))) (vec (reverse (second xs))) - (->> lines + (->> lines (drop-while #(not= % "")) rest (interpose "\n") @@ -412,10 +413,10 @@ id)) parents)))]) tx (cond-> tx - (tempid? authorid) + (tempid? authorid) (conj [:db/add authorid :email/address author]) - - (and (not= committer author) (tempid? committerid)) + + (and (not= committer author) (tempid? committerid)) (conj [:db/add committerid :email/address committer]))] tx)) @@ -427,7 +428,7 @@ (mapv #(vector (subs % 0 40) (subs % 41 (count %))) - (line-seq s)))] + (line-seq s)))] commits)) (defn unimported-commits @@ -459,7 +460,7 @@ tx-ret @(d/transact conn [[:db/add temp :repo/uri repo-uri]]) repo (d/resolve-tempid (d/db conn) (:tempids tx-ret) temp)] (println "Adding repo" repo-uri) - repo))] + repo))] (doseq [commit commits] (let [db (d/db conn)] (println "Importing commit:" (:sha commit)) @@ -475,7 +476,7 @@ (doseq [a analyzers] (let [aname (az/keyname a) exts (az/extensions a) - srevs (set (map first (d/q '[:find ?rev :in $ ?a :where + srevs (set (map first (d/q '[:find ?rev :in $ ?a :where [?tx :tx/op :schema] [?tx :tx/analyzer ?a] [?tx :tx/analyzerRev ?rev]] @@ -484,7 +485,7 @@ ;;install schema(s) if not yet present (doseq [[rev aschema] (az/schemas a)] (when-not (srevs rev) - (d/transact conn + (d/transact conn (conj aschema {:db/id (d/tempid :db.part/tx) :tx/op :schema :tx/analyzer aname @@ -517,7 +518,7 @@ (catch Exception ex (println (.getMessage ex)) []))] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :tx/file f @@ -526,7 +527,7 @@ (println "Analysis complete!")) (defn main [& [db-uri commit]] - (if db-uri + (if db-uri (let [conn (ensure-db db-uri) [repo-uri repo-name] (get-repo-uri)] ;;(prn repo-uri) @@ -562,8 +563,8 @@ (d/q '[:find ?m :where [_ :code/text ?m] [(.contains ^String ?m "(ns ")]] db) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/def ?cn] [?cq :codeq/code ?def]] db)) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/code ?def]] db)) -(sort (d/q '[:find ?var ?def ?n :where - [?cn :code/name ?var] +(sort (d/q '[:find ?var ?def ?n :where + [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/file ?f] [?n :node/object ?f] @@ -575,7 +576,7 @@ s (with-open [s (exec-stream (str \"git cat-file -p \" (:git/sha (d/entity db f))))] (slurp s)) adata (az/analyze a db s)] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :codeq/file f From 1913af35bf684f67cef7a81fe38da54f3f3df8a1 Mon Sep 17 00:00:00 2001 From: Aviad Reich Date: Sat, 20 Oct 2012 10:08:51 +0200 Subject: [PATCH 02/30] same commit without the whitespace changes --- src/datomic/codeq/core.clj | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/datomic/codeq/core.clj b/src/datomic/codeq/core.clj index d07541c..4fdab9d 100644 --- a/src/datomic/codeq/core.clj +++ b/src/datomic/codeq/core.clj @@ -82,7 +82,7 @@ :db/cardinality :db.cardinality/many :db/doc "Associate repo with these git commits" :db.install/_attribute :db.part/db} - + {:db/id #db/id[:db.part/db] :db/ident :repo/uri :db/valueType :db.type/string @@ -250,11 +250,11 @@ :db.install/_attribute :db.part/db} ]) -(defn ^java.io.Reader exec-stream +(defn ^java.io.Reader exec-stream [^String cmd] (-> (Runtime/getRuntime) - (.exec cmd) - .getInputStream + (.exec cmd) + .getInputStream io/reader)) (defn ensure-schema [conn] @@ -304,8 +304,7 @@ noff (if (not (pos? noff)) (.lastIndexOf uri ":") noff) name (subs uri (inc noff)) _ (assert (pos? (count name)) "Can't find remote origin") - name (if (.endsWith name ".git") (subs name 0 (.indexOf name ".")) - name)] + name (if (.endsWith name ".git") (subs name 0 (.indexOf name ".")) name)] [uri name]))) (defn dir @@ -333,7 +332,7 @@ (seq (map second plines)) (vec (reverse (first xs))) (vec (reverse (second xs))) - (->> lines + (->> lines (drop-while #(not= % "")) rest (interpose "\n") @@ -413,10 +412,10 @@ id)) parents)))]) tx (cond-> tx - (tempid? authorid) + (tempid? authorid) (conj [:db/add authorid :email/address author]) - - (and (not= committer author) (tempid? committerid)) + + (and (not= committer author) (tempid? committerid)) (conj [:db/add committerid :email/address committer]))] tx)) @@ -428,7 +427,7 @@ (mapv #(vector (subs % 0 40) (subs % 41 (count %))) - (line-seq s)))] + (line-seq s)))] commits)) (defn unimported-commits @@ -460,7 +459,7 @@ tx-ret @(d/transact conn [[:db/add temp :repo/uri repo-uri]]) repo (d/resolve-tempid (d/db conn) (:tempids tx-ret) temp)] (println "Adding repo" repo-uri) - repo))] + repo))] (doseq [commit commits] (let [db (d/db conn)] (println "Importing commit:" (:sha commit)) @@ -476,7 +475,7 @@ (doseq [a analyzers] (let [aname (az/keyname a) exts (az/extensions a) - srevs (set (map first (d/q '[:find ?rev :in $ ?a :where + srevs (set (map first (d/q '[:find ?rev :in $ ?a :where [?tx :tx/op :schema] [?tx :tx/analyzer ?a] [?tx :tx/analyzerRev ?rev]] @@ -485,7 +484,7 @@ ;;install schema(s) if not yet present (doseq [[rev aschema] (az/schemas a)] (when-not (srevs rev) - (d/transact conn + (d/transact conn (conj aschema {:db/id (d/tempid :db.part/tx) :tx/op :schema :tx/analyzer aname @@ -518,7 +517,7 @@ (catch Exception ex (println (.getMessage ex)) []))] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :tx/file f @@ -527,7 +526,7 @@ (println "Analysis complete!")) (defn main [& [db-uri commit]] - (if db-uri + (if db-uri (let [conn (ensure-db db-uri) [repo-uri repo-name] (get-repo-uri)] ;;(prn repo-uri) @@ -563,8 +562,8 @@ (d/q '[:find ?m :where [_ :code/text ?m] [(.contains ^String ?m "(ns ")]] db) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/def ?cn] [?cq :codeq/code ?def]] db)) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/code ?def]] db)) -(sort (d/q '[:find ?var ?def ?n :where - [?cn :code/name ?var] +(sort (d/q '[:find ?var ?def ?n :where + [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/file ?f] [?n :node/object ?f] @@ -576,10 +575,10 @@ s (with-open [s (exec-stream (str \"git cat-file -p \" (:git/sha (d/entity db f))))] (slurp s)) adata (az/analyze a db s)] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :codeq/file f :tx/analyzer aname :tx/analyzerRev arev}))))") -) \ No newline at end of file +) From cbecaafb55d829bf07bff9482590bb8c3583180e Mon Sep 17 00:00:00 2001 From: John Barnette Date: Sat, 27 Oct 2012 12:54:35 -0700 Subject: [PATCH 03/30] Kill all trailing whitespace --- src/datomic/codeq/analyzer.clj | 20 ++++++++--------- src/datomic/codeq/analyzers/clj.clj | 12 +++++----- src/datomic/codeq/core.clj | 34 ++++++++++++++--------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/datomic/codeq/analyzer.clj b/src/datomic/codeq/analyzer.clj index d82a3be..a76f253 100644 --- a/src/datomic/codeq/analyzer.clj +++ b/src/datomic/codeq/analyzer.clj @@ -38,9 +38,9 @@ (-> sb str .trim))) (defn loc - "Returns zero-based [line col endline endcol] given one-based - \"line col endline endcol\" string" - [loc-string] + "Returns zero-based [line col endline endcol] given one-based + \"line col endline endcol\" string" + [loc-string] (mapv dec (read-string (str "[" loc-string "]")))) (defn line-offsets @@ -50,19 +50,19 @@ index is the length of the string." [^String s] (let [nl (long \newline)] - (persistent! + (persistent! (loop [ret (transient [0]), i 0] - (if (= i (.length s)) + (if (= i (.length s)) ret - (recur (if (= (.codePointAt s i) nl) - (conj! ret (inc i)) - ret) + (recur (if (= (.codePointAt s i) nl) + (conj! ret (inc i)) + ret) (inc i))))))) (defn segment "Given a string and line offsets, returns text from (zero-based) - line and col to endline/endcol (exclusive)" + line and col to endline/endcol (exclusive)" [^String s line-offsets line col endline endcol] - (subs s + (subs s (+ (nth line-offsets line) col) (+ (nth line-offsets endline) endcol))) diff --git a/src/datomic/codeq/analyzers/clj.clj b/src/datomic/codeq/analyzers/clj.clj index d27ff4a..7b89158 100644 --- a/src/datomic/codeq/analyzers/clj.clj +++ b/src/datomic/codeq/analyzers/clj.clj @@ -31,9 +31,9 @@ defing (and ns (symbol? op) (.startsWith (name op) "def")) - + naming (let [nsym (second x)] - (cond + (cond ns? (str nsym) defing (if (namespace nsym) (str nsym) @@ -41,26 +41,26 @@ nameid (when naming (codename->id naming)) - ret (cond-> ret + ret (cond-> ret (tempid? codeqid) (conj {:db/id codeqid :codeq/file f :codeq/loc loc :codeq/code codeid}) - + ns? (conj [:db/add codeqid :clj/ns nameid]) defing (conj [:db/add codeqid :clj/def nameid] [:db/add codeqid :clj/defop (str op)]) - + (tempid? nameid) (conj [:db/add nameid :code/name naming]))] [ret (assoc ctx :added added)]) [ret ctx])) -(defn analyze +(defn analyze [db f src] (with-open [r (clojure.lang.LineNumberingPushbackReader. (java.io.StringReader. src))] (let [loffs (az/line-offsets src) diff --git a/src/datomic/codeq/core.clj b/src/datomic/codeq/core.clj index e39ed0c..d0e68d7 100644 --- a/src/datomic/codeq/core.clj +++ b/src/datomic/codeq/core.clj @@ -82,7 +82,7 @@ :db/cardinality :db.cardinality/many :db/doc "Associate repo with these git commits" :db.install/_attribute :db.part/db} - + {:db/id #db/id[:db.part/db] :db/ident :repo/uri :db/valueType :db.type/string @@ -250,11 +250,11 @@ :db.install/_attribute :db.part/db} ]) -(defn ^java.io.Reader exec-stream +(defn ^java.io.Reader exec-stream [^String cmd] (-> (Runtime/getRuntime) - (.exec cmd) - .getInputStream + (.exec cmd) + .getInputStream io/reader)) (defn ensure-schema [conn] @@ -332,7 +332,7 @@ (seq (map second plines)) (vec (reverse (first xs))) (vec (reverse (second xs))) - (->> lines + (->> lines (drop-while #(not= % "")) rest (interpose "\n") @@ -412,10 +412,10 @@ id)) parents)))]) tx (cond-> tx - (tempid? authorid) + (tempid? authorid) (conj [:db/add authorid :email/address author]) - - (and (not= committer author) (tempid? committerid)) + + (and (not= committer author) (tempid? committerid)) (conj [:db/add committerid :email/address committer]))] tx)) @@ -427,7 +427,7 @@ (mapv #(vector (subs % 0 40) (subs % 41 (count %))) - (line-seq s)))] + (line-seq s)))] commits)) (defn unimported-commits @@ -459,7 +459,7 @@ tx-ret @(d/transact conn [[:db/add temp :repo/uri repo-uri]]) repo (d/resolve-tempid (d/db conn) (:tempids tx-ret) temp)] (println "Adding repo" repo-uri) - repo))] + repo))] (doseq [commit commits] (let [db (d/db conn)] (println "Importing commit:" (:sha commit)) @@ -475,7 +475,7 @@ (doseq [a analyzers] (let [aname (az/keyname a) exts (az/extensions a) - srevs (set (map first (d/q '[:find ?rev :in $ ?a :where + srevs (set (map first (d/q '[:find ?rev :in $ ?a :where [?tx :tx/op :schema] [?tx :tx/analyzer ?a] [?tx :tx/analyzerRev ?rev]] @@ -484,7 +484,7 @@ ;;install schema(s) if not yet present (doseq [[rev aschema] (az/schemas a)] (when-not (srevs rev) - (d/transact conn + (d/transact conn (conj aschema {:db/id (d/tempid :db.part/tx) :tx/op :schema :tx/analyzer aname @@ -517,7 +517,7 @@ (catch Exception ex (println (.getMessage ex)) []))] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :tx/file f @@ -526,7 +526,7 @@ (println "Analysis complete!")) (defn main [& [db-uri commit]] - (if db-uri + (if db-uri (let [conn (ensure-db db-uri) [repo-uri repo-name] (get-repo-uri)] ;;(prn repo-uri) @@ -562,8 +562,8 @@ (d/q '[:find ?m :where [_ :code/text ?m] [(.contains ^String ?m "(ns ")]] db) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/def ?cn] [?cq :codeq/code ?def]] db)) (sort (d/q '[:find ?var ?def :where [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/code ?def]] db)) -(sort (d/q '[:find ?var ?def ?n :where - [?cn :code/name ?var] +(sort (d/q '[:find ?var ?def ?n :where + [?cn :code/name ?var] [?cq :clj/ns ?cn] [?cq :codeq/file ?f] [?n :node/object ?f] @@ -575,7 +575,7 @@ s (with-open [s (exec-stream (str \"git cat-file -p \" (:git/sha (d/entity db f))))] (slurp s)) adata (az/analyze a db s)] - (d/transact conn + (d/transact conn (conj adata {:db/id (d/tempid :db.part/tx) :tx/op :analyze :codeq/file f From 410c855da036994f71ac27651385975c0d8918c1 Mon Sep 17 00:00:00 2001 From: Devin Walters Date: Fri, 16 Nov 2012 22:59:09 -0500 Subject: [PATCH 04/30] Useless build script --- script/build | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 script/build diff --git a/script/build b/script/build new file mode 100755 index 0000000..cec102c --- /dev/null +++ b/script/build @@ -0,0 +1,3 @@ +#!/bin/bash + +lein uberjar From e78b505b7692033df435b917933b2e5cc4f6bf11 Mon Sep 17 00:00:00 2001 From: Devin Walters Date: Sat, 24 Nov 2012 17:16:11 -0600 Subject: [PATCH 05/30] Remove unnecessary build script --- script/build | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 script/build diff --git a/script/build b/script/build deleted file mode 100755 index cec102c..0000000 --- a/script/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -lein uberjar From 9601dc25aef40a87ae4bfef0a8b0cd0e87b0274e Mon Sep 17 00:00:00 2001 From: Robert Pitts Date: Fri, 4 Jan 2013 18:32:26 -0500 Subject: [PATCH 06/30] `bin/rest` example was missing `-p` flag This is necessary to run the example on the given port. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c86dbc..f3f92d5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ You can import more than one repo into the same db. You can re-import later afte You can then (or during) connect to the same db URI with a peer. Or, just start the [Datomic REST service](http://docs.datomic.com/rest.html) and poke around: cd whereverYouPutDatomicFree - bin/rest 8080 free datomic:free://localhost:4334/ + bin/rest -p 8080 free datomic:free://localhost:4334/ Browse to [localhost:8080](http://localhost:8080). You should see the `free` storage and the `git` db within it. From ee1cdc97b19f518a626672fa6005a773e98ffa12 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 11 Jan 2013 14:12:03 -0500 Subject: [PATCH 07/30] Use cond-> for to the one included in Clojure 1.5.0-rc1 --- project.clj | 4 ++-- src/datomic/codeq/analyzers/clj.clj | 2 +- src/datomic/codeq/core.clj | 2 +- src/datomic/codeq/util.clj | 9 --------- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/project.clj b/project.clj index bc473d2..b8411aa 100644 --- a/project.clj +++ b/project.clj @@ -5,6 +5,6 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3546"] + :dependencies [[com.datomic/datomic-free "0.8.3731"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-alpha6"]]) + [org.clojure/clojure "1.5.0-rc1"]]) diff --git a/src/datomic/codeq/analyzers/clj.clj b/src/datomic/codeq/analyzers/clj.clj index d27ff4a..a657a6d 100644 --- a/src/datomic/codeq/analyzers/clj.clj +++ b/src/datomic/codeq/analyzers/clj.clj @@ -8,7 +8,7 @@ (ns datomic.codeq.analyzers.clj (:require [datomic.api :as d] - [datomic.codeq.util :refer [cond-> index->id-fn tempid?]] + [datomic.codeq.util :refer [index->id-fn tempid?]] [datomic.codeq.analyzer :as az])) (defn analyze-1 diff --git a/src/datomic/codeq/core.clj b/src/datomic/codeq/core.clj index e39ed0c..e09b4d2 100644 --- a/src/datomic/codeq/core.clj +++ b/src/datomic/codeq/core.clj @@ -11,7 +11,7 @@ [clojure.java.io :as io] [clojure.set] [clojure.string :as string] - [datomic.codeq.util :refer [cond-> index->id-fn tempid?]] + [datomic.codeq.util :refer [index->id-fn tempid?]] [datomic.codeq.analyzer :as az] [datomic.codeq.analyzers.clj]) (:import java.util.Date) diff --git a/src/datomic/codeq/util.clj b/src/datomic/codeq/util.clj index 76dcbe1..89eae6e 100644 --- a/src/datomic/codeq/util.clj +++ b/src/datomic/codeq/util.clj @@ -24,13 +24,4 @@ (or (index-get-id db attr x) (d/tempid :db.part/user))))) -(defmacro cond-> - [init & steps] - (assert (even? (count steps))) - (let [g (gensym) - pstep (fn [[pred step]] `(if ~pred (-> ~g ~step) ~g))] - `(let [~g ~init - ~@(interleave (repeat g) (map pstep (partition 2 steps)))] - ~g))) - (def tempid? map?) From 2b657d190805db73ef153f356317fc9327bf83b6 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 11 Jan 2013 16:27:31 -0500 Subject: [PATCH 08/30] Add Contributors to the copyright header --- src/datomic/codeq/analyzer.clj | 2 +- src/datomic/codeq/analyzers/clj.clj | 2 +- src/datomic/codeq/core.clj | 2 +- src/datomic/codeq/util.clj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datomic/codeq/analyzer.clj b/src/datomic/codeq/analyzer.clj index d82a3be..527341b 100644 --- a/src/datomic/codeq/analyzer.clj +++ b/src/datomic/codeq/analyzer.clj @@ -1,4 +1,4 @@ -;; Copyright (c) Metadata Partners, LLC. All rights reserved. +;; Copyright (c) Metadata Partners, LLC and Contributors. All rights reserved. ;; The use and distribution terms for this software are covered by the ;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) ;; which can be found in the file epl-v10.html at the root of this distribution. diff --git a/src/datomic/codeq/analyzers/clj.clj b/src/datomic/codeq/analyzers/clj.clj index a657a6d..4b5c90b 100644 --- a/src/datomic/codeq/analyzers/clj.clj +++ b/src/datomic/codeq/analyzers/clj.clj @@ -1,4 +1,4 @@ -;; Copyright (c) Metadata Partners, LLC. All rights reserved. +;; Copyright (c) Metadata Partners, LLC and Contributors. All rights reserved. ;; The use and distribution terms for this software are covered by the ;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) ;; which can be found in the file epl-v10.html at the root of this distribution. diff --git a/src/datomic/codeq/core.clj b/src/datomic/codeq/core.clj index e09b4d2..ecef414 100644 --- a/src/datomic/codeq/core.clj +++ b/src/datomic/codeq/core.clj @@ -1,4 +1,4 @@ -;; Copyright (c) Metadata Partners, LLC. All rights reserved. +;; Copyright (c) Metadata Partners, LLC and Contributors. All rights reserved. ;; The use and distribution terms for this software are covered by the ;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) ;; which can be found in the file epl-v10.html at the root of this distribution. diff --git a/src/datomic/codeq/util.clj b/src/datomic/codeq/util.clj index 89eae6e..e2453bc 100644 --- a/src/datomic/codeq/util.clj +++ b/src/datomic/codeq/util.clj @@ -1,4 +1,4 @@ -;; Copyright (c) Metadata Partners, LLC. All rights reserved. +;; Copyright (c) Metadata Partners, LLC and Contributors. All rights reserved. ;; The use and distribution terms for this software are covered by the ;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php) ;; which can be found in the file epl-v10.html at the root of this distribution. From fdab3e19443bd95e6c8493524bd484327502ca9e Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 18 Jan 2013 10:36:12 -0500 Subject: [PATCH 09/30] Uppercase RC1 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index b8411aa..80a5d1e 100644 --- a/project.clj +++ b/project.clj @@ -7,4 +7,4 @@ :plugins [[lein-tar "1.1.0"]] :dependencies [[com.datomic/datomic-free "0.8.3731"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-rc1"]]) + [org.clojure/clojure "1.5.0-RC1"]]) From 4f5da523209487ff5479d23d1a0ae7e37bf05056 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 18 Jan 2013 11:19:05 -0500 Subject: [PATCH 10/30] Fix copyright statement in README to match those in the source files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3f92d5..b44eefb 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ The [schema diagram](https://github.com/downloads/Datomic/codeq/codeq.pdf) will ## More info See the [intro blog post](http://blog.datomic.com/2012/10/codeq.html) and the [wiki](https://github.com/Datomic/codeq/wiki) - + ## License -Copyright © 2012 Metadata Partners, LLC +Copyright © 2012 Metadata Partners, LLC and Contributors. All rights reserved. Distributed under the Eclipse Public License, the same as Clojure. From bb1a816346d74d7909a3f30c61a2b09e73a4541d Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 18 Jan 2013 18:11:38 -0500 Subject: [PATCH 11/30] Link to REST url /data in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b44eefb..93b5100 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ You can then (or during) connect to the same db URI with a peer. Or, just start cd whereverYouPutDatomicFree bin/rest -p 8080 free datomic:free://localhost:4334/ -Browse to [localhost:8080](http://localhost:8080). You should see the `free` storage and the `git` db within it. +Browse to [localhost:8080/data/](http://localhost:8080/data/). You should see the `free` storage and the `git` db within it. The [schema diagram](https://github.com/downloads/Datomic/codeq/codeq.pdf) will help you get oriented. From 80d357c5bb453f07059c9055cb8144bf7ec800f3 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Thu, 31 Jan 2013 13:53:55 -0500 Subject: [PATCH 12/30] Clojure and contrib example --- examples/clojure-and-contrib | 52 +++++++++++++++++++ .../codeq/examples/clojure_and_contrib.clj | 46 ++++++++++++++++ project.clj | 3 +- 3 files changed, 100 insertions(+), 1 deletion(-) create mode 100755 examples/clojure-and-contrib create mode 100644 examples/src/datomic/codeq/examples/clojure_and_contrib.clj diff --git a/examples/clojure-and-contrib b/examples/clojure-and-contrib new file mode 100755 index 0000000..06d0b1b --- /dev/null +++ b/examples/clojure-and-contrib @@ -0,0 +1,52 @@ +#!/bin/bash + +cd `dirname $0`/.. +CODEQ_ROOT=`pwd` + +DATOMIC_VERSION="0.8.3767" +DATOMIC_FILE="datomic-free-$DATOMIC_VERSION" +DATOMIC_URL=http://downloads.datomic.com/$DATOMIC_VERSION/$DATOMIC_FILE.zip + +BACKUP_FILE="clojure-and-contrib" +BACKUP_URL=http://codeq.s3.amazonaws.com/examples/$BACKUP_FILE.zip + +WORKING_DIR=/tmp/codeq/examples + +DB_URI="datomic:free://localhost:4334/clojure-and-contrib" + +mkdir -p $WORKING_DIR +cd $WORKING_DIR + +if [ ! -d "$BACKUP_FILE" ]; then + wget $BACKUP_URL + unzip $BACKUP_FILE.zip +fi + +if [ ! -d "$DATOMIC_FILE" ]; then + wget $DATOMIC_URL + unzip $DATOMIC_FILE.zip +fi + +#### Restore + +cd $DATOMIC_FILE + +bin/transactor config/samples/free-transactor-template.properties & +TRANSACTOR_PID=$! + +bin/datomic restore-db file:$WORKING_DIR/$BACKUP_FILE $DB_URI + +pkill -P $TRANSACTOR_PID + +#### Verify + +bin/transactor config/samples/free-transactor-template.properties & +TRANSACTOR_PID=$! + +cd $CODEQ_ROOT + +sleep 5 + +lein run -m datomic.codeq.examples.clojure-and-contrib $DB_URI + +pkill -P $TRANSACTOR_PID diff --git a/examples/src/datomic/codeq/examples/clojure_and_contrib.clj b/examples/src/datomic/codeq/examples/clojure_and_contrib.clj new file mode 100644 index 0000000..8a292e6 --- /dev/null +++ b/examples/src/datomic/codeq/examples/clojure_and_contrib.clj @@ -0,0 +1,46 @@ +(ns datomic.codeq.examples.clojure-and-contrib + (:require [datomic.api :as d :refer [q]] + [clojure.pprint :refer [pprint]])) + +(defn -main [& [database-uri]] + (assert database-uri) + (println "Running clojure-and-contrib examples with database" database-uri) + (try + (let [conn (d/connect database-uri) + db (-> conn d/db (d/as-of 435691)) + repos (map first + (q '[:find ?repo + :where [?e :repo/uri ?repo]] + db)) + namespaces (map first + (q '[:find ?ns + :where + [?e :clj/ns ?n] + [?n :code/name ?ns]] + db)) + definitions (reduce (fn [agg [o d]] + (update-in agg [o] (fnil conj []) d)) + {} + (q '[:find ?op ?def + :where + [?e :clj/def ?d] + [?e :clj/defop ?op] + [?d :code/name ?def]] + db))] + (println) + (println "#### Repos:") + (println) + (pprint repos) + (println) + (println "#### Namespaces:") + (println) + (pprint namespaces) + (println) + (println "#### Definitions:") + (println) + (pprint definitions) + (assert (= 44 (-> definitions keys count))) + (assert (= 33 (-> "defne" definitions count)))) + (finally + ;; (shutdown-agents) + (System/exit 0)))) diff --git a/project.clj b/project.clj index 80a5d1e..a49552a 100644 --- a/project.clj +++ b/project.clj @@ -7,4 +7,5 @@ :plugins [[lein-tar "1.1.0"]] :dependencies [[com.datomic/datomic-free "0.8.3731"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC1"]]) + [org.clojure/clojure "1.5.0-RC1"]] + :source-paths ["src" "examples/src"]) From 978c55b0c9791ee7d2206fc61c2f6ab9544ad125 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Thu, 31 Jan 2013 15:35:45 -0500 Subject: [PATCH 13/30] Make examples more self-contained - Also improve error handling without resorting to `set -e` --- .gitignore | 1 + examples/clojure-and-contrib | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 988ea68..cc989ce 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /lib /classes /checkouts +/tmp pom.xml *.jar *.class diff --git a/examples/clojure-and-contrib b/examples/clojure-and-contrib index 06d0b1b..fca3d9d 100755 --- a/examples/clojure-and-contrib +++ b/examples/clojure-and-contrib @@ -10,12 +10,14 @@ DATOMIC_URL=http://downloads.datomic.com/$DATOMIC_VERSION/$DATOMIC_FILE.zip BACKUP_FILE="clojure-and-contrib" BACKUP_URL=http://codeq.s3.amazonaws.com/examples/$BACKUP_FILE.zip -WORKING_DIR=/tmp/codeq/examples - DB_URI="datomic:free://localhost:4334/clojure-and-contrib" +RET=0 + +WORKING_DIR=tmp/`date +"%Y%m%d%H%M%S"` mkdir -p $WORKING_DIR cd $WORKING_DIR +WORKING_DIR=`pwd` if [ ! -d "$BACKUP_FILE" ]; then wget $BACKUP_URL @@ -34,8 +36,12 @@ cd $DATOMIC_FILE bin/transactor config/samples/free-transactor-template.properties & TRANSACTOR_PID=$! +(( RET += $? )) + bin/datomic restore-db file:$WORKING_DIR/$BACKUP_FILE $DB_URI +(( RET += $? )) + pkill -P $TRANSACTOR_PID #### Verify @@ -43,10 +49,16 @@ pkill -P $TRANSACTOR_PID bin/transactor config/samples/free-transactor-template.properties & TRANSACTOR_PID=$! +(( RET += $? )) + cd $CODEQ_ROOT sleep 5 lein run -m datomic.codeq.examples.clojure-and-contrib $DB_URI +(( RET += $? )) + pkill -P $TRANSACTOR_PID + +exit $RET From f87a6022e6449970aa70b71aba55d4b9f8bb96b4 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Thu, 31 Jan 2013 15:36:32 -0500 Subject: [PATCH 14/30] Update to datomic-free 0.8.3767 and clojure 1.5.0-RC4 --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index a49552a..10978a0 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3731"] + :dependencies [[com.datomic/datomic-free "0.8.3767"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC1"]] + [org.clojure/clojure "1.5.0-RC4"]] :source-paths ["src" "examples/src"]) From 02800e80b3440501f5d2515b49175d68ad39c2fb Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 1 Feb 2013 15:36:50 -0500 Subject: [PATCH 15/30] Update Datomic free to 0.8.3784 --- examples/clojure-and-contrib | 2 +- project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/clojure-and-contrib b/examples/clojure-and-contrib index fca3d9d..5a5d604 100755 --- a/examples/clojure-and-contrib +++ b/examples/clojure-and-contrib @@ -3,7 +3,7 @@ cd `dirname $0`/.. CODEQ_ROOT=`pwd` -DATOMIC_VERSION="0.8.3767" +DATOMIC_VERSION="0.8.3784" DATOMIC_FILE="datomic-free-$DATOMIC_VERSION" DATOMIC_URL=http://downloads.datomic.com/$DATOMIC_VERSION/$DATOMIC_FILE.zip diff --git a/project.clj b/project.clj index 10978a0..bf44cd5 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3767"] + :dependencies [[com.datomic/datomic-free "0.8.3784"] [commons-codec "1.7"] [org.clojure/clojure "1.5.0-RC4"]] :source-paths ["src" "examples/src"]) From 7188ca3f277a4fa063f09532b94d9511346cd51a Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 5 Feb 2013 17:12:20 -0500 Subject: [PATCH 16/30] Add an update of Clojure to the clojure-and-contrib example, to exercise the transactor --- examples/clojure-and-contrib | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/examples/clojure-and-contrib b/examples/clojure-and-contrib index 5a5d604..acee7ac 100755 --- a/examples/clojure-and-contrib +++ b/examples/clojure-and-contrib @@ -1,6 +1,7 @@ #!/bin/bash cd `dirname $0`/.. +CODEQ_VERSION="0.1.0-SNAPSHOT" CODEQ_ROOT=`pwd` DATOMIC_VERSION="0.8.3784" @@ -14,7 +15,7 @@ DB_URI="datomic:free://localhost:4334/clojure-and-contrib" RET=0 -WORKING_DIR=tmp/`date +"%Y%m%d%H%M%S"` +WORKING_DIR=tmp/examples/clojure-and-contrib mkdir -p $WORKING_DIR cd $WORKING_DIR WORKING_DIR=`pwd` @@ -33,6 +34,9 @@ fi cd $DATOMIC_FILE +# Start with a fresh database +rm -rf data log + bin/transactor config/samples/free-transactor-template.properties & TRANSACTOR_PID=$! @@ -59,6 +63,16 @@ lein run -m datomic.codeq.examples.clojure-and-contrib $DB_URI (( RET += $? )) +cd $CODEQ_ROOT +lein uberjar + +git clone git@github.com:clojure/clojure.git $WORKING_DIR/clojure +cd $WORKING_DIR/clojure + +java -server -Xmx1g -jar $CODEQ_ROOT/target/codeq-$CODEQ_VERSION-standalone.jar $DB_URI + +(( RET += $? )) + pkill -P $TRANSACTOR_PID exit $RET From 2ef87b1d066b9ff5991d844af9171b4fbe00cb0e Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 12 Feb 2013 16:54:55 -0500 Subject: [PATCH 17/30] Update clojure and datomic. --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index bf44cd5..382c748 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3784"] + :dependencies [[com.datomic/datomic-free "0.8.3803"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC4"]] + [org.clojure/clojure "1.5.0-RC15"]] :source-paths ["src" "examples/src"]) From de3d1bd9e17901801f0beeb9f858ed0e45b16fe6 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Mon, 18 Feb 2013 15:15:42 -0500 Subject: [PATCH 18/30] Update Clojure and Datomic --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 382c748..05ab7c4 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3803"] + :dependencies [[com.datomic/datomic-free "0.8.3814"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC15"]] + [org.clojure/clojure "1.5.0-RC16"]] :source-paths ["src" "examples/src"]) From 0515f50143474ff1440a5ceffbeaf5cf03c9b56c Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 26 Feb 2013 14:59:06 -0500 Subject: [PATCH 19/30] Update Clojure to 1.5.0-RC17 and Datomic to 0.8.3826 --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 05ab7c4..efdbd0f 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3814"] + :dependencies [[com.datomic/datomic-free "0.8.3826"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC16"]] + [org.clojure/clojure "1.5.0-RC17"]] :source-paths ["src" "examples/src"]) From c9ec6e7a4ec4055a39720dc227f7c42a25250cca Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 5 Mar 2013 17:01:59 -0500 Subject: [PATCH 20/30] Update to Clojure 1.5.0 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index efdbd0f..97d0579 100644 --- a/project.clj +++ b/project.clj @@ -7,5 +7,5 @@ :plugins [[lein-tar "1.1.0"]] :dependencies [[com.datomic/datomic-free "0.8.3826"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0-RC17"]] + [org.clojure/clojure "1.5.0"]] :source-paths ["src" "examples/src"]) From 10bb136e5f67f148fe17baa46c34d3c60250ffcd Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 12 Mar 2013 15:57:24 -0400 Subject: [PATCH 21/30] Update Clojure to 1.5.1 and Datomic to 0.8.3843 --- project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 97d0579..7a9acf8 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3826"] + :dependencies [[com.datomic/datomic-free "0.8.3843"] [commons-codec "1.7"] - [org.clojure/clojure "1.5.0"]] + [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 0077148ce1af0f3953fa19dab18f25cc376573dc Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 12 Mar 2013 15:58:00 -0400 Subject: [PATCH 22/30] Clean before creating uberjar in clojure-and-contrib example --- examples/clojure-and-contrib | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/clojure-and-contrib b/examples/clojure-and-contrib index acee7ac..db35467 100755 --- a/examples/clojure-and-contrib +++ b/examples/clojure-and-contrib @@ -64,6 +64,7 @@ lein run -m datomic.codeq.examples.clojure-and-contrib $DB_URI (( RET += $? )) cd $CODEQ_ROOT +lein clean lein uberjar git clone git@github.com:clojure/clojure.git $WORKING_DIR/clojure From e339839b3c9975b93473befec23b4788fa1a554f Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Wed, 27 Mar 2013 16:46:41 -0400 Subject: [PATCH 23/30] Update to Datomic 0.8.3861 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 7a9acf8..2ff0678 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3843"] + :dependencies [[com.datomic/datomic-free "0.8.3861"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 8db739cd5634e1c41d49e75bce7ca421a6bb0626 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Wed, 3 Apr 2013 16:00:02 -0400 Subject: [PATCH 24/30] Update to Datomic 0.8.3862 --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2ff0678..bcc1537 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3861"] + :dependencies [[com.datomic/datomic-free "0.8.3862"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 3b5e72c21daa69a9969ed00301173a6c81cb916c Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Wed, 8 May 2013 11:47:55 -0400 Subject: [PATCH 25/30] Update Datomic --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index bcc1537..9313871 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3862"] + :dependencies [[com.datomic/datomic-free "0.8.3895"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 84f3d40346d81d691282c285f394224a8bef39f0 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Mon, 13 May 2013 17:15:39 -0400 Subject: [PATCH 26/30] Update Datomic --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 9313871..6e5e2f2 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3895"] + :dependencies [[com.datomic/datomic-free "0.8.3941"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From fe44479eb1b2c5d24b39e943dbb2778c59586774 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Mon, 24 Jun 2013 10:10:21 -0400 Subject: [PATCH 27/30] Upgrade Datomic --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 6e5e2f2..bb2bf08 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.3941"] + :dependencies [[com.datomic/datomic-free "0.8.4020"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 329d0c3d9e1a0f9dadda5e3d77b6992e49dbb65d Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Mon, 1 Jul 2013 08:53:54 -0400 Subject: [PATCH 28/30] Upgrade Datomic --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index bb2bf08..eb5ac35 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.4020"] + :dependencies [[com.datomic/datomic-free "0.8.4020.24"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From 087c4dc45c7f3eb9901c273917c656f59da92a92 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Fri, 6 Dec 2013 12:14:12 -0500 Subject: [PATCH 29/30] Upgrade Datomic --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index eb5ac35..7a43a14 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.8.4020.24"] + :dependencies [[com.datomic/datomic-free "0.9.4324"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"]) From de60a9d2df23cc750b1fa4aa4c7d4c2c926a1422 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Wed, 26 Mar 2014 09:20:20 -0400 Subject: [PATCH 30/30] Upgrade Datomic. Fixes issue #18. Issue #18 is due to a change in the index format introduced in version 0.9.4699. Peers and transactors must upgrade to this version simultaneously. Please see http://docs.datomic.com/release-notices.html for details. --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 7a43a14..1ce950d 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :main datomic.codeq.core :plugins [[lein-tar "1.1.0"]] - :dependencies [[com.datomic/datomic-free "0.9.4324"] + :dependencies [[com.datomic/datomic-free "0.9.4699"] [commons-codec "1.7"] [org.clojure/clojure "1.5.1"]] :source-paths ["src" "examples/src"])