.../main/java/org/apache/hadoop/hbase/CellUtil.java | 3 +++ .../org/apache/hadoop/hbase/mapreduce/Import.java | 20 ++++++++++++++++++++ .../hbase/mapreduce/KeyValueSerialization.java | 6 +++++- .../hadoop/hbase/mapreduce/KeyValueSortReducer.java | 2 ++ .../org/apache/hadoop/hbase/mapreduce/WALPlayer.java | 2 ++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java index d1a72b7..a2c9374 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java @@ -1715,7 +1715,10 @@ public final class CellUtil { * @param cell * @param out * @throws IOException + * @deprecated From 3.0 onwards the 'out' will be changed to type + * DataOutput */ + @Deprecated public static void writeFlatKey(Cell cell, DataOutputStream out) throws IOException { short rowLen = cell.getRowLength(); byte fLen = cell.getFamilyLength(); diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java index 18dcf35..c327def 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/Import.java @@ -81,6 +81,8 @@ import org.apache.zookeeper.KeeperException; /** * Import data written by {@link Export}. + * @deprecated Some of the inner helper class have been + * renamed from 3.0 onwards */ @InterfaceAudience.Public public class Import extends Configured implements Tool { @@ -96,6 +98,10 @@ public class Import extends Configured implements Tool { private final static String JOB_NAME_CONF_KEY = "mapreduce.job.name"; + /** + * @deprecated Use CellWriteCompareablePartitioner from 3.0 onwards + */ + @Deprecated public static class KeyValueWritableComparablePartitioner extends Partitioner { private static KeyValueWritableComparable[] START_KEYS = null; @@ -112,6 +118,10 @@ public class Import extends Configured implements Tool { } + /** + * @deprecated Use CellWritableComparable from 3.0 onwards + */ + @Deprecated public static class KeyValueWritableComparable implements WritableComparable { @@ -166,6 +176,10 @@ public class Import extends Configured implements Tool { } + /** + * @deprecated Use CellReducer from 3.0 onwards + */ + @Deprecated public static class KeyValueReducer extends Reducer { @@ -185,6 +199,10 @@ public class Import extends Configured implements Tool { } } + /** + * @deprecated Use CellSortImporter from 3.0 onwards + */ + @Deprecated public static class KeyValueSortImporter extends TableMapper { private Map cfRenameMap; @@ -249,7 +267,9 @@ public class Import extends Configured implements Tool { /** * A mapper that just writes out KeyValues. + * @deprecated Use CellImporter from 3.0 onwards */ + @Deprecated @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="EQ_COMPARETO_USE_OBJECT_EQUALS", justification="Writables are going away and this has been this way forever") public static class KeyValueImporter extends TableMapper { diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSerialization.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSerialization.java index 241608b..243e18e 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSerialization.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSerialization.java @@ -29,8 +29,12 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.io.serializer.Deserializer; import org.apache.hadoop.io.serializer.Serialization; import org.apache.hadoop.io.serializer.Serializer; - +/** + * @deprecated Use CellSerialization from 3.0 onwards + */ @InterfaceAudience.Public +@Deprecated +// This will be replaced with CellSerialization from 3.0 onwards public class KeyValueSerialization implements Serialization { @Override public boolean accept(Class c) { diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java index 997e5a8..761437e 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/KeyValueSortReducer.java @@ -32,8 +32,10 @@ import org.apache.hadoop.mapreduce.Reducer; * KeyValues in sorted order. If lots of columns per row, it will use lots of * memory sorting. * @see HFileOutputFormat2 + * @deprecated Use CellSortReducer from 3.0 onwards */ @InterfaceAudience.Public +@Deprecated public class KeyValueSortReducer extends Reducer { protected void reduce(ImmutableBytesWritable row, Iterable kvs, diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java index b1e655c..0920ef7 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java @@ -95,7 +95,9 @@ public class WALPlayer extends Configured implements Tool { /** * A mapper that just writes out KeyValues. * This one can be used together with {@link KeyValueSortReducer} + * @deprecated Works with Cell from 3.0 onwards */ + @Deprecated static class WALKeyValueMapper extends Mapper { private byte[] table;