Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Split Max #234

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
(defproject factual/drake "1.0.3"
(defproject factual/drake "1.0.4-cdh5-SNAPSHOT"
:description "Drake: the data processing workflow tool (a.k.a. 'make for data')"
:url "https://github.com/Factual/drake"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:scm {:name "git"
:url "https://github.com/Factual/drake"}
:deploy-repositories [["clojars" {:creds :gpg}]]
:repositories {"cloudera" "https://repository.cloudera.com/content/groups/cdh-releases-rcs"
"foursquare" {:url "https://foursquaredev.jfrog.io/foursquaredev/fsnexus"
:username :env/MVN_USERNAME :password :env/MVN_PASSWORD}
}
:deploy-repositories {"snapshots" {:id "foursquare"
:url "https://foursquaredev.jfrog.io/foursquaredev/fsfactual-snapshots-local"
:username :env/MVN_USERNAME :password :env/MVN_PASSWORD
:sign-releases false}
"releases" {:id "foursquare"
:url "https://foursquaredev.jfrog.io/foursquaredev/fsfactual-releases-local"
:username :env/MVN_USERNAME :password :env/MVN_PASSWORD
:sign-releases false}}
Comment on lines +3 to +14

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand these changes, where did they come from and why are those so different?

:dependencies [[org.clojure/clojure "1.6.0"]
[org.clojure/core.memoize "0.5.6"]
[factual/drake-interface "0.0.1"]
Expand All @@ -26,7 +32,9 @@
[factual/sosueme "0.0.15"]
[factual/c4 "0.2.1"]
[hdfs-clj "0.1.3"] ;; for HDFS support
[org.apache.hadoop/hadoop-core "0.20.2"]
[org.apache.hadoop/hadoop-mapreduce-client-core "2.6.0-cdh5.13.0"]
[org.apache.hadoop/hadoop-hdfs "2.6.0-cdh5.13.0"]
[org.apache.hadoop/hadoop-common "2.6.0-cdh5.13.0"]
Comment on lines +35 to +37

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these necessary?

[clj-aws-s3 "0.3.10" :exclusions [joda-time]] ;; for AWS S3 support
;; for plugins
[com.cemerick/pomegranate "0.2.0" :exclusions [org.apache.httpcomponents/httpcore]]]
Expand Down
4 changes: 2 additions & 2 deletions src/drake/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,12 @@
(let [pairs (str/split vars-str (re-pattern split-regex-str))]
(reduce
(fn [acc pair]
(let [spl (str/split pair #"=" -1)]
(let [spl (str/split pair #"=" 2)]
(if (not= (count spl) 2)
(do
(println "Invalid variable definition in -v or --vars:" pair)
(shutdown -1)))
(conj acc (str/split pair #"="))))
(conj acc (str/split pair #"=" 2))))
{}
pairs))))

Expand Down