Author: kturner
Date: Fri Apr 13 20:15:31 2012
New Revision: 1325933
URL: http://svn.apache.org/viewvc?rev=1325933&view=rev
Log:
ACCUMULO-533 merged from 1.4
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
- copied unchanged from r1325930,
accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SynchronizedIterator.java
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
accumulo/trunk/server/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1325859-1325930
Merged /accumulo/branches/1.4:r1325858-1325930
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1325858-1325930
Merged /accumulo/branches/1.4/src/core:r1325859-1325930
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java?rev=1325933&r1=1325932&r2=1325933&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
Fri Apr 13 20:15:31 2012
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.thrift.IterInfo;
import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
+import org.apache.accumulo.core.iterators.system.SynchronizedIterator;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
import org.apache.hadoop.io.Writable;
@@ -213,7 +214,8 @@ public class IteratorUtil {
@SuppressWarnings("unchecked")
public static <K extends WritableComparable<?>,V extends Writable>
SortedKeyValueIterator<K,V> loadIterators(SortedKeyValueIterator<K,V> source,
Collection<IterInfo> iters, Map<String,Map<String,String>> iterOpts,
IteratorEnvironment env, boolean useAccumuloClassLoader) throws IOException {
- SortedKeyValueIterator<K,V> prev = source;
+ // wrap the source in a SynchronizedIterator in case any of the additional
configured iterators want to use threading
+ SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<K,V>(source);
try {
for (IterInfo iterInfo : iters) {
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1325858-1325930
Merged /accumulo/branches/1.4/src/server:r1325859-1325930
