You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/08/06 04:14:36 UTC
[1/6] storm git commit: STORM-966 ConfigValidation.DoubleValidator
doesn't really validate whether the type of the object is a double
Repository: storm
Updated Branches:
refs/heads/master ac14de3ea -> 544e55cb8
STORM-966 ConfigValidation.DoubleValidator doesn't really validate whether the type of the object is a double
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db503a45
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db503a45
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db503a45
Branch: refs/heads/master
Commit: db503a4576499f4fd89ea9566b14fdc7ade0b5a4
Parents: c3a9385
Author: Jerry <jerry@ubuntu.(none)>
Authored: Wed Jul 29 21:00:49 2015 -0700
Committer: Jerry <jerry@ubuntu.(none)>
Committed: Wed Jul 29 21:00:49 2015 -0700
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
.../jvm/backtype/storm/ConfigValidation.java | 20 --------------------
.../test/clj/backtype/storm/config_test.clj | 9 ---------
3 files changed, 1 insertion(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/db503a45/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 58e2a4a..0dd489e 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1194,7 +1194,7 @@ public class Config extends HashMap<String, Object> {
* The percentage of tuples to sample to produce stats for a task.
*/
public static final String TOPOLOGY_STATS_SAMPLE_RATE="topology.stats.sample.rate";
- public static final Object TOPOLOGY_STATS_SAMPLE_RATE_SCHEMA = ConfigValidation.DoubleValidator;
+ public static final Object TOPOLOGY_STATS_SAMPLE_RATE_SCHEMA = Number.class;
/**
* The time period that builtin metrics data in bucketed into.
http://git-wip-us.apache.org/repos/asf/storm/blob/db503a45/storm-core/src/jvm/backtype/storm/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
index ce0f3de..a6e3057 100644
--- a/storm-core/src/jvm/backtype/storm/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
@@ -254,26 +254,6 @@ public class ConfigValidation {
};
/**
- * Validates a Double.
- */
- public static Object DoubleValidator = new FieldValidator() {
- @Override
- public void validateField(String name, Object o) throws IllegalArgumentException {
- if (o == null) {
- // A null value is acceptable.
- return;
- }
-
- // we can provide a lenient way to convert int/long to double with losing some precision
- if (o instanceof Number) {
- return;
- }
-
- throw new IllegalArgumentException("Field " + name + " must be an Double.");
- }
- };
-
- /**
* Validates a power of 2.
*/
public static Object PowerOf2Validator = new FieldValidator() {
http://git-wip-us.apache.org/repos/asf/storm/blob/db503a45/storm-core/test/clj/backtype/storm/config_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/config_test.clj b/storm-core/test/clj/backtype/storm/config_test.clj
index 9750185..ac80b14 100644
--- a/storm-core/test/clj/backtype/storm/config_test.clj
+++ b/storm-core/test/clj/backtype/storm/config_test.clj
@@ -99,15 +99,6 @@
(is (thrown-cause? java.lang.IllegalArgumentException
(.validateField validator "test" [-100 (inc Integer/MAX_VALUE)])))))
-(deftest test-double-validator
- (let [validator ConfigValidation/DoubleValidator]
- (.validateField validator "test" nil)
- (.validateField validator "test" 10)
- ;; we can provide lenient way to convert int/long to double with losing precision
- (.validateField validator "test" Integer/MAX_VALUE)
- (.validateField validator "test" (inc Integer/MAX_VALUE))
- (.validateField validator "test" Double/MAX_VALUE)))
-
(deftest test-topology-workers-is-integer
(let [validator (CONFIG-SCHEMA-MAP TOPOLOGY-WORKERS)]
(.validateField validator "test" 42)
[3/6] storm git commit: added united tests and changed exception
message
Posted by ka...@apache.org.
added united tests and changed exception message
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/394d62ae
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/394d62ae
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/394d62ae
Branch: refs/heads/master
Commit: 394d62ae39532dea42474578747a59a41e1e2d38
Parents: e7d8907
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Mon Aug 3 11:57:29 2015 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Mon Aug 3 11:59:56 2015 -0500
----------------------------------------------------------------------
.../src/jvm/backtype/storm/ConfigValidation.java | 3 +--
storm-core/test/clj/backtype/storm/config_test.clj | 14 ++++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/394d62ae/storm-core/src/jvm/backtype/storm/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
index 7fd918b..a4897c8 100644
--- a/storm-core/src/jvm/backtype/storm/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
@@ -28,7 +28,6 @@ public class ConfigValidation {
/**
* Declares methods for validating configuration values.
*/
- public static interface FieldValidator {
/**
* Validates the given field.
* @param name the name of the field.
@@ -268,7 +267,7 @@ public class ConfigValidation {
return;
}
}
- throw new IllegalArgumentException("Field " + name + " must be a Number");
+ throw new IllegalArgumentException("Field " + name + " must be a Positive Number");
}
};
http://git-wip-us.apache.org/repos/asf/storm/blob/394d62ae/storm-core/test/clj/backtype/storm/config_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/config_test.clj b/storm-core/test/clj/backtype/storm/config_test.clj
index ac80b14..fa5575e 100644
--- a/storm-core/test/clj/backtype/storm/config_test.clj
+++ b/storm-core/test/clj/backtype/storm/config_test.clj
@@ -99,6 +99,20 @@
(is (thrown-cause? java.lang.IllegalArgumentException
(.validateField validator "test" [-100 (inc Integer/MAX_VALUE)])))))
+(deftest test-positive-number-validator
+ (let [validator ConfigValidation/PositiveNumberValidator]
+ (.validateField validator "test" nil)
+ (.validateField validator "test" 1.0)
+ (.validateField validator "test" 1)
+ (is (thrown-cause? java.lang.IllegalArgumentException
+ (.validateField validator "test" -1.0)))
+ (is (thrown-cause? java.lang.IllegalArgumentException
+ (.validateField validator "test" -1)))
+ (is (thrown-cause? java.lang.IllegalArgumentException
+ (.validateField validator "test" 0)))
+ (is (thrown-cause? java.lang.IllegalArgumentException
+ (.validateField validator "test" 0.0)))))
+
(deftest test-topology-workers-is-integer
(let [validator (CONFIG-SCHEMA-MAP TOPOLOGY-WORKERS)]
(.validateField validator "test" 42)
[2/6] storm git commit: replacement of the double validator
Posted by ka...@apache.org.
replacement of the double validator
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e7d89071
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e7d89071
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e7d89071
Branch: refs/heads/master
Commit: e7d890711fd72b3ff2eceddb5a090d24c6a89c98
Parents: db503a4
Author: Jerry <jerry@ubuntu.(none)>
Authored: Thu Jul 30 22:44:57 2015 -0700
Committer: Jerry <jerry@ubuntu.(none)>
Committed: Thu Jul 30 22:44:57 2015 -0700
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
.../src/jvm/backtype/storm/ConfigValidation.java | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e7d89071/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 0dd489e..4628bd4 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -1194,7 +1194,7 @@ public class Config extends HashMap<String, Object> {
* The percentage of tuples to sample to produce stats for a task.
*/
public static final String TOPOLOGY_STATS_SAMPLE_RATE="topology.stats.sample.rate";
- public static final Object TOPOLOGY_STATS_SAMPLE_RATE_SCHEMA = Number.class;
+ public static final Object TOPOLOGY_STATS_SAMPLE_RATE_SCHEMA =ConfigValidation.PositiveNumberValidator;
/**
* The time period that builtin metrics data in bucketed into.
http://git-wip-us.apache.org/repos/asf/storm/blob/e7d89071/storm-core/src/jvm/backtype/storm/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
index a6e3057..7fd918b 100644
--- a/storm-core/src/jvm/backtype/storm/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
@@ -254,6 +254,25 @@ public class ConfigValidation {
};
/**
+ * Validates a Positive Number
+ */
+ public static Object PositiveNumberValidator = new FieldValidator() {
+ @Override
+ public void validateField(String name, Object o) throws IllegalArgumentException {
+ if (o == null) {
+ // A null value is acceptable.
+ return;
+ }
+ if(o instanceof Number) {
+ if(((Number)o).doubleValue() > 0.0) {
+ return;
+ }
+ }
+ throw new IllegalArgumentException("Field " + name + " must be a Number");
+ }
+ };
+
+ /**
* Validates a power of 2.
*/
public static Object PowerOf2Validator = new FieldValidator() {
[4/6] storm git commit: added line incorrectly deleted
Posted by ka...@apache.org.
added line incorrectly deleted
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2360fe1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2360fe1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2360fe1e
Branch: refs/heads/master
Commit: 2360fe1ed6b5407658b3942ba15f1feff029ff09
Parents: 394d62a
Author: Boyang Jerry Peng <je...@yahoo-inc.com>
Authored: Tue Aug 4 09:29:15 2015 -0500
Committer: Boyang Jerry Peng <je...@yahoo-inc.com>
Committed: Tue Aug 4 09:29:15 2015 -0500
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/ConfigValidation.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2360fe1e/storm-core/src/jvm/backtype/storm/ConfigValidation.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/ConfigValidation.java b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
index a4897c8..1153a4a 100644
--- a/storm-core/src/jvm/backtype/storm/ConfigValidation.java
+++ b/storm-core/src/jvm/backtype/storm/ConfigValidation.java
@@ -28,6 +28,7 @@ public class ConfigValidation {
/**
* Declares methods for validating configuration values.
*/
+ public static interface FieldValidator {
/**
* Validates the given field.
* @param name the name of the field.
[5/6] storm git commit: Merge branch 'master' of
https://github.com/jerrypeng/storm into STORM-966
Posted by ka...@apache.org.
Merge branch 'master' of https://github.com/jerrypeng/storm into STORM-966
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8203ec63
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8203ec63
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8203ec63
Branch: refs/heads/master
Commit: 8203ec63997a902ef4d04a503f6681ae2e3dadd5
Parents: 124e846 2360fe1
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 6 10:01:04 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 6 10:01:04 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
.../src/jvm/backtype/storm/ConfigValidation.java | 15 +++++++--------
.../test/clj/backtype/storm/config_test.clj | 19 ++++++++++++-------
3 files changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[6/6] storm git commit: Merge branch 'STORM-966'
Posted by ka...@apache.org.
Merge branch 'STORM-966'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/544e55cb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/544e55cb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/544e55cb
Branch: refs/heads/master
Commit: 544e55cb8ab8878c4af500aab49bd35d4b69cd3e
Parents: ac14de3 8203ec6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Aug 6 11:14:24 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Aug 6 11:14:24 2015 +0900
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
.../src/jvm/backtype/storm/ConfigValidation.java | 15 +++++++--------
.../test/clj/backtype/storm/config_test.clj | 19 ++++++++++++-------
3 files changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------