Permalink
Browse files

Merge branch 'release/0.2.0'

  • Loading branch information...
2 parents 8894a15 + cb5587d commit 054e3fb280bf523cd7343cf63130a58c4f36586b @sritchie sritchie committed Jan 15, 2012
View
@@ -1,9 +1,11 @@
elephantdb-cascading.jar
-CHILD
-CHILDMAKER
-_deps
classes
lib
pom.xml
*.jar
.lein-failures
+.lein-deps-sum
+.DS_Store
+*.iml
+*.ipr
+*.iws
File renamed without changes.
View
@@ -1,12 +1,13 @@
-(defproject elephantdb/elephantdb-cascading "0.1.0"
+(defproject elephantdb/elephantdb-cascading "0.2.0"
:java-source-path "src/jvm"
- :test-path "test/clj"
- :java-fork "true"
- :javac-debug "true"
- :dependencies [[org.clojure/clojure "1.3.0"]
- [elephantdb "0.1.0"]
+ :source-path "src/clj"
+ :javac-options {:debug "true" :fork "true"}
+ :repositories {"conjars" "http://conjars.org/repo"}
+ :dependencies [[elephantdb "0.2.0"]
[cascading/cascading-core "1.2.4"
:exclusions [org.codehaus.janino/janino]]]
- :repositories {"conjars" "http://conjars.org/repo"}
- :dev-dependencies [[org.apache.hadoop/hadoop-core "0.20.2-dev"]
- [swank-clojure "1.4.0-SNAPSHOT"]])
+ :dev-dependencies [[org.clojure/clojure "1.3.0"]
+ [hadoop-util "0.2.7"]
+ [jackknife "0.1.2"]
+ [org.apache.hadoop/hadoop-core "0.20.2-dev"]
+ [midje "1.3.0" :exclusions [org.clojure/clojure]]])
@@ -1,28 +0,0 @@
-package elephantdb.cascading;
-
-import elephantdb.Utils;
-import org.apache.hadoop.io.BytesWritable;
-
-
-public class Common {
- public static byte[] getBytes(BytesWritable bw) {
- byte[] padded = bw.getBytes();
- byte[] ret = new byte[bw.getLength()];
- System.arraycopy(padded, 0, ret, 0, ret.length);
- return ret;
- }
-
- public static byte[] serializeElephantVal(Object o) {
- if(o instanceof BytesWritable) {
- //TODO: does cascading support byte[] directly now?
- return getBytes((BytesWritable) o);
- } else if(o instanceof String) {
- return Utils.serializeString((String) o);
- } else if(o instanceof Integer) {
- return Utils.serializeInt((Integer)o);
- } else if(o instanceof Long) {
- return Utils.serializeLong((Long) o);
- }
- throw new IllegalArgumentException("Could not serialize " + o.toString());
- }
-}
@@ -1,8 +0,0 @@
-package elephantdb.cascading;
-
-import java.io.Serializable;
-import org.apache.hadoop.io.BytesWritable;
-
-public interface Deserializer extends Serializable {
- public Object deserialize(BytesWritable bw);
-}
Oops, something went wrong.

0 comments on commit 054e3fb

Please sign in to comment.