You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@storm.apache.org by taojoe <gi...@git.apache.org> on 2014/10/07 02:51:37 UTC
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
GitHub user taojoe opened a pull request:
https://github.com/apache/storm/pull/285
use boolean to replace some?, backtype.storm.util is compatible with clojure 1.6
use boolean to replace some?, backtype.storm.util is compatible with clojure 1.6
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/taojoe/storm master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/285.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #285
----
commit e738e27ed8a24b30143c229a3b8405271372ca23
Author: joe <ta...@gmail.com>
Date: 2014-10-07T00:26:16Z
delete 'some?', change 'zip-contains-dir?'. make storm-core/src/clj/backtype/storm/util.clj compatible with clojure 1.6. in fact zip-contains-dir? use some? will include empty zip file.
commit c0e51a281f3de5715e8108e9f556e32a0f501f79
Author: joe <ta...@gmail.com>
Date: 2014-10-07T00:41:05Z
Revert "delete 'some?', change 'zip-contains-dir?'. make storm-core/src/clj/backtype/storm/util.clj compatible with clojure 1.6. in fact zip-contains-dir? use some? will include empty zip file."
This reverts commit e738e27ed8a24b30143c229a3b8405271372ca23.
commit 6ede0787ea7401ff98f6c4bb2adf5df9153a1b7a
Author: joe <ta...@gmail.com>
Date: 2014-10-07T00:49:42Z
use boolean to replace some?, backtype.storm.util is compatible with clojure 1.6
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by taojoe <gi...@git.apache.org>.
Github user taojoe commented on the pull request:
https://github.com/apache/storm/pull/285#issuecomment-65891279
hi Robert,
thanks very much, this is the first time for me. I change
supervisor_test.clj the same way. but I don't the the apache jira account,
and the sign up is not working well, it always return the form i submit
without error msg.
Joe
On Sat, Nov 29, 2014 at 7:05 AM, Robert (Bobby) Evans <
notifications@github.com> wrote:
> I like the change, but supervisor_test.clj needs to be updated too (same
> chage as before). It would also be good if you could file a JIRA for this
> at http://issues.apache.org/jira, for tracking purposes. Other then that
> I am +1.
>
> Oh I ran the full set of unit tests with clojure-1.6.0 and they all
> passed, might be worth updating that too.
>
> diff --git a/pom.xml b/pom.xml
> index 5645b9a..233c7ba 100644
> --- a/pom.xml
> +++ b/pom.xml
> @@ -180,7 +180,7 @@
> <test.extra.args>-Djava.net.preferIPv4Stack=true</test.extra.args>
>
> <!-- dependency versions -->
> - <clojure.version>1.5.1</clojure.version>
> + <clojure.version>1.6.0</clojure.version>
> <compojure.version>1.1.3</compojure.version>
> <hiccup.version>0.3.6</hiccup.version>
> <commons-io.version>2.4</commons-io.version>
> diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
> index a3594a3..4157c83 100644
> --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
> +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
> @@ -517,7 +517,7 @@
> (defn found? [sub-str input-str]
> (if (string? input-str)
> (contrib-str/substring? sub-str (str input-str))
> - (some? #(contrib-str/substring? sub-str %) input-str)))
> + (boolean (some #(contrib-str/substring? sub-str %) input-str))))
>
> (defn not-found? [sub-str input-str]
> (complement (found? sub-str input-str)))
>
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/apache/storm/pull/285#issuecomment-64933603>.
>
--
Zhou Xiangtao
Email: taojoe@gmail.com
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/storm/pull/285
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by revans2 <gi...@git.apache.org>.
Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/285#issuecomment-69243249
@taojoe any update on this? If I don't hear from you soon, I'll probably just file a JIRA myself for this.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by revans2 <gi...@git.apache.org>.
Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/285#issuecomment-66633105
@taojoe It really doesn't matter that much if it is an improvement or a bug. If you want to file it as a bug that would be fine. After filing the JIRA please add the JIRA number to the title of this pull request. something like
[STORM-12345] use boolean to replace some?...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by revans2 <gi...@git.apache.org>.
Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/285#issuecomment-64933603
I like the change, but supervisor_test.clj needs to be updated too (same chage as before). It would also be good if you could file a JIRA for this at http://issues.apache.org/jira, for tracking purposes. Other then that I am +1.
Oh I ran the full set of unit tests with clojure-1.6.0 and they all passed, might be worth updating that too.
```
diff --git a/pom.xml b/pom.xml
index 5645b9a..233c7ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@
<test.extra.args>-Djava.net.preferIPv4Stack=true</test.extra.args>
<!-- dependency versions -->
- <clojure.version>1.5.1</clojure.version>
+ <clojure.version>1.6.0</clojure.version>
<compojure.version>1.1.3</compojure.version>
<hiccup.version>0.3.6</hiccup.version>
<commons-io.version>2.4</commons-io.version>
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index a3594a3..4157c83 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -517,7 +517,7 @@
(defn found? [sub-str input-str]
(if (string? input-str)
(contrib-str/substring? sub-str (str input-str))
- (some? #(contrib-str/substring? sub-str %) input-str)))
+ (boolean (some #(contrib-str/substring? sub-str %) input-str))))
(defn not-found? [sub-str input-str]
(complement (found? sub-str input-str)))
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] storm pull request: use boolean to replace some?, backtype.storm.u...
Posted by revans2 <gi...@git.apache.org>.
Github user revans2 commented on the pull request:
https://github.com/apache/storm/pull/285#issuecomment-71256412
The change looks good to me and matches with STORM-630, so I am +1 and think I will pull both in together.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---