Index: hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java (revision 1588376) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java (working copy) @@ -103,28 +103,9 @@ */ @Override public void filterRowCells(List ignored) throws IOException { - // Old filters based off of this class will override KeyValue transform(KeyValue). - // Thus to maintain compatibility we need to call the old version. - List kvs = new ArrayList(ignored.size()); - for (Cell c : ignored) { - kvs.add(KeyValueUtil.ensureKeyValue(c)); - } - filterRow(kvs); - ignored.clear(); - ignored.addAll(kvs); } /** - * WARNING: please to not override this method. Instead override {@link #transformCell(Cell)}. - * - * This is for transition from 0.94 -> 0.96 - */ - @Override - @Deprecated - public void filterRow(List kvs) throws IOException { - } - - /** * Fitlers that never filter by modifying the returned List of Cells can * inherit this implementation that does nothing. * Index: hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java (revision 1588376) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java (working copy) @@ -306,43 +306,12 @@ * @inheritDoc */ @Override - public void filterRowCells(List ignored) throws IOException { - // Old filters based off of this class will override KeyValue transform(KeyValue). - // Thus to maintain compatibility we need to call the old version. - List kvs = new ArrayList(ignored.size()); - for (Cell c : ignored) { - kvs.add(KeyValueUtil.ensureKeyValue(c)); - } - filterRow(kvs); - ignored.clear(); - ignored.addAll(kvs); - } - - /** - * WARNING: please to not override this method. Instead override {@link #transformCell(Cell)}. - * - * This is for transition from 0.94 -> 0.96 - */ - @Override - @Deprecated - public void filterRow(List kvs) throws IOException { - // when removing this, this body should be in filterRowCells - - // convert to List and call the new interface (this will call 0.96-style - // #filterRowCells(List) which may delegate to legacy #filterRow(List) - List cells = new ArrayList(kvs.size()); - cells.addAll(kvs); + public void filterRowCells(List cells) throws IOException { for (Filter filter : filters) { filter.filterRowCells(cells); } - - // convert results into kvs - kvs.clear(); - for (Cell c : cells) { - kvs.add(KeyValueUtil.ensureKeyValue(c)); - } } - + @Override public boolean hasFilterRow() { for (Filter filter : filters) { Index: hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java (revision 1588376) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/Filter.java (working copy) @@ -188,17 +188,10 @@ abstract public void filterRowCells(List kvs) throws IOException; /** - * WARNING: please to not override this method. Instead override {@link #filterRowCells(List)}. - * This is for transition from 0.94 -> 0.96 - **/ - @Deprecated - abstract public void filterRow(List kvs) throws IOException; - - /** * Primarily used to check for conflicts with scans(such as scans that do not read a full row at a * time). * - * @return True if this filter actively uses filterRow(List) or filterRow(). + * @return True if this filter actively uses filterRowCells(List) or filterRow(). */ abstract public boolean hasFilterRow(); Index: hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java (revision 1588376) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/filter/FilterWrapper.java (working copy) @@ -178,20 +178,7 @@ return FilterRowRetCode.NOT_CALLED; } - /** - * WARNING: please to not override this method. Instead override {@link #transformCell(Cell)}. - * - * This is for transition from 0.94 -> 0.96 - */ @Override - @Deprecated - public void filterRow(List kvs) throws IOException { - // This is only used internally, marked InterfaceAudience.private, and not used anywhere. - // We can get away with not implementing this. - throw new UnsupportedOperationException("filterRow(List) should never be called"); - } - - @Override public boolean isFamilyEssential(byte[] name) throws IOException { return filter.isFamilyEssential(name); }