git commit: ACCUMULO-2671 adjusting test to make jenkins happy
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 8d6432bec -> 055072064
ACCUMULO-2671 adjusting test to make jenkins happy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05507206
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05507206
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05507206
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 05507206410bc289da98bfb7931d1cea43cc69a2
Parents: 8d6432b
Author: John Vines
Authored: Fri Apr 18 10:40:34 2014 -0400
Committer: John Vines
Committed: Fri Apr 18 10:40:34 2014 -0400
--
.../security/crypto/BlockedIOStreamTest.java | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05507206/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 17a20da..212aaaf 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -23,9 +23,11 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Random;
import org.apache.accumulo.core.Constants;
+import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
@@ -127,8 +129,13 @@ public class BlockedIOStreamTest {
int size = 1024 * 1024 * 128;
byte[] giant = new byte[size];
+byte[] pattern = new byte[1024];
-r.nextBytes(giant);
+r.nextBytes(pattern);
+
+for (int i = 0; i < size / 1024; i++) {
+ System.arraycopy(pattern, 0, giant, i * 1024, 1024);
+}
blockOut.write(giant);
blockOut.flush();
@@ -142,11 +149,15 @@ public class BlockedIOStreamTest {
assertEquals(blocks * 16, byteStream.length);
DataInputStream blockIn = new DataInputStream(new BlockedInputStream(new
ByteArrayInputStream(byteStream), blockSize, blockSize));
-byte[] giantRead = new byte[size];
-blockIn.readFully(giantRead, 0, size);
+Arrays.fill(giant, (byte) 0);
+blockIn.readFully(giant, 0, size);
blockIn.close();
-assertArrayEquals(giant, giantRead);
+for (int i = 0; i < size / 1024; i++) {
+ byte[] readChunk = new byte[1024];
+ System.arraycopy(giant, i * 1024, readChunk, 0, 1024);
+ assertArrayEquals(pattern, readChunk);
+}
}
}
[2/6] git commit: ACCUMULO-2671 Refactoring BlockedOutputStream to not recurse. With test
ACCUMULO-2671 Refactoring BlockedOutputStream to not recurse. With test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17344890
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17344890
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17344890
Branch: refs/heads/master
Commit: 173448903a4b3eb5e755421428e65a4a4dd67de5
Parents: cacb1b6
Author: John Vines
Authored: Thu Apr 17 17:57:32 2014 -0400
Committer: John Vines
Committed: Thu Apr 17 17:57:32 2014 -0400
--
.../security/crypto/BlockedOutputStream.java| 17
.../security/crypto/BlockedIOStreamTest.java| 44 +++-
2 files changed, 44 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17344890/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
index ca72055..3ce648e 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedOutputStream.java
@@ -72,15 +72,18 @@ public class BlockedOutputStream extends OutputStream {
@Override
public void write(byte b[], int off, int len) throws IOException {
-if (bb.remaining() >= len) {
- bb.put(b, off, len);
- if (bb.remaining() == 0)
-flush();
-} else {
+// Can't recurse here in case the len is large and the blocksize is small
(and the stack is small)
+// So we'll just fill up the buffer over and over
+while (len >= bb.remaining()) {
int remaining = bb.remaining();
- write(b, off, remaining);
- write(b, off + remaining, len - remaining);
+ bb.put(b, off, remaining);
+ // This is guaranteed to have the buffer filled, so we'll just flush it.
No check needed
+ flush();
+ off += remaining;
+ len -= remaining;
}
+// And then write the remainder (and this is guaranteed to not fill the
buffer, so we won't flush afteward
+bb.put(b, off, len);
}
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/17344890/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index b344fc3..a116110 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -70,49 +70,73 @@ public class BlockedIOStreamTest {
@Test
public void testSmallBufferBlockedIO() throws IOException {
-writeRead(16, (12 + 4) * (int) (Math.ceil(25.0/12) + Math.ceil(31.0/12)));
+writeRead(16, (12 + 4) * (int) (Math.ceil(25.0 / 12) + Math.ceil(31.0 /
12)));
}
-
+
@Test
public void testSpillingOverOutputStream() throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
// buffer will be size 12
BlockedOutputStream blockOut = new BlockedOutputStream(baos, 16, 16);
Random r = new Random(22);
-
+
byte[] undersized = new byte[11];
byte[] perfectSized = new byte[12];
byte[] overSized = new byte[13];
byte[] perfectlyOversized = new byte[13];
byte filler = (byte) r.nextInt();
-
+
r.nextBytes(undersized);
r.nextBytes(perfectSized);
r.nextBytes(overSized);
r.nextBytes(perfectlyOversized);
-
+
// 1 block
blockOut.write(undersized);
blockOut.write(filler);
blockOut.flush();
-
+
// 2 blocks
blockOut.write(perfectSized);
blockOut.write(filler);
blockOut.flush();
-
+
// 2 blocks
blockOut.write(overSized);
blockOut.write(filler);
blockOut.flush();
-
+
// 3 blocks
blockOut.write(undersized);
blockOut.write(perfectlyOversized);
blockOut.write(filler);
blockOut.flush();
-
+
+blockOut.close();
+assertEquals(16 * 8, baos.toByteArray().length);
+ }
+
+ @Test
+ public void testGiantWrite() throws IOException {
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+int blockSize = 16;
+// buffer will be size 12
+BlockedOutputStream blockOut = new BlockedOutputStream(baos, blockSize,
blockSize);
+Random r = new Random(22);
+
+int size = 1024 * 1024 * 128;
+byte[] giant = new byte[size];
+
+r.n
[5/6] git commit: ACCUMULO-2671 adjusting test to make jenkins happy
ACCUMULO-2671 adjusting test to make jenkins happy
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/05507206
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/05507206
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/05507206
Branch: refs/heads/master
Commit: 05507206410bc289da98bfb7931d1cea43cc69a2
Parents: 8d6432b
Author: John Vines
Authored: Fri Apr 18 10:40:34 2014 -0400
Committer: John Vines
Committed: Fri Apr 18 10:40:34 2014 -0400
--
.../security/crypto/BlockedIOStreamTest.java | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/05507206/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 17a20da..212aaaf 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -23,9 +23,11 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Random;
import org.apache.accumulo.core.Constants;
+import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
@@ -127,8 +129,13 @@ public class BlockedIOStreamTest {
int size = 1024 * 1024 * 128;
byte[] giant = new byte[size];
+byte[] pattern = new byte[1024];
-r.nextBytes(giant);
+r.nextBytes(pattern);
+
+for (int i = 0; i < size / 1024; i++) {
+ System.arraycopy(pattern, 0, giant, i * 1024, 1024);
+}
blockOut.write(giant);
blockOut.flush();
@@ -142,11 +149,15 @@ public class BlockedIOStreamTest {
assertEquals(blocks * 16, byteStream.length);
DataInputStream blockIn = new DataInputStream(new BlockedInputStream(new
ByteArrayInputStream(byteStream), blockSize, blockSize));
-byte[] giantRead = new byte[size];
-blockIn.readFully(giantRead, 0, size);
+Arrays.fill(giant, (byte) 0);
+blockIn.readFully(giant, 0, size);
blockIn.close();
-assertArrayEquals(giant, giantRead);
+for (int i = 0; i < size / 1024; i++) {
+ byte[] readChunk = new byte[1024];
+ System.arraycopy(giant, i * 1024, readChunk, 0, 1024);
+ assertArrayEquals(pattern, readChunk);
+}
}
}
[3/6] git commit: ACCUMULO-2690 fixing output stream short circuiting in walog
ACCUMULO-2690 fixing output stream short circuiting in walog
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8e3dc7b4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8e3dc7b4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8e3dc7b4
Branch: refs/heads/master
Commit: 8e3dc7b475b6b803c4c4402e54ad185cf60b3d89
Parents: 1734489
Author: John Vines
Authored: Thu Apr 17 18:00:49 2014 -0400
Committer: John Vines
Committed: Thu Apr 17 18:00:49 2014 -0400
--
.../core/security/crypto/NoFlushOutputStream.java | 10 ++
.../java/org/apache/accumulo/tserver/log/DfsLogger.java | 9 ++---
2 files changed, 8 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e3dc7b4/core/src/main/java/org/apache/accumulo/core/security/crypto/NoFlushOutputStream.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/crypto/NoFlushOutputStream.java
b/core/src/main/java/org/apache/accumulo/core/security/crypto/NoFlushOutputStream.java
index 2f9f4bb..17fc06a 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/crypto/NoFlushOutputStream.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/crypto/NoFlushOutputStream.java
@@ -16,22 +16,16 @@
*/
package org.apache.accumulo.core.security.crypto;
-import java.io.FilterOutputStream;
-import java.io.IOException;
+import java.io.DataOutputStream;
import java.io.OutputStream;
-public class NoFlushOutputStream extends FilterOutputStream {
+public class NoFlushOutputStream extends DataOutputStream {
public NoFlushOutputStream(OutputStream out) {
super(out);
}
@Override
- public void write(byte[] b, int off, int len) throws IOException {
-out.write(b, off, len);
- }
-
- @Override
public void flush() {}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8e3dc7b4/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index c960bd6..eb04f09 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -368,7 +368,8 @@ public class DfsLogger {
CryptoModuleParameters params =
CryptoModuleFactory.createParamsObjectFromAccumuloConfiguration(conf.getConfiguration());
- params.setPlaintextOutputStream(new NoFlushOutputStream(logFile));
+ NoFlushOutputStream nfos = new NoFlushOutputStream(logFile);
+ params.setPlaintextOutputStream(nfos);
// In order to bootstrap the reading of this file later, we have to
record the CryptoModule that was used to encipher it here,
// so that that crypto module can re-read its own parameters.
@@ -380,9 +381,11 @@ public class DfsLogger {
// If the module just kicks back our original stream, then just use it,
don't wrap it in
// another data OutputStream.
- if (encipheringOutputStream == logFile) {
-encryptingLogFile = logFile;
+ if (encipheringOutputStream == nfos) {
+log.debug("No enciphering, using raw output stream");
+encryptingLogFile = nfos;
} else {
+log.debug("Enciphering found, wrapping in DataOutputStream");
encryptingLogFile = new DataOutputStream(encipheringOutputStream);
}
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94008f6a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/94008f6a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/94008f6a
Branch: refs/heads/master
Commit: 94008f6a1235edf178294effc7623576a249cdb4
Parents: 8aedbe6 0550720
Author: John Vines
Authored: Fri Apr 18 10:42:51 2014 -0400
Committer: John Vines
Committed: Fri Apr 18 10:42:51 2014 -0400
--
.../security/crypto/BlockedOutputStream.java| 17 +++---
.../security/crypto/NoFlushOutputStream.java| 10 +--
.../security/crypto/BlockedIOStreamTest.java| 64 +---
.../apache/accumulo/tserver/log/DfsLogger.java | 9 ++-
4 files changed, 72 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94008f6a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --cc
core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 8ea55a6,212aaaf..d80124c
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@@ -16,15 -16,18 +16,17 @@@
*/
package org.apache.accumulo.core.security.crypto;
-import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+ import java.util.Arrays;
import java.util.Random;
-import org.apache.accumulo.core.Constants;
-import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94008f6a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
[1/6] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Repository: accumulo Updated Branches: refs/heads/master 8aedbe6ca -> 94008f6a1 Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cacb1b62 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cacb1b62 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cacb1b62 Branch: refs/heads/master Commit: cacb1b625bf7db27ba70afc805b11fc730532744 Parents: 9fb7417 4048bb2 Author: Eric C. Newton Authored: Wed Apr 16 15:16:39 2014 -0400 Committer: Eric C. Newton Committed: Wed Apr 16 15:16:39 2014 -0400 -- README | 4 1 file changed, 4 deletions(-) --
[4/6] git commit: ACCUMULO-2690 expanding test to validate giant read as well
ACCUMULO-2690 expanding test to validate giant read as well
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8d6432be
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8d6432be
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8d6432be
Branch: refs/heads/master
Commit: 8d6432bec3d479eb15c3609a66b588ccfc7e5308
Parents: 8e3dc7b
Author: John Vines
Authored: Thu Apr 17 18:41:39 2014 -0400
Committer: John Vines
Committed: Thu Apr 17 18:41:39 2014 -0400
--
.../core/security/crypto/BlockedIOStreamTest.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8d6432be/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index a116110..17a20da 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -17,6 +17,7 @@
package org.apache.accumulo.core.security.crypto;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -136,7 +137,16 @@ public class BlockedIOStreamTest {
baos.close();
int blocks = (int) Math.ceil(size / (blockSize - 4.0));
-assertEquals(blocks * 16, baos.toByteArray().length);
+byte[] byteStream = baos.toByteArray();
+
+assertEquals(blocks * 16, byteStream.length);
+
+DataInputStream blockIn = new DataInputStream(new BlockedInputStream(new
ByteArrayInputStream(byteStream), blockSize, blockSize));
+byte[] giantRead = new byte[size];
+blockIn.readFully(giantRead, 0, size);
+blockIn.close();
+
+assertArrayEquals(giant, giantRead);
}
}
[9/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1645b4f6 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 1645b4f6297f24ce815c6379acfbc67b334c64ec Parents: 0550720 0aa1d03 Author: Christopher Tubbs Authored: Fri Apr 18 12:37:40 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:37:40 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1645b4f6/pom.xml -- diff --cc pom.xml index 10dfcc8,9aeb7ee..f109643 --- a/pom.xml +++ b/pom.xml @@@ -520,6 -432,9 +520,8 @@@ 1.6 1.6 true -UTF-8 + true + true
[6/9] git commit: ACCUMULO-2529 Show compiler warnings in maven build
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3648c1bd Branch: refs/heads/1.6.0-SNAPSHOT Commit: 3648c1bd3d4018ad13e14091aef237f5b5eac1ad Parents: 4d53f2e Author: Christopher Tubbs Authored: Fri Apr 18 12:27:28 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:27:28 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3648c1bd/pom.xml -- diff --git a/pom.xml b/pom.xml index 615d0bf..6ed7a61 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,8 @@ 1.6 1.6 true + true + true
[2/9] git commit: ACCUMULO-2625 Remove build warnings for 1.4
ACCUMULO-2625 Remove build warnings for 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d53f2e5
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 4d53f2e5513f944e220fffbaa603a0e460760fdb
Parents: 7461ed9
Author: Christopher Tubbs
Authored: Fri Apr 18 12:26:02 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:26:02 2014 -0400
--
pom.xml | 6 +++---
src/core/pom.xml | 4
2 files changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 87c50b9..615d0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,7 +496,7 @@
jdeb
-
${project.build.directory}/${artifactId}_${project.version}.deb
+
${project.build.directory}/${project.artifactId}_${project.version}.deb
false
src/packages/deb/accumulo
/usr/lib/accumulo
@@ -592,7 +592,7 @@
false
src/packages/deb/accumulo-native
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb
src/server/src/main/c++
@@ -632,7 +632,7 @@
false
src/packages/deb/accumulo-test
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb
test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/src/core/pom.xml
--
diff --git a/src/core/pom.xml b/src/core/pom.xml
index b310764..7b5ff02 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -172,10 +172,6 @@
libthrift
- org.apache.accumulo
- cloudtrace
-
-
jline
jline
[5/9] git commit: ACCUMULO-2529 Show compiler warnings in maven build
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3648c1bd Branch: refs/heads/1.5.2-SNAPSHOT Commit: 3648c1bd3d4018ad13e14091aef237f5b5eac1ad Parents: 4d53f2e Author: Christopher Tubbs Authored: Fri Apr 18 12:27:28 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:27:28 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3648c1bd/pom.xml -- diff --git a/pom.xml b/pom.xml index 615d0bf..6ed7a61 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,8 @@ 1.6 1.6 true + true + true
[8/9] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
pom.xml
src/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa1d039
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa1d039
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0aa1d039e9369b00e3c19e1abaf92009d18b0496
Parents: 708ad54 3648c1b
Author: Christopher Tubbs
Authored: Fri Apr 18 12:35:15 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:35:15 2014 -0400
--
pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa1d039/pom.xml
--
diff --cc pom.xml
index 9464bff,6ed7a61..9aeb7ee
--- a/pom.xml
+++ b/pom.xml
@@@ -355,159 -336,6 +355,161 @@@
+ com.google.code.sortpom
+ maven-sortpom-plugin
+ 2.1.0
+
+recommended_2008_06
+\n
+false
+2
+scope,groupId,artifactId
+true
+Stop
+
+
+
+ com.github.koraktor
+ mavanagaiata
+ 0.6.1
+
+true
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+false
+gnu
+
+
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+ 2.9
+
+
+ JIRA
+
+true
+Closed,Resolved
+1
+true
+
+
+
+ maven-clean-plugin
+
+
+
+lib
+
+ *.jar
+
+
+
+docs/apidocs
+
+
+test
+
+ **/*.so
+
+
+
+./
+
+ **/*.pyc
+
+
+
+
+
+
+ maven-compiler-plugin
+
+1.6
+1.6
+true
+UTF-8
++true
++true
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.8
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+${sealJars}
+
${mvngit.commit.id}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+UTF-8
+true
+docs
+1.6
+-J-Xmx512m
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+-P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb
+true
+clean compile javadoc:aggregate deploy
+clean compile javadoc:aggregate
verify
+@{project.version}
+seal-jars
+false
+false
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ 3.3
+
+true
+
+
+
+ maven-surefire-plugin
+
+true
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+ 0.10
+
+
+ docs/apidocs/package-list
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.8
+
+
org.codehaus.mojo
cobertura-maven-plugin
2.5.2
[4/5] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1645b4f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1645b4f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1645b4f6 Branch: refs/heads/master Commit: 1645b4f6297f24ce815c6379acfbc67b334c64ec Parents: 0550720 0aa1d03 Author: Christopher Tubbs Authored: Fri Apr 18 12:37:40 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:37:40 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1645b4f6/pom.xml -- diff --cc pom.xml index 10dfcc8,9aeb7ee..f109643 --- a/pom.xml +++ b/pom.xml @@@ -520,6 -432,9 +520,8 @@@ 1.6 1.6 true -UTF-8 + true + true
[1/5] git commit: ACCUMULO-2625 Remove build warnings for 1.4
Repository: accumulo
Updated Branches:
refs/heads/master 94008f6a1 -> ca2d4ebd9
ACCUMULO-2625 Remove build warnings for 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d53f2e5
Branch: refs/heads/master
Commit: 4d53f2e5513f944e220fffbaa603a0e460760fdb
Parents: 7461ed9
Author: Christopher Tubbs
Authored: Fri Apr 18 12:26:02 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:26:02 2014 -0400
--
pom.xml | 6 +++---
src/core/pom.xml | 4
2 files changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 87c50b9..615d0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,7 +496,7 @@
jdeb
-
${project.build.directory}/${artifactId}_${project.version}.deb
+
${project.build.directory}/${project.artifactId}_${project.version}.deb
false
src/packages/deb/accumulo
/usr/lib/accumulo
@@ -592,7 +592,7 @@
false
src/packages/deb/accumulo-native
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb
src/server/src/main/c++
@@ -632,7 +632,7 @@
false
src/packages/deb/accumulo-test
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb
test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/src/core/pom.xml
--
diff --git a/src/core/pom.xml b/src/core/pom.xml
index b310764..7b5ff02 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -172,10 +172,6 @@
libthrift
- org.apache.accumulo
- cloudtrace
-
-
jline
jline
[3/9] git commit: ACCUMULO-2625 Remove build warnings for 1.4
ACCUMULO-2625 Remove build warnings for 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d53f2e5
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4d53f2e5513f944e220fffbaa603a0e460760fdb
Parents: 7461ed9
Author: Christopher Tubbs
Authored: Fri Apr 18 12:26:02 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:26:02 2014 -0400
--
pom.xml | 6 +++---
src/core/pom.xml | 4
2 files changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 87c50b9..615d0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,7 +496,7 @@
jdeb
-
${project.build.directory}/${artifactId}_${project.version}.deb
+
${project.build.directory}/${project.artifactId}_${project.version}.deb
false
src/packages/deb/accumulo
/usr/lib/accumulo
@@ -592,7 +592,7 @@
false
src/packages/deb/accumulo-native
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb
src/server/src/main/c++
@@ -632,7 +632,7 @@
false
src/packages/deb/accumulo-test
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb
test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/src/core/pom.xml
--
diff --git a/src/core/pom.xml b/src/core/pom.xml
index b310764..7b5ff02 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -172,10 +172,6 @@
libthrift
- org.apache.accumulo
- cloudtrace
-
-
jline
jline
[4/9] git commit: ACCUMULO-2529 Show compiler warnings in maven build
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3648c1bd Branch: refs/heads/1.4.6-SNAPSHOT Commit: 3648c1bd3d4018ad13e14091aef237f5b5eac1ad Parents: 4d53f2e Author: Christopher Tubbs Authored: Fri Apr 18 12:27:28 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:27:28 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3648c1bd/pom.xml -- diff --git a/pom.xml b/pom.xml index 615d0bf..6ed7a61 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,8 @@ 1.6 1.6 true + true + true
[1/9] git commit: ACCUMULO-2625 Remove build warnings for 1.4
Repository: accumulo
Updated Branches:
refs/heads/1.4.6-SNAPSHOT 7461ed924 -> 3648c1bd3
refs/heads/1.5.2-SNAPSHOT 708ad54ec -> 0aa1d039e
refs/heads/1.6.0-SNAPSHOT 055072064 -> 1645b4f62
ACCUMULO-2625 Remove build warnings for 1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d53f2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d53f2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d53f2e5
Branch: refs/heads/1.4.6-SNAPSHOT
Commit: 4d53f2e5513f944e220fffbaa603a0e460760fdb
Parents: 7461ed9
Author: Christopher Tubbs
Authored: Fri Apr 18 12:26:02 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:26:02 2014 -0400
--
pom.xml | 6 +++---
src/core/pom.xml | 4
2 files changed, 3 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 87c50b9..615d0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,7 +496,7 @@
jdeb
-
${project.build.directory}/${artifactId}_${project.version}.deb
+
${project.build.directory}/${project.artifactId}_${project.version}.deb
false
src/packages/deb/accumulo
/usr/lib/accumulo
@@ -592,7 +592,7 @@
false
src/packages/deb/accumulo-native
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb
src/server/src/main/c++
@@ -632,7 +632,7 @@
false
src/packages/deb/accumulo-test
/usr/lib/accumulo
-
${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb
+
${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb
test
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d53f2e5/src/core/pom.xml
--
diff --git a/src/core/pom.xml b/src/core/pom.xml
index b310764..7b5ff02 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -172,10 +172,6 @@
libthrift
- org.apache.accumulo
- cloudtrace
-
-
jline
jline
[2/5] git commit: ACCUMULO-2529 Show compiler warnings in maven build
ACCUMULO-2529 Show compiler warnings in maven build Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3648c1bd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3648c1bd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3648c1bd Branch: refs/heads/master Commit: 3648c1bd3d4018ad13e14091aef237f5b5eac1ad Parents: 4d53f2e Author: Christopher Tubbs Authored: Fri Apr 18 12:27:28 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:27:28 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3648c1bd/pom.xml -- diff --git a/pom.xml b/pom.xml index 615d0bf..6ed7a61 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,8 @@ 1.6 1.6 true + true + true
[3/5] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
pom.xml
src/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa1d039
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa1d039
Branch: refs/heads/master
Commit: 0aa1d039e9369b00e3c19e1abaf92009d18b0496
Parents: 708ad54 3648c1b
Author: Christopher Tubbs
Authored: Fri Apr 18 12:35:15 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:35:15 2014 -0400
--
pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa1d039/pom.xml
--
diff --cc pom.xml
index 9464bff,6ed7a61..9aeb7ee
--- a/pom.xml
+++ b/pom.xml
@@@ -355,159 -336,6 +355,161 @@@
+ com.google.code.sortpom
+ maven-sortpom-plugin
+ 2.1.0
+
+recommended_2008_06
+\n
+false
+2
+scope,groupId,artifactId
+true
+Stop
+
+
+
+ com.github.koraktor
+ mavanagaiata
+ 0.6.1
+
+true
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+false
+gnu
+
+
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+ 2.9
+
+
+ JIRA
+
+true
+Closed,Resolved
+1
+true
+
+
+
+ maven-clean-plugin
+
+
+
+lib
+
+ *.jar
+
+
+
+docs/apidocs
+
+
+test
+
+ **/*.so
+
+
+
+./
+
+ **/*.pyc
+
+
+
+
+
+
+ maven-compiler-plugin
+
+1.6
+1.6
+true
+UTF-8
++true
++true
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.8
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+${sealJars}
+
${mvngit.commit.id}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+UTF-8
+true
+docs
+1.6
+-J-Xmx512m
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+-P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb
+true
+clean compile javadoc:aggregate deploy
+clean compile javadoc:aggregate
verify
+@{project.version}
+seal-jars
+false
+false
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ 3.3
+
+true
+
+
+
+ maven-surefire-plugin
+
+true
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+ 0.10
+
+
+ docs/apidocs/package-list
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.8
+
+
org.codehaus.mojo
cobertura-maven-plugin
2.5.2
[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca2d4ebd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca2d4ebd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca2d4ebd Branch: refs/heads/master Commit: ca2d4ebd904240796c5a0cf9eb75881b60d47ea1 Parents: 94008f6 1645b4f Author: Christopher Tubbs Authored: Fri Apr 18 12:37:51 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 12:37:51 2014 -0400 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ca2d4ebd/pom.xml -- diff --cc pom.xml index 2f22beb,f109643..6a82507 --- a/pom.xml +++ b/pom.xml @@@ -523,9 -517,11 +523,11 @@@ maven-compiler-plugin -1.6 -1.6 +1.7 +1.7 true + true + true
[7/9] git commit: Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Conflicts:
pom.xml
src/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0aa1d039
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0aa1d039
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0aa1d039
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 0aa1d039e9369b00e3c19e1abaf92009d18b0496
Parents: 708ad54 3648c1b
Author: Christopher Tubbs
Authored: Fri Apr 18 12:35:15 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 12:35:15 2014 -0400
--
pom.xml | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0aa1d039/pom.xml
--
diff --cc pom.xml
index 9464bff,6ed7a61..9aeb7ee
--- a/pom.xml
+++ b/pom.xml
@@@ -355,159 -336,6 +355,161 @@@
+ com.google.code.sortpom
+ maven-sortpom-plugin
+ 2.1.0
+
+recommended_2008_06
+\n
+false
+2
+scope,groupId,artifactId
+true
+Stop
+
+
+
+ com.github.koraktor
+ mavanagaiata
+ 0.6.1
+
+true
+
+
+
+ org.apache.maven.plugins
+ maven-assembly-plugin
+
+false
+gnu
+
+
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+ 2.9
+
+
+ JIRA
+
+true
+Closed,Resolved
+1
+true
+
+
+
+ maven-clean-plugin
+
+
+
+lib
+
+ *.jar
+
+
+
+docs/apidocs
+
+
+test
+
+ **/*.so
+
+
+
+./
+
+ **/*.pyc
+
+
+
+
+
+
+ maven-compiler-plugin
+
+1.6
+1.6
+true
+UTF-8
++true
++true
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.8
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+${sealJars}
+
${mvngit.commit.id}
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+UTF-8
+true
+docs
+1.6
+-J-Xmx512m
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+
+-P
apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb
+true
+clean compile javadoc:aggregate deploy
+clean compile javadoc:aggregate
verify
+@{project.version}
+seal-jars
+false
+false
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ 3.3
+
+true
+
+
+
+ maven-surefire-plugin
+
+true
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+ 0.10
+
+
+ docs/apidocs/package-list
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.8
+
+
org.codehaus.mojo
cobertura-maven-plugin
2.5.2
git commit: ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 1645b4f62 -> 0f3b4ca0a
ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault
This change fixes issues that occurred when the conditional writer got an
exception when trying to connect to a tserver. The conditonal writer could
throw an exception or loose mutations in this case. In either case the client
would hang.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f3b4ca0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f3b4ca0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f3b4ca0
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0f3b4ca0a321eb7514fe4b5c6dcc9b71c09ff187
Parents: 1645b4f
Author: Keith Turner
Authored: Fri Apr 18 17:39:36 2014 -0400
Committer: Keith Turner
Committed: Fri Apr 18 17:39:36 2014 -0400
--
.../core/client/impl/ConditionalWriterImpl.java | 21
.../test/randomwalk/conditional/Init.java | 7 ++-
2 files changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f3b4ca0/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 1ec6dee..01e4b95 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -559,15 +559,15 @@ class ConditionalWriterImpl implements ConditionalWriter {
SessionID sessionId = null;
-try {
-
- client = getClient(location);
-
+try {
Map> tmutations = new
HashMap>();
CompressedIterators compressedIters = new CompressedIterators();
convertMutations(mutations, cmidToCm, cmid, tmutations, compressedIters);
+ //getClient() call must come after converMutations in case it throws a
TException
+ client = getClient(location);
+
List tresults = null;
while (tresults == null) {
try {
@@ -615,7 +615,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
} catch (Exception e) {
queueException(location, cmidToCm, e);
} finally {
- unreserveSessionID(location);
+ if(sessionId != null)
+unreserveSessionID(location);
ThriftUtil.returnClient((TServiceClient) client);
}
}
@@ -637,7 +638,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
queueRetry(cmidToCm, location);
} else {
try {
-invalidateSession(sessionId, location, mutations);
+invalidateSession(sessionId, location);
for (CMK cmk : cmidToCm.values())
cmk.cm.queueResult(new Result(Status.UNKNOWN, cmk.cm, location));
} catch (Exception e2) {
@@ -652,15 +653,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
*
* If a conditional mutation is taking a long time to process, then this
method will wait for it to finish... unless this exceeds timeout.
*/
- private void invalidateSession(SessionID sessionId, String location,
TabletServerMutations mutations) throws AccumuloException,
+ private void invalidateSession(SessionID sessionId, String location) throws
AccumuloException,
AccumuloSecurityException, TableNotFoundException {
-ArrayList mutList = new ArrayList();
-
-for (List tml : mutations.getMutations().values()) {
- mutList.addAll(tml);
-}
-
long sleepTime = 50;
long startTime = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f3b4ca0/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
index bfad730..28f1fd8 100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
@@ -66,7 +66,12 @@ public class Init extends Test {
m.put(cf, "seq", Utils.getSeq(0));
if (j % 1000 == 0 && j > 0) {
- if (cw.write(m).getStatus() == Status.ACCEPTED)
+ Status status = cw.write(m).getStatus();
+
+ while(status == Status.UNKNOWN)
+status = cw.write(m).getStatus();
+
+ if (status == Status.ACCEPTED)
a
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5abb916f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5abb916f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5abb916f Branch: refs/heads/master Commit: 5abb916fc45a6608849d6bf2cb26cbf7b232b82d Parents: ca2d4eb 0f3b4ca Author: Keith Turner Authored: Fri Apr 18 17:56:47 2014 -0400 Committer: Keith Turner Committed: Fri Apr 18 17:56:47 2014 -0400 -- .../core/client/impl/ConditionalWriterImpl.java | 21 .../test/randomwalk/conditional/Init.java | 7 ++- 2 files changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5abb916f/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java --
[1/2] git commit: ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault
Repository: accumulo
Updated Branches:
refs/heads/master ca2d4ebd9 -> 5abb916fc
ACCUMULO-2695 Fixed Conditional writer hang caused by tablet server fault
This change fixes issues that occurred when the conditional writer got an
exception when trying to connect to a tserver. The conditonal writer could
throw an exception or loose mutations in this case. In either case the client
would hang.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f3b4ca0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f3b4ca0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f3b4ca0
Branch: refs/heads/master
Commit: 0f3b4ca0a321eb7514fe4b5c6dcc9b71c09ff187
Parents: 1645b4f
Author: Keith Turner
Authored: Fri Apr 18 17:39:36 2014 -0400
Committer: Keith Turner
Committed: Fri Apr 18 17:39:36 2014 -0400
--
.../core/client/impl/ConditionalWriterImpl.java | 21
.../test/randomwalk/conditional/Init.java | 7 ++-
2 files changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f3b4ca0/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 1ec6dee..01e4b95 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -559,15 +559,15 @@ class ConditionalWriterImpl implements ConditionalWriter {
SessionID sessionId = null;
-try {
-
- client = getClient(location);
-
+try {
Map> tmutations = new
HashMap>();
CompressedIterators compressedIters = new CompressedIterators();
convertMutations(mutations, cmidToCm, cmid, tmutations, compressedIters);
+ //getClient() call must come after converMutations in case it throws a
TException
+ client = getClient(location);
+
List tresults = null;
while (tresults == null) {
try {
@@ -615,7 +615,8 @@ class ConditionalWriterImpl implements ConditionalWriter {
} catch (Exception e) {
queueException(location, cmidToCm, e);
} finally {
- unreserveSessionID(location);
+ if(sessionId != null)
+unreserveSessionID(location);
ThriftUtil.returnClient((TServiceClient) client);
}
}
@@ -637,7 +638,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
queueRetry(cmidToCm, location);
} else {
try {
-invalidateSession(sessionId, location, mutations);
+invalidateSession(sessionId, location);
for (CMK cmk : cmidToCm.values())
cmk.cm.queueResult(new Result(Status.UNKNOWN, cmk.cm, location));
} catch (Exception e2) {
@@ -652,15 +653,9 @@ class ConditionalWriterImpl implements ConditionalWriter {
*
* If a conditional mutation is taking a long time to process, then this
method will wait for it to finish... unless this exceeds timeout.
*/
- private void invalidateSession(SessionID sessionId, String location,
TabletServerMutations mutations) throws AccumuloException,
+ private void invalidateSession(SessionID sessionId, String location) throws
AccumuloException,
AccumuloSecurityException, TableNotFoundException {
-ArrayList mutList = new ArrayList();
-
-for (List tml : mutations.getMutations().values()) {
- mutList.addAll(tml);
-}
-
long sleepTime = 50;
long startTime = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f3b4ca0/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
index bfad730..28f1fd8 100644
---
a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
+++
b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Init.java
@@ -66,7 +66,12 @@ public class Init extends Test {
m.put(cf, "seq", Utils.getSeq(0));
if (j % 1000 == 0 && j > 0) {
- if (cw.write(m).getStatus() == Status.ACCEPTED)
+ Status status = cw.write(m).getStatus();
+
+ while(status == Status.UNKNOWN)
+status = cw.write(m).getStatus();
+
+ if (status == Status.ACCEPTED)
acceptedCount++;
git commit: ACCUMULO-2686 Label classes with correct @since tag
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 0f3b4ca0a -> b383cc571
ACCUMULO-2686 Label classes with correct @since tag
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b383cc57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b383cc57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b383cc57
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b383cc571535dc8306f338a22e87051ab861dae3
Parents: 0f3b4ca
Author: Christopher Tubbs
Authored: Fri Apr 18 17:29:00 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 18:09:13 2014 -0400
--
.../apache/accumulo/core/security/crypto/BlockedIOStreamTest.java | 3 +--
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
.../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 212aaaf..ea64ac7 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.accumulo.core.security.crypto;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.Random;
import org.apache.accumulo.core.Constants;
-import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index fbd7ef3..6d16617 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -82,7 +82,7 @@ import com.google.common.collect.Maps;
* A utility class that will create Zookeeper and Accumulo processes that
write all of their data to a single local directory. This class makes it easy
to test
* code against a real Accumulo instance. Its much more accurate for testing
than {@link org.apache.accumulo.core.client.mock.MockAccumulo}, but much slower.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloClusterImpl implements AccumuloCluster {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 8f65786..3258991 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.server.util.PortUtils;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required
configurations must be passed to constructor(s) and all other configurations
are optional.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloConfigImpl implements AccumuloConfig {
@@ -204,6 +204,7 @@ public class MiniAccumuloConfigImpl implements
AccumuloConfig {
*
* @since 1.6.0
*/
+ @Override
public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) {
this.configuredZookeeperPort = zooKeeperPort;
this.zooKeeperPort = zooKeeperPort;
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3086472f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3086472f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3086472f Branch: refs/heads/master Commit: 3086472f4a90ba35e22ee4db3b228f002f68ad1d Parents: 5abb916 b383cc5 Author: Christopher Tubbs Authored: Fri Apr 18 18:13:46 2014 -0400 Committer: Christopher Tubbs Committed: Fri Apr 18 18:13:46 2014 -0400 -- .../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +- .../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3086472f/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java --
[1/2] git commit: ACCUMULO-2686 Label classes with correct @since tag
Repository: accumulo
Updated Branches:
refs/heads/master 5abb916fc -> 3086472f4
ACCUMULO-2686 Label classes with correct @since tag
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b383cc57
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b383cc57
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b383cc57
Branch: refs/heads/master
Commit: b383cc571535dc8306f338a22e87051ab861dae3
Parents: 0f3b4ca
Author: Christopher Tubbs
Authored: Fri Apr 18 17:29:00 2014 -0400
Committer: Christopher Tubbs
Committed: Fri Apr 18 18:09:13 2014 -0400
--
.../apache/accumulo/core/security/crypto/BlockedIOStreamTest.java | 3 +--
.../apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 2 +-
.../apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
index 212aaaf..ea64ac7 100644
---
a/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/security/crypto/BlockedIOStreamTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.accumulo.core.security.crypto;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,7 +27,6 @@ import java.util.Arrays;
import java.util.Random;
import org.apache.accumulo.core.Constants;
-import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
public class BlockedIOStreamTest {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index fbd7ef3..6d16617 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -82,7 +82,7 @@ import com.google.common.collect.Maps;
* A utility class that will create Zookeeper and Accumulo processes that
write all of their data to a single local directory. This class makes it easy
to test
* code against a real Accumulo instance. Its much more accurate for testing
than {@link org.apache.accumulo.core.client.mock.MockAccumulo}, but much slower.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloClusterImpl implements AccumuloCluster {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b383cc57/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
--
diff --git
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
index 8f65786..3258991 100644
---
a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
+++
b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloConfigImpl.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.server.util.PortUtils;
/**
* Holds configuration for {@link MiniAccumuloClusterImpl}. Required
configurations must be passed to constructor(s) and all other configurations
are optional.
*
- * @since 1.5.0
+ * @since 1.6.0
*/
public class MiniAccumuloConfigImpl implements AccumuloConfig {
@@ -204,6 +204,7 @@ public class MiniAccumuloConfigImpl implements
AccumuloConfig {
*
* @since 1.6.0
*/
+ @Override
public MiniAccumuloConfigImpl setZooKeeperPort(int zooKeeperPort) {
this.configuredZookeeperPort = zooKeeperPort;
this.zooKeeperPort = zooKeeperPort;
