svn commit: r1305525 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/data/Key.java docs/src/user_manual/chapters/design.tex server/

[ec...@apache.org]

Author: ecn
Date: Mon Mar 26 20:00:13 2012
New Revision: 1305525

URL: http://svn.apache.org/viewvc?rev=1305525&view=rev
Log:
ACCUMULO-491 merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java
    accumulo/trunk/docs/src/user_manual/chapters/design.tex
    accumulo/trunk/server/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1305435,1305460
  Merged /incubator/accumulo/branches/1.4:r1304002,1304027,1304092,1304443,1304577
  Merged /incubator/accumulo/branches/1.4/src:r1304027,1304092
  Merged /accumulo/branches/1.4:r1305403,1305435,1305460

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4/core:r1304002,1304027,1304092,1304443,1304577
  Merged /incubator/accumulo/branches/1.4/src/core:r1304027,1304092
  Merged /accumulo/branches/1.4/core:r1305403,1305435,1305460
  Merged /accumulo/branches/1.4/src/core:r1305435,1305460
  Merged /incubator/accumulo/branches/1.4.0rc/src/core:r1304025

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java?rev=1305525&r1=1305524&r2=1305525&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Key.java Mon Mar 26 20:00:13 2012
@@ -331,7 +331,7 @@ public class Key implements WritableComp
    * 
    * @param r
    *          row to compare to keys row
-   * @return same as {@link getRow()}.compareTo(r)
+   * @return same as {@link #getRow()}.compareTo(r)
    */
   
   public int compareRow(Text r) {

Modified: accumulo/trunk/docs/src/user_manual/chapters/design.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/design.tex?rev=1305525&r1=1305524&r2=1305525&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/design.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/design.tex Mon Mar 26 20:00:13 2012
@@ -52,10 +52,10 @@ servers, one Garbage Collector process, 
 \subsection{Tablet Server}
 
 The TabletServer manages some subset of all the tablets (partitions of tables). This includes receiving writes from clients, persisting writes to a
-write‐ahead log, sorting new key‐value pairs in memory, periodically
-flushing sorted key‐value pairs to new files in HDFS, and responding
-to reads from clients, forming a merge‐sorted view of all keys and
-values from all the files it has created and the sorted in‐memory
+write-ahead log, sorting new key-value pairs in memory, periodically
+flushing sorted key-value pairs to new files in HDFS, and responding
+to reads from clients, forming a merge-sorted view of all keys and
+values from all the files it has created and the sorted in-memory
 store.
 
 TabletServers also perform recovery of a tablet
@@ -107,18 +107,18 @@ ingest and query load is balanced across
 \section{Tablet Service}
 
 
-When a write arrives at a TabletServer it is written to a Write‐Ahead Log and
+When a write arrives at a TabletServer it is written to a Write-Ahead Log and
 then inserted into a sorted data structure in memory called a MemTable. When the
 MemTable reaches a certain size the TabletServer writes out the sorted key-value
 pairs to a file in HDFS called Indexed Sequential Access Method (ISAM)
 file. This process is called a minor compaction.  A new MemTable is then created
-and the fact of the compaction is recorded in the Write‐Ahead Log.
+and the fact of the compaction is recorded in the Write-Ahead Log.
 
 When a request to read data arrives at a TabletServer, the TabletServer does a
 binary search across the MemTable as well as the in-memory indexes associated
 with each ISAM file to find the relevant values. If clients are performing a
-scan, several key‐value pairs are returned to the client in order from the
-MemTable and the set of ISAM files by performing a merge‐sort as they are read.
+scan, several key-value pairs are returned to the client in order from the
+MemTable and the set of ISAM files by performing a merge-sort as they are read.
 
 \section{Compactions}
 
@@ -126,7 +126,7 @@ In order to manage the number of files p
 performs Major Compactions of files within a tablet, in which some set of ISAM
 files are combined into one file. The previous files will eventually be removed
 by the Garbage Collector. This also provides an opportunity to permanently
-remove deleted key‐value pairs by omitting key‐value pairs suppressed by a
+remove deleted key-value pairs by omitting key-value pairs suppressed by a
 delete entry when the new file is created.
 
 \section{Fault-Tolerance}

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /incubator/accumulo/branches/1.4/server:r1304002,1304027,1304092,1304443,1304577
  Merged /accumulo/branches/1.4/server:r1305403,1305435,1305460
  Merged /incubator/accumulo/branches/1.4.0rc/src/server:r1304025
  Merged /incubator/accumulo/branches/1.4/src/server:r1304027,1304092
  Merged /accumulo/branches/1.4/src/server:r1305435,1305460