incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1230699 - in /incubator/accumulo/trunk: ./ conf/ docs/ docs/examples/ docs/src/user_manual/chapters/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/test/
Date Thu, 12 Jan 2012 18:51:55 GMT
Author: kturner
Date: Thu Jan 12 18:51:54 2012
New Revision: 1230699

URL: http://svn.apache.org/viewvc?rev=1230699&view=rev
Log:
Sorted out issues w/ merging from 1.4 to trunk.  Merged unmerged changes from 1.4 to trunk.

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/README
    incubator/accumulo/trunk/conf/accumulo-site.xml.example
    incubator/accumulo/trunk/docs/examples/README.batch
    incubator/accumulo/trunk/docs/examples/README.bloom
    incubator/accumulo/trunk/docs/examples/README.bulkIngest
    incubator/accumulo/trunk/docs/examples/README.combiner
    incubator/accumulo/trunk/docs/examples/README.constraints
    incubator/accumulo/trunk/docs/examples/README.dirlist
    incubator/accumulo/trunk/docs/examples/README.helloworld
    incubator/accumulo/trunk/docs/examples/README.mapred
    incubator/accumulo/trunk/docs/examples/README.shard
    incubator/accumulo/trunk/docs/isolation.html
    incubator/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 18:51:54 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230280,1230311
+/incubator/accumulo/branches/1.4:1201902-1230674

Modified: incubator/accumulo/trunk/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/README?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/README (original)
+++ incubator/accumulo/trunk/README Thu Jan 12 18:51:54 2012
@@ -19,7 +19,7 @@ but having them available suppresses a r
 ******************************************************************************
 2. Deployment
 
-Copy the accumulo tar file produced by "mvn package && mvn assembly:single" 
+Copy the accumulo tar file produced by mvn package 
 from the target/ directory to the desired destination, then untar it (e.g. 
 tar xvzf accumulo-1.5.0-incubating-SNAPSHOT-dist.tar.gz).
 
@@ -61,6 +61,8 @@ These directories must be at the same lo
 Note that zookeeper must be installed on every machine, but it should not be 
 run on every machine.
 
+Create the $ACCUMULO_LOG_DIR on every machine in the slaves file.
+
 * Note that you will be specifying the Java heap space in accumulo-env.sh.  
 You should make sure that the total heap space used for the accumulo tserver,
 logger and the hadoop datanode and tasktracker is less than the available

Modified: incubator/accumulo/trunk/conf/accumulo-site.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/accumulo-site.xml.example?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/accumulo-site.xml.example (original)
+++ incubator/accumulo/trunk/conf/accumulo-site.xml.example Thu Jan 12 18:51:54 2012
@@ -65,6 +65,19 @@
     </property>
     
     <property>
+      <name>trace.password</name>
+      <!-- 
+        change this to the root user's password, and/or change the user below 
+       -->
+      <value>secret</value>
+    </property>
+    
+    <property>
+      <name>trace.user</name>
+      <value>root</value>
+    </property>
+    
+    <property>
       <name>general.classpaths</name>
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

Modified: incubator/accumulo/trunk/docs/examples/README.batch
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.batch?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.batch (original)
+++ incubator/accumulo/trunk/docs/examples/README.batch Thu Jan 12 18:51:54 2012
@@ -38,8 +38,8 @@ You must also create the table, batchtes
     $ ./bin/accumulo shell -u username
     > createtable batchtest1
     > exit
-    $ ./bin/accumulo org.apache.accumulo.examples.client.SequentialBatchWriter instance zookeepers
username password batchtest1 0 10000 50 20000000 500 20 exampleVis
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner instance zookeepers
username password batchtest1 100 0 10000 50 20 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.SequentialBatchWriter instance
zookeepers username password batchtest1 0 10000 50 20000000 500 20 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner instance
zookeepers username password batchtest1 100 0 10000 50 20 exampleVis
     07 11:33:11,103 [client.CountingVerifyingReceiver] INFO : Generating 100 random queries...
     07 11:33:11,112 [client.CountingVerifyingReceiver] INFO : finished
     07 11:33:11,260 [client.CountingVerifyingReceiver] INFO : 694.44 lookups/sec   0.14 secs

Modified: incubator/accumulo/trunk/docs/examples/README.bloom
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.bloom?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.bloom (original)
+++ incubator/accumulo/trunk/docs/examples/README.bloom Thu Jan 12 18:51:54 2012
@@ -39,7 +39,7 @@ Below 1 million random values are insert
 generated rows range between 0 and 1 billion.  The random number generator is
 initialized with the seed 7.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test 1000000 0 1000000000 50 2000000 60000 3 exampleVis
 
 Below the table is flushed:
 
@@ -50,7 +50,7 @@ After the flush completes, 500 random qu
 same seed is used to generate the queries, therefore everything is found in the
 table.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test 500 0 1000000000 50 20 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test 500 0 1000000000 50 20 exampleVis
     Generating 500 random queries...finished
     96.19 lookups/sec   5.20 secs
     num results : 500
@@ -62,7 +62,7 @@ Below another 500 queries are performed,
 in nothing being found.  In this case the lookups are much faster because of
 the bloom filters.
 
-    $ ../bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner -s 8 instance
zookeepers username password bloom_test 500 0 1000000000 50 20 exampleVis
+    $ ../bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -s 8
instance zookeepers username password bloom_test 500 0 1000000000 50 20 exampleVis
     Generating 500 random queries...finished
     2212.39 lookups/sec   0.23 secs
     num results : 0
@@ -113,11 +113,11 @@ The commands for creating the first tabl
     username@instance bloom_test1> config -t bloom_test1 -s table.compaction.major.ratio=7
     username@instance bloom_test1> exit
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 8 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 8 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 9 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 9 instance
zookeepers username password bloom_test1 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test1 -w'
 
 The commands for creating the second table with bloom filers are below.
@@ -136,18 +136,18 @@ The commands for creating the second tab
     username@instance bloom_test2> config -t bloom_test2 -s table.bloom.enabled=true
     username@instance bloom_test2> exit
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 7 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 8 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 8 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchWriter -s 9 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchWriter -s 9 instance
zookeepers username password bloom_test2 1000000 0 1000000000 50 2000000 60000 3 exampleVis
     $ ./bin/accumulo shell -u username -p password -e 'flush -t bloom_test2 -w'
 
 Below 500 lookups are done against the table without bloom filters using random
 NG seed 7.  Even though only one map file will likely contain entries for this
 seed, all map files will be interrogated.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test1 500 0 1000000000 50 20 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test1 500 0 1000000000 50 20 exampleVis
     Generating 500 random queries...finished
     35.09 lookups/sec  14.25 secs
     num results : 500
@@ -159,7 +159,7 @@ Below the same lookups are done against 
 lookups were 2.86 times faster because only one map file was used, even though three
 map files existed.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test2 500 0 1000000000 50 20 exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.client.RandomBatchScanner -s 7 instance
zookeepers username password bloom_test2 500 0 1000000000 50 20 exampleVis
     Generating 500 random queries...finished
     99.03 lookups/sec   5.05 secs
     num results : 500

Modified: incubator/accumulo/trunk/docs/examples/README.bulkIngest
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.bulkIngest?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.bulkIngest (original)
+++ incubator/accumulo/trunk/docs/examples/README.bulkIngest Thu Jan 12 18:51:54 2012
@@ -25,10 +25,10 @@ accumulo.  Then we verify the 1000 rows 
 first two arguments to all of the commands except for GenerateTestData are the
 accumulo instance name, and a comma-separated list of zookeepers.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.mapreduce.bulk.SetupTable instance zookeepers
username password test_bulk row_00000333 row_00000666
-    $ ./bin/accumulo org.apache.accumulo.examples.mapreduce.bulk.GenerateTestData 0 1000
bulk/test_1.txt
+    $ ./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/accumulo-examples-*[^c].jar org.apache.accumulo.examples.mapreduce.bulk.BulkIngestExample
instance zookeepers username password test_bulk bulk tmp/bulkWork
-    $ ./bin/accumulo org.apache.accumulo.examples.mapreduce.bulk.VerifyIngest instance zookeepers
username password test_bulk 0 1000
+    $ ./bin/tool.sh lib/accumulo-examples-*[^c].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: incubator/accumulo/trunk/docs/examples/README.combiner
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.combiner?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.combiner (original)
+++ incubator/accumulo/trunk/docs/examples/README.combiner Thu Jan 12 18:51:54 2012
@@ -32,11 +32,11 @@ tar distribution.
     - type 'help' for a list of available commands
     - 
     username@instance> createtable runners
-    username@instance runners> setiter -t runners -p 10 -scan -minc -majc -n decStats
-class org.apache.accumulo.examples.combiner.StatsCombiner
+    username@instance runners> setiter -t runners -p 10 -scan -minc -majc -n decStats
-class org.apache.accumulo.examples.simple.combiner.StatsCombiner
     Combiner that keeps track of min, max, sum, and count
     ----------> set StatsCombiner parameter columns, <col fam>[:<col qual>]{,<col
fam>[:<col qual>]} escape non aplhanum chars using %<hex>.: stat
     ----------> set StatsCombiner parameter radix, radix/base of the numbers: 10
-    username@instance runners> setiter -t runners -p 10 -scan -minc -majc -n hexStats
-class org.apache.accumulo.examples.combiner.StatsCombiner
+    username@instance runners> setiter -t runners -p 10 -scan -minc -majc -n hexStats
-class org.apache.accumulo.examples.simple.combiner.StatsCombiner
     Combiner that keeps track of min, max, sum, and count
     ----------> set StatsCombiner parameter columns, <col fam>[:<col qual>]{,<col
fam>[:<col qual>]} escape non aplhanum chars using %<hex>.: hstat
     ----------> set StatsCombiner parameter radix, radix/base of the numbers: 16

Modified: incubator/accumulo/trunk/docs/examples/README.constraints
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.constraints?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.constraints (original)
+++ incubator/accumulo/trunk/docs/examples/README.constraints Thu Jan 12 18:51:54 2012
@@ -33,16 +33,16 @@ the end shows the inserts were not allow
     - type 'help' for a list of available commands
     - 
     username@instance> createtable testConstraints
-    username@instance testConstraints> config -t testConstraints -s table.constraint.1=org.apache.accumulo.examples.constraints.NumericValueConstraint
-    username@instance testConstraints> config -t testConstraints -s table.constraint.2=org.apache.accumulo.examples.constraints.AlphaNumKeyConstraint
+    username@instance testConstraints> config -t testConstraints -s table.constraint.1=org.apache.accumulo.examples.simple.constraints.NumericValueConstraint
+    username@instance testConstraints> config -t testConstraints -s table.constraint.2=org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint
     username@instance testConstraints> insert r1 cf1 cq1 1111
     username@instance testConstraints> insert r1 cf1 cq1 ABC
       Constraint Failures:
-          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.constraints.NumericValueConstraint,
violationCode:1, violationDescription:Value is not numeric, numberOfViolatingMutations:1)
+          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.simple.constraints.NumericValueConstraint,
violationCode:1, violationDescription:Value is not numeric, numberOfViolatingMutations:1)
     username@instance testConstraints> insert r1! cf1 cq1 ABC 
       Constraint Failures:
-          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.constraints.NumericValueConstraint,
violationCode:1, violationDescription:Value is not numeric, numberOfViolatingMutations:1)
-          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.constraints.AlphaNumKeyConstraint,
violationCode:1, violationDescription:Row was not alpha numeric, numberOfViolatingMutations:1)
+          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.simple.constraints.NumericValueConstraint,
violationCode:1, violationDescription:Value is not numeric, numberOfViolatingMutations:1)
+          ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint,
violationCode:1, violationDescription:Row was not alpha numeric, numberOfViolatingMutations:1)
     username@instance testConstraints> scan
     r1 cf1:cq1 []    1111
     username@instance testConstraints> 

Modified: incubator/accumulo/trunk/docs/examples/README.dirlist
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.dirlist?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.dirlist (original)
+++ incubator/accumulo/trunk/docs/examples/README.dirlist Thu Jan 12 18:51:54 2012
@@ -31,7 +31,7 @@ This example shows how to use Accumulo t
  
 To begin, ingest some data with Ingest.java.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.Ingest instance zookeepers username
password dirTable indexTable dataTable exampleVis 100000 /local/username/workspace
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.Ingest instance zookeepers
username password dirTable indexTable dataTable exampleVis 100000 /local/username/workspace
 
 This may take some time if there are large files in the /local/username/workspace directory.
 If you use 0 instead of 100000 on the command line, the ingest will run much faster, but
it will not put any file data into Accumulo (the dataTable will be empty).
 Note that running this example will create tables dirTable, indexTable, and dataTable in
Accumulo that you should delete when you have completed the example.
@@ -39,26 +39,26 @@ If you modify a file or add new files in
 
 To browse the data ingested, use Viewer.java.  Be sure to give the "username" user the authorizations
to see the data (in this case, run "setauths -u username -s exampleVis" in the shell, and
use the string "exampleVis" as the "auths" in command lines below).
 
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.Viewer instance zookeepers username
password dirTable dataTable auths /local/username/workspace
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.Viewer instance zookeepers
username password dirTable dataTable auths /local/username/workspace
 
 To list the contents of specific directories, use QueryUtil.java.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password dirTable auths /local/username
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password dirTable auths /local/username/workspace
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password dirTable auths /local/username
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password dirTable auths /local/username/workspace
 
 To perform searches on file or directory names, also use QueryUtil.java.  Search terms must
contain no more than one wild card and cannot contain "/".
 *Note* these queries run on the _indexTable_ table instead of the dirTable table.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password indexTable exampleVis filename -search
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password indexTable exampleVis 'filename*' -search
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password indexTable exampleVis '*jar' -search
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.QueryUtil instance zookeepers username
password indexTable exampleVis filename*jar -search
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password indexTable exampleVis filename -search
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password indexTable exampleVis 'filename*' -search
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password indexTable exampleVis '*jar' -search
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.QueryUtil instance zookeepers
username password indexTable exampleVis filename*jar -search
 
 To count the number of direct children (directories and files) and descendants (children
and children's descendants, directories and files), run the FileCount over the dirTable table.
 The results are written back to the same table.  FileCount reads from and writes to Accumulo.
 This requires scan authorizations for the read and a visibility for the data written.
 In this example, the authorizations and visibility are set to the same value, exampleVis.
 See README.visibility for more information on visibility and authorizations.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.dirlist.FileCount instance zookeepers username
password dirTable exampleVis exampleVis
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.dirlist.FileCount instance zookeepers
username password dirTable exampleVis exampleVis
 
 ## Directory Table
 

Modified: incubator/accumulo/trunk/docs/examples/README.helloworld
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.helloworld?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.helloworld (original)
+++ incubator/accumulo/trunk/docs/examples/README.helloworld Thu Jan 12 18:51:54 2012
@@ -16,7 +16,7 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-This tutorial uses the following Java classes, which can be found in org.apache.accumulo.examples.helloworld
in the accumulo-examples module: 
+This tutorial uses the following Java classes, which can be found in org.apache.accumulo.examples.simple.helloworld
in the simple-examples module: 
 
  * InsertWithBatchWriter.java - Inserts 10K rows (50K entries) into accumulo with each row
having 5 entries
  * InsertWithOutputFormat.java - Example of inserting data in MapReduce
@@ -32,11 +32,11 @@ Create a table called 'hellotable':
 
 Launch a Java program that inserts data with a BatchWriter:
 
-    $ ./bin/accumulo org.apache.accumulo.examples.helloworld.InsertWithBatchWriter instance
zookeepers hellotable username password
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.InsertWithBatchWriter
instance zookeepers hellotable username password
 
 Alternatively, the same data can be inserted using MapReduce writers:
 
-    $ ./bin/accumulo org.apache.accumulo.examples.helloworld.InsertWithOutputFormat instance
zookeepers hellotable username password
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.InsertWithOutputFormat
instance zookeepers hellotable username password
 
 On the accumulo status page at the URL below (where 'master' is replaced with the name or
IP of your accumulo master), you should see 50K entries
 	
@@ -49,4 +49,4 @@ To view the entries, use the shell to sc
 
 You can also use a Java class to scan the table:
 
-    $ ./bin/accumulo org.apache.accumulo.examples.helloworld.ReadData instance zookeepers
hellotable username password row_0 row_1001
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.ReadData instance zookeepers
hellotable username password row_0 row_1001

Modified: incubator/accumulo/trunk/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.mapred?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.mapred (original)
+++ incubator/accumulo/trunk/docs/examples/README.mapred Thu Jan 12 18:51:54 2012
@@ -44,7 +44,7 @@ for the column family count.
 
 After creating the table, run the word count map reduce job.
 
-    $ ./bin/tool.sh lib/accumulo-examples-*[^c].jar org.apache.accumulo.examples.mapreduce.WordCount
instance zookeepers /user/username/wc wordCount -u username -p password
+    $ 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
     
     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: incubator/accumulo/trunk/docs/examples/README.shard
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.shard?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.shard (original)
+++ incubator/accumulo/trunk/docs/examples/README.shard Thu Jan 12 18:51:54 2012
@@ -32,12 +32,12 @@ To run these example programs, create tw
 After creating the tables, index some files.  The following command indexes all of the java
files in the Accumulo source code.
 
     $ cd /local/username/workspace/accumulo/
-    $ find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.examples.shard.Index
instance zookeepers shard username password 30
+    $ find src -name "*.java" | xargs ./bin/accumulo org.apache.accumulo.examples.simple.shard.Index
instance zookeepers shard username password 30
 
 The following command queries the index to find all files containing 'foo' and 'bar'.
 
     $ cd $ACCUMULO_HOME
-    $ ./bin/accumulo org.apache.accumulo.examples.shard.Query instance zookeepers shard username
password foo bar
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.shard.Query instance zookeepers
shard username password foo bar
     /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/ColumnVisibilityTest.java
     /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/client/mock/MockConnectorTest.java
     /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/VisibilityEvaluatorTest.java
@@ -52,11 +52,11 @@ The following command queries the index 
 
 In order to run ContinuousQuery, we need to run Reverse.java to populate doc2term.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.shard.Reverse instance zookeepers shard
doc2term username password
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.shard.Reverse instance zookeepers
shard doc2term username password
 
 Below ContinuousQuery is run using 5 terms.  So it selects 5 random terms from each document,
then it continually randomly selects one set of 5 terms and queries.  It prints the number
of matching documents and the time in seconds.
 
-    $ ./bin/accumulo org.apache.accumulo.examples.shard.ContinuousQuery instance zookeepers
shard doc2term username password 5
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.shard.ContinuousQuery instance zookeepers
shard doc2term username password 5
     [public, core, class, binarycomparable, b] 2  0.081
     [wordtodelete, unindexdocument, doctablename, putdelete, insert] 1  0.041
     [import, columnvisibilityinterpreterfactory, illegalstateexception, cv, columnvisibility]
1  0.049

Modified: incubator/accumulo/trunk/docs/isolation.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/isolation.html?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/isolation.html (original)
+++ incubator/accumulo/trunk/docs/isolation.html Thu Jan 12 18:51:54 2012
@@ -31,7 +31,7 @@
  <li>iterators executed as part of a minor or major compaction 
  <li>bulk import of new files
 </ul>
-Isolation guarantees that either all or none of the changes made by these operations on a
row are seen.  Use the <a href='apidocs/org/apache/accumulo/core/client/IsolatedScanner.html'>IsolatedScanner</a>
to obtain an isolated view of an accumulo table.  When using the regular scanner it is possible
to see a non isolated view of a row.  For example if a mutation modifies three columns, it
is possible that you will only see two of those modifications.  With the isolated scanner
either all three of the changes are seen or none.  For an example of this try running the
<a href='apidocs/org/apache/accumulo/examples/isolation/InterferenceTest.html'>InterferenceTest</a>
example.  
+Isolation guarantees that either all or none of the changes made by these operations on a
row are seen.  Use the <a href='apidocs/org/apache/accumulo/core/client/IsolatedScanner.html'>IsolatedScanner</a>
to obtain an isolated view of an accumulo table.  When using the regular scanner it is possible
to see a non isolated view of a row.  For example if a mutation modifies three columns, it
is possible that you will only see two of those modifications.  With the isolated scanner
either all three of the changes are seen or none.  For an example of this try running the
<a href='apidocs/org/apache/accumulo/examples/simple/isolation/InterferenceTest.html'>InterferenceTest</a>
example.  
 
 <p>At this time there is no client side isolation support for the <a href='apidocs/org/apache/accumulo/core/client/BatchScanner.html'>BatchScanner</a>.
 You may consider using the <a href='apidocs/org/apache/accumulo/core/iterators/WholeRowIterator.html'>WholeRowIterator</a>
with the  <a href='apidocs/org/apache/accumulo/core/client/BatchScanner.html'>BatchScanner</a>
to achieve isolation though. This drawback of doing this is that entire rows are read into
memory on the server side.  If a row is too big, it may crash a tablet server.  The <a
href='apidocs/org/apache/accumulo/core/client/IsolatedScanner.html'>IsolatedScanner</a>
buffers rows on the client side so a large row will not crash a tablet server.
 

Modified: incubator/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex (original)
+++ incubator/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Thu Jan
12 18:51:54 2012
@@ -119,7 +119,7 @@ change to an existing constraint class r
 
 An example of constraints can be found in\\
 \texttt{accumulo/docs/examples/README.constraints} with corresponding code under\\
-\texttt{accumulo/src/examples/main/java/accumulo/examples/constraints} .
+\texttt{accumulo/src/examples/simple/main/java/accumulo/examples/simple/constraints} .
 
 \section{Bloom Filters}
 As mutations are applied to an Accumulo table, several files are created per tablet. If
@@ -353,7 +353,7 @@ Additional Combiners can be added by cre
 class to Accumulo's lib/ext directory.
 
 An example of a Combiner can be found under\\
-accumulo/src/examples/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java
+accumulo/src/examples/simple/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
 
 
 \section{Block Cache}

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 18:51:54 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230280,1230311
+/incubator/accumulo/branches/1.4/src/core:1201902-1230674

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 18:51:54 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
 /incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1229205,1229220,1229248,1229357,1229424,1229427-1229428,1229588,1229651,1229699,1229738,1229758,1230006,1230184-1230186,1230280,1230311
+/incubator/accumulo/branches/1.4/src/server:1201902-1230674

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1230699&r1=1230698&r2=1230699&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
Thu Jan 12 18:51:54 2012
@@ -283,7 +283,6 @@ public class TestIngest {
       if (ingestArgs.outputToRFile) {
         Configuration conf = CachedConfiguration.getInstance();
         FileSystem fs = FileSystem.get(conf);
-        System.out.println(ingestArgs.outputFile);
         writer = FileOperations.getInstance().openWriter(ingestArgs.outputFile + "." + RFile.EXTENSION,
fs, conf,
             AccumuloConfiguration.getDefaultConfiguration());
         writer.startDefaultLocalityGroup();



Mime
View raw message