accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1452493 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/main/java/org/apache/accumulo/test/
Date Mon, 04 Mar 2013 20:34:15 GMT
Author: ecn
Date: Mon Mar  4 20:34:15 2013
New Revision: 1452493

URL: http://svn.apache.org/r1452493
Log:
ACCUMULO-745 fix Test/Verify ingest to work on wider rows

Modified:
    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/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1452491

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1452491

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1452491

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1452491

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:r1452491

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:r1452491

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1452491

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1452491

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java?rev=1452493&r1=1452492&r2=1452493&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java Mon Mar  4
20:34:15 2013
@@ -231,7 +231,7 @@ public class TestIngest {
         Mutation m = new Mutation(row);
         for (int j = 0; j < opts.cols; j++) {
           Text colf = new Text(opts.columnFamily);
-          Text colq = new Text(FastFormat.toZeroPaddedString(j, 5, 10, COL_PREFIX));
+          Text colq = new Text(FastFormat.toZeroPaddedString(j, 7, 10, COL_PREFIX));
           
           if (writer != null) {
             Key key = new Key(row, colf, colq, labBA);

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java?rev=1452493&r1=1452492&r2=1452493&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java Mon Mar 
4 20:34:15 2013
@@ -94,7 +94,7 @@ public class VerifyIngest {
         if (opts.useGet) {
           Text rowKey = new Text("row_" + String.format("%010d", expectedRow + opts.startRow));
           Text colf = new Text(opts.columnFamily);
-          Text colq = new Text("col_" + String.format("%05d", expectedCol));
+          Text colq = new Text("col_" + String.format("%07d", expectedCol));
           
           Scanner scanner = connector.createScanner("test_ingest", labelAuths);
           scanner.setBatchSize(1);
@@ -144,7 +144,7 @@ public class VerifyIngest {
           scanner.setBatchSize(scanOpts.scanBatchSize);
           scanner.setRange(new Range(startKey, endKey));
           for (int j = 0; j < opts.cols; j++) {
-            scanner.fetchColumn(new Text(opts.columnFamily), new Text("col_" + String.format("%05d",
j)));
+            scanner.fetchColumn(new Text(opts.columnFamily), new Text("col_" + String.format("%07d",
j)));
           }
           
           int recsReadBefore = recsRead;



Mime
View raw message