Repository: hbase Updated Branches: refs/heads/master 21e31f0c8 -> b48a47498
HBASE-12111 Remove deprecated APIs from Mutation(s). Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b48a4749 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b48a4749 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b48a4749 Branch: refs/heads/master Commit: b48a474988a56c0a4775ec1dfb72473e6eb64140 Parents: 21e31f0 Author: anoopsjohn <anoopsamj...@gmail.com> Authored: Mon Sep 29 08:03:00 2014 +0530 Committer: anoopsjohn <anoopsamj...@gmail.com> Committed: Mon Sep 29 08:03:00 2014 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Append.java | 12 ----- .../org/apache/hadoop/hbase/client/Delete.java | 12 ----- .../apache/hadoop/hbase/client/Increment.java | 12 ----- .../apache/hadoop/hbase/client/Mutation.java | 56 -------------------- .../org/apache/hadoop/hbase/client/Put.java | 12 ----- 5 files changed, 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b48a4749/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 66e8d32..6556f8b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -143,12 +143,6 @@ public class Append extends Mutation { } @Override - @Deprecated - public Append setWriteToWAL(boolean write) { - return (Append) super.setWriteToWAL(write); - } - - @Override public Append setDurability(Durability d) { return (Append) super.setDurability(d); } @@ -159,12 +153,6 @@ public class Append extends Mutation { } @Override - @Deprecated - public Append setFamilyMap(NavigableMap<byte[], List<KeyValue>> map) { - return (Append) super.setFamilyMap(map); - } - - @Override public Append setClusterIds(List<UUID> clusterIds) { return (Append) super.setClusterIds(clusterIds); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b48a4749/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java index 3adb759..0533b31 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java @@ -340,12 +340,6 @@ public class Delete extends Mutation implements Comparable<Row> { } @Override - @Deprecated - public Delete setWriteToWAL(boolean write) { - return (Delete) super.setWriteToWAL(write); - } - - @Override public Delete setDurability(Durability d) { return (Delete) super.setDurability(d); } @@ -356,12 +350,6 @@ public class Delete extends Mutation implements Comparable<Row> { } @Override - @Deprecated - public Delete setFamilyMap(NavigableMap<byte[], List<KeyValue>> map) { - return (Delete) super.setFamilyMap(map); - } - - @Override public Delete setClusterIds(List<UUID> clusterIds) { return (Delete) super.setClusterIds(clusterIds); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b48a4749/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index 54e366b..21af382 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -293,12 +293,6 @@ public class Increment extends Mutation implements Comparable<Row> { } @Override - @Deprecated - public Increment setWriteToWAL(boolean write) { - return (Increment) super.setWriteToWAL(write); - } - - @Override public Increment setDurability(Durability d) { return (Increment) super.setDurability(d); } @@ -309,12 +303,6 @@ public class Increment extends Mutation implements Comparable<Row> { } @Override - @Deprecated - public Increment setFamilyMap(NavigableMap<byte[], List<KeyValue>> map) { - return (Increment) super.setFamilyMap(map); - } - - @Override public Increment setClusterIds(List<UUID> clusterIds) { return (Increment) super.setClusterIds(clusterIds); } http://git-wip-us.apache.org/repos/asf/hbase/blob/b48a4749/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java index 7cdc1d1..c7ca4c7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java @@ -50,7 +50,6 @@ import org.apache.hadoop.hbase.util.ClassSize; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; -import com.google.common.collect.Lists; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; @@ -210,28 +209,6 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C } /** - * @deprecated Use {@link #getDurability()} instead. - * @return true if edits should be applied to WAL, false if not - */ - @Deprecated - public boolean getWriteToWAL() { - return this.durability == Durability.SKIP_WAL; - } - - /** - * Set whether this Delete should be written to the WAL or not. - * Not writing the WAL means you may lose edits on server crash. - * This method will reset any changes made via {@link #setDurability(Durability)} - * @param write true if edits should be written to WAL, false if not - * @deprecated Use {@link #setDurability(Durability)} instead. - */ - @Deprecated - public Mutation setWriteToWAL(boolean write) { - setDurability(write ? Durability.USE_DEFAULT : Durability.SKIP_WAL); - return this; - } - - /** * Set the durability for this mutation * @param d */ @@ -264,39 +241,6 @@ public abstract class Mutation extends OperationWithAttributes implements Row, C } /** - * Method for retrieving the put's familyMap that is deprecated and inefficient. - * @return the map - * @deprecated use {@link #getFamilyCellMap()} instead. - */ - @Deprecated - public NavigableMap<byte [], List<KeyValue>> getFamilyMap() { - TreeMap<byte[], List<KeyValue>> fm = - new TreeMap<byte[], List<KeyValue>>(Bytes.BYTES_COMPARATOR); - for (Map.Entry<byte[], List<Cell>> e : familyMap.entrySet()) { - List<KeyValue> kvl = new ArrayList<KeyValue>(e.getValue().size()); - for (Cell c : e.getValue()) { - kvl.add(KeyValueUtil.ensureKeyValue(c)); - } - fm.put(e.getKey(), kvl); - } - return fm; - } - - /** - * Method for setting the put's familyMap that is deprecated and inefficient. - * @deprecated use {@link #setFamilyCellMap(NavigableMap)} instead. - */ - @Deprecated - public Mutation setFamilyMap(NavigableMap<byte [], List<KeyValue>> map) { - TreeMap<byte[], List<Cell>> fm = new TreeMap<byte[], List<Cell>>(Bytes.BYTES_COMPARATOR); - for (Map.Entry<byte[], List<KeyValue>> e : map.entrySet()) { - fm.put(e.getKey(), Lists.<Cell>newArrayList(e.getValue())); - } - this.familyMap = fm; - return this; - } - - /** * Method to check if the familyMap is empty * @return true if empty, false otherwise */ http://git-wip-us.apache.org/repos/asf/hbase/blob/b48a4749/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java index 20d445a..7a9562e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Put.java @@ -432,12 +432,6 @@ public class Put extends Mutation implements HeapSize, Comparable<Row> { } @Override - @Deprecated - public Put setWriteToWAL(boolean write) { - return (Put) super.setWriteToWAL(write); - } - - @Override public Put setDurability(Durability d) { return (Put) super.setDurability(d); } @@ -448,12 +442,6 @@ public class Put extends Mutation implements HeapSize, Comparable<Row> { } @Override - @Deprecated - public Put setFamilyMap(NavigableMap<byte[], List<KeyValue>> map) { - return (Put) super.setFamilyMap(map); - } - - @Override public Put setClusterIds(List<UUID> clusterIds) { return (Put) super.setClusterIds(clusterIds); }
