You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/02/25 22:12:55 UTC
[1/3] storm git commit: STORM-688: update Util to compile under JDK8
Repository: storm
Updated Branches:
refs/heads/master a91e9f698 -> d4e943825
STORM-688: update Util to compile under JDK8
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2a0bb0dc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2a0bb0dc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2a0bb0dc
Branch: refs/heads/master
Commit: 2a0bb0dcb3d7fa7aa4e71d89ca1a59a2127b4f38
Parents: fc9927b
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Feb 24 15:46:09 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Feb 24 15:46:09 2015 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/jdbc/common/Util.java | 5 +-
.../org/apache/storm/jdbc/common/UtilTest.java | 69 ++++++++++++++++++++
2 files changed, 72 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2a0bb0dc/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Util.java
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Util.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Util.java
index cc723c3..7bac4c8 100644
--- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Util.java
+++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Util.java
@@ -24,10 +24,11 @@ import java.sql.Timestamp;
import java.sql.Types;
public class Util {
- public static String getSqlTypeName(int sqlType) {
+ private static String getSqlTypeName(int sqlType) {
try {
+ Integer val = new Integer(sqlType);
for (Field field : Types.class.getFields()) {
- if (sqlType == field.get(null)) {
+ if (val.equals(field.get(null))) {
return field.getName();
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/2a0bb0dc/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java
----------------------------------------------------------------------
diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java
new file mode 100644
index 0000000..8b6e8b3
--- /dev/null
+++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/UtilTest.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.storm.jdbc.common;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class UtilTest {
+
+ @Test
+ public void testBasic() {
+ assertEquals(String.class, Util.getJavaType(Types.CHAR));
+ assertEquals(String.class, Util.getJavaType(Types.VARCHAR));
+ assertEquals(String.class, Util.getJavaType(Types.LONGVARCHAR));
+ assertEquals(byte[].class, Util.getJavaType(Types.BINARY));
+ assertEquals(byte[].class, Util.getJavaType(Types.VARBINARY));
+ assertEquals(byte[].class, Util.getJavaType(Types.LONGVARBINARY));
+ assertEquals(Boolean.class, Util.getJavaType(Types.BIT));
+ assertEquals(Short.class, Util.getJavaType(Types.TINYINT));
+ assertEquals(Short.class, Util.getJavaType(Types.SMALLINT));
+ assertEquals(Integer.class, Util.getJavaType(Types.INTEGER));
+ assertEquals(Long.class, Util.getJavaType(Types.BIGINT));
+ assertEquals(Float.class, Util.getJavaType(Types.REAL));
+ assertEquals(Double.class, Util.getJavaType(Types.DOUBLE));
+ assertEquals(Double.class, Util.getJavaType(Types.FLOAT));
+ assertEquals(Date.class, Util.getJavaType(Types.DATE));
+ assertEquals(Time.class, Util.getJavaType(Types.TIME));
+ assertEquals(Timestamp.class, Util.getJavaType(Types.TIMESTAMP));
+ }
+
+ @Test
+ public void testError() {
+ //This test is rather ugly, but it is the only way to see if the error messages are working correctly.
+ try {
+ Util.getJavaType(Types.REF);
+ fail("didn't throw like expected");
+ } catch (Exception e) {
+ assertEquals("We do not support tables with SqlType: REF", e.getMessage());
+ }
+
+ try {
+ Util.getJavaType(-1000);
+ fail("didn't throw like expected");
+ } catch (Exception e) {
+ assertEquals("Unknown sqlType -1000", e.getMessage());
+ }
+
+ }
+}
[2/3] storm git commit: Merge branch 'STORM-688' of
https://github.com/revans2/incubator-storm into STORM-688
Posted by bo...@apache.org.
Merge branch 'STORM-688' of https://github.com/revans2/incubator-storm into STORM-688
STORM-688: update Util to compile under JDK8
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0fc2cd57
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0fc2cd57
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0fc2cd57
Branch: refs/heads/master
Commit: 0fc2cd57bfc43556095107dd96a23153ad4d587e
Parents: a91e9f6 2a0bb0d
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 25 14:53:16 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 25 14:53:16 2015 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/jdbc/common/Util.java | 5 +-
.../org/apache/storm/jdbc/common/UtilTest.java | 69 ++++++++++++++++++++
2 files changed, 72 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-688 to changelog
Posted by bo...@apache.org.
Added STORM-688 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d4e94382
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d4e94382
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d4e94382
Branch: refs/heads/master
Commit: d4e9438255c3ea37133f4f8d8a7876c65edb3d39
Parents: 0fc2cd5
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Feb 25 15:12:12 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Feb 25 15:12:12 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d4e94382/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e988c61..58ee5ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
* STORM-684: In RichSpoutBatchExecutor: underlying spout is not closed when emitter is closed
* STORM-683: Make false in a conf really evaluate to false in clojure.
* STORM-685: wrong output in log when committed offset is too far behind latest offset
+ * STORM-688: update Util to compile under JDK8
## 0.9.3-rc2
* STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor