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 0D38C9FE6 for ; Wed, 11 Apr 2012 15:25:51 +0000 (UTC) Received: (qmail 64284 invoked by uid 500); 11 Apr 2012 15:25:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 64262 invoked by uid 500); 11 Apr 2012 15:25:51 -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 64253 invoked by uid 99); 11 Apr 2012 15:25:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Apr 2012 15:25:50 +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, 11 Apr 2012 15:25:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 376AC23889E3 for ; Wed, 11 Apr 2012 15:25:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1324817 - /accumulo/branches/1.4/test/system/auto/simple/examples.py Date: Wed, 11 Apr 2012 15:25:29 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120411152529.376AC23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Wed Apr 11 15:25:28 2012 New Revision: 1324817 URL: http://svn.apache.org/viewvc?rev=1324817&view=rev Log: ACCUMULO-521 fix all the example class names Modified: accumulo/branches/1.4/test/system/auto/simple/examples.py Modified: accumulo/branches/1.4/test/system/auto/simple/examples.py URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/test/system/auto/simple/examples.py?rev=1324817&r1=1324816&r2=1324817&view=diff ============================================================================== --- accumulo/branches/1.4/test/system/auto/simple/examples.py (original) +++ accumulo/branches/1.4/test/system/auto/simple/examples.py Wed Apr 11 15:25:28 2012 @@ -95,17 +95,17 @@ class Examples(TestUtilsMixin, unittest. self.comment("Testing bloom filters are fast for missing data") self.ashell('createtable bloom_test\nconfig -t bloom_test -s table.bloom.enabled=true\n') - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.client.RandomBatchWriter', '-s', '7', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchWriter', '-s', '7', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test', '1000000', '0', '1000000000', '50', '2000000', '60000', '3' 'A') self.ashell('flush -t bloom_test -w\n') now = time.time() - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.client.RandomBatchScanner', '-s', '7', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '-s', '7', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test', 500, 0, 1000000000, 50, 20, 'A') diff = time.time() - now now = time.time() - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.client.RandomBatchScanner', '-s', '8', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.client.RandomBatchScanner', '-s', '8', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bloom_test', 500, 0, 1000000000, 50, 20, 'A') diff2 = time.time() - now @@ -114,28 +114,28 @@ class Examples(TestUtilsMixin, unittest. self.comment("Creating a sharded index of the accumulo java files") self.ashell('createtable shard\ncreatetable doc2term\nquit\n') self.execute('/bin/sh', '-c', - 'find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.examples.shard.Index %s %s shard %s %s 30' % + 'find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.simple.examples.shard.Index %s %s shard %s %s 30' % (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD)) - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.shard.Query', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.Query', INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD, 'foo', 'bar') self.comment("Creating a word index of the sharded files") - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.shard.Reverse', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.Reverse', INSTANCE_NAME, ZOOKEEPERS, 'shard', 'doc2term', ROOT, ROOT_PASSWORD) self.comment("Making 1000 conjunctive queries of 5 random words") - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.shard.ContinuousQuery', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.shard.ContinuousQuery', INSTANCE_NAME, ZOOKEEPERS, 'shard', 'doc2term', ROOT, ROOT_PASSWORD, 5, 1000) self.execute('hadoop', 'fs', '-rmr', "/tmp/input", "/tmp/files", "/tmp/splits.txt", "/tmp/failures") self.execute('hadoop', 'fs', '-mkdir', "/tmp/input") self.comment("Starting bulk ingest example") self.comment(" Creating some test data") - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.mapreduce.bulk.GenerateTestData', 0, 1000000, '/tmp/input/data') - self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.mapreduce.bulk.SetupTable', + self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.mapreduce.bulk.GenerateTestData', 0, 1000000, '/tmp/input/data') + self.execute(self.accumulo_sh(), 'org.apache.accumulo.simple.examples.mapreduce.bulk.SetupTable', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bulkTable') - self.execute(ACCUMULO_HOME+'/bin/tool.sh', examplesJar, 'org.apache.accumulo.examples.mapreduce.bulk.BulkIngestExample', + self.execute(ACCUMULO_HOME+'/bin/tool.sh', examplesJar, 'org.apache.accumulo.simple.examples.mapreduce.bulk.BulkIngestExample', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bulkTable', '/tmp/input', '/tmp') - self.execute(ACCUMULO_HOME+'/bin/tool.sh', examplesJar, 'org.apache.accumulo.examples.mapreduce.bulk.VerifyIngest', + self.execute(ACCUMULO_HOME+'/bin/tool.sh', examplesJar, 'org.apache.accumulo.simple.examples.mapreduce.bulk.VerifyIngest', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD, 'bulkTable', 0, 1000000) self.wait(self.runOn(self.masterHost(), [ 'hadoop', 'fs', '-rmr', "/tmp/tableFile", "/tmp/nines" @@ -146,7 +146,7 @@ class Examples(TestUtilsMixin, unittest. self.wait(self.runOn(self.masterHost(), [ ACCUMULO_HOME+'/bin/tool.sh', examplesJar, - 'org.apache.accumulo.examples.mapreduce.TeraSortIngest', + 'org.apache.accumulo.simple.examples.mapreduce.TeraSortIngest', ROWS, 10, 10, 78, 78, @@ -160,7 +160,7 @@ class Examples(TestUtilsMixin, unittest. self.wait(self.runOn(self.masterHost(), [ ACCUMULO_HOME+'/bin/tool.sh', examplesJar, - 'org.apache.accumulo.examples.mapreduce.RegexExample', + 'org.apache.accumulo.simple.examples.mapreduce.RegexExample', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -175,7 +175,7 @@ class Examples(TestUtilsMixin, unittest. self.wait(self.runOn(self.masterHost(), [ ACCUMULO_HOME+'/bin/tool.sh', examplesJar, - 'org.apache.accumulo.examples.mapreduce.RowHash', + 'org.apache.accumulo.simple.examples.mapreduce.RowHash', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -188,7 +188,7 @@ class Examples(TestUtilsMixin, unittest. self.wait(self.runOn(self.masterHost(), [ ACCUMULO_HOME+'/bin/tool.sh', examplesJar, - 'org.apache.accumulo.examples.mapreduce.TableToFile', + 'org.apache.accumulo.simple.examples.mapreduce.TableToFile', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -211,28 +211,28 @@ class Examples(TestUtilsMixin, unittest. self.wait(self.runOn(self.masterHost(), [ ACCUMULO_HOME+'/bin/tool.sh', examplesJar, - 'org.apache.accumulo.examples.mapreduce.WordCount', + 'org.apache.accumulo.simple.examples.mapreduce.WordCount', INSTANCE_NAME, ZOOKEEPERS, '/tmp/wc', 'wctable' ])) self.comment("Inserting data with a batch writer") - self.runExample(['org.apache.accumulo.examples.helloworld.InsertWithBatchWriter', + self.runExample(['org.apache.accumulo.simple.examples.helloworld.InsertWithBatchWriter', INSTANCE_NAME, ZOOKEEPERS, 'helloBatch', ROOT, ROOT_PASSWORD]) self.comment("Reading data") - self.runExample(['org.apache.accumulo.examples.helloworld.ReadData', + self.runExample(['org.apache.accumulo.simple.examples.helloworld.ReadData', INSTANCE_NAME, ZOOKEEPERS, 'helloBatch', ROOT, ROOT_PASSWORD]) self.comment("Running isolated scans") - self.runExample(['org.apache.accumulo.examples.isolation.InterferenceTest', + self.runExample(['org.apache.accumulo.simple.examples.isolation.InterferenceTest', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -241,7 +241,7 @@ class Examples(TestUtilsMixin, unittest. 100000, 'true']) self.comment("Running scans without isolation") - self.runExample(['org.apache.accumulo.examples.isolation.InterferenceTest', + self.runExample(['org.apache.accumulo.simple.examples.isolation.InterferenceTest', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -250,7 +250,7 @@ class Examples(TestUtilsMixin, unittest. 100000, 'false']) self.comment("Inserting data using a map/reduce job") - self.runExample(['org.apache.accumulo.examples.helloworld.InsertWithOutputFormat', + self.runExample(['org.apache.accumulo.simple.examples.helloworld.InsertWithOutputFormat', INSTANCE_NAME, ZOOKEEPERS, 'helloOutputFormat', @@ -259,21 +259,21 @@ class Examples(TestUtilsMixin, unittest. self.comment("Using some example constraints") self.ashell('\n'.join([ 'createtable testConstraints', - 'config -t testConstraints -s table.constraint.1=org.apache.accumulo.examples.constraints.NumericValueConstraint', - 'config -t testConstraints -s table.constraint.2=org.apache.accumulo.examples.constraints.AlphaNumKeyConstraint', + 'config -t testConstraints -s table.constraint.1=org.apache.accumulo.simple.examples.constraints.NumericValueConstraint', + 'config -t testConstraints -s table.constraint.2=org.apache.accumulo.simple.examples.constraints.AlphaNumKeyConstraint', 'insert r1 cf1 cq1 1111', 'insert r1 cf1 cq1 ABC', 'scan', 'quit' ])) self.comment("Performing some row operations") - self.runExample(['org.apache.accumulo.examples.client.RowOperations', + self.runExample(['org.apache.accumulo.simple.examples.client.RowOperations', INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD]) self.comment("Using the batch writer") - self.runExample(['org.apache.accumulo.examples.client.SequentialBatchWriter', + self.runExample(['org.apache.accumulo.simple.examples.client.SequentialBatchWriter', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -287,7 +287,7 @@ class Examples(TestUtilsMixin, unittest. numThreads, visibility]) self.comment("Reading and writing some data") - self.runExample(['org.apache.accumulo.examples.client.ReadWriteExample', + self.runExample(['org.apache.accumulo.simple.examples.client.ReadWriteExample', '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, @@ -298,7 +298,7 @@ class Examples(TestUtilsMixin, unittest. '-r', '-dbg']) self.comment("Deleting some data") - self.runExample(['org.apache.accumulo.examples.client.ReadWriteExample', + self.runExample(['org.apache.accumulo.simple.examples.client.ReadWriteExample', '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT, @@ -308,7 +308,7 @@ class Examples(TestUtilsMixin, unittest. '-d', '-dbg']) self.comment("Writing some random data with the batch writer") - self.runExample(['org.apache.accumulo.examples.client.RandomBatchWriter', + self.runExample(['org.apache.accumulo.simple.examples.client.RandomBatchWriter', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -323,7 +323,7 @@ class Examples(TestUtilsMixin, unittest. numThreads, visibility]) self.comment("Writing some random data with the batch writer") - self.runExample(['org.apache.accumulo.examples.client.RandomBatchScanner', + self.runExample(['org.apache.accumulo.simple.examples.client.RandomBatchScanner', INSTANCE_NAME, ZOOKEEPERS, ROOT, @@ -336,7 +336,7 @@ class Examples(TestUtilsMixin, unittest. numThreads, auths]); self.comment("Running an example table operation (Flush)") - self.runExample(['org.apache.accumulo.examples.client.Flush', + self.runExample(['org.apache.accumulo.simple.examples.client.Flush', INSTANCE_NAME, ZOOKEEPERS, ROOT,