accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1439403 [1/3] - in /accumulo/trunk/proxy/src: main/java/org/apache/accumulo/proxy/ main/java/org/apache/accumulo/proxy/thrift/ main/thrift/ test/java/org/apache/accumulo/proxy/
Date Mon, 28 Jan 2013 13:55:35 GMT
Author: ecn
Date: Mon Jan 28 13:55:34 2013
New Revision: 1439403

URL: http://svn.apache.org/viewvc?rev=1439403&view=rev
Log:
ACCUMUL-969 make ranges setting optional for batch scans

Modified:
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
    accumulo/trunk/proxy/src/main/thrift/proxy.thrift
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1439403&r1=1439402&r2=1439403&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java Mon Jan
28 13:55:34 2013
@@ -777,11 +777,12 @@ public class ProxyServer implements Accu
   }
   
   @Override
-  public String createBatchScanner(UserPass userpass, String tableName, List<org.apache.accumulo.proxy.thrift.Range>
pranges, BatchScanOptions opts)
+  public String createBatchScanner(UserPass userpass, String tableName, BatchScanOptions
opts)
       throws TException {
     try {
       Connector connector = getConnector(userpass);
       
+            
       int threads = 10;
       Authorizations auth;
       if (opts != null && opts.isSetAuthorizations()) {
@@ -804,10 +805,10 @@ public class ProxyServer implements Accu
         
         ArrayList<Range> ranges = new ArrayList<Range>();
         
-        if (pranges == null) {
+        if (opts.ranges == null) {
           ranges.add(new Range());
         } else {
-          for (org.apache.accumulo.proxy.thrift.Range range : pranges) {
+          for (org.apache.accumulo.proxy.thrift.Range range : opts.ranges) {
             Range aRange = new Range(range.getStart() == null ? null : Util.fromThrift(range.getStart()),
true, range.getStop() == null ? null
                 : Util.fromThrift(range.getStop()), false);
             ranges.add(aRange);



Mime
View raw message