Author: ecn
Date: Wed Dec 19 20:33:18 2012
New Revision: 1424088
URL: http://svn.apache.org/viewvc?rev=1424088&view=rev
Log:
ACCUMULO-889 merge from trunk
Modified:
accumulo/branches/1.4/ (props changed)
accumulo/branches/1.4/docs/examples/README.bulkIngest
accumulo/branches/1.4/docs/examples/README.filedata
accumulo/branches/1.4/docs/examples/README.mapred
accumulo/branches/1.4/src/ (props changed)
accumulo/branches/1.4/src/core/ (props changed)
accumulo/branches/1.4/src/server/ (props changed)
Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1415914
Modified: accumulo/branches/1.4/docs/examples/README.bulkIngest
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/examples/README.bulkIngest?rev=1424088&r1=1424087&r2=1424088&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/examples/README.bulkIngest (original)
+++ accumulo/branches/1.4/docs/examples/README.bulkIngest Wed Dec 19 20:33:18
2012
@@ -28,7 +28,7 @@ accumulo instance name, and a comma-sepa
$ ./bin/accumulo
org.apache.accumulo.examples.simple.mapreduce.bulk.SetupTable instance
zookeepers username password test_bulk row_00000333 row_00000666
$ ./bin/accumulo
org.apache.accumulo.examples.simple.mapreduce.bulk.GenerateTestData 0 1000
bulk/test_1.txt
- $ ./bin/tool.sh lib/examples-simple-*[^c].jar
org.apache.accumulo.examples.simple.mapreduce.bulk.BulkIngestExample instance
zookeepers username password test_bulk bulk tmp/bulkWork
+ $ ./bin/tool.sh lib/examples-simple-*[^cs].jar
org.apache.accumulo.examples.simple.mapreduce.bulk.BulkIngestExample instance
zookeepers username password test_bulk bulk tmp/bulkWork
$ ./bin/accumulo
org.apache.accumulo.examples.simple.mapreduce.bulk.VerifyIngest instance
zookeepers username password test_bulk 0 1000
For a high level discussion of bulk ingest, see the docs dir.
Modified: accumulo/branches/1.4/docs/examples/README.filedata
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/examples/README.filedata?rev=1424088&r1=1424087&r2=1424088&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/examples/README.filedata (original)
+++ accumulo/branches/1.4/docs/examples/README.filedata Wed Dec 19 20:33:18 2012
@@ -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*[^c].jar
org.apache.accumulo.examples.simple.filedata.CharacterHistogram instance
zookeepers username password dataTable exampleVis exampleVis
+ $ bin/tool.sh lib/examples-simple*[^cs].jar
org.apache.accumulo.examples.simple.filedata.CharacterHistogram instance
zookeepers username password dataTable exampleVis exampleVis
Scan again to see the histogram stored in the 'info' column family.
Modified: accumulo/branches/1.4/docs/examples/README.mapred
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/docs/examples/README.mapred?rev=1424088&r1=1424087&r2=1424088&view=diff
==============================================================================
--- accumulo/branches/1.4/docs/examples/README.mapred (original)
+++ accumulo/branches/1.4/docs/examples/README.mapred Wed Dec 19 20:33:18 2012
@@ -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*[^c].jar
org.apache.accumulo.examples.simple.mapreduce.WordCount instance zookeepers
/user/username/wc wordCount -u username -p password
+ $ bin/tool.sh lib/examples-simple*[^cs].jar
org.apache.accumulo.examples.simple.mapreduce.WordCount instance zookeepers
/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
Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1415914
Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src/core:r1415914
Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src/server:r1415914
