You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/05/21 23:23:21 UTC
svn commit: r1484966 - in /accumulo/trunk: ./ assemble/ core/ docs/examples/
examples/ fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
Author: ctubbsii
Date: Tue May 21 21:23:20 2013
New Revision: 1484966
URL: http://svn.apache.org/r1484966
Log:
ACCUMULO-1329 merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/docs/examples/README.bulkIngest
accumulo/trunk/docs/examples/README.filedata
accumulo/trunk/docs/examples/README.mapred
accumulo/trunk/docs/examples/README.regex
accumulo/trunk/docs/examples/README.rowhash
accumulo/trunk/docs/examples/README.tabletofile
accumulo/trunk/docs/examples/README.terasort
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1484939-1484947,1484949-1484965
Modified: accumulo/trunk/docs/examples/README.bulkIngest
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.bulkIngest?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.bulkIngest (original)
+++ accumulo/trunk/docs/examples/README.bulkIngest Tue May 21 21:23:20 2013
@@ -27,7 +27,7 @@ accumulo. Then we verify the 1000 rows
$ ARGS="-i instance -z zookeepers -u username -p password"
$ ./bin/accumulo $PKG.SetupTable $ARGS -t test_bulk row_00000333 row_00000666
$ ./bin/accumulo $PKG.GenerateTestData --start-row 0 --count 1000 --output bulk/test_1.txt
- $ ./bin/tool.sh lib/accumulo-examples-simple-*[^cs].jar $PKG.BulkIngestExample $ARGS -t test_bulk --inputDir bulk --workDir tmp/bulkWork
+ $ ./bin/tool.sh lib/accumulo-examples-simple.jar $PKG.BulkIngestExample $ARGS -t test_bulk --inputDir bulk --workDir tmp/bulkWork
$ ./bin/accumulo $PKG.VerifyIngest $ARGS -t test_bulk --start-row 0 --count 1000
For a high level discussion of bulk ingest, see the docs dir.
Modified: accumulo/trunk/docs/examples/README.filedata
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.filedata?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.filedata (original)
+++ accumulo/trunk/docs/examples/README.filedata Tue May 21 21:23:20 2013
@@ -40,7 +40,7 @@ Open the accumulo shell and look at the
Run the CharacterHistogram MapReduce to add some information about the file.
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.filedata.CharacterHistogram -i instance -z zookeepers -u username -p password -t dataTable --auths exampleVis --vis exampleVis
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.filedata.CharacterHistogram -i instance -z zookeepers -u username -p password -t dataTable --auths exampleVis --vis exampleVis
Scan again to see the histogram stored in the 'info' column family.
Modified: accumulo/trunk/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.mapred?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.mapred (original)
+++ accumulo/trunk/docs/examples/README.mapred Tue May 21 21:23:20 2013
@@ -50,7 +50,7 @@ for the column family count.
After creating the table, run the word count map reduce job.
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.mapreduce.WordCount -i instance -z zookeepers --input /user/username/wc wordCount -u username -p password
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.mapreduce.WordCount -i instance -z zookeepers --input /user/username/wc wordCount -u username -p password
11/02/07 18:20:11 INFO input.FileInputFormat: Total input paths to process : 1
11/02/07 18:20:12 INFO mapred.JobClient: Running job: job_201102071740_0003
Modified: accumulo/trunk/docs/examples/README.regex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.regex?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.regex (original)
+++ accumulo/trunk/docs/examples/README.regex Tue May 21 21:23:20 2013
@@ -41,7 +41,7 @@ in parallel and will store the results i
The following will search for any rows in the input table that starts with "dog":
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.mapreduce.RegexExample -u user -p passwd -i instance -t input --rowRegex 'dog.*' --output /tmp/output
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.mapreduce.RegexExample -u user -p passwd -i instance -t input --rowRegex 'dog.*' --output /tmp/output
$ hadoop fs -ls /tmp/output
Found 3 items
Modified: accumulo/trunk/docs/examples/README.rowhash
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.rowhash?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.rowhash (original)
+++ accumulo/trunk/docs/examples/README.rowhash Tue May 21 21:23:20 2013
@@ -38,7 +38,7 @@ put a trivial amount of data into accumu
The RowHash class will insert a hash for each row in the database if it contains a
specified colum. Here's how you run the map/reduce job
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.mapreduce.RowHash -u user -p passwd -i instance -t input --column cf:cq
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.mapreduce.RowHash -u user -p passwd -i instance -t input --column cf:cq
Now we can scan the table and see the hashes:
Modified: accumulo/trunk/docs/examples/README.tabletofile
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.tabletofile?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.tabletofile (original)
+++ accumulo/trunk/docs/examples/README.tabletofile Tue May 21 21:23:20 2013
@@ -40,7 +40,7 @@ write the key/value pairs to a file in H
The following will extract the rows containing the column "cf:cq":
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.mapreduce.TableToFile -u user -p passwd -i instance -t input --columns cf:cq --output /tmp/output
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.mapreduce.TableToFile -u user -p passwd -i instance -t input --columns cf:cq --output /tmp/output
$ hadoop fs -ls /tmp/output
-rw-r--r-- 1 username supergroup 0 2013-01-10 14:44 /tmp/output/_SUCCESS
Modified: accumulo/trunk/docs/examples/README.terasort
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.terasort?rev=1484966&r1=1484965&r2=1484966&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.terasort (original)
+++ accumulo/trunk/docs/examples/README.terasort Tue May 21 21:23:20 2013
@@ -22,7 +22,7 @@ hadoop terasort benchmark.
To run this example you run it with arguments describing the amount of data:
- $ bin/tool.sh lib/examples-simple*[^cs].jar org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest \
+ $ bin/tool.sh lib/accumulo-examples-simple.jar org.apache.accumulo.examples.simple.mapreduce.TeraSortIngest \
-i instance -z zookeepers -u user -p password \
--count 10 \
--minKeySize 10 \
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1484939-1484947,1484949-1484965
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1484939-1484947,1484949-1484965