Skip to content

Commit 5337a8b

Browse files
author
Marshall Bockrath-Vandegrift
committed
A more recent CDH5; fix resulting reflection.
1 parent 7459b3d commit 5337a8b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

project.clj

+4-4
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@
113113
[org.apache.hadoop/hadoop-common "2.0.0-cdh4.1.2"]]}]
114114
:avro-cdh5 [:cloudera
115115
{:dependencies
116-
[[org.apache.avro/avro "1.7.6-cdh5.3.1"]
117-
[org.apache.avro/avro-mapred "1.7.6-cdh5.3.1"
116+
[[org.apache.avro/avro "1.7.6-cdh5.4.2"]
117+
[org.apache.avro/avro-mapred "1.7.6-cdh5.4.2"
118118
:classifier "hadoop2"]]}]
119119
:hadoop-cdh5 [:cloudera
120120
:avro-cdh5
121121
{:dependencies
122-
[[org.apache.hadoop/hadoop-client "2.5.0-cdh5.3.1"]
123-
[org.apache.hadoop/hadoop-common "2.5.0-cdh5.3.1"]]}]})
122+
[[org.apache.hadoop/hadoop-client "2.6.0-cdh5.4.2"]
123+
[org.apache.hadoop/hadoop-common "2.6.0-cdh5.4.2"]]}]})

src/clojure/parkour/io/avro.clj

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
{:-seekable-input (fn [p opts]
3232
(FsInput.
3333
(fs/path p)
34-
(cond (contains? opts :conf) (:conf opts)
35-
(contains? opts :fs) (conf/ig (:fs opts))
36-
:else (conf/ig))))})
34+
(conf/ig
35+
(cond (contains? opts :conf) (:conf opts)
36+
(contains? opts :fs) (:fs opts)
37+
:else {}))))})
3738

3839
(extend Path avro/PSeekableInput fs-input-impl)
3940
(extend URI avro/PSeekableInput fs-input-impl)

0 commit comments

Comments
 (0)