You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/04/23 17:18:27 UTC
[1/6] accumulo git commit: Merge branch '1.7' of
git://git.apache.org/accumulo into 1.7
Repository: accumulo
Updated Branches:
refs/heads/master 3e64bc999 -> 489c9279c
Merge branch '1.7' of git://git.apache.org/accumulo 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/5e71adcb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e71adcb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e71adcb
Branch: refs/heads/master
Commit: 5e71adcb540fcb91ed39c48e5d22186adb77d6ff
Parents: b731194 47c64d9
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:28:19 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:28:19 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/client/ClientConfiguration.java | 8 ++++++--
.../accumulo/core/client/ClientConfigurationTest.java | 13 +++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[4/6] accumulo git commit: Merge branch '1.7'
Posted by ec...@apache.org.
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/b63f7437
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b63f7437
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b63f7437
Branch: refs/heads/master
Commit: b63f743757ab9e29a34430e525bbefbd77d85a94
Parents: 3e64bc9 351f199
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 11:13:07 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 11:13:07 2015 -0400
----------------------------------------------------------------------
.../compaction/MajorCompactionRequest.java | 15 +++++++++++++--
test/src/test/resources/TestCompactionStrat.jar | Bin 2259 -> 2530 bytes
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/6] accumulo git commit: Merge branch 'master' of
git://git.apache.org/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch 'master' of git://git.apache.org/accumulo 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/02db25eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02db25eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02db25eb
Branch: refs/heads/master
Commit: 02db25eb8d328a5b71bd7679bfdbfe24972de0d7
Parents: 5e71adc dd01cbf
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:28:30 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:28:30 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
docs/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 2 +-
proxy/pom.xml | 2 +-
server/base/pom.xml | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
server/native/pom.xml | 2 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
shell/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[6/6] accumulo git commit: Merge branch '1.7'
Posted by ec...@apache.org.
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/489c9279
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/489c9279
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/489c9279
Branch: refs/heads/master
Commit: 489c9279c6d7c5f782942e0b5c0968bf6b06e884
Parents: b63f743 d3f74f7
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 11:17:51 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 11:17:51 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] accumulo git commit: ACCUMULO-3488 make MajorCompactionRequest
backwards compatible
Posted by ec...@apache.org.
ACCUMULO-3488 make MajorCompactionRequest backwards compatible
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/351f199d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/351f199d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/351f199d
Branch: refs/heads/master
Commit: 351f199d390b192d09e176bb2c5a1b19e74b72a0
Parents: 02db25e
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 11:12:52 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 11:12:52 2015 -0400
----------------------------------------------------------------------
.../compaction/MajorCompactionRequest.java | 15 +++++++++++++--
test/src/test/resources/TestCompactionStrat.jar | Bin 2259 -> 2530 bytes
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/351f199d/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index 712e8df..c6733f8 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -22,7 +22,9 @@ import java.util.Map;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.TabletId;
import org.apache.accumulo.core.data.impl.KeyExtent;
+import org.apache.accumulo.core.data.impl.TabletIdImpl;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVIterator;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
@@ -54,8 +56,17 @@ public class MajorCompactionRequest implements Cloneable {
this.files = mcr.files;
}
- public KeyExtent getExtent() {
- return extent;
+ /**
+ * @return org.apache.accumulo.core.data.KeyExtent
+ * @deprecated since 1.7. Use {@link #getTabletId()} instead.
+ */
+ @Deprecated
+ public org.apache.accumulo.core.data.KeyExtent getExtent() {
+ return new org.apache.accumulo.core.data.KeyExtent(extent.getTableId(), extent.getEndRow(), extent.getPrevEndRow());
+ }
+
+ public TabletId getTabletId() {
+ return new TabletIdImpl(extent);
}
public MajorCompactionReason getReason() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/351f199d/test/src/test/resources/TestCompactionStrat.jar
----------------------------------------------------------------------
diff --git a/test/src/test/resources/TestCompactionStrat.jar b/test/src/test/resources/TestCompactionStrat.jar
index a28cf7a..3daa16e 100644
Binary files a/test/src/test/resources/TestCompactionStrat.jar and b/test/src/test/resources/TestCompactionStrat.jar differ
[5/6] accumulo git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo 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/d3f74f7b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3f74f7b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3f74f7b
Branch: refs/heads/master
Commit: d3f74f7beec110882a4b65c50e31bda51d454944
Parents: 351f199 3e64bc9
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 11:17:01 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 11:17:01 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------