Permalink
Browse files

removed contrib and updated dependencies.

  • Loading branch information...
1 parent d6de3f7 commit b593c4b543879fefe85ed592969eabb52e1709f4 @sritchie sritchie committed Oct 18, 2011
Showing with 9 additions and 14 deletions.
  1. +5 −6 project.clj
  2. +2 −4 src/clj/elephantdb/cascalog/impl.clj
  3. +2 −4 test/clj/elephantdb/cascalog/integration_test.clj
View
@@ -1,12 +1,11 @@
-(defproject elephantdb/elephantdb-cascalog "0.0.7"
+(defproject elephantdb/elephantdb-cascalog "0.1.0"
:source-path "src/clj"
:test-path "test/clj"
:java-source-path "src/jvm"
:java-fork "true"
:javac-debug "true"
- :dependencies [[org.clojure/clojure "1.2.0"]
- [org.clojure/clojure-contrib "1.2.0"]
- [elephantdb/elephantdb-cascading "0.0.7"]
- [cascalog "1.8.0"]]
+ :dependencies [[org.clojure/clojure "1.3.0"]
+ [elephantdb/elephantdb-cascading "0.1.0"]
+ [cascalog "1.8.2"]]
:dev-dependencies [[org.apache.hadoop/hadoop-core "0.20.2-dev"]
- [swank-clojure "1.2.1"]])
+ [swank-clojure "1.4.0-SNAPSHOT"]])
@@ -5,15 +5,13 @@
(:import [java.util ArrayList HashMap])
(:import [cascalog.ops IdentityBuffer])
(:import [org.apache.hadoop.io BytesWritable])
- (:use [cascalog api])
- )
+ (:use [cascalog api]))
(defn- serializable-persistence-options [options]
(HashMap. options))
(defn- serializable-list [l]
- (when l
- (ArrayList. l)))
+ (when l (ArrayList. l)))
(defn convert-clj-args [args]
(let [ret (ElephantDBTap$Args.)]
@@ -6,8 +6,7 @@
(:require [cascalog [ops :as c]])
(:import [org.apache.hadoop.io BytesWritable])
(:import [elephantdb.persistence JavaBerkDB])
- (:import [elephantdb Utils])
- )
+ (:import [elephantdb Utils]))
(defn mk-writable-pairs [pairs]
(map (fn [[k v]] [(BytesWritable. k) (BytesWritable. v)]) pairs))
@@ -17,8 +16,7 @@
nv (if ov
(byte-array (concat (seq ov) (seq v)))
v)]
- (.add lp k nv)
- ))
+ (.add lp k nv)))
(e/deffstest test-all [fs tmp]
(let [data [[(e/barr 0) (e/barr 1)]

0 comments on commit b593c4b

Please sign in to comment.