accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1449880 - in /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk: image/Commit.java image/ImageFixture.java multitable/Commit.java multitable/MultiTableFixture.java security/WalkingSecurity.java
Date Mon, 25 Feb 2013 20:45:52 GMT
Author: ecn
Date: Mon Feb 25 20:45:52 2013
New Revision: 1449880

URL: http://svn.apache.org/r1449880
Log:
ACCUMULO-1105 more issues with random walk tests

Modified:
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java?rev=1449880&r1=1449879&r2=1449880&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java
Mon Feb 25 20:45:52 2013
@@ -28,7 +28,7 @@ public class Commit extends Test {
     state.getMultiTableBatchWriter().flush();
     
     log.debug("Committed " + state.getLong("numWrites") + " writes.  Total writes: " + state.getLong("totalWrites"));
-    state.set("numWrites", new Integer(0));
+    state.set("numWrites", new Long(0));
   }
   
 }

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java?rev=1449880&r1=1449879&r2=1449880&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
Mon Feb 25 20:45:52 2013
@@ -84,8 +84,8 @@ public class ImageFixture extends Fixtur
       log.debug("Configured locality groups for " + imageTableName + " groups = " + groups);
     }
     
-    state.set("numWrites", new Integer(0));
-    state.set("totalWrites", new Integer(0));
+    state.set("numWrites", new Long(0));
+    state.set("totalWrites", new Long(0));
     state.set("verified", new Integer(0));
     state.set("lastIndexRow", new Text(""));
   }

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java?rev=1449880&r1=1449879&r2=1449880&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java
Mon Feb 25 20:45:52 2013
@@ -33,7 +33,7 @@ public class Commit extends Test {
     log.debug("Committed " + numWrites + " writes.  Total writes: " + totalWrites);
     
     state.set("totalWrites", totalWrites);
-    state.set("numWrites", new Integer(0));
+    state.set("numWrites", new Long(0));
   }
   
 }

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java?rev=1449880&r1=1449879&r2=1449880&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
Mon Feb 25 20:45:52 2013
@@ -33,8 +33,8 @@ public class MultiTableFixture extends F
     
     state.set("tableNamePrefix", String.format("multi_%s_%s_%d", hostname, state.getPid(),
System.currentTimeMillis()));
     state.set("nextId", new Integer(0));
-    state.set("numWrites", new Integer(0));
-    state.set("totalWrites", new Integer(0));
+    state.set("numWrites", new Long(0));
+    state.set("totalWrites", new Long(0));
     state.set("tableList", new ArrayList<String>());
   }
   

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1449880&r1=1449879&r2=1449880&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Mon Feb 25 20:45:52 2013
@@ -279,11 +279,19 @@ public class WalkingSecurity extends Sec
   }
   
   public byte[] getUserPassword(String user) {
-    return (byte[]) state.get(user + userPass);
+    Object obj = state.get(getSysUserName() + userPass);
+    if (obj instanceof PasswordToken) {
+      return ((PasswordToken)obj).getPassword();
+    }
+    return null;
   }
   
   public byte[] getSysPassword() {
-    return (byte[]) state.get(getSysUserName() + userPass);
+    Object obj = state.get(getSysUserName() + userPass);
+    if (obj instanceof PasswordToken) {
+      return ((PasswordToken)obj).getPassword();
+    }
+    return null;
   }
   
   public byte[] getTabPassword() {



Mime
View raw message