incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1239410 - in /incubator/accumulo/trunk: ./ docs/examples/ docs/src/user_manual/chapters/ src/core/ src/core/src/main/java/org/apache/accumulo/core/client/impl/ src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworl...
Date Wed, 01 Feb 2012 23:48:16 GMT
Author: kturner
Date: Wed Feb  1 23:48:16 2012
New Revision: 1239410

URL: http://svn.apache.org/viewvc?rev=1239410&view=rev
Log:
ACCUMULO-275 ACCUMULO-277 ACCUMULO-278 ACCUMULO-340 ACCUMULO-265 ACCUMULO-248 ACCUMULO-344
merged from 1.4

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/docs/examples/README.combiner
    incubator/accumulo/trunk/docs/examples/README.filter
    incubator/accumulo/trunk/docs/examples/README.helloworld
    incubator/accumulo/trunk/docs/examples/README.mapred
    incubator/accumulo/trunk/docs/src/user_manual/chapters/shell.tex
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
    incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
    incubator/accumulo/trunk/src/server/   (props changed)

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 23:48:16 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,1230736,1231043,1236873
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1238785
+/incubator/accumulo/branches/1.4:1201902-1239409

Modified: incubator/accumulo/trunk/docs/examples/README.combiner
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.combiner?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.combiner (original)
+++ incubator/accumulo/trunk/docs/examples/README.combiner Wed Feb  1 23:48:16 2012
@@ -34,10 +34,12 @@ tar distribution.
     username@instance> createtable runners
     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 all, set to true to apply Combiner to every
column, otherwise leave blank. if true, columns option will be ignored.: 
     ----------> 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.simple.combiner.StatsCombiner
+    username@instance runners> setiter -t runners -p 11 -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 all, set to true to apply Combiner to every
column, otherwise leave blank. if true, columns option will be ignored.: 
     ----------> 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
     username@instance runners> insert 123456 name first Joe

Modified: incubator/accumulo/trunk/docs/examples/README.filter
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.filter?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.filter (original)
+++ incubator/accumulo/trunk/docs/examples/README.filter Wed Feb  1 23:48:16 2012
@@ -19,7 +19,7 @@ Notice:    Licensed to the Apache Softwa
 This is a simple filter example.  It uses the AgeOffFilter that is provided as 
 part of the core package org.apache.accumulo.core.iterators.user.  Filters are 
 iterators that select desired key/value pairs (or weed out undesired ones).  
-Filters extend the org.apache.accumulo.core.iterators.iterators.Filter class 
+Filters extend the org.apache.accumulo.core.iterators.Filter class 
 and must implement a method accept(Key k, Value v).  This method returns true 
 if the key/value pair are to be delivered and false if they are to be ignored.
 Filter takes a "negate" parameter which defaults to false.  If set to true, the

Modified: incubator/accumulo/trunk/docs/examples/README.helloworld
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/examples/README.helloworld?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.helloworld (original)
+++ incubator/accumulo/trunk/docs/examples/README.helloworld Wed Feb  1 23:48:16 2012
@@ -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.simple.helloworld.InsertWithBatchWriter
instance zookeepers hellotable username password
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.InsertWithBatchWriter
instance zookeepers username password hellotable 
 
 Alternatively, the same data can be inserted using MapReduce writers:
 
-    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.InsertWithOutputFormat
instance zookeepers hellotable username password
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.InsertWithOutputFormat
instance zookeepers username password hellotable 
 
 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.simple.helloworld.ReadData instance zookeepers
hellotable username password row_0 row_1001
+    $ ./bin/accumulo org.apache.accumulo.examples.simple.helloworld.ReadData instance zookeepers
username password hellotable 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=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/examples/README.mapred (original)
+++ incubator/accumulo/trunk/docs/examples/README.mapred Wed Feb  1 23:48:16 2012
@@ -18,7 +18,7 @@ Notice:    Licensed to the Apache Softwa
 
 This example uses mapreduce and accumulo to compute word counts for a set of
 documents.  This is accomplished using a map-only mapreduce job and a
-accumulo table with aggregators.
+accumulo table with combiners.
 
 To run this example you will need a directory in HDFS containing text files.
 The accumulo readme will be used to show how to run this example.
@@ -28,7 +28,7 @@ The accumulo readme will be used to show
     Found 1 items
     -rw-r--r--   2 username supergroup       9359 2009-07-15 17:54 /user/username/wc/Accumulo.README
 
-The first part of running this example is to create a table with aggregation
+The first part of running this example is to create a table with a combiner
 for the column family count.
 
     $ ./bin/accumulo shell -u username -p password
@@ -39,7 +39,13 @@ for the column family count.
     - 
     - type 'help' for a list of available commands
     - 
-    username@instance> createtable wordCount -a count=org.apache.accumulo.core.iterators.aggregation.StringSummation

+    username@instance> createtable wordCount
+    username@instance wordCount> setiter -class org.apache.accumulo.core.iterators.user.SummingCombiner
-p 10 -t wordCount -majc -minc -scan
+    SummingCombiner interprets Values as Longs and adds them together.  A variety of encodings
(variable length, fixed length, or string) are available
+    ----------> set SummingCombiner parameter all, set to true to apply Combiner to every
column, otherwise leave blank. if true, columns option will be ignored.: false
+    ----------> set SummingCombiner parameter columns, <col fam>[:<col qual>]{,<col
fam>[:<col qual>]} escape non-alphanum chars using %<hex>.: count
+    ----------> set SummingCombiner parameter lossy, if true, failed decodes are ignored.
Otherwise combiner will error on failed decodes (default false): <TRUE|FALSE>: false

+    ----------> set SummingCombiner parameter type, <VARLEN|FIXEDLEN|STRING|fullClassName>:
STRING
     username@instance wordCount> quit
 
 After creating the table, run the word count map reduce job.

Modified: incubator/accumulo/trunk/docs/src/user_manual/chapters/shell.tex
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/docs/src/user_manual/chapters/shell.tex?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/docs/src/user_manual/chapters/shell.tex (original)
+++ incubator/accumulo/trunk/docs/src/user_manual/chapters/shell.tex Wed Feb  1 23:48:16 2012
@@ -14,10 +14,10 @@
 % See the License for the specific language governing permissions and
 % limitations under the License.
 
-\chapter{Accumulo Shell}
+\chapter{Accumulo Shell} 
 Accumulo provides a simple shell that can be used to examine the contents and
-configuration settings of tables, apply individual mutations, and change
-configuration settings.
+configuration settings of tables, insert/update/delete values, and change
+configuration settings.  
 
 The shell can be started by the following command:
 
@@ -88,6 +88,9 @@ row1 colf:colq [] value1
 \end{verbatim}
 \normalsize
 
+The value in brackets "[]" would be the visibility labels.  Since none were used, this is
empty for this row.
+You can use the "-t" option to scan to see the timestamp for the cell, too.
+
 \section{Table Maintenance}
 
 The \textbf{compact} command instructs Accumulo to schedule a compaction of the table during
which

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 23:48:16 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-1238753
+/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.4/src/core:1201902-1239409

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
Wed Feb  1 23:48:16 2012
@@ -29,9 +29,9 @@ import org.apache.accumulo.core.conf.Pro
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.ServerServices;
+import org.apache.accumulo.core.util.ServerServices.Service;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.core.util.ServerServices.Service;
 import org.apache.accumulo.core.zookeeper.ZooCache;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.log4j.Logger;
@@ -109,6 +109,8 @@ public class ServerClient {
     }
   }
   
+  static volatile boolean warnedAboutTServersBeingDown = false;
+
   public static ClientService.Iface getConnection(Instance instance) throws TTransportException
{
     ArgumentChecker.notNull(instance);
     // create list of servers
@@ -131,10 +133,19 @@ public class ServerClient {
       TTransport socket = ThriftTransportPool.getInstance().getAnyTransport(servers);
       ClientService.Iface client = ThriftUtil.createClient(new ClientService.Client.Factory(),
socket);
       opened = true;
+      warnedAboutTServersBeingDown = false;
       return client;
     } finally {
-      if (!opened)
-        log.warn("Failed to find an available server in the list of servers: " + servers);
+      if (!opened) {
+        if (!warnedAboutTServersBeingDown) {
+          if (servers.isEmpty()) {
+            log.warn("There are no tablet servers: check that zookeeper and accumulo are
running.");
+          } else {
+            log.warn("Failed to find an available server in the list of servers: " + servers);
+          }
+          warnedAboutTServersBeingDown = true;
+        }
+      }
     }
   }
   

Modified: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
(original)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithBatchWriter.java
Wed Feb  1 23:48:16 2012
@@ -34,15 +34,15 @@ public class InsertWithBatchWriter {
       TableNotFoundException {
     if (args.length != 5) {
       System.out
-          .println("Usage: bin/tool.sh accumulo-examplesjar accumulo.examples.helloworld.InsertWithBatchWriter
<instance name> <zoo keepers> <tableName> <username> <password>");
+          .println("Usage: bin/tool.sh accumulo-examplesjar accumulo.examples.helloworld.InsertWithBatchWriter
<instance name> <zoo keepers> <username> <password> <tableName>");
       System.exit(1);
     }
     
     String instanceName = args[0];
     String zooKeepers = args[1];
-    String tableName = args[2];
-    String user = args[3];
-    byte[] pass = args[4].getBytes();
+    String user = args[2];
+    byte[] pass = args[3].getBytes();
+    String tableName = args[4];
     
     ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
     Connector connector = instance.getConnector(user, pass);

Modified: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
(original)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
Wed Feb  1 23:48:16 2012
@@ -38,14 +38,14 @@ public class InsertWithOutputFormat exte
   @Override
   public int run(String[] args) throws Exception {
     if (args.length != 5) {
-      System.out.println("Usage: accumulo " + this.getClass().getName() + " <instance
name> <zoo keepers> <tablename> <username> <password>");
+      System.out.println("Usage: accumulo " + this.getClass().getName() + " <instance
name> <zoo keepers> <username> <password> <tablename>");
       return 1;
     }
-    Text tableName = new Text(args[2]);
+    Text tableName = new Text(args[4]);
     Job job = new Job(getConf());
     Configuration conf = job.getConfiguration();
     AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), args[0], args[1]);
-    AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[3], args[4].getBytes(),
true, null);
+    AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), args[2], args[3].getBytes(),
true, null);
     job.setOutputFormatClass(AccumuloOutputFormat.class);
     
     // when running a mapreduce, you won't need to instantiate the output

Modified: incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java?rev=1239410&r1=1239409&r2=1239410&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
(original)
+++ incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/ReadData.java
Wed Feb  1 23:48:16 2012
@@ -35,15 +35,15 @@ public class ReadData {
   public static void main(String[] args) throws AccumuloException, AccumuloSecurityException,
TableNotFoundException {
     if (args.length < 5 || args.length > 7) {
       System.out
-          .println("bin/accumulo accumulo.examples.helloworld.ReadData <instance name>
<zoo keepers> <tablename> <username> <password> [startkey [endkey]]");
+          .println("bin/accumulo accumulo.examples.helloworld.ReadData <instance name>
<zoo keepers> <username> <password> <tablename> [startkey [endkey]]");
       System.exit(1);
     }
     
     String instanceName = args[0];
     String zooKeepers = args[1];
-    String tableName = args[2];
-    String user = args[3];
-    byte[] pass = args[4].getBytes();
+    String user = args[2];
+    byte[] pass = args[3].getBytes();
+    String tableName = args[4];
     
     ZooKeeperInstance instance = new ZooKeeperInstance(instanceName, zooKeepers);
     Connector connector = instance.getConnector(user, pass);

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 23:48:16 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-1238753
+/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.4/src/server:1201902-1239409



Mime
View raw message