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 46C1A105C6 for ; Wed, 19 Jun 2013 15:58:09 +0000 (UTC) Received: (qmail 15389 invoked by uid 500); 19 Jun 2013 15:58:09 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 15359 invoked by uid 500); 19 Jun 2013 15:58:08 -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 15352 invoked by uid 99); 19 Jun 2013 15:58:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 15:58:08 +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, 19 Jun 2013 15:58:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 67FF02388AB9; Wed, 19 Jun 2013 15:57:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1494671 [6/6] - in /accumulo/branches/ACCUMULO-118: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main... Date: Wed, 19 Jun 2013 15:57:14 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130619155721.67FF02388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1494671&r1=1494670&r2=1494671&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java (original) +++ accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java Wed Jun 19 15:57:11 2013 @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEqu import java.util.Map.Entry; -import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; @@ -35,6 +34,7 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.util.MetadataTable; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.hadoop.io.Text; @@ -71,9 +71,9 @@ public class TestAccumuloSplitRecovery { boolean isOffline(String tablename, Connector connector) throws TableNotFoundException { String tableId = connector.tableOperations().tableIdMap().get(tablename); - Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY); + Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(new Range(new Text(tableId + ";"), new Text(tableId + "<"))); - scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY); + scanner.fetchColumnFamily(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY); for (@SuppressWarnings("unused") Entry entry : scanner) { return false; @@ -101,32 +101,32 @@ public class TestAccumuloSplitRecovery { UtilWaitThread.sleep(200); // poke a partial split into the !METADATA table - connector.securityOperations().grantTablePermission("root", Constants.METADATA_TABLE_NAME, TablePermission.WRITE); + connector.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE); String tableId = connector.tableOperations().tableIdMap().get(TABLE); KeyExtent extent = new KeyExtent(new Text(tableId), null, new Text("b")); Mutation m = extent.getPrevRowUpdateMutation(); - Constants.METADATA_SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(0.5).getBytes())); - Constants.METADATA_OLD_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(null)); - bw = connector.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); + MetadataTable.SPLIT_RATIO_COLUMN.put(m, new Value(Double.toString(0.5).getBytes())); + MetadataTable.OLD_PREV_ROW_COLUMN.put(m, KeyExtent.encodePrevEndRow(null)); + bw = connector.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig()); bw.addMutation(m); if (tn == 1) { bw.flush(); - Scanner scanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY); + Scanner scanner = connector.createScanner(MetadataTable.NAME, Authorizations.EMPTY); scanner.setRange(extent.toMetadataRange()); - scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY); + scanner.fetchColumnFamily(MetadataTable.DATAFILE_COLUMN_FAMILY); KeyExtent extent2 = new KeyExtent(new Text(tableId), new Text("b"), null); m = extent2.getPrevRowUpdateMutation(); - Constants.METADATA_DIRECTORY_COLUMN.put(m, new Value("/t2".getBytes())); - Constants.METADATA_TIME_COLUMN.put(m, new Value("M0".getBytes())); + MetadataTable.DIRECTORY_COLUMN.put(m, new Value("/t2".getBytes())); + MetadataTable.TIME_COLUMN.put(m, new Value("M0".getBytes())); for (Entry entry : scanner) { - m.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY, entry.getKey().getColumnQualifier(), entry.getValue()); + m.put(MetadataTable.DATAFILE_COLUMN_FAMILY, entry.getKey().getColumnQualifier(), entry.getValue()); } bw.addMutation(m); Modified: accumulo/branches/ACCUMULO-118/test/system/auto/TestUtils.py URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/test/system/auto/TestUtils.py?rev=1494671&r1=1494670&r2=1494671&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-118/test/system/auto/TestUtils.py (original) +++ accumulo/branches/ACCUMULO-118/test/system/auto/TestUtils.py Wed Jun 19 15:57:11 2013 @@ -457,6 +457,8 @@ class TestUtilsMixin: out,err = handle.communicate() self.assert_(handle.returncode==0) for line in out.split('\n') : + if line.find("=>") < 0: + continue left, right = line.split("=>") left = left.strip() right = right.strip() Modified: accumulo/branches/ACCUMULO-118/test/system/auto/simple/examples.py URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/test/system/auto/simple/examples.py?rev=1494671&r1=1494670&r2=1494671&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-118/test/system/auto/simple/examples.py (original) +++ accumulo/branches/ACCUMULO-118/test/system/auto/simple/examples.py Wed Jun 19 15:57:11 2013 @@ -78,14 +78,14 @@ class Examples(TestUtilsMixin, unittest. '--dataTable', 'dataTable', '--vis', visibility, '--chunkSize', 100000, - ACCUMULO_HOME+"/fate") + ACCUMULO_HOME+"/test") self.comment(" searching for a file") handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.QueryUtil', '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, '-p', ROOT_PASSWORD, - '-t', 'indexTable', '--auths', auths, '--search', '--path', 'Fate.java']) + '-t', 'indexTable', '--auths', auths, '--search', '--path', 'examples.py']) out, err = handle.communicate() self.assert_(handle.returncode == 0) - self.assert_(out.find('accumulo/fate/Fate.java') >= 0) + self.assert_(out.find('test/system/auto/simple/examples.py') >= 0) self.comment(" found file at " + out)