Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hbase-4248 Enhancements for Filter Language exposing HBase filters through the Thrift API 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1162210 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-08-26 19:03:40 +00:00
parent cc93cb0298
commit e22c2172a5
3 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -408,6 +408,8 @@ Release 0.91.0 - Unreleased
HBASE-4240 Allow Loadbalancer to be pluggable HBASE-4240 Allow Loadbalancer to be pluggable
HBASE-4244 Refactor bin/hbase help HBASE-4244 Refactor bin/hbase help
HBASE-4241 Optimize flushing of the Memstore (Lars Hofhansl) HBASE-4241 Optimize flushing of the Memstore (Lars Hofhansl)
HBASE-4248 Enhancements for Filter Language exposing HBase filters through
the Thrift API (Anirudh Todi)
TASKS TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

63
src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java
View File

@ -26,6 +26,7 @@ import java.util.TreeSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Stack; import java.util.Stack;
import java.util.HashMap; import java.util.HashMap;
import java.util.Set;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.hbase.util.Writables;
@ -50,14 +51,50 @@ import java.util.EmptyStackException;
*/ */
public class ParseFilter { public class ParseFilter {
private HashMap<ByteBuffer, Integer> operatorPrecedenceHashMap; private static HashMap<ByteBuffer, Integer> operatorPrecedenceHashMap;
private static HashMap<String, String> filterHashMap;
/** static {
* Constructor // Registers all the filter supported by the Filter Language
* <p> filterHashMap = new HashMap<String, String>();
* Creates the operatorPrecedenceHashMap filterHashMap.put("KeyOnlyFilter", ParseConstants.FILTER_PACKAGE + "." +
*/ "KeyOnlyFilter");
public ParseFilter() { filterHashMap.put("FirstKeyOnlyFilter", ParseConstants.FILTER_PACKAGE + "." +
"FirstKeyOnlyFilter");
filterHashMap.put("PrefixFilter", ParseConstants.FILTER_PACKAGE + "." +
"PrefixFilter");
filterHashMap.put("ColumnPrefixFilter", ParseConstants.FILTER_PACKAGE + "." +
"ColumnPrefixFilter");
filterHashMap.put("MultipleColumnPrefixFilter", ParseConstants.FILTER_PACKAGE + "." +
"MultipleColumnPrefixFilter");
filterHashMap.put("ColumnCountGetFilter", ParseConstants.FILTER_PACKAGE + "." +
"ColumnCountGetFilter");
filterHashMap.put("PageFilter", ParseConstants.FILTER_PACKAGE + "." +
"PageFilter");
filterHashMap.put("ColumnPaginationFilter", ParseConstants.FILTER_PACKAGE + "." +
"ColumnPaginationFilter");
filterHashMap.put("InclusiveStopFilter", ParseConstants.FILTER_PACKAGE + "." +
"InclusiveStopFilter");
filterHashMap.put("TimestampsFilter", ParseConstants.FILTER_PACKAGE + "." +
"TimestampsFilter");
filterHashMap.put("RowFilter", ParseConstants.FILTER_PACKAGE + "." +
"RowFilter");
filterHashMap.put("FamilyFilter", ParseConstants.FILTER_PACKAGE + "." +
"FamilyFilter");
filterHashMap.put("QualifierFilter", ParseConstants.FILTER_PACKAGE + "." +
"QualifierFilter");
filterHashMap.put("ValueFilter", ParseConstants.FILTER_PACKAGE + "." +
"ValueFilter");
filterHashMap.put("ColumnRangeFilter", ParseConstants.FILTER_PACKAGE + "." +
"ColumnRangeFilter");
filterHashMap.put("SingleColumnValueFilter", ParseConstants.FILTER_PACKAGE + "." +
"SingleColumnValueFilter");
filterHashMap.put("SingleColumnValueExcludeFilter", ParseConstants.FILTER_PACKAGE + "." +
"SingleColumnValueExcludeFilter");
filterHashMap.put("DependentColumnFilter", ParseConstants.FILTER_PACKAGE + "." +
"DependentColumnFilter");
// Creates the operatorPrecedenceHashMap
operatorPrecedenceHashMap = new HashMap<ByteBuffer, Integer>(); operatorPrecedenceHashMap = new HashMap<ByteBuffer, Integer>();
operatorPrecedenceHashMap.put(ParseConstants.SKIP_BUFFER, 1); operatorPrecedenceHashMap.put(ParseConstants.SKIP_BUFFER, 1);
operatorPrecedenceHashMap.put(ParseConstants.WHILE_BUFFER, 1); operatorPrecedenceHashMap.put(ParseConstants.WHILE_BUFFER, 1);
@ -199,8 +236,11 @@ public class ParseFilter {
String filterName = Bytes.toString(getFilterName(filterStringAsByteArray)); String filterName = Bytes.toString(getFilterName(filterStringAsByteArray));
ArrayList<byte []> filterArguments = getFilterArguments(filterStringAsByteArray); ArrayList<byte []> filterArguments = getFilterArguments(filterStringAsByteArray);
if (!filterHashMap.containsKey(filterName)) {
throw new IllegalArgumentException("Filter Name " + filterName + " not supported");
}
try { try {
filterName = ParseConstants.FILTER_PACKAGE + "." + filterName; filterName = filterHashMap.get(filterName);
Class c = Class.forName(filterName); Class c = Class.forName(filterName);
Class[] argTypes = new Class [] {ArrayList.class}; Class[] argTypes = new Class [] {ArrayList.class};
Method m = c.getDeclaredMethod("createFilterFromArguments", argTypes); Method m = c.getDeclaredMethod("createFilterFromArguments", argTypes);
@ -793,4 +833,11 @@ public class ParseFilter {
return result; return result;
} }
/**
* Return a Set of filters supported by the Filter Language
*/
public Set<String> getSupportedFilters () {
return filterHashMap.keySet();
}
} }

1
src/main/ruby/shell.rb
View File

@ -227,6 +227,7 @@ Shell.load_command_group(
is_enabled is_enabled
exists exists
list list
show_filters
] ]
) )