Repository: storm Updated Branches: refs/heads/1.x-branch fcebf8e20 -> db8cf121b
STORM-1613 update hbase version Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1c1fff74 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c1fff74 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c1fff74 Branch: refs/heads/1.x-branch Commit: 1c1fff74b0d2fe809e0f825d9ec0122b6f197400 Parents: fcebf8e Author: Satish Duggana <[email protected]> Authored: Tue Apr 12 09:36:33 2016 +0530 Committer: Satish Duggana <[email protected]> Committed: Tue Apr 12 09:41:07 2016 +0530 ---------------------------------------------------------------------- external/storm-hbase/pom.xml | 1 - .../storm/hbase/trident/windowing/HBaseWindowsStore.java | 8 ++++---- pom.xml | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1c1fff74/external/storm-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml index 9b120d2..6ff6331 100644 --- a/external/storm-hbase/pom.xml +++ b/external/storm-hbase/pom.xml @@ -36,7 +36,6 @@ </developers> <properties> - <hbase.version>0.98.4-hadoop2</hbase.version> <hdfs.version>${hadoop.version}</hdfs.version> </properties> http://git-wip-us.apache.org/repos/asf/storm/blob/1c1fff74/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java index b300ed6..d25b898 100644 --- a/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java +++ b/external/storm-hbase/src/main/java/org/apache/storm/hbase/trident/windowing/HBaseWindowsStore.java @@ -205,10 +205,10 @@ public class HBaseWindowsStore implements WindowsStore { Kryo kryo = new Kryo(); Output output = new Output(new ByteArrayOutputStream()); kryo.writeClassAndObject(output, value); - put.add(family, ByteBuffer.wrap(qualifier), System.currentTimeMillis(), ByteBuffer.wrap(output.getBuffer(), 0, output.position())); + put.addColumn(family, ByteBuffer.wrap(qualifier), System.currentTimeMillis(), ByteBuffer.wrap(output.getBuffer(), 0, output.position())); try { htable().put(put); - } catch (InterruptedIOException | RetriesExhaustedWithDetailsException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -221,13 +221,13 @@ public class HBaseWindowsStore implements WindowsStore { Output output = new Output(new ByteArrayOutputStream()); Kryo kryo = new Kryo(); kryo.writeClassAndObject(output, entry.value); - put.add(family, ByteBuffer.wrap(qualifier), System.currentTimeMillis(), ByteBuffer.wrap(output.getBuffer(), 0, output.position())); + put.addColumn(family, ByteBuffer.wrap(qualifier), System.currentTimeMillis(), ByteBuffer.wrap(output.getBuffer(), 0, output.position())); list.add(put); } try { htable().put(list); - } catch (InterruptedIOException | RetriesExhaustedWithDetailsException e) { + } catch (IOException e) { throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/storm/blob/1c1fff74/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 27a9e98..33da388 100644 --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,7 @@ <clojure-contrib.version>1.2.0</clojure-contrib.version> <hive.version>0.14.0</hive.version> <hadoop.version>2.6.1</hadoop.version> + <hbase.version>1.1.0</hbase.version> <kryo.version>3.0.3</kryo.version> <servlet.version>2.5</servlet.version> <joda-time.version>2.3</joda-time.version>
