accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1355487 - in /accumulo/branches/ACCUMULO-259: ./ core/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/main/java/org/apache/accumulo/core/data/ core/src/main/java/org/apache/accumulo/core/security/ server/ src/ test/syste...
Date Fri, 29 Jun 2012 18:03:19 GMT
Author: vines
Date: Fri Jun 29 18:03:11 2012
New Revision: 1355487

URL: http://svn.apache.org/viewvc?rev=1355487&view=rev
Log:
Accumulo-259 - some merging, testing validated


Removed:
    accumulo/branches/ACCUMULO-259/test/system/auto/stress/logger.py
Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/src/   (props changed)

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1354670-1354672
  Merged /accumulo/trunk:r1353584-1355159
  Merged /accumulo/branches/1.4:r1354669-1354672

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1353584-1355159
  Merged /accumulo/branches/1.4/core:r1354669-1354672
  Merged /accumulo/branches/1.4/src/core:r1354670-1354672
  Merged /accumulo/branches/1.4:r1354671

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1355487&r1=1355486&r2=1355487&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
(original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
Fri Jun 29 18:03:11 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/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java?rev=1355487&r1=1355486&r2=1355487&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
(original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
Fri Jun 29 18:03:11 2012
@@ -16,8 +16,12 @@
  */
 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/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java?rev=1355487&r1=1355486&r2=1355487&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
(original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
Fri Jun 29 18:03:11 2012
@@ -94,7 +94,7 @@ public class ColumnVisibility {
     
     byte[] text;
     
-    NodeComparator(byte[] text) {
+    public NodeComparator(byte[] text) {
       this.text = text;
     }
     

Propchange: accumulo/branches/ACCUMULO-259/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1354669-1354672
  Merged /accumulo/branches/1.4/src/server:r1354670-1354672
  Merged /accumulo/trunk/server:r1353584-1355159

Propchange: accumulo/branches/ACCUMULO-259/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1353584-1355159
  Merged /accumulo/branches/1.4/src:r1354669-1354672
  Merged /accumulo/branches/1.4/src/src:r1354670-1354672
  Merged /accumulo/branches/1.4:r1354671



Mime
View raw message