Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A20AF035 for ; Wed, 20 Mar 2013 16:35:41 +0000 (UTC) Received: (qmail 35648 invoked by uid 500); 20 Mar 2013 16:35:41 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 34297 invoked by uid 500); 20 Mar 2013 16:35:39 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 34277 invoked by uid 99); 20 Mar 2013 16:35:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 16:35:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 16:35:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E45D22388847; Wed, 20 Mar 2013 16:35:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1458933 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl: ScannerIterator.java ThriftScanner.java Date: Wed, 20 Mar 2013 16:35:16 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130320163516.E45D22388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Wed Mar 20 16:35:16 2013 New Revision: 1458933 URL: http://svn.apache.org/r1458933 Log: ACCUMULO-1144 merged patch from Kevin Faro Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java?rev=1458933&r1=1458932&r2=1458933&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerIterator.java Wed Mar 20 16:35:16 2013 @@ -49,7 +49,7 @@ public class ScannerIterator implements private static final Logger log = Logger.getLogger(ScannerIterator.class); // scanner options - private Text tableName; + private Text tableId; private int timeOut; // scanner state @@ -124,7 +124,7 @@ public class ScannerIterator implements ScannerIterator(Instance instance, TCredentials credentials, Text table, Authorizations authorizations, Range range, int size, int timeOut, ScannerOptions options, boolean isolated) { this.instance = instance; - this.tableName = new Text(table); + this.tableId = new Text(table); this.timeOut = timeOut; this.credentials = credentials; @@ -136,7 +136,7 @@ public class ScannerIterator implements range = range.bound(this.options.fetchedColumns.first(), this.options.fetchedColumns.last()); } - scanState = new ScanState(credentials, tableName, authorizations, new Range(range), options.fetchedColumns, size, options.serverSideIteratorList, + scanState = new ScanState(credentials, tableId, authorizations, new Range(range), options.fetchedColumns, size, options.serverSideIteratorList, options.serverSideIteratorOptions, isolated); readaheadInProgress = false; iter = null; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1458933&r1=1458932&r2=1458933&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Wed Mar 20 16:35:16 2013 @@ -27,10 +27,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; -import org.apache.accumulo.trace.instrument.Span; -import org.apache.accumulo.trace.instrument.Trace; -import org.apache.accumulo.trace.instrument.Tracer; -import org.apache.accumulo.trace.thrift.TInfo; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Instance; @@ -62,6 +58,10 @@ import org.apache.accumulo.core.util.OpT import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.trace.instrument.Span; +import org.apache.accumulo.trace.instrument.Trace; +import org.apache.accumulo.trace.instrument.Tracer; +import org.apache.accumulo.trace.thrift.TInfo; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -162,7 +162,7 @@ public class ThriftScanner { public static class ScanState { boolean isolated; - Text tableName; + Text tableId; Text startRow; boolean skipStartRow; @@ -183,7 +183,7 @@ public class ThriftScanner { Map> serverSideIteratorOptions; - public ScanState(TCredentials credentials, Text tableName, Authorizations authorizations, Range range, SortedSet fetchedColumns, int size, + public ScanState(TCredentials credentials, Text tableId, Authorizations authorizations, Range range, SortedSet fetchedColumns, int size, List serverSideIteratorList, Map> serverSideIteratorOptions, boolean isolated) { this.credentials = credentials; this.authorizations = authorizations; @@ -193,7 +193,7 @@ public class ThriftScanner { columns.add(column); } - this.tableName = tableName; + this.tableId = tableId; this.range = range; Key startKey = range.getStartKey(); @@ -245,14 +245,15 @@ public class ThriftScanner { Span locateSpan = Trace.start("scan:locateTablet"); try { - loc = TabletLocator.getInstance(instance, scanState.tableName).locateTablet(scanState.startRow, scanState.skipStartRow, false, credentials); + loc = TabletLocator.getInstance(instance, scanState.tableId).locateTablet(scanState.startRow, scanState.skipStartRow, false, credentials); + if (loc == null) { - if (!Tables.exists(instance, scanState.tableName.toString())) - throw new TableDeletedException(scanState.tableName.toString()); - else if (Tables.getTableState(instance, scanState.tableName.toString()) == TableState.OFFLINE) - throw new TableOfflineException(instance, scanState.tableName.toString()); + if (!Tables.exists(instance, scanState.tableId.toString())) + throw new TableDeletedException(scanState.tableId.toString()); + else if (Tables.getTableState(instance, scanState.tableId.toString()) == TableState.OFFLINE) + throw new TableOfflineException(instance, scanState.tableId.toString()); - error = "Failed to locate tablet for table : " + scanState.tableName + " row : " + scanState.startRow; + error = "Failed to locate tablet for table : " + scanState.tableId + " row : " + scanState.startRow; if (!error.equals(lastError)) log.debug(error); else if (log.isTraceEnabled()) @@ -298,9 +299,9 @@ public class ThriftScanner { results = scan(loc, scanState, conf); } catch (AccumuloSecurityException e) { Tables.clearCache(instance); - if (!Tables.exists(instance, scanState.tableName.toString())) - throw new TableDeletedException(scanState.tableName.toString()); - e.setTableInfo(Tables.getPrintableTableInfoFromId(instance, scanState.tableName.toString())); + if (!Tables.exists(instance, scanState.tableId.toString())) + throw new TableDeletedException(scanState.tableId.toString()); + e.setTableInfo(Tables.getPrintableTableInfoFromId(instance, scanState.tableId.toString())); throw e; } catch (TApplicationException tae) { throw new AccumuloServerException(loc.tablet_location, tae); @@ -312,7 +313,7 @@ public class ThriftScanner { log.trace(error); lastError = error; - TabletLocator.getInstance(instance, scanState.tableName).invalidateCache(loc.tablet_extent); + TabletLocator.getInstance(instance, scanState.tableId).invalidateCache(loc.tablet_extent); loc = null; // no need to try the current scan id somewhere else @@ -358,7 +359,7 @@ public class ThriftScanner { UtilWaitThread.sleep(100); } catch (TException e) { - TabletLocator.getInstance(instance, scanState.tableName).invalidateCache(loc.tablet_location); + TabletLocator.getInstance(instance, scanState.tableId).invalidateCache(loc.tablet_location); error = "Scan failed, thrift error " + e.getClass().getName() + " " + e.getMessage() + " " + loc; if (!error.equals(lastError)) log.debug(error);