Author: kturner
Date: Wed Apr 10 21:00:00 2013
New Revision: 1466667
URL: http://svn.apache.org/r1466667
Log:
ACCUMULO-1044 added unit test for metdata bulk load filter
Added:
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/iterators/
- copied from r1466664,
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
- copied unchanged from r1466664,
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1466627
Merged /accumulo/branches/1.5:r1466592-1466664
Merged /accumulo/branches/1.4:r1466627
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1466627
Merged /accumulo/branches/1.4/assemble:r1466627
Merged /accumulo/branches/1.5/assemble:r1466592-1466664
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1466592-1466664
Merged /accumulo/branches/1.4/core:r1466627
Merged /accumulo/branches/1.4/src/core:r1466627
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/examples:r1466627
Merged /accumulo/branches/1.5/examples:r1466592-1466664
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466592-1466664
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627
Merged
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466592-1466664
Merged
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1466627
Merged /accumulo/branches/1.5/server:r1466592-1466664
Merged /accumulo/branches/1.4/src/server:r1466627
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java?rev=1466667&r1=1466666&r2=1466667&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
Wed Apr 10 21:00:00 2013
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
/**
@@ -40,7 +41,7 @@ public class MetadataBulkLoadFilter exte
}
Map<Long,Status> bulkTxStatusCache;
- ZooArbitrator arbitrator;
+ Arbitrator arbitrator;
@Override
public boolean accept(Key k, Value v) {
@@ -78,6 +79,10 @@ public class MetadataBulkLoadFilter exte
}
bulkTxStatusCache = new HashMap<Long,MetadataBulkLoadFilter.Status>();
- arbitrator = new ZooArbitrator();
+ arbitrator = getArbitrator();
+ }
+
+ protected Arbitrator getArbitrator() {
+ return new ZooArbitrator();
}
}
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1466627
Merged /accumulo/branches/1.4/src/src:r1466627
Merged /accumulo/branches/1.5/src:r1466592-1466664
