accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1452488 - in /accumulo/branches/1.5/test/system: test1/ test2/ test3/ test4/
Date Mon, 04 Mar 2013 20:31:11 GMT
Author: ecn
Date: Mon Mar  4 20:31:10 2013
New Revision: 1452488

URL: http://svn.apache.org/r1452488
Log:
ACCUMULO-745 bring oldest test up-to-date with CLI

Modified:
    accumulo/branches/1.5/test/system/test1/README
    accumulo/branches/1.5/test/system/test1/ingest_test.sh
    accumulo/branches/1.5/test/system/test1/ingest_test_2.sh
    accumulo/branches/1.5/test/system/test1/ingest_test_3.sh
    accumulo/branches/1.5/test/system/test1/verify_test.sh
    accumulo/branches/1.5/test/system/test1/verify_test_2.sh
    accumulo/branches/1.5/test/system/test2/README
    accumulo/branches/1.5/test/system/test2/concurrent.sh
    accumulo/branches/1.5/test/system/test3/bigrow.sh
    accumulo/branches/1.5/test/system/test4/README
    accumulo/branches/1.5/test/system/test4/bulk_import_test.sh

Modified: accumulo/branches/1.5/test/system/test1/README
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/README?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/README (original)
+++ accumulo/branches/1.5/test/system/test1/README Mon Mar  4 20:31:10 2013
@@ -1,9 +1,9 @@
-Command to run from command line
+# Command to run from command line
 
 #Can run this test with pre-existing splits... use the following command to create the table
with
 #100 pre-existing splits 
 
-#../../../bin/accumulo 'org.apache.accumulo.test.TestIngest$CreateTable' 0 5000000 100
+../../../bin/accumulo org.apache.accumulo.test.TestIngest --createTable -u root -p secret
--splits 100 --rows 0
 
 #could try running verify commands after stopping and restarting accumulo
 

Modified: accumulo/branches/1.5/test/system/test1/ingest_test.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/ingest_test.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/ingest_test.sh (original)
+++ accumulo/branches/1.5/test/system/test1/ingest_test.sh Mon Mar  4 20:31:10 2013
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random
56 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random
56 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random
56 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random
56 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timestamp 1 --size 50 --random
56 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1
--size 50 --random 56 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1
--size 50 --random 56 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1
--size 50 --random 56 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1
--size 50 --random 56 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 1
--size 50 --random 56 --rows 1000000 --start 4000000 --cols 1 &

Modified: accumulo/branches/1.5/test/system/test1/ingest_test_2.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/ingest_test_2.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/ingest_test_2.sh (original)
+++ accumulo/branches/1.5/test/system/test1/ingest_test_2.sh Mon Mar  4 20:31:10 2013
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timeestamp 2 --size 50 --random
57 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timeestamp 2 --size 50 --random
57 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timeestamp 2 --size 50 --random
57 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timeestamp 2 --size 50 --random
57 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest --timeestamp 2 --size 50 --random
57 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 2
--size 50 --random 57 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 2
--size 50 --random 57 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 2
--size 50 --random 57 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 2
--size 50 --random 57 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 2
--size 50 --random 57 --rows 1000000 --start 4000000 --cols 1 &

Modified: accumulo/branches/1.5/test/system/test1/ingest_test_3.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/ingest_test_3.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/ingest_test_3.sh (original)
+++ accumulo/branches/1.5/test/system/test1/ingest_test_3.sh Mon Mar  4 20:31:10 2013
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo org.apache.accumulo.test.TestIngest -timestamp 3 -delete 1000000 0
1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest -timestamp 3 -delete 1000000 1000000
1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest -timestamp 3 -delete 1000000 2000000
1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest -timestamp 3 -delete 1000000 3000000
1 &
-../../../bin/accumulo org.apache.accumulo.test.TestIngest -timestamp 3 -delete 1000000 4000000
1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 3
--delete --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 3
--delete --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 3
--delete --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 3
--delete --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --timestamp 3
--delete --rows 1000000 --start 4000000 --cols 1 &

Modified: accumulo/branches/1.5/test/system/test1/verify_test.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/verify_test.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/verify_test.sh (original)
+++ accumulo/branches/1.5/test/system/test1/verify_test.sh Mon Mar  4 20:31:10 2013
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 1 --random 56 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 1 --random 56 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 1 --random 56 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 1 --random 56 --rows 1000000 --start 4000000 --cols 1 &

Modified: accumulo/branches/1.5/test/system/test1/verify_test_2.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test1/verify_test_2.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test1/verify_test_2.sh (original)
+++ accumulo/branches/1.5/test/system/test1/verify_test_2.sh Mon Mar  4 20:31:10 2013
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 2 --random 57 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 2 --random 57 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 2 --random 57 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 2 --random 57 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo  org.apache.accumulo.test.VerifyIngest -u root -p secret --size 50
--timestamp 2 --random 57 --rows 1000000 --start 4000000 --cols 1 &

Modified: accumulo/branches/1.5/test/system/test2/README
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test2/README?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test2/README (original)
+++ accumulo/branches/1.5/test/system/test2/README Mon Mar  4 20:31:10 2013
@@ -1,6 +1,7 @@
-this test concurrently reads and writes data to accumulo...
+# this test concurrently reads and writes data to accumulo...
 
-Can run this test with pre-existing splits... use the following command to create the table
with
-100 pre-existing splits 
+# Can run this test with pre-existing splits... use the following command to create the table
with
+# 100 pre-existing splits 
 
-hadoop jar ../../../lib/accumulo.jar 'org.apache.accumulo.test.TestIngest$CreateTable' 0
5000000 100
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --rows 0 --createTable
--splits 100
+. concurrent.sh

Modified: accumulo/branches/1.5/test/system/test2/concurrent.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test2/concurrent.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test2/concurrent.sh (original)
+++ accumulo/branches/1.5/test/system/test2/concurrent.sh Mon Mar  4 20:31:10 2013
@@ -15,82 +15,85 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo "ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc)"
+USERPASS='-u root -p secret'
+../../../bin/accumulo shell $USERPASS -e 'deletetable -f test_ingest'
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --rows 0 --createTable
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 0 1 &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 1000000 1 &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 2000000 1 &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 3000000 1 &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 4000000 1 &
+echo "ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc)"
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 4000000 --cols 1 &
 
 wait
 
 echo "ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first
halves"
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 0 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 1000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 2000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 3000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 4000000 --cols 1  &
-
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 1500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 2500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 3500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56 --rows 5000000 --start 4500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 5000000 --start 0 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 5000000 --start 1000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 5000000 --start 2000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 5000000 --start 3000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 5000000 --start 4000000 --cols 1  &
+
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 1500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 2500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 3500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 5000000 --start 4500000 --cols 1  &
 
 wait
 
 echo "verifying complete range"
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 1000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 2000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 3000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 4000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 0 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 1000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 2000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 3000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 4000000 --cols 1  &
 
 wait
 
 echo "ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) w/ new timestamp AND
verifying second half w/ old timestamp"
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 0 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 1000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 2000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 3000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 4000000 --cols 1  &
-
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 1500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 2500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 3500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 5000000 --start 4500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 0 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 1000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 2000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 3000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 4000000 --cols 1  &
+
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 500000 --start 500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 500000 --start 1500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 500000 --start 2500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 500000 --start 3500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 500000 --start 4500000 --cols 1  &
 
 
 wait
 
 echo "ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first
halves"
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 --rows 500000 --start 1000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 --rows 500000 --start 2000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 --rows 500000 --start 3000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 --rows 500000 --start 4000000 --cols 1  &
-
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 1500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 2500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 3500000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
2 --size 50 --random 57 --rows 500000 --start 4500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 500000 --start 0 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 500000 --start 1000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 500000 --start 2000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 500000 --start 3000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 500000 --start 4000000 --cols 1  &
+
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 1500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 2500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 3500000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 2 --size
50 --random 57 --rows 500000 --start 4500000 --cols 1  &
 
 wait
 
 echo "verifying complete range"
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 1000000 0 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 1000000 1000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 1000000 2000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 1000000 3000000 --cols 1  &
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 2 --random 57 1000000 4000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 0 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 1000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 2000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 3000000 --cols 1  &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 4000000 --cols 1  &
 
 
 wait

Modified: accumulo/branches/1.5/test/system/test3/bigrow.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test3/bigrow.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test3/bigrow.sh (original)
+++ accumulo/branches/1.5/test/system/test3/bigrow.sh Mon Mar  4 20:31:10 2013
@@ -15,9 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56   --rows 1       --start 5000000 --cols 2000000;
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56   --rows 1000000 --start 0       --cols 1;
-#../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--timestamp 1 --size 50 --random 56 --rows 1      --start 5000000 --cols 2000000;
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 0       --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.TestIngest --timestamp
1 --size 50 --random 56   --rows 1000000 --start 7000000 --cols 1;
-../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.test.VerifyIngest
--size 50 --timestamp 1 --random 56 --rows 1000000 --start 7000000 --cols 1;
+USERPASS='-u root -p secret'
+../../../bin/accumulo shell $USERPASS -e 'deletetable -f test_ingest'
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --rows 0 --createTable
+
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56   --rows 1       --start 5000000 --cols 2000000;
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56   --rows 1000000 --start 0       --cols 1;
+#../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --timestamp 1 --size
50 --random 56 --rows 1      --start 5000000 --cols 2000000;
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 0       --cols 1;
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --timestamp 1 --size
50 --random 56   --rows 1000000 --start 7000000 --cols 1;
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 7000000 --cols 1;

Modified: accumulo/branches/1.5/test/system/test4/README
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test4/README?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test4/README (original)
+++ accumulo/branches/1.5/test/system/test4/README Mon Mar  4 20:31:10 2013
@@ -3,4 +3,4 @@ Test bulk importing data
 Can run this test with pre-existing splits... use the following command to create the table
with
 100 pre-existing splits 
 
-hadoop jar ../../../lib/accumulo.jar 'org.apache.accumulo.test.TestIngest$CreateTable' 0
5000000 100
+../../../bin/accumulo org.apache.accumulo.test.TestIngest -u root -p secret --createTable
--rows 0 --splits 100

Modified: accumulo/branches/1.5/test/system/test4/bulk_import_test.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/test4/bulk_import_test.sh?rev=1452488&r1=1452487&r2=1452488&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/test4/bulk_import_test.sh (original)
+++ accumulo/branches/1.5/test/system/test4/bulk_import_test.sh Mon Mar  4 20:31:10 2013
@@ -16,6 +16,9 @@
 # limitations under the License.
 
 hadoop dfs -rmr /testmf
+USERPASS='-u root -p secret'
+../../../bin/accumulo shell $USERPASS -e 'deletetable -f test_ingest'
+../../../bin/accumulo org.apache.accumulo.test.TestIngest $USERPASS --rows 0 --createTable
--splits 100
 
 echo "creating first set of map files"
 
@@ -30,15 +33,15 @@ wait
 echo "bulk importing"
 
 hadoop dfs -rmr /testmfFail
-../../../bin/accumulo org.apache.accumulo.test.BulkImportDirectory -u root -p secret -t test_ingest
-s /testmf -f /testmfFail
+../../../bin/accumulo org.apache.accumulo.test.BulkImportDirectory $USERPASS -t test_ingest
-s /testmf -f /testmfFail
 
 echo "verifying"
 
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 1 --random
56 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
1 --random 56 --rows 1000000 --start 4000000 --cols 1 &
 
 wait
 
@@ -57,13 +60,13 @@ wait
 echo "bulk importing"
 
 hadoop dfs -rmr /testmfFail
-../../../bin/accumulo org.apache.accumulo.test.BulkImportDirectory -u root -p secret -t test_ingest
-s /testmf -f /testmfFail
+../../../bin/accumulo org.apache.accumulo.test.BulkImportDirectory $USERPASS -t test_ingest
-s /testmf -f /testmfFail
 
 echo "creating second set of map files"
 
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 0 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 1000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 2000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 3000000 --cols 1 &
-../../../bin/accumulo org.apache.accumulo.test.VerifyIngest --size 50 --timestamp 2 --random
57 --rows 1000000 --start 4000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 0 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 1000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 2000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 3000000 --cols 1 &
+../../../bin/accumulo org.apache.accumulo.test.VerifyIngest $USERPASS --size 50 --timestamp
2 --random 57 --rows 1000000 --start 4000000 --cols 1 &
 



Mime
View raw message