accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1354985 - in /accumulo/branches/1.4.1: ./ src/ src/core/ src/core/src/main/java/org/apache/accumulo/core/client/impl/ src/core/src/main/java/org/apache/accumulo/core/client/mock/ src/core/src/main/java/org/apache/accumulo/core/data/ src/co...
Date Thu, 28 Jun 2012 12:44:16 GMT
Author: ecn
Date: Thu Jun 28 12:44:15 2012
New Revision: 1354985

URL: http://svn.apache.org/viewvc?rev=1354985&view=rev
Log:
incorporate ACCUMULO-646 ACCUMULO-17 ACCUMULO-659 and ACCUMULO-660 into the 1.4.1 release

Modified:
    accumulo/branches/1.4.1/   (props changed)
    accumulo/branches/1.4.1/src/   (props changed)
    accumulo/branches/1.4.1/src/core/   (props changed)
    accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
    accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
    accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
    accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
    accumulo/branches/1.4.1/src/server/   (props changed)

Propchange: accumulo/branches/1.4.1/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1354674-1354979

Propchange: accumulo/branches/1.4.1/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1354674-1354979

Propchange: accumulo/branches/1.4.1/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1354674-1354979

Modified: accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java?rev=1354985&r1=1354984&r2=1354985&view=diff
==============================================================================
--- accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
(original)
+++ accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
Thu Jun 28 12:44:15 2012
@@ -107,7 +107,7 @@ public class ScannerOptions implements S
    */
   @Override
   public void setScanIterators(int priority, String iteratorClass, String iteratorName) {
-    addScanIterator(new IteratorSetting(priority, iteratorClass, iteratorName));
+    addScanIterator(new IteratorSetting(priority, iteratorName, iteratorClass));
   }
   
   /**

Modified: accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1354985&r1=1354984&r2=1354985&view=diff
==============================================================================
--- accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
(original)
+++ accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
Thu Jun 28 12:44:15 2012
@@ -31,6 +31,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.commons.collections.iterators.IteratorChain;
 
 public class MockBatchScanner extends MockScannerBase implements BatchScanner {
   
@@ -67,20 +68,25 @@ public class MockBatchScanner extends Mo
     }
   }
   
+  @SuppressWarnings("unchecked")
   @Override
   public Iterator<Entry<Key,Value>> iterator() {
     if (ranges == null) {
       throw new IllegalStateException("ranges not set");
     }
 
-    SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
-    try {
-      i = new RangesFilter(createFilter(i), ranges);
-      i.seek(new Range(), createColumnBSS(fetchedColumns), !fetchedColumns.isEmpty());
-      return new IteratorAdapter(i);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    IteratorChain chain = new IteratorChain();
+    for (Range range : ranges) {
+    	SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
+    	try {
+    		i = new RangesFilter(createFilter(i), ranges);
+    		i.seek(range, createColumnBSS(fetchedColumns), !fetchedColumns.isEmpty());
+    		chain.addIterator(new IteratorAdapter(i));
+    	} catch (IOException e) {
+    		throw new RuntimeException(e);
+    	}
     }
+    return chain;
   }
   
   @Override

Modified: accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java?rev=1354985&r1=1354984&r2=1354985&view=diff
==============================================================================
--- accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
(original)
+++ accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
Thu Jun 28 12:44:15 2012
@@ -16,8 +16,11 @@
  */
 package org.apache.accumulo.core.data;
 
-public class ArrayByteSequence extends ByteSequence {
+import java.io.Serializable;
+
+public class ArrayByteSequence extends ByteSequence implements Serializable {
   
+  private static final long serialVersionUID = 1L;
   protected byte data[];
   protected int offset;
   protected int length;

Modified: accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1354985&r1=1354984&r2=1354985&view=diff
==============================================================================
--- accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
(original)
+++ accumulo/branches/1.4.1/src/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
Thu Jun 28 12:44:15 2012
@@ -94,7 +94,7 @@ public class ColumnVisibility {
     
     byte[] text;
     
-    NodeComparator(byte[] text) {
+    public NodeComparator(byte[] text) {
       this.text = text;
     }
     

Propchange: accumulo/branches/1.4.1/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server:r1354674-1354979



Mime
View raw message