Author: ecn
Date: Mon Oct 15 14:40:07 2012
New Revision: 1398309
URL: http://svn.apache.org/viewvc?rev=1398309&view=rev
Log:
ACCUMULO-663 merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1398308
Merged /accumulo/branches/1.4:r1398308
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1398308
Merged /accumulo/branches/1.4/src/core:r1398308
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1398309&r1=1398308&r2=1398309&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
Mon Oct 15 14:40:07 2012
@@ -97,10 +97,18 @@ public class RegExFilter extends Filter
@Override
public boolean accept(Key key, Value value) {
if (orFields)
- return matches(rowMatcher, key.getRowData()) || matches(colfMatcher,
key.getColumnFamilyData()) || matches(colqMatcher, key.getColumnQualifierData())
- || matches(valueMatcher, value.get(), 0, value.get().length);
- return matches(rowMatcher, key.getRowData()) && matches(colfMatcher,
key.getColumnFamilyData()) && matches(colqMatcher, key.getColumnQualifierData())
- && matches(valueMatcher, value.get(), 0, value.get().length);
+ return (
+ (matches(rowMatcher, rowMatcher == null ? null : key.getRowData()))
||
+ (matches(colfMatcher, colfMatcher == null ? null :
key.getColumnFamilyData())) ||
+ (matches(colqMatcher, colqMatcher == null ? null :
key.getColumnQualifierData())) ||
+ (matches(valueMatcher, value.get(), 0, value.get().length))
+ );
+ return (
+ (matches(rowMatcher, rowMatcher == null ? null : key.getRowData())) &&
+ (matches(colfMatcher, colfMatcher == null ? null :
key.getColumnFamilyData())) &&
+ (matches(colqMatcher, colqMatcher == null ? null :
key.getColumnQualifierData())) &&
+ (matches(valueMatcher, value.get(), 0, value.get().length))
+ );
}
@Override
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1398308
Merged
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1398308
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1398308
Merged /accumulo/branches/1.4/src/server:r1398308
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1398308
Merged /accumulo/branches/1.4/src/src:r1398308
