Storm-616: fixed casing mismatch. added collectore.reportError so the error is reported back to ui. added storm-jdbc to storm-dist.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1e0f623f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1e0f623f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1e0f623f Branch: refs/heads/master Commit: 1e0f623f850f219e132ad0807e2d2aca16b64aa4 Parents: f217096 Author: Parth Brahmbhatt <[email protected]> Authored: Wed Jan 14 14:24:45 2015 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Wed Jan 14 14:24:45 2015 -0800 ---------------------------------------------------------------------- .../apache/storm/jdbc/bolt/AbstractJdbcBolt.java | 7 +++---- .../java/org/apache/storm/jdbc/bolt/JdbcBolt.java | 1 + .../org/apache/storm/jdbc/bolt/JdbcLookupBolt.java | 3 ++- .../org/apache/storm/jdbc/common/JDBCClient.java | 6 +++--- .../apache/storm/jdbc/mapper/SimpleJdbcMapper.java | 4 ++-- .../apache/storm/jdbc/trident/state/JdbcState.java | 6 +++--- .../apache/storm/jdbc/common/JdbcClientTest.java | 4 ++-- .../storm/jdbc/topology/AbstractUserTopology.java | 4 ++-- storm-dist/binary/src/main/assembly/binary.xml | 16 ++++++++++++++-- 9 files changed, 32 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java index 1e717eb..ae5a249 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java @@ -21,8 +21,7 @@ import backtype.storm.task.OutputCollector; import backtype.storm.task.TopologyContext; import backtype.storm.topology.base.BaseRichBolt; import org.apache.commons.lang.Validate; -import org.apache.storm.jdbc.common.JDBCClient; -import org.apache.storm.jdbc.mapper.JdbcMapper; +import org.apache.storm.jdbc.common.JdbcClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +32,7 @@ public abstract class AbstractJdbcBolt extends BaseRichBolt { protected OutputCollector collector; - protected transient JDBCClient jdbcClient; + protected transient JdbcClient jdbcClient; protected String configKey; public AbstractJdbcBolt(String configKey) { @@ -48,6 +47,6 @@ public abstract class AbstractJdbcBolt extends BaseRichBolt { Map<String, Object> conf = (Map<String, Object>)map.get(this.configKey); Validate.notEmpty(conf, "Hikari configuration not found using key '" + this.configKey + "'"); - this.jdbcClient = new JDBCClient(conf); + this.jdbcClient = new JdbcClient(conf); } } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcBolt.java index 4c63a09..fd27285 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcBolt.java @@ -61,6 +61,7 @@ public class JdbcBolt extends AbstractJdbcBolt { } catch (Exception e) { LOG.warn("Failing tuple.", e); this.collector.fail(tuple); + this.collector.reportError(e); return; } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java index 2e4e4e6..7e548ff 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java @@ -68,8 +68,9 @@ public class JdbcLookupBolt extends AbstractJdbcBolt { } this.collector.ack(tuple); } catch (Exception e) { - LOG.info("Failed to execute a select query {} on tuple {} ", this.selectQuery, tuple); + LOG.warn("Failed to execute a select query {} on tuple {} ", this.selectQuery, tuple); this.collector.fail(tuple); + this.collector.reportError(e); } } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/JDBCClient.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/JDBCClient.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/JDBCClient.java index 410c884..ab3f8a7 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/JDBCClient.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/JDBCClient.java @@ -31,12 +31,12 @@ import java.sql.*; import java.sql.Date; import java.util.*; -public class JDBCClient { - private static final Logger LOG = LoggerFactory.getLogger(JDBCClient.class); +public class JdbcClient { + private static final Logger LOG = LoggerFactory.getLogger(JdbcClient.class); private HikariDataSource dataSource; - public JDBCClient(Map<String, Object> map) { + public JdbcClient(Map<String, Object> map) { Properties properties = new Properties(); properties.putAll(map); HikariConfig config = new HikariConfig(properties); http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java index df25695..81fc207 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java @@ -19,7 +19,7 @@ package org.apache.storm.jdbc.mapper; import backtype.storm.tuple.ITuple; import org.apache.storm.jdbc.common.Column; -import org.apache.storm.jdbc.common.JDBCClient; +import org.apache.storm.jdbc.common.JdbcClient; import org.apache.storm.jdbc.common.Util; import java.sql.Date; @@ -34,7 +34,7 @@ public class SimpleJdbcMapper implements JdbcMapper { private List<Column> schemaColumns; public SimpleJdbcMapper(String tableName, Map map) { - JDBCClient client = new JDBCClient(map); + JdbcClient client = new JdbcClient(map); this.schemaColumns = client.getColumnSchema(tableName); } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java index 6b4e79a..129191a 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java @@ -22,7 +22,7 @@ import backtype.storm.tuple.Values; import com.google.common.collect.Lists; import org.apache.commons.lang.Validate; import org.apache.storm.jdbc.common.Column; -import org.apache.storm.jdbc.common.JDBCClient; +import org.apache.storm.jdbc.common.JdbcClient; import org.apache.storm.jdbc.mapper.JdbcMapper; import org.apache.storm.jdbc.mapper.JdbcLookupMapper; import org.slf4j.Logger; @@ -41,7 +41,7 @@ public class JdbcState implements State { private static final Logger LOG = LoggerFactory.getLogger(JdbcState.class); private Options options; - private JDBCClient jdbcClient; + private JdbcClient jdbcClient; private Map map; protected JdbcState(Map map, int partitionIndex, int numPartitions, Options options) { @@ -86,7 +86,7 @@ public class JdbcState implements State { Map<String, Object> conf = (Map<String, Object>) map.get(options.configKey); Validate.notEmpty(conf, "Hikari configuration not found using key '" + options.configKey + "'"); - this.jdbcClient = new JDBCClient(conf); + this.jdbcClient = new JdbcClient(conf); } @Override http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java index 432d9f8..3623b77 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/common/JdbcClientTest.java @@ -32,7 +32,7 @@ import java.util.Map; public class JdbcClientTest { - private JDBCClient client; + private JdbcClient client; private static final String tableName = "user_details"; @Before @@ -43,7 +43,7 @@ public class JdbcClientTest { map.put("dataSource.user","SA");//root map.put("dataSource.password","");//password - this.client = new JDBCClient(map); + this.client = new JdbcClient(map); client.executeSql("create table user_details (id integer, user_name varchar(100), create_date date)"); } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java index 6d2f8e9..dc04ac1 100644 --- a/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java +++ b/external/storm-jdbc/src/test/java/org/apache/storm/jdbc/topology/AbstractUserTopology.java @@ -24,7 +24,7 @@ import backtype.storm.tuple.Fields; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.storm.jdbc.common.Column; -import org.apache.storm.jdbc.common.JDBCClient; +import org.apache.storm.jdbc.common.JdbcClient; import org.apache.storm.jdbc.mapper.JdbcMapper; import org.apache.storm.jdbc.mapper.JdbcLookupMapper; import org.apache.storm.jdbc.mapper.SimpleJdbcMapper; @@ -74,7 +74,7 @@ public abstract class AbstractUserTopology { Config config = new Config(); config.put(JDBC_CONF, map); - JDBCClient jdbcClient = new JDBCClient(map); + JdbcClient jdbcClient = new JdbcClient(map); for (String sql : setupSqls) { jdbcClient.executeSql(sql); } http://git-wip-us.apache.org/repos/asf/storm/blob/1e0f623f/storm-dist/binary/src/main/assembly/binary.xml ---------------------------------------------------------------------- diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml index 5b687b6..122633f 100644 --- a/storm-dist/binary/src/main/assembly/binary.xml +++ b/storm-dist/binary/src/main/assembly/binary.xml @@ -103,8 +103,20 @@ <include>README.*</include> </includes> </fileSet> - - + <fileSet> + <directory>${project.basedir}/../../external/storm-jdbc/target</directory> + <outputDirectory>external/storm-jdbc</outputDirectory> + <includes> + <include>storm*jar</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/../../external/storm-jdbc</directory> + <outputDirectory>external/storm-jdbc</outputDirectory> + <includes> + <include>README.*</include> + </includes> + </fileSet> </fileSets> <files>
