accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1451008 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/test/java/org/apache/accumulo/core/cli/ docs/src/user_manual/chapters/ examples/ examples/simple/src/test/java/org/apache/accumulo/e...
Date Wed, 27 Feb 2013 22:33:37 GMT
Author: kturner
Date: Wed Feb 27 22:33:37 2013
New Revision: 1451008

merging changes from 1.5

ACCUMULO-1118 - updating cli's default password to be empty, and some of the tests appropriately
ACCUMULO-1102 - Improve documentation
ACCUMULO-858: Parse Exception During Run of Maven Changes Report Plugin
ACCUMULO-1120 - credentials now getting properly read

    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/   (props changed)
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
  Merged /accumulo/branches/1.5:r1450418,1450441-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Propchange: accumulo/trunk/assemble/
  Merged /accumulo/branches/1.5/assemble:r1450274-1450392,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Propchange: accumulo/trunk/core/
  Merged /accumulo/branches/1.5/core:r1450274-1450392,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ Wed Feb
27 22:33:37 2013
@@ -104,7 +104,7 @@ public class ClientOpts extends Help {
   public String principal = System.getProperty("");
   @Parameter(names = "-p", converter = PasswordConverter.class, description = "Connection
-  public Password password = new Password("secret");
+  public Password password = null;
   @Parameter(names = "--password", converter = PasswordConverter.class, description = "Enter
the connection password", password = true)
   public Password securePassword = null;
@@ -112,7 +112,7 @@ public class ClientOpts extends Help {
   public SecurityToken getToken() {
     PasswordToken pt = new PasswordToken();
     if (securePassword == null) {
-      if (password.value == null)
+      if (password == null)
         return null;
       return pt.setPassword(password.value);

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/ (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/ Wed
Feb 27 22:33:37 2013
@@ -43,7 +43,7 @@ public class TestClientOpts {
     BatchScannerOpts bsOpts = new BatchScannerOpts();
     assertEquals(System.getProperty(""), args.principal);
-    assertEquals(new PasswordToken().setPassword("secret".getBytes()), args.getToken());
+    assertNull(args.getToken());
     assertEquals(new Long(cfg.getMaxLatency(TimeUnit.MILLISECONDS)), bwOpts.batchLatency);
     assertEquals(new Long(cfg.getTimeout(TimeUnit.MILLISECONDS)), bwOpts.batchTimeout);
     assertEquals(new Long(cfg.getMaxMemory()), bwOpts.batchMemory);

Modified: accumulo/trunk/docs/src/user_manual/chapters/clients.tex
--- accumulo/trunk/docs/src/user_manual/chapters/clients.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/clients.tex Wed Feb 27 22:33:37 2013
@@ -27,7 +27,7 @@ of the different ways to execute client 
   \item using the tool script 
-Inorder to run client code written to run against Accumulo, you will need to
+In order to run client code written to run against Accumulo, you will need to
 include the jars that Accumulo depends on in your classpath.  Accumulo client
 code depends on Hadoop and Zookeeper.  For Hadoop add the hadoop core jar, all
 of the jars in the Hadoop lib directory, and the conf directory to the
@@ -123,7 +123,7 @@ to efficiently return ranges of consecut
-To retrieve data, Clients use a Scanner, which provides acts like an Iterator over
+To retrieve data, Clients use a Scanner, which acts like an Iterator over
 keys and values. Scanners can be configured to start and stop at particular keys, and
 to return a subset of the columns available.

Modified: accumulo/trunk/docs/src/user_manual/chapters/design.tex
--- accumulo/trunk/docs/src/user_manual/chapters/design.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/design.tex Wed Feb 27 22:33:37 2013
@@ -133,7 +133,7 @@ delete entry when the new file is create
 If a TabletServer fails, the Master detects it and automatically reassigns the tablets
 assigned from the failed server to other servers. Any key-value pairs that were in
-memory at the time the TabletServer are automatically reapplied from the Write-Ahead
+memory at the time the TabletServer fails are automatically reapplied from the Write-Ahead
 Log to prevent any loss of data.
 The Master will coordinate the copying of write-ahead logs to HDFS so the logs

Modified: accumulo/trunk/docs/src/user_manual/chapters/shell.tex
--- accumulo/trunk/docs/src/user_manual/chapters/shell.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/shell.tex Wed Feb 27 22:33:37 2013
@@ -66,7 +66,7 @@ root@myinstance mytable> createtable tes
 root@myinstance testtable>
-root@myinstance junk> deletetable testtable
+root@myinstance testtable> deletetable testtable

Modified: accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex
--- accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_configuration.tex Wed Feb 27 22:33:37
@@ -21,13 +21,13 @@ behavior of Accumulo as well as improve 
 These include locality groups, constraints, bloom filters, iterators, and block cache.
 \section{Locality Groups}
-Accumulo supports storing of sets of column families separately on disk to allow
-clients to scan over columns that are frequently used together efficient and to avoid
-scanning over column families that are not requested. After a locality group is set
+Accumulo supports storing sets of column families separately on disk to allow
+clients to efficiently scan over columns that are frequently used together and to avoid
+scanning over column families that are not requested. After a locality group is set,
 Scanner and BatchScanner operations will automatically take advantage of them
 whenever the fetchColumnFamilies() method is used.
-By default tables place all column families into the same ``default" locality group.
+By default, tables place all column families into the same ``default'' locality group.
 Additional locality groups can be configured anytime via the shell or
 programmatically as follows:
@@ -38,10 +38,9 @@ programmatically as follows:
 usage: setgroups <group>=<col fam>{,<col fam>}{ <group>=<col fam>{,<col
 fam>}} [-?] -t <table>
-user@myinstance mytable> setgroups -t mytable group_one=colf1,colf2
+user@myinstance mytable> setgroups group_one=colf1,colf2 -t mytable
-user@myinstance mytable> getgroups -t mytable
+user@myinstance mytable> getgroups group_one=colf1,colf2 -t mytable
@@ -51,8 +50,7 @@ group_one=colf1,colf2
 Connector conn;
-HashMap<String,Set<Text>> localityGroups =
-    new HashMap<String, Set<Text>>();
+HashMap<String,Set<Text>> localityGroups = new HashMap<String, Set<Text>>();
 HashSet<Text> metadataColumns = new HashSet<Text>();
 metadataColumns.add(new Text("domain"));
@@ -470,7 +468,7 @@ compact tablets that overlap the given r
 \section{Pre-splitting tables}
-Accumulo will balance and distribute tables accross servers. Before a
+Accumulo will balance and distribute tables across servers. Before a
 table gets large, it will be maintained as a single tablet on a single
 server.  This limits the speed at which data can be added or queried
 to the speed of a single node. To improve performance when the a table
@@ -503,7 +501,7 @@ of data may change over time.  For examp
 information, and data is continually added and removed to maintain a
 window of current information, tablets for older rows may be empty.
-Accumulo supports tablet merging, which can be used to reduce delete
+Accumulo supports tablet merging, which can be used to reduce 
 the number of split points.  The following command will merge all rows
 from ``A'' to ``Z'' into a single tablet:
@@ -536,7 +534,7 @@ root@myinstance> merge -t myTable -s 100
 By default, small tablets will not be merged into tablets that are
 already larger than the given size.  This can leave isolated small
 tablets.  To force small tablets to be merged into larger tablets use
-the ``--force'' option:
+the ``--{}--force'' option:
@@ -562,7 +560,7 @@ Consider an indexing scheme that uses da
 For example ``20110823-15:20:25.013'' might be a row that specifies a
 date and time.  In some cases, we might like to delete rows based on
 this date, say to remove all the data older than the current year.
-Accumulo supports a delete range operation which can efficiently
+Accumulo supports a delete range operation which efficiently
 removes data between two rows.  For example:
@@ -582,7 +580,7 @@ root@myinstance> deleterange -t myTable 
 The shell will not allow you to delete an unbounded range (no start)
-unless you provide the ``--force'' option.
+unless you provide the ``--{}--force'' option.
 Range deletion is implemented using splits at the given start/end
 positions, and will affect the number of splits in the table.

Modified: accumulo/trunk/docs/src/user_manual/chapters/table_design.tex
--- accumulo/trunk/docs/src/user_manual/chapters/table_design.tex (original)
+++ accumulo/trunk/docs/src/user_manual/chapters/table_design.tex Wed Feb 27 22:33:37 2013
@@ -19,7 +19,7 @@
 \section{Basic Table}
 Since Accumulo tables are sorted by row ID, each table can be thought of as being
-indexed by the row ID. Lookups performed row ID can be executed quickly, by doing
+indexed by the row ID. Lookups performed by row ID can be executed quickly, by doing
 a binary search, first across the tablets, and then within a tablet. Clients should
 choose a row ID carefully in order to support their desired application. A simple rule
 is to select a unique identifier as the row ID for each entity to be stored and assign

Propchange: accumulo/trunk/examples/
  Merged /accumulo/branches/1.5/examples:r1450274-1450392,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Modified: accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/
--- accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/
+++ accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/
Wed Feb 27 22:33:37 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
 import junit.framework.TestCase;
 import org.apache.accumulo.core.cli.BatchWriterOpts;
+import org.apache.accumulo.core.cli.ClientOpts.Password;
 import org.apache.accumulo.core.cli.ScannerOpts;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -69,6 +70,7 @@ public class CountTest extends TestCase 
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.instance = "counttest";
     opts.tableName = "dirlisttable";
+    opts.password = new Password("secret");
     opts.mock = true;
     opts.password = new Opts.Password("");
     FileCount fc = new FileCount(opts, scanOpts, bwOpts);

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Modified: accumulo/trunk/pom.xml
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Wed Feb 27 22:33:37 2013
@@ -383,6 +383,7 @@
+          <useJql>true</useJql>

Propchange: accumulo/trunk/server/
  Merged /accumulo/branches/1.5/server:r1450274-1450392,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

Propchange: accumulo/trunk/src/
  Merged /accumulo/branches/1.5/src:r1450274-1450392,1450394-1450396,1450398-1450399,1450401-1450816,1450818-1450849,1450851-1450928,1450930-1450984,1450986-1450992,1450994-1451002

View raw message