STORM-676 Refactored HBase#put APIs for hbase version upgrade.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1f1b5504 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1f1b5504 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1f1b5504 Branch: refs/heads/master Commit: 1f1b5504317b9b21dfa2242e7d9650e65bd9cf19 Parents: ac590b4 Author: Satish Duggana <[email protected]> Authored: Sat Mar 26 23:13:40 2016 +0530 Committer: Satish Duggana <[email protected]> Committed: Sat Mar 26 23:13:40 2016 +0530 ---------------------------------------------------------------------- .../storm/hbase/trident/windowing/HBaseWindowsStore.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1f1b5504/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..ccce03a 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 @@ -27,7 +27,6 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter; import org.apache.storm.trident.windowing.WindowsStore; @@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InterruptedIOException; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -205,10 +203,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 +219,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); } }
