accumulo git commit: ACCUMULO-3871 Fix findbugs issues in test module
Repository: accumulo
Updated Branches:
refs/heads/master 5eede28e0 - 2e51eec35
ACCUMULO-3871 Fix findbugs issues in test module
* Fix all findbugs issues in SimpleProxyBase
* Minor improvements to shade plugin configuration
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e51eec3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e51eec3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e51eec3
Branch: refs/heads/master
Commit: 2e51eec351f9e5153c9196848a4a26fcafe8f1b5
Parents: 5eede28
Author: Christopher Tubbs ctubb...@apache.org
Authored: Fri Jun 12 15:54:43 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Fri Jun 12 15:54:43 2015 -0400
--
mrit/.gitignore | 1 -
mrit/pom.xml| 2 --
pom.xml | 5
.../accumulo/test/proxy/SimpleProxyBase.java| 29 +++-
4 files changed, 21 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e51eec3/mrit/.gitignore
--
diff --git a/mrit/.gitignore b/mrit/.gitignore
index fd31787..56204d2 100644
--- a/mrit/.gitignore
+++ b/mrit/.gitignore
@@ -23,4 +23,3 @@
/.pydevproject
/.idea
/*.iml
-/dependency-reduced-pom.xml
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e51eec3/mrit/pom.xml
--
diff --git a/mrit/pom.xml b/mrit/pom.xml
index 91921eb..b8ace04 100644
--- a/mrit/pom.xml
+++ b/mrit/pom.xml
@@ -61,7 +61,6 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-shade-plugin/artifactId
-version2.3/version
configuration
filters
filter
@@ -84,7 +83,6 @@
goals
goalshade/goal
/goals
-phasepackage/phase
/execution
/executions
/plugin
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e51eec3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 44d0861..8b89c7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,6 +584,11 @@
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-shade-plugin/artifactId
+ version2.3/version
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-assembly-plugin/artifactId
configuration
attachfalse/attach
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e51eec3/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
index 1f9f60a..fc79abd 100644
--- a/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
+++ b/test/src/main/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.accumulo.test.proxy;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@@ -145,10 +146,11 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterBase {
private org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
private static MapString,String properties = new HashMap();
- private static ByteBuffer creds = null;
private static String hostname, proxyPrincipal, proxyPrimary,
clientPrincipal;
private static File proxyKeytab, clientKeytab;
+ private ByteBuffer creds = null;
+
// Implementations can set this
static TProtocolFactory factory = null;
@@ -616,7 +618,7 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterBase {
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
public void splitRangeByTabletsLoginFailure() throws Exception {
-client.splitRangeByTablets(badLogin, table,
client.getRowRange(ByteBuffer.wrap(row.getBytes())), 10);
+client.splitRangeByTablets(badLogin, table,
client.getRowRange(ByteBuffer.wrap(row.getBytes(UTF_8))), 10);
}
@Test(expected = AccumuloSecurityException.class, timeout = 5000)
@@ -794,7 +796,7 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterBase {
fail(exception not thrown);
} catch (TableNotFoundException ex) {}
try {
- client.splitRangeByTablets(creds, doesNotExist,
client.getRowRange(ByteBuffer.wrap(row.getBytes())), 10);
+
[2/3] accumulo git commit: ACCUMULO-3871 a module to run the ITs as a shaded jar unnder map/reduce and a variety of tricks to run under mvn or map/reduce
ACCUMULO-3871 a module to run the ITs as a shaded jar unnder map/reduce and a variety of tricks to run under mvn or map/reduce Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2fe0bef8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2fe0bef8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2fe0bef8 Branch: refs/heads/master Commit: 2fe0bef866752716de2b85350eed1962e5fd4ba7 Parents: 9e98508 Author: Eric C. Newton eric.new...@gmail.com Authored: Fri Jun 12 11:45:11 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Fri Jun 12 11:45:11 2015 -0400 -- mrit/.gitignore | 26 ++ mrit/pom.xml| 93 ++ .../accumulo/mrit/IntegrationTestMapReduce.java | 147 + pom.xml | 1 + .../accumulo/test/IntegrationTestMapReduce.java | 147 - .../org/apache/accumulo/test/TestIngest.java| 10 +- .../functional/BulkSplitOptimizationIT.java | 3 +- .../accumulo/test/functional/CompactionIT.java | 19 +- .../test/functional/FunctionalTestUtils.java| 10 +- .../accumulo/test/functional/KerberosIT.java| 301 --- .../test/functional/KerberosProxyIT.java| 13 +- .../accumulo/test/functional/WriteLotsIT.java | 25 +- .../accumulo/test/proxy/SimpleProxyBase.java| 8 +- .../test/replication/KerberosReplicationIT.java | 132 14 files changed, 569 insertions(+), 366 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fe0bef8/mrit/.gitignore -- diff --git a/mrit/.gitignore b/mrit/.gitignore new file mode 100644 index 000..fd31787 --- /dev/null +++ b/mrit/.gitignore @@ -0,0 +1,26 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the License); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Maven ignores +/target/ + +# IDE ignores +/.settings/ +/.project +/.classpath +/.pydevproject +/.idea +/*.iml +/dependency-reduced-pom.xml http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fe0bef8/mrit/pom.xml -- diff --git a/mrit/pom.xml b/mrit/pom.xml new file mode 100644 index 000..91921eb --- /dev/null +++ b/mrit/pom.xml @@ -0,0 +1,93 @@ +?xml version=1.0 encoding=UTF-8? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.accumulo/groupId +artifactIdaccumulo-project/artifactId +version1.8.0-SNAPSHOT/version + /parent + artifactIdaccumulo-mrit/artifactId + nameTest Runner/name + descriptionRun Integration Tests Using Map-Reduce/description + dependencies +dependency + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-test/artifactId + exclusions +exclusion + groupIdorg.apache.accumulo/groupId + artifactIdaccumulo-native/artifactId +/exclusion +exclusion + groupIdorg.slf4j/groupId + artifactIdslf4j-log4j12/artifactId +/exclusion +exclusion +
[3/3] accumulo git commit: ACCUMULO-3423 fixing issues found in ITs
ACCUMULO-3423 fixing issues found in ITs
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/844166a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/844166a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/844166a0
Branch: refs/heads/master
Commit: 844166a05a248d13148d8f82f7f135d808994c13
Parents: 2fe0bef
Author: Eric C. Newton eric.new...@gmail.com
Authored: Fri Jun 12 11:45:53 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Fri Jun 12 11:45:53 2015 -0400
--
.../gc/GarbageCollectWriteAheadLogs.java| 15 +
.../CloseWriteAheadLogReferences.java | 10 +--
.../gc/GarbageCollectWriteAheadLogsTest.java| 65 +---
...bageCollectorCommunicatesWithTServersIT.java | 4 +-
.../test/replication/ReplicationIT.java | 39
5 files changed, 93 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/844166a0/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
--
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index b8fb9fb..8803a40 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -39,6 +39,9 @@ import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
+import org.apache.accumulo.core.replication.ReplicationTable;
+import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.trace.Span;
import org.apache.accumulo.core.trace.Trace;
@@ -315,6 +318,18 @@ public class GarbageCollectWriteAheadLogs {
Connector conn;
try {
conn = context.getConnector();
+ try {
+final Scanner s = ReplicationTable.getScanner(conn);
+StatusSection.limit(s);
+for (EntryKey,Value entry : s) {
+ UUID id = path2uuid(new Path(entry.getKey().getRow().toString()));
+ candidates.remove(id);
+ log.info(Ignore closed log + id + because it is being
replicated);
+}
+ } catch (ReplicationTableOfflineException ex) {
+return candidates.size();
+ }
+
final Scanner scanner = conn.createScanner(MetadataTable.NAME,
Authorizations.EMPTY);
scanner.fetchColumnFamily(MetadataSchema.ReplicationSection.COLF);
scanner.setRange(MetadataSchema.ReplicationSection.getRange());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/844166a0/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
--
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
index 1444127..8857939 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/replication/CloseWriteAheadLogReferences.java
@@ -155,10 +155,10 @@ public class CloseWriteAheadLogReferences implements
Runnable {
*
* @param conn
* Connector
- * @param referencedWals
- * {@link Set} of paths to WALs that are referenced in the tablets
section of the metadata table
+ * @param closedWals
+ * {@link Set} of paths to WALs that marked as closed or
unreferenced in zookeeper
*/
- protected long updateReplicationEntries(Connector conn, SetString
referencedWals) {
+ protected long updateReplicationEntries(Connector conn, SetString
closedWals) {
BatchScanner bs = null;
BatchWriter bw = null;
long recordsClosed = 0;
@@ -181,11 +181,11 @@ public class CloseWriteAheadLogReferences implements
Runnable {
// Ignore things that aren't completely replicated as we can't delete
those anyways
MetadataSchema.ReplicationSection.getFile(entry.getKey(),
replFileText);
String replFile = replFileText.toString();
-boolean isReferenced = referencedWals.contains(replFile);
+boolean isClosed = closedWals.contains(replFile);
// We only want to clean up WALs (which is everything but rfiles) and
only when
[1/3] accumulo git commit: ACCUMULO-3871 Range.open does not exist in the guava inherited under m/r
Repository: accumulo
Updated Branches:
refs/heads/master 7b4a3b8ab - 844166a05
ACCUMULO-3871 Range.open does not exist in the guava inherited under m/r
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9e98508a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e98508a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e98508a
Branch: refs/heads/master
Commit: 9e98508aeb9c5abad839980bb393e25fe6872e04
Parents: 7b4a3b8
Author: Eric C. Newton eric.new...@gmail.com
Authored: Fri Jun 12 11:41:36 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Fri Jun 12 11:41:36 2015 -0400
--
.../accumulo/test/functional/WatchTheWatchCountIT.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9e98508a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
index 07d197d..84b944b 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Range;
import com.google.common.net.HostAndPort;
// ACCUMULO-2757 - make sure we don't make too many more watchers
@@ -52,7 +51,8 @@ public class WatchTheWatchCountIT extends ConfigurableMacBase
{
}
c.tableOperations().list();
String zooKeepers = c.getInstance().getZooKeepers();
-final RangeLong expectedWatcherRange = Range.open(475l, 700l);
+final long MIN = 475L;
+final long MAX = 700L;
long total = 0;
final HostAndPort hostAndPort = HostAndPort.fromString(zooKeepers);
for (int i = 0; i 5; i++) {
@@ -64,17 +64,18 @@ public class WatchTheWatchCountIT extends
ConfigurableMacBase {
String response = new String(buffer, 0, n);
total = Long.parseLong(response.split(:)[1].trim());
log.info(Total: {}, total);
-if (expectedWatcherRange.contains(total)) {
+if (total MIN total MAX) {
break;
}
-log.debug(Expected number of watchers to be contained in {}, but
actually was {}. Sleeping and retrying, expectedWatcherRange, total);
+log.debug(Expected number of watchers to be contained in ({}, {}),
but actually was {}. Sleeping and retrying, MIN, MAX, total);
Thread.sleep(5000);
} finally {
socket.close();
}
}
-assertTrue(Expected number of watchers to be contained in +
expectedWatcherRange + , but actually was + total,
expectedWatcherRange.contains(total));
+assertTrue(Expected number of watchers to be contained in ( + MIN + ,
+ MAX + ), but actually was + total, total MIN total MAX);
+
}
}
[2/5] accumulo git commit: ACCUMULO-3900 Fix Lexicoder precondition check and bad test.
ACCUMULO-3900 Fix Lexicoder precondition check and bad test.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246129f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246129f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246129f1
Branch: refs/heads/master
Commit: 246129f1b2155f1abc4f8a0f2213a2f14aae6135
Parents: 699b8bf
Author: Dylan Hutchison dhutc...@mit.edu
Authored: Thu Jun 11 20:12:08 2015 -0400
Committer: Dylan Hutchison dhutc...@mit.edu
Committed: Fri Jun 12 02:28:40 2015 -0400
--
.../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +-
.../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 -
2 files changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/246129f1/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
index 6ba7e02..d776329 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
@@ -51,7 +51,7 @@ public abstract class AbstractEncoderT implements
EncoderT {
Preconditions.checkNotNull(b, cannot decode null byte array);
Preconditions.checkArgument(offset = 0, offset %s cannot be negative,
offset);
Preconditions.checkArgument(len = 0, length %s cannot be negative, len);
-Preconditions.checkArgument(offset + len b.length, offset + length %s
exceeds byte array length %s, (offset + len), b.length);
+Preconditions.checkArgument(offset + len = b.length, offset + length %s
exceeds byte array length %s, (offset + len), b.length);
return decodeUnchecked(b, offset, len);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/246129f1/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
index d695ce9..d0f7571 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
@@ -78,11 +78,6 @@ public abstract class AbstractLexicoderTest extends
LexicoderTest {
} catch (IllegalArgumentException e) {}
try {
- lexicoder.decode(encoded, encoded.length, 0);
- fail(Should throw on offset==length.);
-} catch (IllegalArgumentException e) {}
-
-try {
lexicoder.decode(encoded, 0, -1);
fail(Should throw on negative length.);
} catch (IllegalArgumentException e) {}
[4/5] accumulo git commit: Merge remote-tracking branch 'dhutchis/ACCUMULO-3900' into 1.7
Merge remote-tracking branch 'dhutchis/ACCUMULO-3900' into 1.7 This closes #37 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/341034a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341034a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/341034a5 Branch: refs/heads/1.7 Commit: 341034a5655ad119ddf77125ed190e647f704e7d Parents: 699b8bf 246129f Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Jun 12 11:40:09 2015 -0400 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Jun 12 11:40:09 2015 -0400 -- .../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +- .../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 - 2 files changed, 1 insertion(+), 6 deletions(-) --
[1/5] accumulo git commit: ACCUMULO-3900 Fix Lexicoder precondition check and bad test.
Repository: accumulo
Updated Branches:
refs/heads/1.7 699b8bf06 - 341034a56
refs/heads/master 844166a05 - 5eede28e0
ACCUMULO-3900 Fix Lexicoder precondition check and bad test.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/246129f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/246129f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/246129f1
Branch: refs/heads/1.7
Commit: 246129f1b2155f1abc4f8a0f2213a2f14aae6135
Parents: 699b8bf
Author: Dylan Hutchison dhutc...@mit.edu
Authored: Thu Jun 11 20:12:08 2015 -0400
Committer: Dylan Hutchison dhutc...@mit.edu
Committed: Fri Jun 12 02:28:40 2015 -0400
--
.../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +-
.../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 -
2 files changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/246129f1/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
index 6ba7e02..d776329 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
@@ -51,7 +51,7 @@ public abstract class AbstractEncoderT implements
EncoderT {
Preconditions.checkNotNull(b, cannot decode null byte array);
Preconditions.checkArgument(offset = 0, offset %s cannot be negative,
offset);
Preconditions.checkArgument(len = 0, length %s cannot be negative, len);
-Preconditions.checkArgument(offset + len b.length, offset + length %s
exceeds byte array length %s, (offset + len), b.length);
+Preconditions.checkArgument(offset + len = b.length, offset + length %s
exceeds byte array length %s, (offset + len), b.length);
return decodeUnchecked(b, offset, len);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/246129f1/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
index d695ce9..d0f7571 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/impl/AbstractLexicoderTest.java
@@ -78,11 +78,6 @@ public abstract class AbstractLexicoderTest extends
LexicoderTest {
} catch (IllegalArgumentException e) {}
try {
- lexicoder.decode(encoded, encoded.length, 0);
- fail(Should throw on offset==length.);
-} catch (IllegalArgumentException e) {}
-
-try {
lexicoder.decode(encoded, 0, -1);
fail(Should throw on negative length.);
} catch (IllegalArgumentException e) {}
[5/5] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5eede28e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5eede28e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5eede28e Branch: refs/heads/master Commit: 5eede28e0dd0d00874c5f67a24de204226066ca0 Parents: 844166a 341034a Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Jun 12 11:59:03 2015 -0400 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Jun 12 11:59:03 2015 -0400 -- .../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +- .../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 - 2 files changed, 1 insertion(+), 6 deletions(-) --
[3/5] accumulo git commit: Merge remote-tracking branch 'dhutchis/ACCUMULO-3900' into 1.7
Merge remote-tracking branch 'dhutchis/ACCUMULO-3900' into 1.7 This closes #37 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/341034a5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341034a5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/341034a5 Branch: refs/heads/master Commit: 341034a5655ad119ddf77125ed190e647f704e7d Parents: 699b8bf 246129f Author: Christopher Tubbs ctubb...@apache.org Authored: Fri Jun 12 11:40:09 2015 -0400 Committer: Christopher Tubbs ctubb...@apache.org Committed: Fri Jun 12 11:40:09 2015 -0400 -- .../apache/accumulo/core/client/lexicoder/AbstractEncoder.java | 2 +- .../core/client/lexicoder/impl/AbstractLexicoderTest.java | 5 - 2 files changed, 1 insertion(+), 6 deletions(-) --
