You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/18 00:07:03 UTC
svn commit: r1469083 - in /accumulo/trunk: ./ assemble/ core/ docs/examples/
docs/src/user_manual/chapters/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Author: ecn
Date: Wed Apr 17 22:07:02 2013
New Revision: 1469083
URL: http://svn.apache.org/r1469083
Log:
ACCUMULO-1187 update constraint info, remove reference to Loggers
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/docs/examples/README.constraints
accumulo/trunk/docs/src/user_manual/chapters/design.tex
accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
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/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1469078,1469080
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1469078,1469080
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1469078,1469080
Modified: accumulo/trunk/docs/examples/README.constraints
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.constraints?rev=1469083&r1=1469082&r2=1469083&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.constraints (original)
+++ accumulo/trunk/docs/examples/README.constraints Wed Apr 17 22:07:02 2013
@@ -38,8 +38,8 @@ 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.simple.constraints.NumericValueConstraint
- username@instance testConstraints> config -t testConstraints -s table.constraint.2=org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint
+ username@instance testConstraints> constraint -a org.apache.accumulo.examples.simple.constraints.NumericValueConstraint
+ username@instance testConstraints> constraint -a 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:
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=1469083&r1=1469082&r2=1469083&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/design.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/design.tex Wed Apr 17 22:07:02 2013
@@ -46,8 +46,8 @@ machines.
\section{Components}
-An instance of Accumulo includes many TabletServers, write-ahead Logger
-servers, one Garbage Collector process, one Master server and many Clients.
+An instance of Accumulo includes many TabletServers, one Garbage Collector process,
+one Master server and many Clients.
\subsection{Tablet Server}
@@ -72,11 +72,14 @@ delete them.
The Accumulo Master is responsible for detecting and responding to TabletServer
failure. It tries to balance the load across TabletServer by assigning tablets carefully
-and instructing TabletServers to migrate tablets when necessary. The Master ensures all
+and instructing TabletServers to unload tablets when necessary. The Master ensures all
tablets are assigned to one TabletServer each, and handles table creation, alteration,
and deletion requests from clients. The Master also coordinates startup, graceful
shutdown and recovery of changes in write-ahead logs when Tablet servers fail.
+Multiple masters may be run. The masters will choose among themselves a single master,
+and the others will become backups if the master should fail.
+
\subsection{Client}
Accumulo includes a client library that is linked to every application. The client
@@ -149,8 +152,7 @@ Log to prevent any loss of data.
The Master will coordinate the copying of write-ahead logs to HDFS so the logs
are available to all tablet servers. To make recovery efficient, the updates
-within a log are grouped by tablet. The sorting process can be performed by
-Hadoops MapReduce or the Logger server. TabletServers can quickly apply the
+within a log are grouped by tablet. TabletServers can quickly apply the
mutations from the sorted logs that are destined for the tablets they have now
been assigned.
Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex?rev=1469083&r1=1469082&r2=1469083&view=diff
==============================================================================
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Wed Apr 17 22:07:02 2013
@@ -40,7 +40,7 @@ fam>}} [-?] -t <table>
user@myinstance mytable> setgroups group_one=colf1,colf2 -t mytable
-user@myinstance mytable> getgroups group_one=colf1,colf2 -t mytable
+user@myinstance mytable> getgroups -t mytable
\end{verbatim}
\normalsize
@@ -94,15 +94,10 @@ Constraints can be enabled by setting a
\small
\begin{verbatim}
-user@myinstance mytable> config -t mytable -s table.constraint.1=com.test.ExampleConstraint
-user@myinstance mytable> config -t mytable -s table.constraint.2=com.test.AnotherConstraint
-user@myinstance mytable> config -t mytable -f constraint
----------+--------------------------------+----------------------------
-SCOPE | NAME | VALUE
----------+--------------------------------+----------------------------
-table | table.constraint.1............ | com.test.ExampleConstraint
-table | table.constraint.2............ | com.test.AnotherConstraint
----------+--------------------------------+----------------------------
+user@myinstance mytable> constraint -t mytable -a com.test.ExampleConstraint com.test.AnotherConstraint
+user@myinstance mytable> constraint -l
+com.test.ExampleConstraint=1
+com.test.AnotherConstraint=2
\end{verbatim}
\normalsize
@@ -219,14 +214,11 @@ table as follows:
\small
\begin{verbatim}
-user@myinstance mytable> config -t mytable -s
-table.iterator.scan.vers.opt.maxVersions=3
+user@myinstance mytable> config -t mytable -s table.iterator.scan.vers.opt.maxVersions=3
-user@myinstance mytable> config -t mytable -s
-table.iterator.minc.vers.opt.maxVersions=3
+user@myinstance mytable> config -t mytable -s table.iterator.minc.vers.opt.maxVersions=3
-user@myinstance mytable> config -t mytable -s
-table.iterator.majc.vers.opt.maxVersions=3
+user@myinstance mytable> config -t mytable -s table.iterator.majc.vers.opt.maxVersions=3
\end{verbatim}
\normalsize
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1469078,1469080
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:r1469078,1469080
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:r1469078,1469080
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1469078,1469080
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1469078,1469080
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1469078,1469080