You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2011/12/13 19:30:35 UTC

svn commit: r1213833 - in /incubator/accumulo/site/trunk/content/accumulo: user_manual_1.3-incubating/ user_manual_1.4-incubating/

Author: billie
Date: Tue Dec 13 18:30:35 2011
New Revision: 1213833

URL: http://svn.apache.org/viewvc?rev=1213833&view=rev
Log:
ACCUMULO-70 updated web manuals

Modified:
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/Administration.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img1.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img2.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img3.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img4.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img5.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Administration.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Analytics.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Contents.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/High_Speed_Ingest.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Security.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Shell_Commands.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Table_Configuration.mdtext
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img1.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img4.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img5.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img6.png
    incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img7.png

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/Administration.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/Administration.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/Administration.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/Administration.mdtext Tue Dec 13 18:30:35 2011
@@ -136,7 +136,7 @@ The initialization script will prompt yo
 
 Make sure Hadoop is configured on all of the machines in the cluster, including access to a shared HDFS instance. Make sure HDFS and ZooKeeper are running. Make sure ZooKeeper is configured and running on at least one machine in the cluster. Start Accumulo using the bin/start-all.sh script. 
 
-To verify that Accumulo is running, check the Status page as described under _Monitoring_. In addition, the Shell can provide some information about the status of tables via reading the !METADATA table. 
+To verify that Accumulo is running, check the Status page as described under *Monitoring*. In addition, the Shell can provide some information about the status of tables via reading the !METADATA table. 
 
 ### <a id=Stopping_Accumulo></a> Stopping Accumulo
 

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img1.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img1.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img2.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img2.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img3.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img3.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img4.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img4.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img5.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.3-incubating/img5.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Administration.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Administration.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Administration.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Administration.mdtext Tue Dec 13 18:30:35 2011
@@ -67,7 +67,7 @@ Accumulo is configured by editing severa
 
 ### <a id=Edit_conf/accumulo-env.sh></a> Edit conf/accumulo-env.sh
 
-Accumulo needs to know where to find the software it depends on. Edit accumuloenv. sh and specify the following: 
+Accumulo needs to know where to find the software it depends on. Edit accumulo-env.sh and specify the following: 
 
 1. Enter the location of the installation directory of Accumulo for $ACCUMULO_HOME
 2. Enter your system's Java home for $JAVA_HOME

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Analytics.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Analytics.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Analytics.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Analytics.mdtext Tue Dec 13 18:30:35 2011
@@ -21,7 +21,7 @@ Notice:    Licensed to the Apache Softwa
 <a id=CHILD_LINKS></a>**Subsections**
 
 * [MapReduce][9]
-* [Aggregating Iterators][10]
+* [Combiners][10]
 * [Statistical Modeling][11]
 
 * * *
@@ -132,17 +132,17 @@ To use a regular expression to match row
 An example of using MapReduce with Accumulo can be found at   
 accumulo/docs/examples/README.mapred 
 
-## <a id=Aggregating_Iterators></a> Aggregating Iterators
+## <a id=Combiners></a> Combiners
 
-Many applications can benefit from the ability to aggregate values across common keys. This can be done via aggregating iterators and is similar to the Reduce step in MapReduce. This provides the ability to define online, incrementally updated analytics without the overhead or latency associated with batch-oriented MapReduce jobs. 
+Many applications can benefit from the ability to aggregate values across common keys. This can be done via Combiner iterators and is similar to the Reduce step in MapReduce. This provides the ability to define online, incrementally updated analytics without the overhead or latency associated with batch-oriented MapReduce jobs. 
 
-All that is needed to aggregate values of a table is to identify the fields over which values will be grouped, insert mutations with those fields as the key, and configure the table with an aggregating iterator that supports the summarization operation desired. 
+All that is needed to aggregate values of a table is to identify the fields over which values will be grouped, insert mutations with those fields as the key, and configure the table with a combining iterator that supports the summarizing operation desired. 
 
-The only restriction on an aggregating iterator is that the aggregator developer should not assume that all values for a given key have been seen, since new mutations can be inserted at anytime. This precludes using the total number of values in the aggregation such as when calculating an average, for example. 
+The only restriction on an combining iterator is that the combiner developer should not assume that all values for a given key have been seen, since new mutations can be inserted at anytime. This precludes using the total number of values in the aggregation such as when calculating an average, for example. 
 
 ### <a id=Feature_Vectors></a> Feature Vectors
 
-An interesting use of aggregating iterators within a Accumulo table is to store feature vectors for use in machine learning algorithms. For example, many algorithms such as k-means clustering, support vector machines, anomaly detection, etc. use the concept of a feature vector and the calculation of distance metrics to learn a particular model. The columns in a Accumulo table can be used to efficiently store sparse features and their weights to be incrementally updated via the use of an aggregating iterator. 
+An interesting use of combining iterators within a Accumulo table is to store feature vectors for use in machine learning algorithms. For example, many algorithms such as k-means clustering, support vector machines, anomaly detection, etc. use the concept of a feature vector and the calculation of distance metrics to learn a particular model. The columns in a Accumulo table can be used to efficiently store sparse features and their weights to be incrementally updated via the use of an combining iterator. 
 
 ## <a id=Statistical_Modeling></a> Statistical Modeling
 
@@ -159,6 +159,6 @@ Using Accumulo this way enables efficien
    [6]: High_Speed_Ingest.html
    [8]: Contents.html
    [9]: Analytics.html#MapReduce
-   [10]: Analytics.html#Aggregating_Iterators
+   [10]: Analytics.html#Combiners
    [11]: Analytics.html#Statistical_Modeling
 

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Contents.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Contents.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Contents.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Contents.mdtext Tue Dec 13 18:30:35 2011
@@ -80,7 +80,7 @@ Notice:    Licensed to the Apache Softwa
         * [Setting Iterators Programmatically][38]
         * [Versioning Iterators and Timestamps][39]
         * [Filters][40]
-        * [Aggregating Iterators][41]
+        * [Combiners][41]
 
     * [Block Cache][42]
     * [Compaction][43]
@@ -119,7 +119,7 @@ Notice:    Licensed to the Apache Softwa
         * [AccumuloInputFormat options][63]
         * [AccumuloOutputFormat options][64]
 
-    * [Aggregating Iterators][65]
+    * [Combiners][65]
 
         * [Feature Vectors][66]
 
@@ -207,7 +207,7 @@ Notice:    Licensed to the Apache Softwa
    [38]: Table_Configuration.html#Setting_Iterators_Programmatically
    [39]: Table_Configuration.html#Versioning_Iterators_and_Timestamps
    [40]: Table_Configuration.html#Filters
-   [41]: Table_Configuration.html#Aggregating_Iterators
+   [41]: Table_Configuration.html#Combiners
    [42]: Table_Configuration.html#Block_Cache
    [43]: Table_Configuration.html#Compaction
    [44]: Table_Configuration.html#Pre-splitting_tables
@@ -231,7 +231,7 @@ Notice:    Licensed to the Apache Softwa
    [62]: Analytics.html#Mapper_and_Reducer_classes
    [63]: Analytics.html#AccumuloInputFormat_options
    [64]: Analytics.html#AccumuloOutputFormat_options
-   [65]: Analytics.html#Aggregating_Iterators
+   [65]: Analytics.html#Combiners
    [66]: Analytics.html#Feature_Vectors
    [67]: Analytics.html#Statistical_Modeling
    [68]: Security.html

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/High_Speed_Ingest.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/High_Speed_Ingest.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/High_Speed_Ingest.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/High_Speed_Ingest.mdtext Tue Dec 13 18:30:35 2011
@@ -82,7 +82,7 @@ accumulo/docs/examples/README.bulkIngest
 
 Logical time is important for bulk imported data, for which the client code may be choosing a timestamp. At bulk import time, the user can choose to enable logical time for the set of files being imported. When its enabled, Accumulo uses a specialized system iterator to lazily set times in a bulk imported file. This mechanism guarantees that times set by unsynchronized multi-node applications (such as those running on MapReduce) will maintain some semblance of causal ordering. This mitigates the problem of the time being wrong on the system that created the file for bulk import. These times are not set when the file is imported, but whenever it is read by scans or compactions. At import, a time is obtained and always used by the specialized system iterator to set that time. 
 
-The timestamp asigned by accumulo will be the same for every key in the file. This could cause problems if the file contains multiple keys that are identical except for the timestamp. In this case, the sort order of the keys will be undefined. This could occur if an insert and an update were in the same bulk import file. 
+The timestamp assigned by accumulo will be the same for every key in the file. This could cause problems if the file contains multiple keys that are identical except for the timestamp. In this case, the sort order of the keys will be undefined. This could occur if an insert and an update were in the same bulk import file. 
 
 ## <a id=MapReduce_Ingest></a> MapReduce Ingest
 

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Security.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Security.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Security.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Security.mdtext Tue Dec 13 18:30:35 2011
@@ -105,11 +105,11 @@ To prevent users from writing data they 
     config -t table -s table.constraint.1=org.apache.accumulo.core.security.VisibilityConstraint
     
 
-Any user with the alter table permission can add or remove this constraint. This constraint is not applied to bulk imported data, if this a concern then disable the bulk import pesmission. 
+Any user with the alter table permission can add or remove this constraint. This constraint is not applied to bulk imported data, if this a concern then disable the bulk import permission. 
 
 ## <a id=Secure_Authorizations_Handling></a> Secure Authorizations Handling
 
-For applications serving many users, it is not expected that a accumulo user will be created for each application user. In this case a accumulo user with all authorizations needed by any of the applications users must be created. To service queries, the application should create a scanner with the application users authorizations. These authorizations could be obtined from a trusted 3rd party. 
+For applications serving many users, it is not expected that a accumulo user will be created for each application user. In this case a accumulo user with all authorizations needed by any of the applications users must be created. To service queries, the application should create a scanner with the application users authorizations. These authorizations could be obtained from a trusted 3rd party. 
 
 Often production systems will integrate with Public-Key Infrastructure (PKI) and designate client code within the query layer to negotiate with PKI servers in order to authenticate users and retrieve their authorization tokens (credentials). This requires users to specify only the information necessary to authenticate themselves to the system. Once user identity is established, their credentials can be accessed by the client code and passed to Accumulo outside of the reach of the user. 
 

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Shell_Commands.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Shell_Commands.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Shell_Commands.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Shell_Commands.mdtext Tue Dec 13 18:30:35 2011
@@ -253,19 +253,23 @@ Notice:    Licensed to the Apache Softwa
   
     usage: egrep <regex> <regex> [-?] [-b <start-row>] [-c   
            <<columnfamily>[:<columnqualifier>]>] [-e <end-row>] [-f <int>]   
-           [-np] [-s <comma-separated-authorizations>] [-st] [-t <arg>]   
+           [-np] [-nt <arg>] [-s <comma-separated-authorizations>] [-st] [-t   
+           <table>]   
     description: searches each row, column family, column qualifier and value, in   
-           parallel, on the server side (using a java regular expression)   
+           parallel, on the server side (using a java Matcher, so put .*   
+           before and after your term if you're not matching the whole   
+           element)   
       -?,-help  display this help   
       -b,-begin-row <start-row>  begin row (inclusive)   
       -c,-columns <<columnfamily>[:<columnqualifier>]>  comma-separated columns   
       -e,-end-row <end-row>  end row (inclusive)   
       -f,-show few <int>  Only shows certain amount of characters   
       -np,-no-pagination  disables pagination of output   
+      -nt,-num-threads <arg>  num threads   
       -s,-scan-authorizations <comma-separated-authorizations>  scan authorizations   
            (all user auths are used if this argument is not specified)   
       -st,-show-timestamps  enables displaying timestamps   
-      -t,-num-threads <arg>  num threads   
+      -t,-tableName <table>  table to grep through   
   
 **execfile**   
   
@@ -339,7 +343,8 @@ Notice:    Licensed to the Apache Softwa
   
     usage: grep <term> <term> [-?] [-b <start-row>] [-c   
            <<columnfamily>[:<columnqualifier>]>] [-e <end-row>] [-f <int>]   
-           [-np] [-s <comma-separated-authorizations>] [-st] [-t <arg>]   
+           [-np] [-nt <arg>] [-s <comma-separated-authorizations>] [-st] [-t   
+           <table>]   
     description: searches each row, column family, column qualifier and value in a   
            table for a substring (not a regular expression), in parallel, on   
            the server side   
@@ -349,10 +354,11 @@ Notice:    Licensed to the Apache Softwa
       -e,-end-row <end-row>  end row (inclusive)   
       -f,-show few <int>  Only shows certain amount of characters   
       -np,-no-pagination  disables pagination of output   
+      -nt,-num-threads <arg>  num threads   
       -s,-scan-authorizations <comma-separated-authorizations>  scan authorizations   
            (all user auths are used if this argument is not specified)   
       -st,-show-timestamps  enables displaying timestamps   
-      -t,-num-threads <arg>  num threads   
+      -t,-tableName <table>  table to grep through   
   
 **help**   
   
@@ -395,7 +401,7 @@ Notice:    Licensed to the Apache Softwa
   
     usage: listscans [-?] [-np] [-ts <tablet server>]   
     description: list what scans are currently running in accumulo. See the   
-           org.apache.accumulo.core.client.admin.ActiveScan javadoc for more information   
+           accumulo.core.client.admin.ActiveScan javadoc for more information   
            about columns.   
       -?,-help  display this help   
       -np,-no-pagination  disables pagination of output   
@@ -545,8 +551,8 @@ Notice:    Licensed to the Apache Softwa
   
 **setiter**   
   
-    usage: setiter [-?] -ageoff | -agg | -class <name> | -nolabel | -regex | -vers   
-           [-majc] [-minc] [-n <itername>]  -p <pri>  [-scan] [-t <table>]   
+    usage: setiter [-?] -ageoff | -agg | -class <name> | -regex | -reqvis | -vers   
+           [-majc] [-minc] [-n <itername>] -p <pri> [-scan] [-t <table>]   
     description: sets a table-specific iterator   
       -?,-help  display this help   
       -ageoff,-ageoff  an aging off type   
@@ -555,26 +561,26 @@ Notice:    Licensed to the Apache Softwa
       -majc,-major-compaction  applied at major compaction   
       -minc,-minor-compaction  applied at minor compaction   
       -n,-name <itername> iterator to set   
-      -nolabel,-no-label  a no-labeling type   
       -p,-priority <pri>  the order in which the iterator is applied   
       -regex,-regular-expression  a regex matching type   
+      -reqvis,-require-visibility a type that omits entries with empty visibilities   
       -scan,-scan-time  applied at scan time   
       -t,-table <table>  tableName   
       -vers,-version  a versioning type   
   
 **setscaniter**   
   
-    usage: setscaniter [-?] -ageoff | -agg | -class <name> | -nolabel | -regex |   
-           -vers  [-n <itername>]  -p <pri> [-t <table>]   
+    usage: setscaniter [-?] -ageoff | -agg | -class <name> | -regex | -reqvis | -vers   
+            [-n <itername>] -p <pri>  [-t <table>]   
     description: sets a table-specific scan iterator for this shell session   
       -?,-help  display this help   
       -ageoff,-ageoff  an aging off type   
       -agg,-aggregator  an aggregating type   
       -class,-class-name <name>  a java class type   
       -n,-name <itername> iterator to set   
-      -nolabel,-no-label  a no-labeling type   
       -p,-priority <pri>  the order in which the iterator is applied   
       -regex,-regular-expression  a regex matching type   
+      -reqvis,-require-visibility a type that omits entries with empty visibilities   
       -t,-table <table>  tableName   
       -vers,-version  a versioning type   
   

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Table_Configuration.mdtext
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Table_Configuration.mdtext?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
--- incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Table_Configuration.mdtext (original)
+++ incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/Table_Configuration.mdtext Tue Dec 13 18:30:35 2011
@@ -133,9 +133,9 @@ Iterators provide a modular mechanism fo
 ### <a id=Setting_Iterators_via_the_Shell></a> Setting Iterators via the Shell
     
     
-    usage: setiter [-?] -agg | -class <name> | -filter | -nolabel | 
-    -regex | -vers [-majc] [-minc] [-n <itername>] -p <pri> [-scan] 
-    [-t <table>]
+    usage: setiter [-?] -ageoff | -agg | -class <name> | -regex | 
+    -reqvis | -vers   [-majc] [-minc] [-n <itername>] -p <pri>   
+    [-scan] [-t <table>]
     
     user@myinstance mytable> setiter -t mytable -scan -p 10 -n myiter
     
@@ -239,11 +239,11 @@ To see the iterator settings for a table
     ---------+------------------------------------------+------------------
     
 
-### <a id=Aggregating_Iterators></a> Aggregating Iterators
+### <a id=Combiners></a> Combiners
 
-Accumulo allows aggregating iterators to be configured on tables and column families. When an aggregating iterator is set, the iterator is applied across the values associated with any keys that share rowID, column family, and column qualifier. This is similar to the reduce step in MapReduce, which applied some function to all the values associated with a particular key. 
+Accumulo allows Combiners to be configured on tables and column families. When a Combiner is set it is applied across the values associated with any keys that share rowID, column family, and column qualifier. This is similar to the reduce step in MapReduce, which applied some function to all the values associated with a particular key. 
 
-For example, if an aggregating iterator were configured on a table and the following mutations were inserted: 
+For example, if a summing combiner were configured on a table and the following mutations were inserted: 
     
     
     Row     Family Qualifier Timestamp  Value
@@ -257,36 +257,37 @@ The table would reflect only one aggrega
     rowID1  colfA  colqA     -          2
     
 
-Aggregating iterators can be enabled for a table as follows: 
+Combiners can be enabled for a table using the setiter command in the shell. Below is an example. 
     
     
-    user@myinstance> createtable perDayCounts -a
-    day=org.apache.accumulo.core.iterators.aggregation.StringSummation
+    root@a14 perDayCounts> setiter -t perDayCounts -p 10 -scan -minc -majc -n daycount 
+                           -class org.apache.accumulo.core.iterators.user.SummingCombiner
+    TypedValueCombiner can interpret Values as a variety of number encodings 
+      (VLong, Long, or String) before combining
+    ----------> set SummingCombiner parameter columns, 
+                <col fam>[:<col qual>]{,<col fam>[:<col qual>]} : day
+    ----------> set SummingCombiner parameter type, <VARNUM|LONG|STRING>: STRING
     
-    user@myinstance perDayCounts> insert row1 day 20080101 1
-    user@myinstance perDayCounts> insert row1 day 20080101 1
-    user@myinstance perDayCounts> insert row1 day 20080103 1
-    user@myinstance perDayCounts> insert row2 day 20080101 1
-    user@myinstance perDayCounts> insert row3 day 20080101 1
+    root@a14 perDayCounts> insert foo day 20080101 1
+    root@a14 perDayCounts> insert foo day 20080101 1
+    root@a14 perDayCounts> insert foo day 20080103 1
+    root@a14 perDayCounts> insert bar day 20080101 1
+    root@a14 perDayCounts> insert bar day 20080101 1
     
-    user@myinstance perDayCounts> scan
-    row1 day:20080101 [] 2
-    row1 day:20080103 [] 1
-    row2 day:20080101 [] 2
+    root@a14 perDayCounts> scan
+    bar day:20080101 []    2
+    foo day:20080101 []    2
+    foo day:20080103 []    1
     
 
-Accumulo includes the following aggregators: 
+Accumulo includes some useful Combiners out of the box. To find these look in the   
+**org.apache.accumulo.core.iterators.user** package. 
 
-* **LongSummation**: expects values of type long and adds them. 
-* **StringSummation**: expects numbers represented as strings and adds them. 
-* **StringMax**: expects numbers as strings and retains the maximum number inserted. 
-* **StringMin**: expects numbers as strings and retains the minimum number inserted. 
+Additional Combiners can be added by creating a Java class that extends   
+**org.apache.accumulo.core.iterators.Combiner** and adding a jar containing that class to Accumulo's lib/ext directory. 
 
-Additional Aggregators can be added by creating a Java class that implements   
-**org.apache.accumulo.core.iterators.aggregation.Aggregator** and adding a jar containing that class to Accumulo's lib directory. 
-
-An example of an aggregator can be found under   
-accumulo/src/examples/main/java/org/apache/accumulo/examples/aggregation/SortedSetAggregator.java 
+An example of a Combiner can be found under   
+accumulo/src/examples/main/java/org/apache/accumulo/examples/combiner/StatsCombiner.java 
 
 ## <a id=Block_Cache></a> Block Cache
 

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img1.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img1.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img4.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img4.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img5.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img5.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img6.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img6.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img7.png
URL: http://svn.apache.org/viewvc/incubator/accumulo/site/trunk/content/accumulo/user_manual_1.4-incubating/img7.png?rev=1213833&r1=1213832&r2=1213833&view=diff
==============================================================================
Binary files - no diff available.