diff --git a/CHANGES.txt b/CHANGES.txt index 9be0641ad95..e9c0478fc6f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -196,7 +196,6 @@ Release 0.91.0 - Unreleased (Michael Weng) HBASE-4181 HConnectionManager can't find cached HRegionInterface and makes clients work very slow (Jia Liu) - HBASE-4156 ZKConfig defaults clientPort improperly (Michajlo Matijkiw) IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) @@ -417,7 +416,6 @@ Release 0.91.0 - Unreleased (Nichole Treadway and Nicholas Telford) HBASE-2233 Support both Hadoop 0.20 and 0.22 HBASE-3857 Change the HFile Format (Mikhail & Liyin) - HBASE-4176 Exposing HBase Filters to the Thrift API (Anirudh Todi) Release 0.90.5 - Unreleased diff --git a/src/docbkx/book.xml b/src/docbkx/book.xml index f520eaa5728..2c19cef72e9 100644 --- a/src/docbkx/book.xml +++ b/src/docbkx/book.xml @@ -1745,336 +1745,6 @@ When I build, why do I always get Unable to find resource 'VM_global_libra - - HFile format version 2 - - - Mikhail Bautin - - Mikhail Bautin - Liyin Tang - Kannan Muthukarrupan - - - -
Motivation - We found it necessary to revise the HFile format after encountering high memory usage and slow startup times caused by large Bloom filters and block indexes in the region server. Bloom filters can get as large as 100 MB per HFile, which adds up to 2 GB when aggregated over 20 regions. Block indexes can grow as large as 6 GB in aggregate size over the same set of regions. A region is not considered opened until all of its block index data is loaded. Large Bloom filters produce a different performance problem: the first get request that requires a Bloom filter lookup will incur the latency of loading the entire Bloom filter bit array. - To speed up region server startup we break Bloom filters and block indexes into multiple blocks and write those blocks out as they fill up, which also reduces the HFile writer’s memory footprint. In the Bloom filter case, “filling up a block” means accumulating enough keys to efficiently utilize a fixed-size bit array, and in the block index case we accumulate an “index block” of the desired size. Bloom filter blocks and index blocks (we call these “inline blocks”) become interspersed with data blocks, and as a side effect we can no longer rely on the difference between block offsets to determine data block length, as it was done in version 1. - HFile is a low-level file format by design, and it should not deal with application-specific details such as Bloom filters, which are handled at StoreFile level. Therefore, we call Bloom filter blocks in an HFile "inline" blocks. We also supply HFile with an interface to write those inline blocks. - Another format modification aimed at reducing the region server startup time is to use a contiguous “load-on-open” section that has to be loaded in memory at the time an HFile is being opened. Currently, as an HFile opens, there are separate seek operations to read the trailer, data/meta indexes, and file info. To read the Bloom filter, there are two more seek operations for its “data” and “meta” portions. In version 2, we seek once to read the trailer and seek again to read everything else we need to open the file from a contiguous block.
-
HFile format version 1 overview As we will be discussing the changes we are making to the HFile format, it is useful to give a short overview of the previous (HFile version 1) format. An HFile in the existing format is structured as follows: - - - - - - HFile Version 1 - - - HFile Version 1 - - - - Image courtesy of Lars George, hbase-architecture-101-storage.html. - -
Block index format in version 1 - The block index in version 1 is very straightforward. For each entry, it contains: - - - Offset (long) - - - Uncompressed size (int) - - - Key (a serialized byte array written using Bytes.writeByteArray) - - - The number of entries in the block index is stored in the fixed file trailer, and has to be passed in to the method that reads the block index. One of the limitations of the block index in version 1 is that it does not provide the compressed size of a block, which turns out to be necessary for decompression. Therefore, the HFile reader has to infer this compressed size from the offset difference between blocks. We fix this limitation in version 2, where we store on-disk block size instead of uncompressed size, and get uncompressed size from the block header.
- HBase file format with inline blocks (version 2) - -
Overview - The version of HBase introducing the above features reads both version 1 and 2 HFiles, but only writes version 2 HFiles. A version 2 HFile is structured as follows: - -HFile Version 2 - - - - - - - - "Scanned block" section - - Data Block - - ... - - Leaf index block/Bloom block - - ... - Data Block - ... - Leaf index block/Bloom block - ... - Data Block - - c1 - Span Both - c4 - - - d1 - d4 - d5 - - - -
- -
-
Unified version 2 block format - In the version 2 every block in the data section contains the following fields: - - - 8 bytes: Block type, a sequence of bytes equivalent to version 1's "magic records". Supported block types are: - - - Compressed size of the block's data, not including the header (int)  - - - Uncompressed size of the block's data, not including the header (int) - - - File offset of the previous block of the same type (long) - - - Compressed data (or uncompressed data if the compression algorithm is NONE). - - - The above format of blocks is used in the following HFile sections: - - - Scanned block section. The section is named so because it contains all data blocks that need to be read when an HFile is scanned sequentially.  Also contains leaf block index and Bloom chunk blocks. - - - Non-scanned block section. This section still contains unified-format v2 blocks but it does not have to be read when doing a sequential scan. This section contains “meta” blocks and intermediate-level index blocks. - - - - We are supporting “meta” blocks in version 2 the same way they were supported in version 1, even though we do not store Bloom filter data in these blocks anymore.
- Block index in version 2 - There are three types of block indexes in HFile version 2, stored in two different formats (root and non-root): - - - Data index — version 2 multi-level block index, consisting of: - - - Meta index — version 2 root index format only, stored in the meta index section of the file - - - Bloom index — version 2 root index format only, stored in the “load-on-open” section as part of Bloom filter metadata. - -
- Root block index format in version 2 - This format applies to: - - - Root level of the version 2 data index - - - Entire meta and Bloom indexes in version 2, which are always single-level. - - - A version 2 root index block is a sequence of entries of the following format, similar to entries of a version 1 block index, but storing on-disk size instead of uncompressed size. - - - Offset (long) - - - On-disk size (int) - - - Key (a serialized byte array stored using Bytes.writeByteArray) - - - A single-level version 2 block index consists of just a single root index block. To read a root index block of version 2, one needs to know the number of entries. For the data index and the meta index the number of entries is stored in the trailer, and for the Bloom index it is stored in the compound Bloom filter metadata. - For a multi-level block index we also store the following fields in the root index block in the load-on-open section of the HFile, in addition to the data structure described above: - - - Middle leaf index block offset - - - Middle leaf block on-disk size (meaning the leaf index block containing the reference to the “middle” data block of the file) - - - The index of the mid-key (defined below) in the middle leaf-level block. - - - - These additional fields are used to efficiently retrieve the mid-key of the HFile used in HFile splits, which we define as the first key of the block with a zero-based index of (n – 1) / 2, if the total number of blocks in the HFile is n. This definition is consistent with how the mid-key was determined in HFile version 1, and is reasonable in general, because blocks are likely to be the same size on average, but we don’t have any estimates on individual key/value pair sizes. - - When writing a version 2 HFile, the total number of data blocks pointed to by every leaf-level index block is kept track of. When we finish writing and the total number of leaf-level blocks is determined, it is clear which leaf-level block contains the mid-key, and the fields listed above are computed.  When reading the HFile and the mid-key is requested, we retrieve the middle leaf index block (potentially from the block cache) and get the mid-key value from the appropriate position inside that leaf block.
- Non-root block index format in version 2 - This format applies to intermediate-level and leaf index blocks of a version 2 multi-level data block index. Every non-root index block is structured as follows. - - - numEntries: the number of entries (int). - - - entryOffsets: the “secondary index” of offsets of entries in the block, to facilitate a quick binary search on the key (numEntries + 1 int values). The last value is the total length of all entries in this index block. For example, in a non-root index block with entry sizes 60, 80, 50 the “secondary index” will contain the following int array: {0, 60, 140, 190}. - - - Entries. Each entry contains: - -
- Bloom filters in version 2 - In contrast with version 1, in a version 2 HFile Bloom filter metadata is stored in the load-on-open section of the HFile for quick startup. - - - A compound Bloom filter. - -
File Info format in versions 1 and 2 - The file info block is a serialized HbaseMapWritable (essentially a map from byte arrays to byte arrays) with the following keys, among others. StoreFile-level logic adds more keys to this. - - - - hfile.LASTKEY - - - The last key of the file (byte array) - - - - - hfile.AVG_KEY_LEN - - - The average key length in the file (int) - - - - - hfile.AVG_VALUE_LEN - - - The average value length in the file (int) - - - - File info format did not change in version 2. However, we moved the file info to the final section of the file, which can be loaded as one block at the time the HFile is being opened. Also, we do not store comparator in the version 2 file info anymore. Instead, we store it in the fixed file trailer. This is because we need to know the comparator at the time of parsing the load-on-open section of the HFile.
- Fixed_file_trailer_format_differences_be"/>Fixed file trailer format differences between versions 1 and 2 - The following table shows common and different fields between fixed file trailers in versions 1 and 2. Note that the size of the trailer is different depending on the version, so it is “fixed” only within one version. However, the version is always stored as the last four-byte integer in the file. - - - - - Version 1 - - - Version 2 - - - - - File info offset (long) - - - - - Data index offset (long) - - - loadOnOpenOffset (long) - - - - - The offset of the section that we need to load when opening the file. - - - - - Number of data index entries (int) - - - - - metaIndexOffset (long) - This field is not being used by the version 1 reader, so we removed it from version 2. - - - uncompressedDataIndexSize (long) - The total uncompressed size of the whole data block index, including root-level, intermediate-level, and leaf-level blocks. - - - - - Number of meta index entries (int) - - - - - Total uncompressed bytes (long) - - - - - numEntries (int) - - - numEntries (long) - - - - - Compression codec: 0 = LZO, 1 = GZ, 2 = NONE (int) - - - - -   - - - The number of levels in the data block index (int) - - - - -   - - - firstDataBlockOffset (long) - - - - - The offset of the first first data block. Used when scanning. - - - - -   - - - lastDataBlockEnd (long) - - - - - The offset of the first byte after the last key/value data block. We don't need to go beyond this offset when scanning. - - - - - Version: 1 (int) - - - Version: 2 (int) - - - -
diff --git a/src/docbkx/developer.xml b/src/docbkx/developer.xml index a634b7a120d..a3e22eacb7e 100644 --- a/src/docbkx/developer.xml +++ b/src/docbkx/developer.xml @@ -112,7 +112,7 @@ mvn test -Dtest=TestXYZ HBase Case-Study: Using HBaseTestingUtility for Local Testing and Development (2010).
- Mockito + Mocito Sometimes you don't need a full running server unit testing. For example, some methods can make do with a a org.apache.hadoop.hbase.Server instance diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java index 8602c67bf79..306ed2160aa 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.java @@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.KeyValue; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.ArrayList; /** * Simple filter that returns first N columns on row only. @@ -46,9 +45,6 @@ public class ColumnCountGetFilter extends FilterBase { } public ColumnCountGetFilter(final int n) { - if (n < 0) { - throw new IllegalArgumentException("Limit must not be negative"); - } this.limit = n; } @@ -72,16 +68,6 @@ public class ColumnCountGetFilter extends FilterBase { this.count = 0; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 1) { - throw new IllegalArgumentException("Incorrect Arguments passed to ColumnCountGetFilter. " + - "Expected: 1 but got: " + filterArguments.size()); - } - int limit = ParseFilter.convertByteArrayToInt(filterArguments.get(0)); - return new ColumnCountGetFilter(limit); - } - @Override public void readFields(DataInput in) throws IOException { this.limit = in.readInt(); diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java index ca80ad6324b..52bbdf934c7 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.filter; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.ArrayList; import org.apache.hadoop.hbase.KeyValue; @@ -47,12 +46,6 @@ public class ColumnPaginationFilter extends FilterBase public ColumnPaginationFilter(final int limit, final int offset) { - if (limit < 0) { - throw new IllegalArgumentException("Limit must not be negative"); - } - if (offset < 0) { - throw new IllegalArgumentException("Offset must not be negative"); - } this.limit = limit; this.offset = offset; } @@ -90,17 +83,6 @@ public class ColumnPaginationFilter extends FilterBase this.count = 0; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 2) { - throw new IllegalArgumentException("Incorrect Arguments passed to ColumnPaginationFilter. " + - "Expected: 2 but got: " + filterArguments.size()); - } - int limit = ParseFilter.convertByteArrayToInt(filterArguments.get(0)); - int offset = ParseFilter.convertByteArrayToInt(filterArguments.get(1)); - return new ColumnPaginationFilter(limit, offset); - } - public void readFields(DataInput in) throws IOException { this.limit = in.readInt(); diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java index ee3b8c6065a..0fcdcb69f4a 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.java @@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.util.Bytes; import java.io.DataOutput; import java.io.IOException; import java.io.DataInput; -import java.util.ArrayList; /** * This filter is used for selecting only those keys with columns that matches @@ -79,17 +78,6 @@ public class ColumnPrefixFilter extends FilterBase { } } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 1) { - throw new IllegalArgumentException("Incorrect Arguments passed to ColumnPrefixFilter. " + - "Expected: 1 but got: " + filterArguments.size()); - } - - byte [] columnPrefix = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - return new ColumnPrefixFilter(columnPrefix); - } - public void write(DataOutput out) throws IOException { Bytes.writeByteArray(out, this.prefix); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java index df363f97d3c..828a813b04f 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ColumnRangeFilter.java @@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.util.Bytes; import java.io.DataOutput; import java.io.IOException; import java.io.DataInput; -import java.util.ArrayList; /** * This filter is used for selecting only those keys with columns that are @@ -144,26 +143,6 @@ public class ColumnRangeFilter extends FilterBase { return ReturnCode.NEXT_ROW; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 4) { - throw new IllegalArgumentException("Incorrect arguments passed to ColumnRangeFilter. " + - "Expected: 4 but got: " + filterArguments.size()); - } - - byte [] minColumn = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - boolean minColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(1)); - byte [] maxColumn = ParseFilter.convertByteArrayToString(filterArguments.get(2)); - boolean maxColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(3)); - - if (minColumn.length == 0) - minColumn = null; - if (maxColumn.length == 0) - maxColumn = null; - return new ColumnRangeFilter(minColumn, minColumnInclusive, - maxColumn, maxColumnInclusive); - } - @Override public void write(DataOutput out) throws IOException { // need to write out a flag for null value separately. Otherwise, diff --git a/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java index 96719d71177..6d734396fe2 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/CompareFilter.java @@ -27,7 +27,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.Arrays; -import java.util.ArrayList; + /** * This is a generic filter to be used to filter by comparison. It takes an * operator (equal, greater, not equal, etc) and a byte [] comparator. @@ -108,45 +108,23 @@ public abstract class CompareFilter extends FilterBase { offset + length)); switch (compareOp) { case LESS: - return compareResult < 0; - case LESS_OR_EQUAL: return compareResult <= 0; + case LESS_OR_EQUAL: + return compareResult < 0; case EQUAL: - return compareResult == 0; - case NOT_EQUAL: return compareResult != 0; + case NOT_EQUAL: + return compareResult == 0; case GREATER_OR_EQUAL: - return compareResult >= 0; - case GREATER: return compareResult > 0; + case GREATER: + return compareResult >= 0; default: throw new RuntimeException("Unknown Compare op " + compareOp.name()); } } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 2) { - throw new IllegalArgumentException("Incorrect Arguments passed to Compare Filter. " + - "Expected: 2 but got: " + filterArguments.size()); - } - - this.compareOp = ParseFilter.createCompareOp(filterArguments.get(0)); - this.comparator = ParseFilter.createComparator( - ParseFilter.convertByteArrayToString(filterArguments.get(1))); - - if (this.comparator instanceof RegexStringComparator || - this.comparator instanceof SubstringComparator) { - if (this.compareOp != CompareOp.EQUAL && - this.compareOp != CompareOp.NOT_EQUAL) { - throw new IllegalArgumentException ("A regexstring comparator and substring comparator" + - " can only be used with EQUAL and NOT_EQUAL"); - } - } - return this; - } - public void readFields(DataInput in) throws IOException { compareOp = CompareOp.valueOf(in.readUTF()); comparator = (WritableByteArrayComparable) diff --git a/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java index b3bd39a46ae..6f76fe068d5 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/DependentColumnFilter.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.ArrayList; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.util.Bytes; @@ -35,8 +34,8 @@ import org.apache.hadoop.hbase.util.Bytes; * A filter for adding inter-column timestamp matching * Only cells with a correspondingly timestamped entry in * the target column will be retained - * Not compatible with Scan.setBatch as operations need - * full rows for correct filtering + * Not compatible with Scan.setBatch as operations need + * full rows for correct filtering */ public class DependentColumnFilter extends CompareFilter { @@ -45,52 +44,52 @@ public class DependentColumnFilter extends CompareFilter { protected boolean dropDependentColumn; protected Set stampSet = new HashSet(); - + /** * Should only be used for writable */ public DependentColumnFilter() { } - + /** * Build a dependent column filter with value checking * dependent column varies will be compared using the supplied * compareOp and comparator, for usage of which * refer to {@link CompareFilter} - * + * * @param family dependent column family * @param qualifier dependent column qualifier * @param dropDependentColumn whether the column should be discarded after - * @param valueCompareOp comparison op + * @param valueCompareOp comparison op * @param valueComparator comparator */ public DependentColumnFilter(final byte [] family, final byte[] qualifier, final boolean dropDependentColumn, final CompareOp valueCompareOp, final WritableByteArrayComparable valueComparator) { - // set up the comparator + // set up the comparator super(valueCompareOp, valueComparator); this.columnFamily = family; this.columnQualifier = qualifier; this.dropDependentColumn = dropDependentColumn; } - + /** * Constructor for DependentColumn filter. - * Keyvalues where a keyvalue from target column - * with the same timestamp do not exist will be dropped. - * + * Keyvalues where a keyvalue from target column + * with the same timestamp do not exist will be dropped. + * * @param family name of target column family * @param qualifier name of column qualifier */ public DependentColumnFilter(final byte [] family, final byte [] qualifier) { this(family, qualifier, false); } - + /** * Constructor for DependentColumn filter. - * Keyvalues where a keyvalue from target column - * with the same timestamp do not exist will be dropped. - * + * Keyvalues where a keyvalue from target column + * with the same timestamp do not exist will be dropped. + * * @param family name of dependent column family * @param qualifier name of dependent qualifier * @param dropDependentColumn whether the dependent columns keyvalues should be discarded @@ -121,10 +120,6 @@ public class DependentColumnFilter extends CompareFilter { return this.dropDependentColumn; } - public boolean getDropDependentColumn() { - return this.dropDependentColumn; - } - @Override public boolean filterAllRemaining() { return false; @@ -139,8 +134,8 @@ public class DependentColumnFilter extends CompareFilter { } // If it doesn't pass the op, skip it if(comparator != null && doCompare(compareOp, comparator, v.getValue(), 0, v.getValueLength())) - return ReturnCode.SKIP; - + return ReturnCode.SKIP; + stampSet.add(v.getTimestamp()); if(dropDependentColumn) { return ReturnCode.SKIP; @@ -164,7 +159,7 @@ public class DependentColumnFilter extends CompareFilter { public boolean hasFilterRow() { return true; } - + @Override public boolean filterRow() { return false; @@ -174,37 +169,10 @@ public class DependentColumnFilter extends CompareFilter { public boolean filterRowKey(byte[] buffer, int offset, int length) { return false; } + @Override public void reset() { - stampSet.clear(); - } - - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() == 2) { - byte [] family = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - byte [] qualifier = ParseFilter.convertByteArrayToString(filterArguments.get(1)); - return new DependentColumnFilter(family, qualifier); - - } else if (filterArguments.size() == 3) { - byte [] family = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - byte [] qualifier = ParseFilter.convertByteArrayToString(filterArguments.get(1)); - boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2)); - return new DependentColumnFilter(family, qualifier, dropDependentColumn); - - } else if (filterArguments.size() == 5) { - byte [] family = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - byte [] qualifier = ParseFilter.convertByteArrayToString(filterArguments.get(1)); - boolean dropDependentColumn = ParseFilter.convertByteArrayToBoolean(filterArguments.get(2)); - CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(3)); - WritableByteArrayComparable comparator = ParseFilter.createComparator( - ParseFilter.convertByteArrayToString(filterArguments.get(4))); - return new DependentColumnFilter(family, qualifier, dropDependentColumn, - compareOp, comparator); - } else { - throw new IllegalArgumentException("Incorrect Arguments passed to DependentColumnFilter. " + - "Expected: 2, 3 or 5 but got: " + filterArguments.size()); - } + stampSet.clear(); } @Override @@ -214,12 +182,12 @@ public class DependentColumnFilter extends CompareFilter { if(this.columnFamily.length == 0) { this.columnFamily = null; } - + this.columnQualifier = Bytes.readByteArray(in); if(this.columnQualifier.length == 0) { this.columnQualifier = null; - } - + } + this.dropDependentColumn = in.readBoolean(); } @@ -228,7 +196,7 @@ public class DependentColumnFilter extends CompareFilter { super.write(out); Bytes.writeByteArray(out, this.columnFamily); Bytes.writeByteArray(out, this.columnQualifier); - out.writeBoolean(this.dropDependentColumn); + out.writeBoolean(this.dropDependentColumn); } } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java index 3db405104d4..03e16c40883 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/FamilyFilter.java @@ -22,8 +22,6 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.KeyValue; -import java.util.ArrayList; - /** * This filter is used to filter based on the column family. It takes an * operator (equal, greater, not equal, etc) and a byte [] comparator for the @@ -66,9 +64,4 @@ public class FamilyFilter extends CompareFilter { } return ReturnCode.INCLUDE; } - - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - return super.createFilterFromArguments(filterArguments); - } } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/Filter.java b/src/main/java/org/apache/hadoop/hbase/filter/Filter.java index 7f1faa112f9..e6408b7ab31 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/Filter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/Filter.java @@ -24,7 +24,6 @@ import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.io.Writable; import java.util.List; -import java.util.ArrayList; /** * Interface for row and column filters directly applied within the regionserver. @@ -46,7 +45,7 @@ import java.util.ArrayList; * * When implementing your own filters, consider inheriting {@link FilterBase} to help * you reduce boilerplate. - * + * * @see FilterBase */ public interface Filter extends Writable { @@ -149,12 +148,4 @@ public interface Filter extends Writable { * not sure which key to seek to next. */ public KeyValue getNextKeyHint(KeyValue currentKV); - - /** - * Given the filter's arguments it constructs the filter - *

- * @param filterArguments the filter's arguments - * @return constructed filter object - */ - public Filter createFilterFromArguments (ArrayList filterArguments); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java b/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java index 391375b4c3a..fc775c4e10e 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/FilterBase.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.KeyValue; import java.util.List; -import java.util.ArrayList; /** * Abstract base class to help you implement new Filters. Common "ignore" or NOOP type @@ -120,8 +119,4 @@ public abstract class FilterBase implements Filter { return null; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - throw new IllegalArgumentException("This function has not been implemented"); - } } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java b/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java index 1cf12ecc006..ab965fb156b 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java @@ -276,10 +276,4 @@ public class FilterList implements Filter { public KeyValue getNextKeyHint(KeyValue currentKV) { return null; } - - @Override - public Filter createFilterFromArguments(ArrayList filterArguments) { - throw new IllegalArgumentException("This function has not been implemented" + - "A FilterList can be created using the AND/OR operators)"); - } } \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java index fe856881e2a..36170bfa360 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/FirstKeyOnlyFilter.java @@ -26,8 +26,6 @@ import java.io.IOException; import java.io.DataInput; import java.util.List; -import java.util.ArrayList; - /** * A filter that will only return the first KV from each row. *

@@ -49,16 +47,6 @@ public class FirstKeyOnlyFilter extends FilterBase { return ReturnCode.INCLUDE; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 0) { - throw new IllegalArgumentException("Incorrect Arguments passed to FirstKeyOnlyFilter. " + - "Expected: 0 but got: " + filterArguments.size()); - } - - return new FirstKeyOnlyFilter(); - } - public void write(DataOutput out) throws IOException { } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java index 55855454751..6148f3538cd 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/InclusiveStopFilter.java @@ -27,7 +27,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.List; -import java.util.ArrayList; /** * A Filter that stops after the given row. There is no "RowStopFilter" because @@ -73,16 +72,6 @@ public class InclusiveStopFilter extends FilterBase { return done; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 1) { - throw new IllegalArgumentException("Incorrect arguments passed to InclusiveStopFilter. " + - "Expected: 1 but got: " + filterArguments.size()); - } - byte [] stopRowKey = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - return new InclusiveStopFilter(stopRowKey); - } - public void write(DataOutput out) throws IOException { Bytes.writeByteArray(out, this.stopRowKey); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java index 6e8cda3b80f..d417efd02db 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/KeyOnlyFilter.java @@ -25,8 +25,6 @@ import java.io.IOException; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.util.Bytes; -import java.util.ArrayList; - /** * A filter that will only return the key component of each KV (the value will * be rewritten as empty). @@ -46,15 +44,6 @@ public class KeyOnlyFilter extends FilterBase { return ReturnCode.INCLUDE; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 0) { - throw new IllegalArgumentException("Incorrect Arguments passed to KeyOnlyFilter. " + - "Expected: 0 but got: " + filterArguments.size()); - } - return new KeyOnlyFilter(); - } - public void write(DataOutput out) throws IOException { out.writeBoolean(this.lenAsVal); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java index 75b3a7944de..b9ff17ae8e7 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/MultipleColumnPrefixFilter.java @@ -26,7 +26,6 @@ import java.io.DataInput; import java.util.Arrays; import java.util.Comparator; import java.util.TreeSet; -import java.util.ArrayList; /** * This filter is used for selecting only those keys with columns that matches @@ -76,11 +75,11 @@ public class MultipleColumnPrefixFilter extends FilterBase { if (lesserOrEqualPrefixes.size() != 0) { byte [] largestPrefixSmallerThanQualifier = lesserOrEqualPrefixes.last(); - + if (Bytes.startsWith(qualifier, largestPrefixSmallerThanQualifier)) { return ReturnCode.INCLUDE; } - + if (lesserOrEqualPrefixes.size() == sortedPrefixes.size()) { return ReturnCode.NEXT_ROW; } else { @@ -93,16 +92,6 @@ public class MultipleColumnPrefixFilter extends FilterBase { } } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - byte [][] prefixes = new byte [filterArguments.size()][]; - for (int i = 0 ; i < filterArguments.size(); i++) { - byte [] columnPrefix = ParseFilter.convertByteArrayToString(filterArguments.get(i)); - prefixes[i] = columnPrefix; - } - return new MultipleColumnPrefixFilter(prefixes); - } - public void write(DataOutput out) throws IOException { out.writeInt(sortedPrefixes.size()); for (byte [] element : sortedPrefixes) { diff --git a/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java index db8efa1a94c..b5e4dd34677 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/PageFilter.java @@ -25,7 +25,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.List; -import java.util.ArrayList; /** * Implementation of Filter interface that limits results to a specific page @@ -56,9 +55,6 @@ public class PageFilter extends FilterBase { * @param pageSize Maximum result size. */ public PageFilter(final long pageSize) { - if (pageSize < 0) { - throw new IllegalArgumentException("Page Size must not be negative"); - } this.pageSize = pageSize; } @@ -75,16 +71,6 @@ public class PageFilter extends FilterBase { return this.rowsAccepted > this.pageSize; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 1) { - throw new IllegalArgumentException("Incorrect Arguments passed to PageFilter. " + - "Expected: 1 but got: " + filterArguments.size()); - } - long pageSize = ParseFilter.convertByteArrayToLong(filterArguments.get(0)); - return new PageFilter(pageSize); - } - public void readFields(final DataInput in) throws IOException { this.pageSize = in.readLong(); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java b/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java index d6fc1a576dc..e69de29bb2d 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ParseConstants.java @@ -1,258 +0,0 @@ -/** - * Copyright 2011 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.filter; - -import org.apache.hadoop.hbase.ipc.HRegionInterface; -import org.apache.hadoop.hbase.util.Bytes; -import java.nio.ByteBuffer; -import java.util.HashMap; -import org.apache.hadoop.hbase.filter.*; - -/** - * ParseConstants holds a bunch of constants related to parsing Filter Strings - * Used by {@link ParseFilter} - */ -public final class ParseConstants { - - /** - * ASCII code for LPAREN - */ - public static final int LPAREN = '('; - - /** - * ASCII code for RPAREN - */ - public static final int RPAREN = ')'; - - /** - * ASCII code for whitespace - */ - public static final int WHITESPACE = ' '; - - /** - * ASCII code for tab - */ - public static final int TAB = '\t'; - - /** - * ASCII code for 'A' - */ - public static final int A = 'A'; - - /** - * ASCII code for 'N' - */ - public static final int N = 'N'; - - /** - * ASCII code for 'D' - */ - public static final int D = 'D'; - - /** - * ASCII code for 'O' - */ - public static final int O = 'O'; - - /** - * ASCII code for 'R' - */ - public static final int R = 'R'; - - /** - * ASCII code for 'S' - */ - public static final int S = 'S'; - - /** - * ASCII code for 'K' - */ - public static final int K = 'K'; - - /** - * ASCII code for 'I' - */ - public static final int I = 'I'; - - /** - * ASCII code for 'P' - */ - public static final int P = 'P'; - - /** - * SKIP Array - */ - public static final byte [] SKIP_ARRAY = new byte [ ] {'S', 'K', 'I', 'P'}; - public static final ByteBuffer SKIP_BUFFER = ByteBuffer.wrap(SKIP_ARRAY); - - /** - * ASCII code for 'W' - */ - public static final int W = 'W'; - - /** - * ASCII code for 'H' - */ - public static final int H = 'H'; - - /** - * ASCII code for 'L' - */ - public static final int L = 'L'; - - /** - * ASCII code for 'E' - */ - public static final int E = 'E'; - - /** - * WHILE Array - */ - public static final byte [] WHILE_ARRAY = new byte [] {'W', 'H', 'I', 'L', 'E'}; - public static final ByteBuffer WHILE_BUFFER = ByteBuffer.wrap(WHILE_ARRAY); - - /** - * OR Array - */ - public static final byte [] OR_ARRAY = new byte [] {'O','R'}; - public static final ByteBuffer OR_BUFFER = ByteBuffer.wrap(OR_ARRAY); - - /** - * AND Array - */ - public static final byte [] AND_ARRAY = new byte [] {'A','N', 'D'}; - public static final ByteBuffer AND_BUFFER = ByteBuffer.wrap(AND_ARRAY); - - /** - * ASCII code for Backslash - */ - public static final int BACKSLASH = '\\'; - - /** - * ASCII code for a single quote - */ - public static final int SINGLE_QUOTE = '\''; - - /** - * ASCII code for a comma - */ - public static final int COMMA = ','; - - /** - * LESS_THAN Array - */ - public static final byte [] LESS_THAN_ARRAY = new byte [] {'<'}; - public static final ByteBuffer LESS_THAN_BUFFER = ByteBuffer.wrap(LESS_THAN_ARRAY); - - /** - * LESS_THAN_OR_EQUAL_TO Array - */ - public static final byte [] LESS_THAN_OR_EQUAL_TO_ARRAY = new byte [] {'<', '='}; - public static final ByteBuffer LESS_THAN_OR_EQUAL_TO_BUFFER = - ByteBuffer.wrap(LESS_THAN_OR_EQUAL_TO_ARRAY); - - /** - * GREATER_THAN Array - */ - public static final byte [] GREATER_THAN_ARRAY = new byte [] {'>'}; - public static final ByteBuffer GREATER_THAN_BUFFER = ByteBuffer.wrap(GREATER_THAN_ARRAY); - - /** - * GREATER_THAN_OR_EQUAL_TO Array - */ - public static final byte [] GREATER_THAN_OR_EQUAL_TO_ARRAY = new byte [] {'>', '='}; - public static final ByteBuffer GREATER_THAN_OR_EQUAL_TO_BUFFER = - ByteBuffer.wrap(GREATER_THAN_OR_EQUAL_TO_ARRAY); - - /** - * EQUAL_TO Array - */ - public static final byte [] EQUAL_TO_ARRAY = new byte [] {'='}; - public static final ByteBuffer EQUAL_TO_BUFFER = ByteBuffer.wrap(EQUAL_TO_ARRAY); - - /** - * NOT_EQUAL_TO Array - */ - public static final byte [] NOT_EQUAL_TO_ARRAY = new byte [] {'!', '='}; - public static final ByteBuffer NOT_EQUAL_TO_BUFFER = ByteBuffer.wrap(NOT_EQUAL_TO_ARRAY); - - /** - * ASCII code for equal to (=) - */ - public static final int EQUAL_TO = '='; - - /** - * AND Byte Array - */ - public static final byte [] AND = new byte [] {'A','N','D'}; - - /** - * OR Byte Array - */ - public static final byte [] OR = new byte [] {'O', 'R'}; - - /** - * LPAREN Array - */ - public static final byte [] LPAREN_ARRAY = new byte [] {'('}; - public static final ByteBuffer LPAREN_BUFFER = ByteBuffer.wrap(LPAREN_ARRAY); - - /** - * ASCII code for colon (:) - */ - public static final int COLON = ':'; - - /** - * ASCII code for Zero - */ - public static final int ZERO = '0'; - - /** - * ASCII code foe Nine - */ - public static final int NINE = '9'; - - /** - * BinaryType byte array - */ - public static final byte [] binaryType = new byte [] {'b','i','n','a','r','y'}; - - /** - * BinaryPrefixType byte array - */ - public static final byte [] binaryPrefixType = new byte [] {'b','i','n','a','r','y', - 'p','r','e','f','i','x'}; - - /** - * RegexStringType byte array - */ - public static final byte [] regexStringType = new byte [] {'r','e','g','e', 'x', - 's','t','r','i','n','g'}; - - /** - * SubstringType byte array - */ - public static final byte [] substringType = new byte [] {'s','u','b','s','t','r','i','n','g'}; - - /** - * ASCII for Minus Sign - */ - public static final int MINUS_SIGN = '-'; -} \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java index 16d0e174af4..e69de29bb2d 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/ParseFilter.java @@ -1,813 +0,0 @@ -/** - * Copyright 2011 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.filter; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.util.TreeSet; -import java.util.ArrayList; -import java.util.Stack; -import java.util.HashMap; - -import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.Writables; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.filter.ParseConstants; - -import org.apache.hadoop.hbase.filter.FilterList; -import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import java.lang.ArrayIndexOutOfBoundsException; -import java.lang.ClassCastException; -import java.util.EmptyStackException; - -/** - * This class allows a user to specify a filter via a string - * The string is parsed using the methods of this class and - * a filter object is constructed. This filter object is then wrapped - * in a scanner object which is then returned - *

- * This class addresses the HBASE-4168 JIRA. More documentaton on this - * Filter Language can be found at: https://issues.apache.org/jira/browse/HBASE-4176 - */ -public class ParseFilter { - - private HashMap filterHashMap; - private HashMap operatorPrecedenceHashMap; - - /** - * Constructor - *

- * Sets up the filterHashMap by registering all the filters - * Creates the operatorPrecedenceHashMap - */ - public ParseFilter() { - - filterHashMap = new HashMap(); - registerFilter("KeyOnlyFilter", new KeyOnlyFilter()); - registerFilter("FirstKeyOnlyFilter", new FirstKeyOnlyFilter()); - registerFilter("PrefixFilter", new PrefixFilter()); - registerFilter("ColumnPrefixFilter", new ColumnPrefixFilter()); - registerFilter("MultipleColumnPrefixFilter", new MultipleColumnPrefixFilter()); - registerFilter("ColumnCountGetFilter", new ColumnCountGetFilter()); - registerFilter("PageFilter", new PageFilter()); - registerFilter("ColumnPaginationFilter", new ColumnPaginationFilter()); - registerFilter("InclusiveStopFilter", new InclusiveStopFilter()); - registerFilter("TimestampsFilter", new TimestampsFilter()); - registerFilter("RowFilter", new RowFilter()); - registerFilter("FamilyFilter", new FamilyFilter()); - registerFilter("QualifierFilter", new QualifierFilter()); - registerFilter("ValueFilter", new ValueFilter()); - registerFilter("ColumnRangeFilter", new ColumnRangeFilter()); - registerFilter("SingleColumnValueFilter", new SingleColumnValueFilter()); - registerFilter("SingleColumnValueExcludeFilter", new SingleColumnValueExcludeFilter()); - registerFilter("DependentColumnFilter", new DependentColumnFilter()); - - operatorPrecedenceHashMap = new HashMap(); - operatorPrecedenceHashMap.put(ParseConstants.SKIP_BUFFER, 1); - operatorPrecedenceHashMap.put(ParseConstants.WHILE_BUFFER, 1); - operatorPrecedenceHashMap.put(ParseConstants.AND_BUFFER, 2); - operatorPrecedenceHashMap.put(ParseConstants.OR_BUFFER, 3); - } - - /** - * Parses the filterString and constructs a filter using it - *

- * @param filterStringAsByteArray filter string given by the user - * @return filter object we constructed - */ - public Filter parseFilterString (byte [] filterStringAsByteArray) - throws CharacterCodingException { - // stack for the operators and parenthesis - Stack operatorStack = new Stack(); - // stack for the filter objects - Stack filterStack = new Stack(); - - Filter filter = null; - for (int i=0; i - * A simpleFilterExpression is of the form: FilterName('arg', 'arg', 'arg') - * The user given filter string can have many simpleFilterExpressions combined - * using operators. - *

- * This function extracts a simpleFilterExpression from the - * larger filterString given the start offset of the simpler expression - *

- * @param filterStringAsByteArray filter string given by the user - * @param filterExpressionStartOffset start index of the simple filter expression - * @return byte array containing the simple filter expression - */ - public byte [] extractFilterSimpleExpression (byte [] filterStringAsByteArray, - int filterExpressionStartOffset) - throws CharacterCodingException { - int quoteCount = 0; - for (int i=filterExpressionStartOffset; i - * @param filterStringAsByteArray filter string given by the user - * @return filter object we constructed - */ - public Filter parseSimpleFilterExpression (byte [] filterStringAsByteArray) - throws CharacterCodingException { - - byte [] filterName = getFilterName(filterStringAsByteArray); - ArrayList filterArguments = getFilterArguments(filterStringAsByteArray); - - if (filterHashMap.containsKey(ByteBuffer.wrap(filterName))) { - Filter filterSimpleExpression = filterHashMap.get(ByteBuffer.wrap(filterName)); - return filterSimpleExpression.createFilterFromArguments(filterArguments); - } else { - throw new IllegalArgumentException("Incorrect filter string " + - new String(filterStringAsByteArray)); - } - } - - /** - * Registers the filter - *

- * Inserts a key-value composed of a ByteBuffer containing the name of the filter - * and an object of the filter into the HashMap - *

- * @param filterName the name of the filter we wish to register in the filterHashMap - * @param filter an object of that filter - */ - private void registerFilter(String filterName, FilterBase filter) { - byte [] filterNameAsByteArray = Bytes.toBytes(filterName); - ByteBuffer filterNameAsByteBuffer = ByteBuffer.wrap(filterNameAsByteArray); - filterHashMap.put(filterNameAsByteBuffer, filter); - } - -/** - * Returns the filter name given a simple filter expression - *

- * @param filterStringAsByteArray a simple filter expression - * @return name of filter in the simple filter expression - */ - public static byte [] getFilterName (byte [] filterStringAsByteArray) { - int filterNameStartIndex = 0; - int filterNameEndIndex = 0; - - for (int i=filterNameStartIndex; i - * @param filter_string filter string given by the user - * @return an ArrayList containing the arguments of the filter in the filter string - */ - public static ArrayList getFilterArguments (byte [] filterStringAsByteArray) { - int argumentListStartIndex = KeyValue.getDelimiter(filterStringAsByteArray, 0, - filterStringAsByteArray.length, - ParseConstants.LPAREN); - if (argumentListStartIndex == -1) { - throw new IllegalArgumentException("Incorrect argument list"); - } - - int argumentStartIndex = 0; - int argumentEndIndex = 0; - ArrayList filterArguments = new ArrayList(); - - for (int i = argumentListStartIndex + 1; i, != etc - argumentStartIndex = i; - for (int j = argumentStartIndex; j < filterStringAsByteArray.length; j++) { - if (filterStringAsByteArray[j] == ParseConstants.WHITESPACE || - filterStringAsByteArray[j] == ParseConstants.COMMA || - filterStringAsByteArray[j] == ParseConstants.RPAREN) { - argumentEndIndex = j - 1; - i = j; - byte [] filterArgument = new byte [argumentEndIndex - argumentStartIndex + 1]; - Bytes.putBytes(filterArgument, 0, filterStringAsByteArray, - argumentStartIndex, argumentEndIndex - argumentStartIndex + 1); - filterArguments.add(filterArgument); - break; - } else if (j == filterStringAsByteArray.length - 1) { - throw new IllegalArgumentException("Incorrect argument list"); - } - } - } - } - return filterArguments; - } - -/** - * This function is called while parsing the filterString and an operator is parsed - *

- * @param operatorStack the stack containing the operators and parenthesis - * @param filterStack the stack containing the filters - * @param operator the operator found while parsing the filterString - * @return returns the filterStack after evaluating the stack - */ - public void reduce(Stack operatorStack, - Stack filterStack, - ByteBuffer operator) { - while (!operatorStack.empty() && - !(ParseConstants.LPAREN_BUFFER.equals(operatorStack.peek())) && - hasHigherPriority(operatorStack.peek(), operator)) { - filterStack.push(popArguments(operatorStack, filterStack)); - } - } - - /** - * Pops an argument from the operator stack and the number of arguments required by the operator - * from the filterStack and evaluates them - *

- * @param operatorStack the stack containing the operators - * @param filterStack the stack containing the filters - * @return the evaluated filter - */ - public static Filter popArguments (Stack operatorStack, Stack filterStack) { - ByteBuffer argumentOnTopOfStack = operatorStack.peek(); - - if (argumentOnTopOfStack.equals(ParseConstants.OR_BUFFER)) { - // The top of the stack is an OR - try { - ArrayList listOfFilters = new ArrayList(); - while (!operatorStack.empty() && operatorStack.peek().equals(ParseConstants.OR_BUFFER)) { - Filter filter = filterStack.pop(); - listOfFilters.add(0, filter); - operatorStack.pop(); - } - Filter filter = filterStack.pop(); - listOfFilters.add(0, filter); - Filter orFilter = new FilterList(FilterList.Operator.MUST_PASS_ONE, listOfFilters); - return orFilter; - } catch (EmptyStackException e) { - throw new IllegalArgumentException("Incorrect input string - an OR needs two filters"); - } - - } else if (argumentOnTopOfStack.equals(ParseConstants.AND_BUFFER)) { - // The top of the stack is an AND - try { - ArrayList listOfFilters = new ArrayList(); - while (!operatorStack.empty() && operatorStack.peek().equals(ParseConstants.AND_BUFFER)) { - Filter filter = filterStack.pop(); - listOfFilters.add(0, filter); - operatorStack.pop(); - } - Filter filter = filterStack.pop(); - listOfFilters.add(0, filter); - Filter andFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL, listOfFilters); - return andFilter; - } catch (EmptyStackException e) { - throw new IllegalArgumentException("Incorrect input string - an AND needs two filters"); - } - - } else if (argumentOnTopOfStack.equals(ParseConstants.SKIP_BUFFER)) { - // The top of the stack is a SKIP - try { - Filter wrappedFilter = filterStack.pop(); - Filter skipFilter = new SkipFilter(wrappedFilter); - operatorStack.pop(); - return skipFilter; - } catch (EmptyStackException e) { - throw new IllegalArgumentException("Incorrect input string - a SKIP wraps a filter"); - } - - } else if (argumentOnTopOfStack.equals(ParseConstants.WHILE_BUFFER)) { - // The top of the stack is a WHILE - try { - Filter wrappedFilter = filterStack.pop(); - Filter whileMatchFilter = new WhileMatchFilter(wrappedFilter); - operatorStack.pop(); - return whileMatchFilter; - } catch (EmptyStackException e) { - throw new IllegalArgumentException("Incorrect input string - a WHILE wraps a filter"); - } - - } else if (argumentOnTopOfStack.equals(ParseConstants.LPAREN_BUFFER)) { - // The top of the stack is a LPAREN - try { - Filter filter = filterStack.pop(); - operatorStack.pop(); - return filter; - } catch (EmptyStackException e) { - throw new IllegalArgumentException("Incorrect Filter String"); - } - - } else { - throw new IllegalArgumentException("Incorrect arguments on operatorStack"); - } - } - -/** - * Returns which operator has higher precedence - *

- * If a has higher precedence than b, it returns true - * If they have the same precedence, it returns false - */ - public boolean hasHigherPriority(ByteBuffer a, ByteBuffer b) { - if ((operatorPrecedenceHashMap.get(a) - operatorPrecedenceHashMap.get(b)) < 0) { - return true; - } - return false; - } - -/** - * Removes the single quote escaping a single quote - thus it returns an unescaped argument - *

- * @param filterStringAsByteArray filter string given by user - * @param argumentStartIndex start index of the argument - * @param argumentEndIndex end index of the argument - * @return returns an unescaped argument - */ - public static byte [] createUnescapdArgument (byte [] filterStringAsByteArray, - int argumentStartIndex, int argumentEndIndex) { - int unescapedArgumentLength = 2; - for (int i = argumentStartIndex + 1; i <= argumentEndIndex - 1; i++) { - unescapedArgumentLength ++; - if (filterStringAsByteArray[i] == ParseConstants.SINGLE_QUOTE && - i != (argumentEndIndex - 1) && - filterStringAsByteArray[i+1] == ParseConstants.SINGLE_QUOTE) { - i++; - continue; - } - } - - byte [] unescapedArgument = new byte [unescapedArgumentLength]; - int count = 1; - unescapedArgument[0] = '\''; - for (int i = argumentStartIndex + 1; i <= argumentEndIndex - 1; i++) { - if (filterStringAsByteArray [i] == ParseConstants.SINGLE_QUOTE && - i != (argumentEndIndex - 1) && - filterStringAsByteArray [i+1] == ParseConstants.SINGLE_QUOTE) { - unescapedArgument[count++] = filterStringAsByteArray [i+1]; - i++; - } - else { - unescapedArgument[count++] = filterStringAsByteArray [i]; - } - } - unescapedArgument[unescapedArgumentLength - 1] = '\''; - return unescapedArgument; - } - -/** - * Checks if the current index of filter string we are on is the beginning of the keyword 'OR' - *

- * @param filterStringAsByteArray filter string given by the user - * @param indexOfOr index at which an 'O' was read - * @return true if the keyword 'OR' is at the current index - */ - public static boolean checkForOr (byte [] filterStringAsByteArray, int indexOfOr) - throws CharacterCodingException, ArrayIndexOutOfBoundsException { - - try { - if (filterStringAsByteArray[indexOfOr] == ParseConstants.O && - filterStringAsByteArray[indexOfOr+1] == ParseConstants.R && - (filterStringAsByteArray[indexOfOr-1] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfOr-1] == ParseConstants.RPAREN) && - (filterStringAsByteArray[indexOfOr+2] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfOr+2] == ParseConstants.LPAREN)) { - return true; - } else { - return false; - } - } catch (ArrayIndexOutOfBoundsException e) { - return false; - } - } - -/** - * Checks if the current index of filter string we are on is the beginning of the keyword 'AND' - *

- * @param filterStringAsByteArray filter string given by the user - * @param indexOfAnd index at which an 'A' was read - * @return true if the keyword 'AND' is at the current index - */ - public static boolean checkForAnd (byte [] filterStringAsByteArray, int indexOfAnd) - throws CharacterCodingException { - - try { - if (filterStringAsByteArray[indexOfAnd] == ParseConstants.A && - filterStringAsByteArray[indexOfAnd+1] == ParseConstants.N && - filterStringAsByteArray[indexOfAnd+2] == ParseConstants.D && - (filterStringAsByteArray[indexOfAnd-1] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfAnd-1] == ParseConstants.RPAREN) && - (filterStringAsByteArray[indexOfAnd+3] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfAnd+3] == ParseConstants.LPAREN)) { - return true; - } else { - return false; - } - } catch (ArrayIndexOutOfBoundsException e) { - return false; - } - } - -/** - * Checks if the current index of filter string we are on is the beginning of the keyword 'SKIP' - *

- * @param filterStringAsByteArray filter string given by the user - * @param indexOfSkip index at which an 'S' was read - * @return true if the keyword 'SKIP' is at the current index - */ - public static boolean checkForSkip (byte [] filterStringAsByteArray, int indexOfSkip) - throws CharacterCodingException { - - try { - if (filterStringAsByteArray[indexOfSkip] == ParseConstants.S && - filterStringAsByteArray[indexOfSkip+1] == ParseConstants.K && - filterStringAsByteArray[indexOfSkip+2] == ParseConstants.I && - filterStringAsByteArray[indexOfSkip+3] == ParseConstants.P && - (indexOfSkip == 0 || - filterStringAsByteArray[indexOfSkip-1] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfSkip-1] == ParseConstants.RPAREN || - filterStringAsByteArray[indexOfSkip-1] == ParseConstants.LPAREN) && - (filterStringAsByteArray[indexOfSkip+4] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfSkip+4] == ParseConstants.LPAREN)) { - return true; - } else { - return false; - } - } catch (ArrayIndexOutOfBoundsException e) { - return false; - } - } - -/** - * Checks if the current index of filter string we are on is the beginning of the keyword 'WHILE' - *

- * @param filterStringAsByteArray filter string given by the user - * @param indexOfWhile index at which an 'W' was read - * @return true if the keyword 'WHILE' is at the current index - */ - public static boolean checkForWhile (byte [] filterStringAsByteArray, int indexOfWhile) - throws CharacterCodingException { - - try { - if (filterStringAsByteArray[indexOfWhile] == ParseConstants.W && - filterStringAsByteArray[indexOfWhile+1] == ParseConstants.H && - filterStringAsByteArray[indexOfWhile+2] == ParseConstants.I && - filterStringAsByteArray[indexOfWhile+3] == ParseConstants.L && - filterStringAsByteArray[indexOfWhile+4] == ParseConstants.E && - (indexOfWhile == 0 || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.WHITESPACE - || filterStringAsByteArray[indexOfWhile-1] == ParseConstants.RPAREN || - filterStringAsByteArray[indexOfWhile-1] == ParseConstants.LPAREN) && - (filterStringAsByteArray[indexOfWhile+5] == ParseConstants.WHITESPACE || - filterStringAsByteArray[indexOfWhile+5] == ParseConstants.LPAREN)) { - return true; - } else { - return false; - } - } catch (ArrayIndexOutOfBoundsException e) { - return false; - } - } - -/** - * Returns a boolean indicating whether the quote was escaped or not - *

- * @param array byte array in which the quote was found - * @param quoteIndex index of the single quote - * @return returns true if the quote was unescaped - */ - public static boolean isQuoteUnescaped (byte [] array, int quoteIndex) { - if (array == null) { - throw new IllegalArgumentException("isQuoteUnescaped called with a null array"); - } - - if (quoteIndex == array.length - 1 || array[quoteIndex+1] != ParseConstants.SINGLE_QUOTE) { - return true; - } - else { - return false; - } - } - -/** - * Takes a quoted byte array and converts it into an unquoted byte array - * For example: given a byte array representing 'abc', it returns a - * byte array representing 'abc' - *

- * @param stringAsByteArray the quoted byte array - * @return - */ - public static byte [] convertByteArrayToString (byte [] stringAsByteArray) { - if (stringAsByteArray == null || - stringAsByteArray.length < 2 || - stringAsByteArray[0] != ParseConstants.SINGLE_QUOTE || - stringAsByteArray[stringAsByteArray.length - 1] != ParseConstants.SINGLE_QUOTE) { - throw new IllegalArgumentException("convertByteArrayToString needs a quotes byte array"); - } else { - byte [] targetString = new byte [stringAsByteArray.length - 2]; - Bytes.putBytes(targetString, 0, stringAsByteArray, 1, stringAsByteArray.length - 2); - return targetString; - } - } - -/** - * Converts an int expressed in a byte array to an actual int - *

- * This doesn't use Bytes.toInt because that assumes - * that there will be {@link #SIZEOF_INT} bytes available. - *

- * @param numberAsByteArray the int value expressed as a byte array - * @return the int value - */ - public static int convertByteArrayToInt (byte [] numberAsByteArray) { - - long tempResult = ParseFilter.convertByteArrayToLong(numberAsByteArray); - - if (tempResult > Integer.MAX_VALUE) { - throw new IllegalArgumentException("Integer Argument too large"); - } else if (tempResult < Integer.MIN_VALUE) { - throw new IllegalArgumentException("Integer Argument too small"); - } - - int result = (int) tempResult; - return result; - } - -/** - * Converts a long expressed in a byte array to an actual long - *

- * This doesn't use Bytes.toLong because that assumes - * that there will be {@link #SIZEOF_LONG} bytes available. - *

- * @param numberAsByteArray the long value expressed as a byte array - * @return the long value - */ - public static long convertByteArrayToLong (byte [] numberAsByteArray) { - if (numberAsByteArray == null) { - throw new IllegalArgumentException("convertByteArrayToLong called with a null array"); - } - - int i = 0; - long result = 0; - boolean isNegative = false; - - if (numberAsByteArray[i] == ParseConstants.MINUS_SIGN) { - i++; - isNegative = true; - } - - while (i != numberAsByteArray.length) { - if (numberAsByteArray[i] < ParseConstants.ZERO || - numberAsByteArray[i] > ParseConstants.NINE) { - throw new IllegalArgumentException("Byte Array should only contain digits"); - } - result = result*10 + (numberAsByteArray[i] - ParseConstants.ZERO); - if (result < 0) { - throw new IllegalArgumentException("Long Argument too large"); - } - i++; - } - - if (isNegative) { - return -result; - } else { - return result; - } - } - -/** - * Converts a boolean expressed in a byte array to an actual boolean - *

- * This doesn't used Bytes.toBoolean because Bytes.toBoolean(byte []) - * assumes that 1 stands for true and 0 for false. - * Here, the byte array representing "true" and "false" is parsed - *

- * @param booleanAsByteArray the boolean value expressed as a byte array - * @return the boolean value - */ - public static boolean convertByteArrayToBoolean (byte [] booleanAsByteArray) { - if (booleanAsByteArray == null) { - throw new IllegalArgumentException("convertByteArrayToBoolean called with a null array"); - } - - if (booleanAsByteArray.length == 4 && - (booleanAsByteArray[0] == 't' || booleanAsByteArray[0] == 'T') && - (booleanAsByteArray[1] == 'r' || booleanAsByteArray[1] == 'R') && - (booleanAsByteArray[2] == 'u' || booleanAsByteArray[2] == 'U') && - (booleanAsByteArray[3] == 'e' || booleanAsByteArray[3] == 'E')) { - return true; - } - else if (booleanAsByteArray.length == 5 && - (booleanAsByteArray[0] == 'f' || booleanAsByteArray[0] == 'F') && - (booleanAsByteArray[1] == 'a' || booleanAsByteArray[1] == 'A') && - (booleanAsByteArray[2] == 'l' || booleanAsByteArray[2] == 'L') && - (booleanAsByteArray[3] == 's' || booleanAsByteArray[3] == 'S') && - (booleanAsByteArray[4] == 'e' || booleanAsByteArray[4] == 'E')) { - return false; - } - else { - throw new IllegalArgumentException("Incorrect Boolean Expression"); - } - } - -/** - * Takes a compareOperator symbol as a byte array and returns the corresponding CompareOperator - *

- * @param compareOpAsByteArray the comparatorOperator symbol as a byte array - * @return the Compare Operator - */ - public static CompareFilter.CompareOp createCompareOp (byte [] compareOpAsByteArray) { - ByteBuffer compareOp = ByteBuffer.wrap(compareOpAsByteArray); - if (compareOp.equals(ParseConstants.LESS_THAN_BUFFER)) - return CompareOp.LESS; - else if (compareOp.equals(ParseConstants.LESS_THAN_OR_EQUAL_TO_BUFFER)) - return CompareOp.LESS_OR_EQUAL; - else if (compareOp.equals(ParseConstants.GREATER_THAN_BUFFER)) - return CompareOp.GREATER; - else if (compareOp.equals(ParseConstants.GREATER_THAN_OR_EQUAL_TO_BUFFER)) - return CompareOp.GREATER_OR_EQUAL; - else if (compareOp.equals(ParseConstants.NOT_EQUAL_TO_BUFFER)) - return CompareOp.NOT_EQUAL; - else if (compareOp.equals(ParseConstants.EQUAL_TO_BUFFER)) - return CompareOp.EQUAL; - else - throw new IllegalArgumentException("Invalid compare operator"); - } - -/** - * Parses a comparator of the form comparatorType:comparatorValue form and returns a comparator - *

- * @param comparator the comparator in the form comparatorType:comparatorValue - * @return the parsed comparator - */ - public static WritableByteArrayComparable createComparator (byte [] comparator) { - if (comparator == null) - throw new IllegalArgumentException("Incorrect Comparator"); - byte [][] parsedComparator = ParseFilter.parseComparator(comparator); - byte [] comparatorType = parsedComparator[0]; - byte [] comparatorValue = parsedComparator[1]; - - - if (Bytes.equals(comparatorType, ParseConstants.binaryType)) - return new BinaryComparator(comparatorValue); - else if (Bytes.equals(comparatorType, ParseConstants.binaryPrefixType)) - return new BinaryPrefixComparator(comparatorValue); - else if (Bytes.equals(comparatorType, ParseConstants.regexStringType)) - return new RegexStringComparator(new String(comparatorValue)); - else if (Bytes.equals(comparatorType, ParseConstants.substringType)) - return new SubstringComparator(new String(comparatorValue)); - else - throw new IllegalArgumentException("Incorrect comparatorType"); - } - -/** - * Splits a column in comparatorType:comparatorValue form into separate byte arrays - *

- * @param comparator the comparator - * @return the parsed arguments of the comparator as a 2D byte array - */ - public static byte [][] parseComparator (byte [] comparator) { - final int index = KeyValue.getDelimiter(comparator, 0, comparator.length, ParseConstants.COLON); - if (index == -1) { - throw new IllegalArgumentException("Incorrect comparator"); - } - - byte [][] result = new byte [2][0]; - result[0] = new byte [index]; - System.arraycopy(comparator, 0, result[0], 0, index); - - final int len = comparator.length - (index + 1); - result[1] = new byte[len]; - System.arraycopy(comparator, index + 1, result[1], 0, len); - - return result; - } -} diff --git a/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java index 261bae85119..063d06825a3 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/PrefixFilter.java @@ -27,7 +27,6 @@ import java.io.DataOutput; import java.io.IOException; import java.io.DataInput; import java.util.List; -import java.util.ArrayList; /** * Pass results that have same row prefix. @@ -68,17 +67,6 @@ public class PrefixFilter extends FilterBase { return passedPrefix; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 1) { - throw new IllegalArgumentException("Incorrect arguments passed to PrefixFilter. " + - "Expected: 1 but got: " + filterArguments.size()); - } - - byte [] prefix = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - return new PrefixFilter(prefix); - } - public void write(DataOutput out) throws IOException { Bytes.writeByteArray(out, this.prefix); } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java index 688faba6108..43bf526e0ce 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/QualifierFilter.java @@ -23,8 +23,6 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.client.Get; -import java.util.ArrayList; - /** * This filter is used to filter based on the column qualifier. It takes an * operator (equal, greater, not equal, etc) and a byte [] comparator for the @@ -67,9 +65,4 @@ public class QualifierFilter extends CompareFilter { } return ReturnCode.INCLUDE; } - - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - return super.createFilterFromArguments(filterArguments); - } } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java index aebfbd57ed2..9d9d0a4dbf5 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/RowFilter.java @@ -21,9 +21,9 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.client.Scan; import java.util.List; -import java.util.ArrayList; /** * This filter is used to filter based on the key. It takes an operator @@ -83,9 +83,4 @@ public class RowFilter extends CompareFilter { public boolean filterRow() { return this.filterOutRow; } - - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - return super.createFilterFromArguments(filterArguments); - } } \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java index 82e702dba0f..cda1ccfb546 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueExcludeFilter.java @@ -23,8 +23,6 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import java.util.ArrayList; - /** * A {@link Filter} that checks a single column value, but does not emit the * tested column. This will enable a performance boost over @@ -87,20 +85,4 @@ public class SingleColumnValueExcludeFilter extends SingleColumnValueFilter { } return superRetCode; } - - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - SingleColumnValueFilter singleColumnValueFilter = new SingleColumnValueFilter(); - SingleColumnValueFilter tempFilter = (SingleColumnValueFilter) - singleColumnValueFilter.createFilterFromArguments(filterArguments); - SingleColumnValueExcludeFilter filter = new SingleColumnValueExcludeFilter ( - tempFilter.getFamily(), tempFilter.getQualifier(), - tempFilter.getOperator(), tempFilter.getComparator()); - - if (filterArguments.size() == 6) { - filter.setFilterIfMissing(tempFilter.getFilterIfMissing()); - filter.setLatestVersionOnly(tempFilter.getLatestVersionOnly()); - } - return filter; - } } diff --git a/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java index 3285ba9f2d2..929a51995c2 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java @@ -33,7 +33,6 @@ import java.io.DataOutput; import java.io.IOException; import java.util.Arrays; import java.util.List; -import java.util.ArrayList; /** * This filter is used to filter cells based on value. It takes a {@link CompareFilter.CompareOp} @@ -248,39 +247,6 @@ public class SingleColumnValueFilter extends FilterBase { this.latestVersionOnly = latestVersionOnly; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - if (filterArguments.size() != 4 && filterArguments.size() != 6) - throw new IllegalArgumentException("Incorrect Arguments passed to SingleColumnValueFilter. " + - "Expected: 4 or 6 but got: " + filterArguments.size()); - - byte [] family = ParseFilter.convertByteArrayToString(filterArguments.get(0)); - byte [] qualifier = ParseFilter.convertByteArrayToString(filterArguments.get(1)); - CompareOp compareOp = ParseFilter.createCompareOp(filterArguments.get(2)); - WritableByteArrayComparable comparator = ParseFilter.createComparator( - ParseFilter.convertByteArrayToString(filterArguments.get(3))); - - if (comparator instanceof RegexStringComparator || - comparator instanceof SubstringComparator) { - if (compareOp != CompareOp.EQUAL && - compareOp != CompareOp.NOT_EQUAL) { - throw new IllegalArgumentException ("A regexstring comparator and substring comparator " + - "can only be used with EQUAL and NOT_EQUAL"); - } - } - - SingleColumnValueFilter filter = new SingleColumnValueFilter(family, qualifier, - compareOp, comparator); - - if (filterArguments.size() == 6) { - boolean filterIfMissing = ParseFilter.convertByteArrayToBoolean(filterArguments.get(4)); - boolean latestVersionOnly = ParseFilter.convertByteArrayToBoolean(filterArguments.get(5)); - filter.setFilterIfMissing(filterIfMissing); - filter.setLatestVersionOnly(latestVersionOnly); - } - return filter; - } - public void readFields(final DataInput in) throws IOException { this.columnFamily = Bytes.readByteArray(in); if(this.columnFamily.length == 0) { diff --git a/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java b/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java index e0875aaa37e..60ce11483ed 100644 --- a/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java +++ b/src/main/java/org/apache/hadoop/hbase/filter/TimestampsFilter.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.TreeSet; -import java.util.ArrayList; import org.apache.hadoop.hbase.KeyValue; @@ -42,11 +41,6 @@ public class TimestampsFilter extends FilterBase { * @param timestamps */ public TimestampsFilter(List timestamps) { - for (Long timestamp : timestamps) { - if (timestamp < 0) { - throw new IllegalArgumentException("Timestamps must not be negative"); - } - } this.timestamps = new TreeSet(timestamps); init(); } @@ -54,8 +48,10 @@ public class TimestampsFilter extends FilterBase { /** * @return the list of timestamps */ - public TreeSet getTimestamps() { - return this.timestamps; + public List getTimestamps() { + List list = new ArrayList(timestamps.size()); + list.addAll(timestamps); + return list; } private void init() { @@ -84,16 +80,6 @@ public class TimestampsFilter extends FilterBase { return ReturnCode.SKIP; } - @Override - public Filter createFilterFromArguments (ArrayList filterArguments) { - ArrayList timestamps = new ArrayList(); - for (int i = 0; i filterArguments) { - return super.createFilterFromArguments(filterArguments); - } } diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java index d1a03a57f15..24bcafef09a 100644 --- a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java +++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java @@ -47,7 +47,8 @@ public class ZKConfig { private static final String ZK_CFG_PROPERTY = "hbase.zookeeper.property."; private static final int ZK_CFG_PROPERTY_SIZE = ZK_CFG_PROPERTY.length(); - private static final String ZK_CLIENT_PORT_KEY = "clientPort"; + private static final String ZK_CLIENT_PORT_KEY = ZK_CFG_PROPERTY + + "clientPort"; /** * Make a Properties object holding ZooKeeper config equivalent to zoo.cfg. diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java index 13e3064391a..e69de29bb2d 100644 --- a/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java +++ b/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java @@ -1,754 +0,0 @@ -/** - * Copyright 2011 The Apache Software Foundation - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.filter; - -import static org.junit.Assert.*; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.regionserver.HRegion; -import org.apache.hadoop.hbase.regionserver.InternalScanner; -import org.apache.hadoop.hbase.util.Bytes; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * This class tests ParseFilter.java - * It tests the entire work flow from when a string is given by the user - * and how it is parsed to construct the corresponding Filter object - */ -public class TestParseFilter { - - ParseFilter f; - Filter filter; - - @Before - public void setUp() throws Exception { - f = new ParseFilter(); - } - - @After - public void tearDown() throws Exception { - // Nothing to do. - } - - @Test - public void testKeyOnlyFilter() throws IOException { - String filterString = " KeyOnlyFilter( ) "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof KeyOnlyFilter); - - String filterString2 = "KeyOnlyFilter ('') "; - byte [] filterStringAsByteArray2 = Bytes.toBytes(filterString2); - try { - filter = f.parseFilterString(filterStringAsByteArray2); - assertTrue(filter instanceof KeyOnlyFilter); - } catch (IllegalArgumentException e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void testFirstKeyOnlyFilter() throws IOException { - String filterString = " FirstKeyOnlyFilter( ) "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof FirstKeyOnlyFilter); - - String filterString2 = " FirstKeyOnlyFilter ('') "; - byte [] filterStringAsByteArray2 = Bytes.toBytes(filterString2); - try { - filter = f.parseFilterString(filterStringAsByteArray2); - assertTrue(filter instanceof FirstKeyOnlyFilter); - } catch (IllegalArgumentException e) { - System.out.println(e.getMessage()); - } - } - - @Test - public void testPrefixFilter() throws IOException { - String filterString = " PrefixFilter('row' ) "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof PrefixFilter); - - PrefixFilter prefixFilter = (PrefixFilter) filter; - byte [] prefix = prefixFilter.getPrefix(); - assertEquals(new String(prefix), "row"); - - filterString = " PrefixFilter(row)"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof PrefixFilter); - } catch (IllegalArgumentException e) { - System.out.println("PrefixFilter needs a quoted string"); - } - - } - - @Test - public void testColumnPrefixFilter() throws IOException { - String filterString = " ColumnPrefixFilter('qualifier' ) "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnPrefixFilter); - byte [] columnPrefix = ((ColumnPrefixFilter)filter).getPrefix(); - assertEquals(new String(columnPrefix), "qualifier"); - } - - @Test - public void testMultipleColumnPrefixFilter() throws IOException { - String filterString = " MultipleColumnPrefixFilter('qualifier1', 'qualifier2' ) "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof MultipleColumnPrefixFilter); - byte [][] prefixes = ((MultipleColumnPrefixFilter)filter).getPrefix(); - assertEquals(new String(prefixes[0]), "qualifier1"); - assertEquals(new String(prefixes[1]), "qualifier2"); - } - - @Test - public void testColumnCountGetFilter() throws IOException { - String filterString = " ColumnCountGetFilter(4)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnCountGetFilter); - int limit = ((ColumnCountGetFilter)filter).getLimit(); - assertEquals(limit, 4); - - filterString = " ColumnCountGetFilter('abc')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnCountGetFilter); - } catch (IllegalArgumentException e) { - System.out.println("ColumnCountGetFilter needs an int as an argument"); - } - - filterString = " ColumnCountGetFilter(2147483648)"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnCountGetFilter); - } catch (IllegalArgumentException e) { - System.out.println("Integer argument too large"); - } - } - - @Test - public void testPageFilter() throws IOException { - String filterString = " PageFilter(4)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof PageFilter); - - long pageSize = ((PageFilter)filter).getPageSize(); - assertEquals(pageSize, 4); - - filterString = " PageFilter('123')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof PageFilter); - } catch (IllegalArgumentException e) { - System.out.println("PageFilter needs an int as an argument"); - } - } - - @Test - public void testColumnPaginationFilter() throws IOException { - String filterString = "ColumnPaginationFilter(4, 6)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnPaginationFilter); - - int limit = ((ColumnPaginationFilter)filter).getLimit(); - assertEquals(limit, 4); - int offset = ((ColumnPaginationFilter)filter).getOffset(); - assertEquals(offset, 6); - - filterString = " ColumnPaginationFilter('124')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnPaginationFilter); - } catch (IllegalArgumentException e) { - System.out.println("ColumnPaginationFilter needs two arguments"); - } - - filterString = " ColumnPaginationFilter('4' , '123a')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnPaginationFilter); - } catch (IllegalArgumentException e) { - System.out.println("ColumnPaginationFilter needs two ints as arguments"); - } - - filterString = " ColumnPaginationFilter('4' , '-123')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnPaginationFilter); - } catch (IllegalArgumentException e) { - System.out.println("ColumnPaginationFilter arguments should not be negative"); - } - } - - @Test - public void testInclusiveStopFilter() throws IOException { - String filterString = "InclusiveStopFilter ('row 3')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof InclusiveStopFilter); - - byte [] stopRowKey = ((InclusiveStopFilter)filter).getStopRowKey(); - assertEquals(new String(stopRowKey), "row 3"); - } - - - @Test - public void testTimestampsFilter() throws IOException { - String filterString = "TimestampsFilter(9223372036854775806, 6)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof TimestampsFilter); - - TreeSet timestamps = ((TimestampsFilter)filter).getTimestamps(); - assertEquals(timestamps.size(), 2); - assertTrue(timestamps.contains(new Long(6))); - - filterString = "TimestampsFilter()"; - filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof TimestampsFilter); - - timestamps = ((TimestampsFilter)filter).getTimestamps(); - assertEquals(timestamps.size(), 0); - - filterString = "TimestampsFilter(9223372036854775808, 6)"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof TimestampsFilter); - } catch (IllegalArgumentException e) { - System.out.println("Long Argument was too large"); - } - - filterString = "TimestampsFilter(-45, 6)"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof TimestampsFilter); - } catch (IllegalArgumentException e) { - System.out.println("Timestamp Arguments should not be negative"); - } - } - - @Test - public void testRowFilter() throws IOException { - String filterString = "RowFilter ( =, 'binary:regionse')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof RowFilter); - - RowFilter rowFilter = (RowFilter)filter; - assertEquals(CompareFilter.CompareOp.EQUAL, rowFilter.getOperator()); - assertTrue(rowFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator) rowFilter.getComparator(); - assertEquals("regionse", new String(binaryComparator.getValue())); - } - - @Test - public void testFamilyFilter() throws IOException { - String filterString = "FamilyFilter(>=, 'binaryprefix:pre')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof FamilyFilter); - - FamilyFilter familyFilter = (FamilyFilter)filter; - assertEquals(CompareFilter.CompareOp.GREATER_OR_EQUAL, familyFilter.getOperator()); - assertTrue(familyFilter.getComparator() instanceof BinaryPrefixComparator); - BinaryPrefixComparator binaryPrefixComparator = - (BinaryPrefixComparator) familyFilter.getComparator(); - assertEquals("pre", new String(binaryPrefixComparator.getValue())); - } - - @Test - public void testQualifierFilter() throws IOException { - String filterString = "QualifierFilter(=, 'regexstring:pre*')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof QualifierFilter); - - QualifierFilter qualifierFilter = (QualifierFilter) filter; - assertEquals(CompareFilter.CompareOp.EQUAL, qualifierFilter.getOperator()); - assertTrue(qualifierFilter.getComparator() instanceof RegexStringComparator); - RegexStringComparator regexStringComparator = - (RegexStringComparator) qualifierFilter.getComparator(); - assertEquals("pre*", new String(regexStringComparator.getValue())); - } - - @Test - public void testValueFilter() throws IOException { - String filterString = "ValueFilter(!=, 'substring:pre')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ValueFilter); - - ValueFilter valueFilter = (ValueFilter) filter; - assertEquals(CompareFilter.CompareOp.NOT_EQUAL, valueFilter.getOperator()); - assertTrue(valueFilter.getComparator() instanceof SubstringComparator); - SubstringComparator substringComparator = - (SubstringComparator) valueFilter.getComparator(); - assertEquals("pre", new String(substringComparator.getValue())); - } - - @Test - public void testColumnRangeFilter() throws IOException { - String filterString = "ColumnRangeFilter('abc', true, 'xyz', false)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof ColumnRangeFilter); - - ColumnRangeFilter columnRangeFilter = (ColumnRangeFilter) filter; - assertEquals("abc", new String(columnRangeFilter.getMinColumn())); - assertEquals("xyz", new String(columnRangeFilter.getMaxColumn())); - assertTrue(columnRangeFilter.isMinColumnInclusive()); - assertFalse(columnRangeFilter.isMaxColumnInclusive()); - } - - @Test - public void testDependentColumnFilter() throws IOException { - String filterString = "DependentColumnFilter('family', 'qualifier', true, =, 'binary:abc')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof DependentColumnFilter); - - DependentColumnFilter dependentColumnFilter = (DependentColumnFilter) filter; - assertEquals("family", new String(dependentColumnFilter.getFamily())); - assertEquals("qualifier", new String(dependentColumnFilter.getQualifier())); - assertTrue(dependentColumnFilter.getDropDependentColumn()); - assertEquals(CompareFilter.CompareOp.EQUAL, dependentColumnFilter.getOperator()); - assertTrue(dependentColumnFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator)dependentColumnFilter.getComparator(); - assertEquals("abc", new String(binaryComparator.getValue())); - } - - @Test - public void testSingleColumnValueFilter() throws IOException { - - String filterString = "SingleColumnValueFilter " + - "('family', 'qualifier', >=, 'binary:a', true, false)"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - - assertTrue(filter instanceof SingleColumnValueFilter); - - SingleColumnValueFilter singleColumnValueFilter = (SingleColumnValueFilter)filter; - assertEquals("family", new String(singleColumnValueFilter.getFamily())); - assertEquals("qualifier", new String(singleColumnValueFilter.getQualifier())); - assertEquals(singleColumnValueFilter.getOperator(), CompareFilter.CompareOp.GREATER_OR_EQUAL); - assertTrue(singleColumnValueFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator) singleColumnValueFilter.getComparator(); - assertEquals(new String(binaryComparator.getValue()), "a"); - assertTrue(singleColumnValueFilter.getFilterIfMissing()); - assertFalse(singleColumnValueFilter.getLatestVersionOnly()); - - - filterString = "SingleColumnValueFilter ('family', 'qualifier', >, 'binaryprefix:a')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - - assertTrue(filter instanceof SingleColumnValueFilter); - - singleColumnValueFilter = (SingleColumnValueFilter)filter; - assertEquals("family", new String(singleColumnValueFilter.getFamily())); - assertEquals("qualifier", new String(singleColumnValueFilter.getQualifier())); - assertEquals(singleColumnValueFilter.getOperator(), CompareFilter.CompareOp.GREATER); - assertTrue(singleColumnValueFilter.getComparator() instanceof BinaryPrefixComparator); - BinaryPrefixComparator binaryPrefixComparator = - (BinaryPrefixComparator) singleColumnValueFilter.getComparator(); - assertEquals(new String(binaryPrefixComparator.getValue()), "a"); - assertFalse(singleColumnValueFilter.getFilterIfMissing()); - assertTrue(singleColumnValueFilter.getLatestVersionOnly()); - } - - @Test - public void testSingleColumnValueExcludeFilter() throws IOException { - - String filterString = - "SingleColumnValueExcludeFilter ('family', 'qualifier', <, 'binaryprefix:a')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof SingleColumnValueExcludeFilter); - - SingleColumnValueExcludeFilter singleColumnValueExcludeFilter = - (SingleColumnValueExcludeFilter)filter; - assertEquals(singleColumnValueExcludeFilter.getOperator(), CompareFilter.CompareOp.LESS); - assertEquals("family", new String(singleColumnValueExcludeFilter.getFamily())); - assertEquals("qualifier", new String(singleColumnValueExcludeFilter.getQualifier())); - assertEquals(new String(singleColumnValueExcludeFilter.getComparator().getValue()), "a"); - assertFalse(singleColumnValueExcludeFilter.getFilterIfMissing()); - assertTrue(singleColumnValueExcludeFilter.getLatestVersionOnly()); - - filterString = "SingleColumnValueExcludeFilter " + - "('family', 'qualifier', <=, 'binaryprefix:a', true, false)"; - filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof SingleColumnValueExcludeFilter); - - singleColumnValueExcludeFilter = (SingleColumnValueExcludeFilter)filter; - assertEquals("family", new String(singleColumnValueExcludeFilter.getFamily())); - assertEquals("qualifier", new String(singleColumnValueExcludeFilter.getQualifier())); - assertEquals(singleColumnValueExcludeFilter.getOperator(), - CompareFilter.CompareOp.LESS_OR_EQUAL); - assertTrue(singleColumnValueExcludeFilter.getComparator() instanceof BinaryPrefixComparator); - BinaryPrefixComparator binaryPrefixComparator = - (BinaryPrefixComparator) singleColumnValueExcludeFilter.getComparator(); - assertEquals(new String(binaryPrefixComparator.getValue()), "a"); - assertTrue(singleColumnValueExcludeFilter.getFilterIfMissing()); - assertFalse(singleColumnValueExcludeFilter.getLatestVersionOnly()); - } - - @Test - public void testSkipFilter() throws IOException { - String filterString = "SKIP ValueFilter( =, 'binary:0')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof SkipFilter); - SkipFilter skipFilter = (SkipFilter) filter; - assertTrue(skipFilter.getFilter() instanceof ValueFilter); - ValueFilter valueFilter = (ValueFilter) skipFilter.getFilter(); - - assertEquals(CompareFilter.CompareOp.EQUAL, valueFilter.getOperator()); - assertTrue(valueFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator) valueFilter.getComparator(); - assertEquals("0", new String(binaryComparator.getValue())); - } - - @Test - public void testWhileFilter() throws IOException { - String filterString = " WHILE RowFilter ( !=, 'binary:row1')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof WhileMatchFilter); - WhileMatchFilter whileMatchFilter = (WhileMatchFilter) filter; - assertTrue(whileMatchFilter.getFilter() instanceof RowFilter); - RowFilter rowFilter = (RowFilter) whileMatchFilter.getFilter(); - - assertEquals(CompareFilter.CompareOp.NOT_EQUAL, rowFilter.getOperator()); - assertTrue(rowFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator) rowFilter.getComparator(); - assertEquals("row1", new String(binaryComparator.getValue())); - } - - @Test - public void testCompoundFilter1() throws IOException { - String filterString = " (PrefixFilter ('realtime')AND FirstKeyOnlyFilter())"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - FilterList filterList = (FilterList)filter; - ArrayList filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof PrefixFilter); - assertTrue(filters.get(1) instanceof FirstKeyOnlyFilter); - - PrefixFilter PrefixFilter = (PrefixFilter) filters.get(0); - byte [] prefix = PrefixFilter.getPrefix(); - assertEquals(new String(prefix), "realtime"); - FirstKeyOnlyFilter firstKeyOnlyFilter = (FirstKeyOnlyFilter) filters.get(1); - } - - @Test - public void testCompoundFilter2() throws IOException { - String filterString = "(PrefixFilter('realtime') AND QualifierFilter (>=, 'binary:e'))" + - "OR FamilyFilter (=, 'binary:qualifier') "; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - - FilterList filterList = (FilterList)filter; - ArrayList filterListFilters = (ArrayList) filterList.getFilters(); - assertTrue(filterListFilters.get(0) instanceof FilterList); - assertTrue(filterListFilters.get(1) instanceof FamilyFilter); - assertEquals(filterList.getOperator(), FilterList.Operator.MUST_PASS_ONE); - - filterList = (FilterList) filterListFilters.get(0); - FamilyFilter familyFilter = (FamilyFilter) filterListFilters.get(1); - - filterListFilters = (ArrayList)filterList.getFilters(); - assertTrue(filterListFilters.get(0) instanceof PrefixFilter); - assertTrue(filterListFilters.get(1) instanceof QualifierFilter); - assertEquals(filterList.getOperator(), FilterList.Operator.MUST_PASS_ALL); - - assertEquals(CompareFilter.CompareOp.EQUAL, familyFilter.getOperator()); - assertTrue(familyFilter.getComparator() instanceof BinaryComparator); - BinaryComparator binaryComparator = (BinaryComparator) familyFilter.getComparator(); - assertEquals("qualifier", new String(binaryComparator.getValue())); - - PrefixFilter prefixFilter = (PrefixFilter) filterListFilters.get(0); - byte [] prefix = prefixFilter.getPrefix(); - assertEquals(new String(prefix), "realtime"); - - QualifierFilter qualifierFilter = (QualifierFilter) filterListFilters.get(1); - assertEquals(CompareFilter.CompareOp.GREATER_OR_EQUAL, qualifierFilter.getOperator()); - assertTrue(qualifierFilter.getComparator() instanceof BinaryComparator); - binaryComparator = (BinaryComparator) qualifierFilter.getComparator(); - assertEquals("e", new String(binaryComparator.getValue())); - } - - @Test - public void testCompoundFilter3() throws IOException { - String filterString = " ColumnPrefixFilter ('realtime')AND " + - "FirstKeyOnlyFilter() OR SKIP FamilyFilter(=, 'substring:hihi')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - FilterList filterList = (FilterList)filter; - ArrayList filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof FilterList); - assertTrue(filters.get(1) instanceof SkipFilter); - - filterList = (FilterList) filters.get(0); - SkipFilter skipFilter = (SkipFilter) filters.get(1); - - filters = (ArrayList) filterList.getFilters(); - assertTrue(filters.get(0) instanceof ColumnPrefixFilter); - assertTrue(filters.get(1) instanceof FirstKeyOnlyFilter); - - ColumnPrefixFilter columnPrefixFilter = (ColumnPrefixFilter) filters.get(0); - byte [] columnPrefix = columnPrefixFilter.getPrefix(); - assertEquals(new String(columnPrefix), "realtime"); - - FirstKeyOnlyFilter firstKeyOnlyFilter = (FirstKeyOnlyFilter) filters.get(1); - - assertTrue(skipFilter.getFilter() instanceof FamilyFilter); - FamilyFilter familyFilter = (FamilyFilter) skipFilter.getFilter(); - - assertEquals(CompareFilter.CompareOp.EQUAL, familyFilter.getOperator()); - assertTrue(familyFilter.getComparator() instanceof SubstringComparator); - SubstringComparator substringComparator = - (SubstringComparator) familyFilter.getComparator(); - assertEquals("hihi", new String(substringComparator.getValue())); - } - - @Test - public void testCompoundFilter4() throws IOException { - String filterString = " ColumnPrefixFilter ('realtime') OR " + - "FirstKeyOnlyFilter() OR SKIP FamilyFilter(=, 'substring:hihi')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - FilterList filterList = (FilterList)filter; - ArrayList filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof ColumnPrefixFilter); - assertTrue(filters.get(1) instanceof FirstKeyOnlyFilter); - assertTrue(filters.get(2) instanceof SkipFilter); - - ColumnPrefixFilter columnPrefixFilter = (ColumnPrefixFilter) filters.get(0); - FirstKeyOnlyFilter firstKeyOnlyFilter = (FirstKeyOnlyFilter) filters.get(1); - SkipFilter skipFilter = (SkipFilter) filters.get(2); - - byte [] columnPrefix = columnPrefixFilter.getPrefix(); - assertEquals(new String(columnPrefix), "realtime"); - - assertTrue(skipFilter.getFilter() instanceof FamilyFilter); - FamilyFilter familyFilter = (FamilyFilter) skipFilter.getFilter(); - - assertEquals(CompareFilter.CompareOp.EQUAL, familyFilter.getOperator()); - assertTrue(familyFilter.getComparator() instanceof SubstringComparator); - SubstringComparator substringComparator = - (SubstringComparator) familyFilter.getComparator(); - assertEquals("hihi", new String(substringComparator.getValue())); - } - - @Test - public void testIncorrectCompareOperator() throws IOException { - String filterString = "RowFilter ('>>' , 'binary:region')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof RowFilter); - } catch (IllegalArgumentException e) { - System.out.println("Incorrect compare operator >>"); - } - } - - @Test - public void testIncorrectComparatorType () throws IOException { - String filterString = "RowFilter ('>=' , 'binaryoperator:region')"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof RowFilter); - } catch (IllegalArgumentException e) { - System.out.println("Incorrect comparator type: binaryoperator"); - } - - filterString = "RowFilter ('>=' 'regexstring:pre*')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof RowFilter); - } catch (IllegalArgumentException e) { - System.out.println("RegexStringComparator can only be used with EQUAL or NOT_EQUAL"); - } - - filterString = "SingleColumnValueFilter" + - " ('family', 'qualifier', '>=', 'substring:a', 'true', 'false')')"; - filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof RowFilter); - } catch (IllegalArgumentException e) { - System.out.println("SubtringComparator can only be used with EQUAL or NOT_EQUAL"); - } - } - - @Test - public void testPrecedence1() throws IOException { - String filterString = " (PrefixFilter ('realtime')AND FirstKeyOnlyFilter()" + - " OR KeyOnlyFilter())"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - FilterList filterList = (FilterList)filter; - ArrayList filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof FilterList); - assertTrue(filters.get(1) instanceof KeyOnlyFilter); - - filterList = (FilterList) filters.get(0); - filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof PrefixFilter); - assertTrue(filters.get(1) instanceof FirstKeyOnlyFilter); - - PrefixFilter prefixFilter = (PrefixFilter)filters.get(0); - byte [] prefix = prefixFilter.getPrefix(); - assertEquals(new String(prefix), "realtime"); - } - - @Test - public void testPrecedence2() throws IOException { - String filterString = " PrefixFilter ('realtime')AND SKIP FirstKeyOnlyFilter()" + - "OR KeyOnlyFilter()"; - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - FilterList filterList = (FilterList)filter; - ArrayList filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof FilterList); - assertTrue(filters.get(1) instanceof KeyOnlyFilter); - - filterList = (FilterList) filters.get(0); - filters = (ArrayList) filterList.getFilters(); - - assertTrue(filters.get(0) instanceof PrefixFilter); - assertTrue(filters.get(1) instanceof SkipFilter); - - PrefixFilter prefixFilter = (PrefixFilter)filters.get(0); - byte [] prefix = prefixFilter.getPrefix(); - assertEquals(new String(prefix), "realtime"); - - SkipFilter skipFilter = (SkipFilter)filters.get(1); - assertTrue(skipFilter.getFilter() instanceof FirstKeyOnlyFilter); - } - - @Test - public void testUnescapedQuote1 () throws IOException { - String filterString = "InclusiveStopFilter ('row''3')"; - System.out.println(filterString); - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof InclusiveStopFilter); - - byte [] stopRowKey = ((InclusiveStopFilter)filter).getStopRowKey(); - assertEquals(new String(stopRowKey), "row'3"); - } - - @Test - public void testUnescapedQuote2 () throws IOException { - String filterString = "InclusiveStopFilter ('row''3''')"; - System.out.println(filterString); - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof InclusiveStopFilter); - - byte [] stopRowKey = ((InclusiveStopFilter)filter).getStopRowKey(); - assertEquals(new String(stopRowKey), "row'3'"); - } - - @Test - public void testUnescapedQuote3 () throws IOException { - String filterString = " InclusiveStopFilter ('''')"; - System.out.println(filterString); - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof InclusiveStopFilter); - - byte [] stopRowKey = ((InclusiveStopFilter)filter).getStopRowKey(); - assertEquals(new String(stopRowKey), "'"); - } - - @Test - public void testIncorrectFilterString () throws IOException { - String filterString = "()"; - System.out.println(filterString); - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - try { - filter = f.parseFilterString(filterStringAsByteArray); - } catch (IllegalArgumentException e) { - System.out.println(e.getMessage()); - } - - filterString = " OR KeyOnlyFilter() FirstKeyOnlyFilter()"; - System.out.println(filterString); - filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - } - - @Test - public void testCorrectFilterString () throws IOException { - String filterString = "(FirstKeyOnlyFilter())"; - System.out.println(filterString); - byte [] filterStringAsByteArray = Bytes.toBytes(filterString); - filter = f.parseFilterString(filterStringAsByteArray); - assertTrue(filter instanceof FirstKeyOnlyFilter); - } -} diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java index 44be6013430..bc71e5f90a0 100644 --- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java +++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java @@ -132,11 +132,14 @@ public class TestHQuorumPeer { assertEquals("foo.bar", server.addr.getHostName()); } + /** + * Test Case for HBASE-2305 + */ @Test public void testShouldAssignDefaultZookeeperClientPort() { Configuration config = HBaseConfiguration.create(); config.clear(); Properties p = ZKConfig.makeZKProps(config); assertNotNull(p); - assertEquals(2181, p.get("clientPort")); + assertEquals(2181, p.get("hbase.zookeeper.property.clientPort")); } }