Repository: hbase
Updated Branches:
refs/heads/master 011bc0441 - 1b5e6daef
HBASE-12084 Remove deprecated APIs from Result.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b5e6dae
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b5e6dae
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b5e6dae
Branch: refs/heads/master
Commit: 1b5e6daef20550309efaa9b165b0c8d8bb9cb4f8
Parents: 011bc04
Author: anoopsjohn anoopsamj...@gmail.com
Authored: Thu Sep 25 07:36:15 2014 +0530
Committer: anoopsjohn anoopsamj...@gmail.com
Committed: Thu Sep 25 07:36:15 2014 +0530
--
.../org/apache/hadoop/hbase/client/Result.java | 77
.../client/coprocessor/AggregationClient.java | 4 +-
.../hbase/master/TableNamespaceManager.java | 2 +-
.../hadoop/hbase/client/TestFromClientSide.java | 24 +++---
.../regionserver/TestScannerWithBulkload.java | 49 +++--
5 files changed, 40 insertions(+), 116 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b5e6dae/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
index 9392490..a041b91 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -107,23 +107,6 @@ public class Result implements CellScannable, CellScanner {
}
/**
- * @deprecated Use {@link #create(List)} instead.
- */
- @Deprecated
- public Result(KeyValue [] cells) {
-this.cells = cells;
- }
-
- /**
- * @deprecated Use {@link #create(List)} instead.
- */
- @Deprecated
- public Result(ListKeyValue kvs) {
-// TODO: Here we presume the passed in Cells are KVs. One day this won't
always be so.
-this(kvs.toArray(new Cell[kvs.size()]), null, false);
- }
-
- /**
* Instantiate a Result with the specified List of KeyValues.
* brstrongNote:/strong You must ensure that the keyvalues are already
sorted.
* @param cells List of cells
@@ -203,25 +186,6 @@ public class Result implements CellScannable, CellScanner {
}
/**
- * Return an cells of a Result as an array of KeyValues
- *
- * WARNING do not use, expensive. This does an arraycopy of the cell[]'s
value.
- *
- * Added to ease transition from 0.94 - 0.96.
- *
- * @deprecated as of 0.96, use {@link #rawCells()}
- * @return array of KeyValues, empty array if nothing in result.
- */
- @Deprecated
- public KeyValue[] raw() {
-KeyValue[] kvs = new KeyValue[cells.length];
-for (int i = 0 ; i kvs.length; i++) {
- kvs[i] = KeyValueUtil.ensureKeyValue(cells[i]);
-}
-return kvs;
- }
-
- /**
* Create a sorted list of the Cell's in this result.
*
* Since HBase 0.20.5 this is equivalent to raw().
@@ -233,29 +197,6 @@ public class Result implements CellScannable, CellScanner {
}
/**
- * Return an cells of a Result as an array of KeyValues
- *
- * WARNING do not use, expensive. This does an arraycopy of the cell[]'s
value.
- *
- * Added to ease transition from 0.94 - 0.96.
- *
- * @deprecated as of 0.96, use {@link #listCells()}
- * @return all sorted List of KeyValues; can be null if no cells in the
result
- */
- @Deprecated
- public ListKeyValue list() {
-return isEmpty() ? null : Arrays.asList(raw());
- }
-
- /**
- * @deprecated Use {@link #getColumnCells(byte[], byte[])} instead.
- */
- @Deprecated
- public ListKeyValue getColumn(byte [] family, byte [] qualifier) {
-return KeyValueUtil.ensureKeyValues(getColumnCells(family, qualifier));
- }
-
- /**
* Return the Cells for the specific column. The Cells are sorted in
* the {@link KeyValue#COMPARATOR} order. That implies the first entry in
* the list is the most recent column. If the query (Scan or Get) only
@@ -358,14 +299,6 @@ public class Result implements CellScannable, CellScanner {
}
/**
- * @deprecated Use {@link #getColumnLatestCell(byte[], byte[])} instead.
- */
- @Deprecated
- public KeyValue getColumnLatest(byte [] family, byte [] qualifier) {
-return KeyValueUtil.ensureKeyValue(getColumnLatestCell(family, qualifier));
- }
-
- /**
* The Cell for the most recent timestamp for a given column.
*
* @param family
@@ -390,16 +323,6 @@ public class Result implements CellScannable, CellScanner {
}
/**
- * @deprecated Use {@link #getColumnLatestCell(byte[], int, int, byte[],
int, int)} instead.
- */
- @Deprecated
- public KeyValue getColumnLatest(byte [] family, int foffset, int flength,
- byte
