You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/01/08 16:27:11 UTC
[1/6] git commit: ACCUMULO-1988 Fix calls to several example
functional tests
Updated Branches:
refs/heads/1.5.1-SNAPSHOT a86d1522b -> 1413ebcea
refs/heads/1.6.0-SNAPSHOT 472f484a7 -> 7cb5db454
refs/heads/master 1c7159e5b -> e4eaab8dc
ACCUMULO-1988 Fix calls to several example functional tests
- The Accumulo 1.5.x package no longer includes source, so the example test that
builds a sharded index found no Java files. This commit changes the indexing to
use the source code for examples, which is still included.
- The million-row TeraSortIngest example erroneously passed the -nk and -xk options
twice. This commit changes the second set of options to -nv and -xv, which is
what they should have been.
- The following example test intends to output to the tmp/nines file, but the
required "--output" was missing in the command line. It was added.
- The example after that used to write row hashes to a separate table, but today the
job writes to the same table. A vestigial command line argument for that table
prevented the job from running, so it was removed.
- In between the last three tests, and between the last text and the next one, the
examples.py script was removing and recreating the test table, which meant that
all but the first test were running against zero rows. The table is now left
intact between the four tests.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1413ebce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1413ebce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1413ebce
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1413ebceaa227d2b97293635490be1d539d35531
Parents: a86d152
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 2 11:50:02 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:23:11 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/examples.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1413ebce/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index ba05174..749f018 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -128,7 +128,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
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 %s/server -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
+ 'find %s/examples -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
(ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.shard.Query',
'-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '-u', ROOT, '-p', ROOT_PASSWORD,
@@ -163,7 +163,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest',
'--count', ROWS,
'-nk', 10, '-xk', 10,
- '-nk', 78, '-xk', 78,
+ '-nv', 78, '-xv', 78,
'-t', 'sorted',
'-i', INSTANCE_NAME,
'-z', ZOOKEEPERS,
@@ -171,7 +171,6 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'--splits', 4]))
self.comment("Looking for '999' in all rows")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -182,9 +181,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--rowRegex', '.*999.*',
- 'tmp/nines']))
- self.comment("Generating hashes of each row into a new table")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
+ '--output', 'tmp/nines']))
+ self.comment("Generating hashes of each row")
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -195,10 +193,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--column', ':',
- 'sortedHashed',
]))
self.comment("Exporting the table to HDFS")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
[5/6] git commit: ACCUMULO-1988 Merge branch '1.5.1-SNAPSHOT' into
1.6.0-SNAPSHOT
Posted by bh...@apache.org.
ACCUMULO-1988 Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cb5db45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cb5db45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cb5db45
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7cb5db4546f9a384e5ed530c222a8af76f03d1be
Parents: 472f484 1413ebc
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Jan 8 10:25:18 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:25:18 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/6] git commit: ACCUMULO-1988 Merge branch '1.6.0-SNAPSHOT'
Posted by bh...@apache.org.
ACCUMULO-1988 Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4eaab8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4eaab8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4eaab8d
Branch: refs/heads/master
Commit: e4eaab8dc5e2f645a0c0bc0ac083e599a62cc995
Parents: 1c7159e 7cb5db4
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Jan 8 10:25:41 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:25:41 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: ACCUMULO-1988 Fix calls to several example
functional tests
Posted by bh...@apache.org.
ACCUMULO-1988 Fix calls to several example functional tests
- The Accumulo 1.5.x package no longer includes source, so the example test that
builds a sharded index found no Java files. This commit changes the indexing to
use the source code for examples, which is still included.
- The million-row TeraSortIngest example erroneously passed the -nk and -xk options
twice. This commit changes the second set of options to -nv and -xv, which is
what they should have been.
- The following example test intends to output to the tmp/nines file, but the
required "--output" was missing in the command line. It was added.
- The example after that used to write row hashes to a separate table, but today the
job writes to the same table. A vestigial command line argument for that table
prevented the job from running, so it was removed.
- In between the last three tests, and between the last text and the next one, the
examples.py script was removing and recreating the test table, which meant that
all but the first test were running against zero rows. The table is now left
intact between the four tests.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1413ebce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1413ebce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1413ebce
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1413ebceaa227d2b97293635490be1d539d35531
Parents: a86d152
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 2 11:50:02 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:23:11 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/examples.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1413ebce/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index ba05174..749f018 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -128,7 +128,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
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 %s/server -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
+ 'find %s/examples -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
(ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.shard.Query',
'-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '-u', ROOT, '-p', ROOT_PASSWORD,
@@ -163,7 +163,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest',
'--count', ROWS,
'-nk', 10, '-xk', 10,
- '-nk', 78, '-xk', 78,
+ '-nv', 78, '-xv', 78,
'-t', 'sorted',
'-i', INSTANCE_NAME,
'-z', ZOOKEEPERS,
@@ -171,7 +171,6 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'--splits', 4]))
self.comment("Looking for '999' in all rows")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -182,9 +181,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--rowRegex', '.*999.*',
- 'tmp/nines']))
- self.comment("Generating hashes of each row into a new table")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
+ '--output', 'tmp/nines']))
+ self.comment("Generating hashes of each row")
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -195,10 +193,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--column', ':',
- 'sortedHashed',
]))
self.comment("Exporting the table to HDFS")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
[3/6] git commit: ACCUMULO-1988 Fix calls to several example
functional tests
Posted by bh...@apache.org.
ACCUMULO-1988 Fix calls to several example functional tests
- The Accumulo 1.5.x package no longer includes source, so the example test that
builds a sharded index found no Java files. This commit changes the indexing to
use the source code for examples, which is still included.
- The million-row TeraSortIngest example erroneously passed the -nk and -xk options
twice. This commit changes the second set of options to -nv and -xv, which is
what they should have been.
- The following example test intends to output to the tmp/nines file, but the
required "--output" was missing in the command line. It was added.
- The example after that used to write row hashes to a separate table, but today the
job writes to the same table. A vestigial command line argument for that table
prevented the job from running, so it was removed.
- In between the last three tests, and between the last text and the next one, the
examples.py script was removing and recreating the test table, which meant that
all but the first test were running against zero rows. The table is now left
intact between the four tests.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1413ebce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1413ebce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1413ebce
Branch: refs/heads/master
Commit: 1413ebceaa227d2b97293635490be1d539d35531
Parents: a86d152
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 2 11:50:02 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:23:11 2014 -0500
----------------------------------------------------------------------
test/system/auto/simple/examples.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1413ebce/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/examples.py b/test/system/auto/simple/examples.py
index ba05174..749f018 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -128,7 +128,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
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 %s/server -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
+ 'find %s/examples -name "*.java" | xargs %s/bin/accumulo org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p %s --partitions 30' %
(ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
self.execute(self.accumulo_sh(), 'org.apache.accumulo.examples.simple.shard.Query',
'-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', '-u', ROOT, '-p', ROOT_PASSWORD,
@@ -163,7 +163,7 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest',
'--count', ROWS,
'-nk', 10, '-xk', 10,
- '-nk', 78, '-xk', 78,
+ '-nv', 78, '-xv', 78,
'-t', 'sorted',
'-i', INSTANCE_NAME,
'-z', ZOOKEEPERS,
@@ -171,7 +171,6 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'--splits', 4]))
self.comment("Looking for '999' in all rows")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -182,9 +181,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--rowRegex', '.*999.*',
- 'tmp/nines']))
- self.comment("Generating hashes of each row into a new table")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
+ '--output', 'tmp/nines']))
+ self.comment("Generating hashes of each row")
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
@@ -195,10 +193,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
'-p', ROOT_PASSWORD,
'-t', 'sorted',
'--column', ':',
- 'sortedHashed',
]))
self.comment("Exporting the table to HDFS")
- self.ashell('deletetable sorted\ncreatetable sorted\nquit\n')
self.wait(self.runOn(self.masterHost(), [
ACCUMULO_HOME+'/bin/tool.sh',
examplesJar,
[4/6] git commit: ACCUMULO-1988 Merge branch '1.5.1-SNAPSHOT' into
1.6.0-SNAPSHOT
Posted by bh...@apache.org.
ACCUMULO-1988 Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7cb5db45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7cb5db45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7cb5db45
Branch: refs/heads/master
Commit: 7cb5db4546f9a384e5ed530c222a8af76f03d1be
Parents: 472f484 1413ebc
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Jan 8 10:25:18 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Jan 8 10:25:18 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------