You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/07/14 19:37:43 UTC
[01/10] accumulo git commit: ACCUMULO-4372 Fixes synchronization in
CompressionTest
Repository: accumulo
Updated Branches:
refs/heads/1.6 c5ac9f3b5 -> a8d1acd4b
refs/heads/1.7 8949e3d83 -> 9b7f60e5d
refs/heads/1.8 45ddd25b0 -> 791fbd6ba
refs/heads/master fe64f7552 -> 60c07fe80
ACCUMULO-4372 Fixes synchronization in CompressionTest
Also changed LZO so that creating a new codec doesn't always assign the new codec to the default variable
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8d1acd4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8d1acd4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8d1acd4
Branch: refs/heads/1.6
Commit: a8d1acd4bb34947ac49830e5a671e3f528ca2f7e
Parents: c5ac9f3
Author: phrocker <ma...@gmail.com>
Authored: Thu Jul 14 14:42:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 14:42:31 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 3b82462..fb0c066 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -155,8 +155,7 @@ public final class Compression {
// the default defined within the codec
if (bufferSize > 0)
myConf.setInt(BUFFER_SIZE_OPT, bufferSize);
- codec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
- return codec;
+ return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
} catch (ClassNotFoundException e) {
// that is okay
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index 9615564..683ad48 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -225,7 +225,9 @@ public class CompressionTest {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
- testSet.add(System.identityHashCode(codec));
+ synchronized (testSet) {
+ testSet.add(System.identityHashCode(codec));
+ }
return true;
}
});
[08/10] accumulo git commit: ACCUMULO-4372 Fixes synchronization in
CompressionTest
Posted by el...@apache.org.
ACCUMULO-4372 Fixes synchronization in CompressionTest
Also changed LZO so that creating a new codec doesn't always assign the new codec to the default variable
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/791fbd6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/791fbd6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/791fbd6b
Branch: refs/heads/1.8
Commit: 791fbd6ba17aaca1d19f57b20860930c81c99bf0
Parents: 45ddd25
Author: phrocker <ma...@gmail.com>
Authored: Thu Jul 14 14:42:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 15:37:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/791fbd6b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 9df2523..2b81541 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -156,8 +156,7 @@ public final class Compression {
// the default defined within the codec
if (bufferSize > 0)
myConf.setInt(BUFFER_SIZE_OPT, bufferSize);
- codec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
- return codec;
+ return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
} catch (ClassNotFoundException e) {
// that is okay
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/791fbd6b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index f3d6a22..6e8b843 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -219,7 +219,9 @@ public class CompressionTest {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
- testSet.add(System.identityHashCode(codec));
+ synchronized (testSet) {
+ testSet.add(System.identityHashCode(codec));
+ }
return true;
}
});
[09/10] accumulo git commit: ACCUMULO-4372 Fixes synchronization in
CompressionTest
Posted by el...@apache.org.
ACCUMULO-4372 Fixes synchronization in CompressionTest
Also changed LZO so that creating a new codec doesn't always assign the new codec to the default variable
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/791fbd6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/791fbd6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/791fbd6b
Branch: refs/heads/master
Commit: 791fbd6ba17aaca1d19f57b20860930c81c99bf0
Parents: 45ddd25
Author: phrocker <ma...@gmail.com>
Authored: Thu Jul 14 14:42:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 15:37:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/791fbd6b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 9df2523..2b81541 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -156,8 +156,7 @@ public final class Compression {
// the default defined within the codec
if (bufferSize > 0)
myConf.setInt(BUFFER_SIZE_OPT, bufferSize);
- codec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
- return codec;
+ return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
} catch (ClassNotFoundException e) {
// that is okay
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/791fbd6b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index f3d6a22..6e8b843 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -219,7 +219,9 @@ public class CompressionTest {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
- testSet.add(System.identityHashCode(codec));
+ synchronized (testSet) {
+ testSet.add(System.identityHashCode(codec));
+ }
return true;
}
});
[03/10] accumulo git commit: ACCUMULO-4372 Fixes synchronization in
CompressionTest
Posted by el...@apache.org.
ACCUMULO-4372 Fixes synchronization in CompressionTest
Also changed LZO so that creating a new codec doesn't always assign the new codec to the default variable
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8d1acd4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8d1acd4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8d1acd4
Branch: refs/heads/master
Commit: a8d1acd4bb34947ac49830e5a671e3f528ca2f7e
Parents: c5ac9f3
Author: phrocker <ma...@gmail.com>
Authored: Thu Jul 14 14:42:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 14:42:31 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 3b82462..fb0c066 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -155,8 +155,7 @@ public final class Compression {
// the default defined within the codec
if (bufferSize > 0)
myConf.setInt(BUFFER_SIZE_OPT, bufferSize);
- codec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
- return codec;
+ return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
} catch (ClassNotFoundException e) {
// that is okay
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index 9615564..683ad48 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -225,7 +225,9 @@ public class CompressionTest {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
- testSet.add(System.identityHashCode(codec));
+ synchronized (testSet) {
+ testSet.add(System.identityHashCode(codec));
+ }
return true;
}
});
[07/10] accumulo git commit: Merge branch '1.8'
Posted by el...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18a62d75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18a62d75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18a62d75
Branch: refs/heads/master
Commit: 18a62d7543b1ddcce50e9a14c0c0046afc8afd01
Parents: fe64f75 ffb5be4
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 14 15:25:21 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 15:25:21 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[04/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b7f60e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b7f60e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b7f60e5
Branch: refs/heads/1.7
Commit: 9b7f60e5dd059f120cb22287245bff14733608ec
Parents: 8949e3d a8d1acd
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 14 14:55:30 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 14:55:30 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
[02/10] accumulo git commit: ACCUMULO-4372 Fixes synchronization in
CompressionTest
Posted by el...@apache.org.
ACCUMULO-4372 Fixes synchronization in CompressionTest
Also changed LZO so that creating a new codec doesn't always assign the new codec to the default variable
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8d1acd4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8d1acd4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8d1acd4
Branch: refs/heads/1.7
Commit: a8d1acd4bb34947ac49830e5a671e3f528ca2f7e
Parents: c5ac9f3
Author: phrocker <ma...@gmail.com>
Authored: Thu Jul 14 14:42:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 14:42:31 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 3b82462..fb0c066 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -155,8 +155,7 @@ public final class Compression {
// the default defined within the codec
if (bufferSize > 0)
myConf.setInt(BUFFER_SIZE_OPT, bufferSize);
- codec = (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
- return codec;
+ return (CompressionCodec) ReflectionUtils.newInstance(Class.forName(clazz), myConf);
} catch (ClassNotFoundException e) {
// that is okay
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8d1acd4/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
index 9615564..683ad48 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
@@ -225,7 +225,9 @@ public class CompressionTest {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
- testSet.add(System.identityHashCode(codec));
+ synchronized (testSet) {
+ testSet.add(System.identityHashCode(codec));
+ }
return true;
}
});
[06/10] accumulo git commit: Merge branch '1.7' into 1.8
Posted by el...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ffb5be41
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffb5be41
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffb5be41
Branch: refs/heads/master
Commit: ffb5be4123c479d0b3aabd8dabb108cccf92bdf6
Parents: d664254 9b7f60e
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 14 15:11:37 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 15:11:37 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffb5be41/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
[05/10] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b7f60e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b7f60e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b7f60e5
Branch: refs/heads/master
Commit: 9b7f60e5dd059f120cb22287245bff14733608ec
Parents: 8949e3d a8d1acd
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 14 14:55:30 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 14:55:30 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/file/rfile/bcfile/Compression.java | 3 +--
.../apache/accumulo/core/file/rfile/bcfile/CompressionTest.java | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b7f60e5/core/src/test/java/org/apache/accumulo/core/file/rfile/bcfile/CompressionTest.java
----------------------------------------------------------------------
[10/10] accumulo git commit: Merge branch '1.8'
Posted by el...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/60c07fe8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/60c07fe8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/60c07fe8
Branch: refs/heads/master
Commit: 60c07fe80d37ef71505f90f778b06344b62e319e
Parents: 18a62d7 791fbd6
Author: Josh Elser <el...@apache.org>
Authored: Thu Jul 14 15:37:31 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jul 14 15:37:31 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------