Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 6 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
31 pom.xml
@@ -27,12 +27,37 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
- <version>1.0.0</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core-with-dependencies</artifactId>
- <version>0.18.3</version>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.205.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <version>6.1.14</version>
</dependency>
</dependencies>
<build>
View
8 src/main/clojure/clojure_hadoop/config.clj
@@ -2,7 +2,7 @@
(:require [clojure-hadoop.imports :as imp]
[clojure-hadoop.load :as load])
(:import (org.apache.hadoop.io.compress
- DefaultCodec GzipCodec LzoCodec)))
+ DefaultCodec GzipCodec)))
;; This file defines configuration options for clojure-hadoop.
;;
@@ -175,10 +175,6 @@
(FileOutputFormat/setOutputCompressorClass
jobconf GzipCodec)
- (= "lzo" (as-str value))
- (FileOutputFormat/setOutputCompressorClass
- jobconf LzoCodec)
-
:else
(FileOutputFormat/setOutputCompressorClass
jobconf (Class/forName value))))
@@ -233,7 +229,7 @@ Other available options are:
-name Job name
-replace If \"true\", deletes output dir before start
-compress-output If \"true\", compress job output files
- -output-compressor Compression class or \"gzip\",\"lzo\",\"default\"
+ -output-compressor Compression class or \"gzip\",\"default\"
-compression-type For seqfiles, compress \"block\",\"record\",\"none\"
"))
View
4 src/main/clojure/clojure_hadoop/imports.clj
@@ -35,7 +35,7 @@ VersionMismatchException)))
Decompressor BlockCompressorStream BlockDecompressorStream CodecPool
CompressionCodecFactory CompressionInputStream CompressionOutputStream
CompressorStream DecompressorStream DefaultCodec GzipCodec
-GzipCodec$GzipInputStream GzipCodec$GzipOutputStream)))
+ GzipCodec$GzipOutputStream)))
(defn import-fs
"Imports all classes/interfaces/exceptions from the package
@@ -44,7 +44,7 @@ GzipCodec$GzipInputStream GzipCodec$GzipOutputStream)))
(import '(org.apache.hadoop.fs PathFilter PositionedReadable
Seekable Syncable BlockLocation BufferedFSInputStream
ChecksumFileSystem ContentSummary DF DU FileStatus FileSystem
-FileSystem$Statistics FileUtil FileUtil$HardLink FilterFileSystem
+FileSystem$Statistics FileUtil HardLink FilterFileSystem
FSDataInputStream FSDataOutputStream FSInputChecker FSInputStream
FSOutputSummer FsShell FsUrlStreamHandlerFactory HarFileSystem
InMemoryFileSystem LocalDirAllocator LocalFileSystem Path

No commit comments for this range

Something went wrong with that request. Please try again.