From dc1e3e607830258b79dfc1e48263986bc6114743 Mon Sep 17 00:00:00 2001 From: Balazs Meszaros Date: Wed, 11 Jul 2018 15:23:15 +0200 Subject: [PATCH] HBASE-20853 Polish "Add defaults to Table Interface so Implementors don't have to" --- .../org/apache/hadoop/hbase/client/Table.java | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 191d359c82..6b1b80000f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.client; import java.io.Closeable; import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -96,7 +97,7 @@ public interface Table extends Closeable { * @throws IOException e */ default boolean exists(Get get) throws IOException { - throw new NotImplementedException("Add an implementation!"); + return exists(Collections.singletonList(get))[0]; } /** @@ -176,7 +177,7 @@ public interface Table extends Closeable { * @since 0.20.0 */ default Result get(Get get) throws IOException { - throw new NotImplementedException("Add an implementation!"); + return get(Collections.singletonList(get))[0]; } /** @@ -240,7 +241,6 @@ public interface Table extends Closeable { throw new NotImplementedException("Add an implementation!"); } - /** * Puts some data in the table. * @@ -249,7 +249,7 @@ public interface Table extends Closeable { * @since 0.20.0 */ default void put(Put put) throws IOException { - throw new NotImplementedException("Add an implementation!"); + put(Collections.singletonList(put)); } /** @@ -289,7 +289,7 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) throws IOException { - throw new NotImplementedException("Add an implementation!"); + return checkAndPut(row, family, qualifier, CompareOperator.EQUAL, value, put); } /** @@ -315,7 +315,10 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareFilter.CompareOp compareOp, byte[] value, Put put) throws IOException { - throw new NotImplementedException("Add an implementation!"); + RowMutations mutations = new RowMutations(put.getRow(), 1); + mutations.add(put); + + return checkAndMutate(row, family, qualifier, compareOp, value, mutations); } /** @@ -341,7 +344,10 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, Put put) throws IOException { - throw new NotImplementedException("Add an implementation!"); + RowMutations mutations = new RowMutations(put.getRow(), 1); + mutations.add(put); + + return checkAndMutate(row, family, qualifier, op, value, mutations); } /** @@ -352,7 +358,7 @@ public interface Table extends Closeable { * @since 0.20.0 */ default void delete(Delete delete) throws IOException { - throw new NotImplementedException("Add an implementation!"); + delete(Collections.singletonList(delete)); } /** @@ -399,7 +405,7 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, Delete delete) throws IOException { - throw new NotImplementedException("Add an implementation!"); + return checkAndDelete(row, family, qualifier, CompareOperator.EQUAL, value, delete); } /** @@ -425,7 +431,10 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareFilter.CompareOp compareOp, byte[] value, Delete delete) throws IOException { - throw new NotImplementedException("Add an implementation!"); + RowMutations mutations = new RowMutations(delete.getRow(), 1); + mutations.add(delete); + + return checkAndMutate(row, family, qualifier, compareOp, value, mutations); } /** @@ -451,7 +460,10 @@ public interface Table extends Closeable { @Deprecated default boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, Delete delete) throws IOException { - throw new NotImplementedException("Add an implementation!"); + RowMutations mutations = new RowMutations(delete.getRow(), 1); + mutations.add(delete); + + return checkAndMutate(row, family, qualifier, op, value, mutations); } /** @@ -833,7 +845,7 @@ public interface Table extends Closeable { */ @Deprecated default int getRpcTimeout() { - throw new NotImplementedException("Add an implementation!"); + return (int)getRpcTimeout(TimeUnit.MILLISECONDS); } /** @@ -850,7 +862,8 @@ public interface Table extends Closeable { */ @Deprecated default void setRpcTimeout(int rpcTimeout) { - throw new NotImplementedException("Add an implementation!"); + setReadRpcTimeout(rpcTimeout); + setWriteRpcTimeout(rpcTimeout); } /** @@ -869,7 +882,7 @@ public interface Table extends Closeable { */ @Deprecated default int getReadRpcTimeout() { - throw new NotImplementedException("Add an implementation!"); + return (int)getReadRpcTimeout(TimeUnit.MILLISECONDS); } /** @@ -902,7 +915,7 @@ public interface Table extends Closeable { */ @Deprecated default int getWriteRpcTimeout() { - throw new NotImplementedException("Add an implementation!"); + return (int)getWriteRpcTimeout(TimeUnit.MILLISECONDS); } /** @@ -935,7 +948,7 @@ public interface Table extends Closeable { */ @Deprecated default int getOperationTimeout() { - throw new NotImplementedException("Add an implementation!"); + return (int)getOperationTimeout(TimeUnit.MILLISECONDS); } /** -- 2.17.0