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/10/02 20:43:10 UTC
[1/7] accumulo git commit: ACCUMULO-4016 use object reference
equality to remove the minimum object queued
Repository: accumulo
Updated Branches:
refs/heads/master 8f6ab6d3e -> 49b44e4eb
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fbb082d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fbb082d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fbb082d9
Branch: refs/heads/master
Commit: fbb082d962aa472240ffccce753c5b4309fd5a46
Parents: 7a1d6d9
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 13:09:57 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:20:32 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fbb082d9/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index 0cb04a7..1e7c086 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@ -36,8 +36,14 @@ public class CompactionQueue extends AbstractQueue<Runnable> implements Blocking
return null;
Comparable min = Collections.min(task);
- task.remove(min);
- return (Runnable) min;
+ Iterator<Comparable> iterator = task.iterator();
+ while (iterator.hasNext()) {
+ if (iterator.next() == min) {
+ iterator.remove();
+ return (Runnable) min;
+ }
+ }
+ throw new IllegalStateException("Minimum object found, but not there when removing");
}
@Override
[6/7] accumulo git commit: ACCUMULO-4016 resolve conflict
Posted by ec...@apache.org.
ACCUMULO-4016 resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4623103e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4623103e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4623103e
Branch: refs/heads/master
Commit: 4623103e2644e46eb06d8a0a0cddf9ac8f6e622e
Parents: 01234be a39b3f6
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 14:42:19 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:42:19 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/7] accumulo git commit: ACCUMULO-4016 use object reference
equality to remove the minimum object queued
Posted by ec...@apache.org.
ACCUMULO-4016 use object reference equality to remove the minimum object queued
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/747a1901
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/747a1901
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/747a1901
Branch: refs/heads/master
Commit: 747a1901cc964e61ffd7f32b0b4302b28397a615
Parents: f50db38 4b5ea53
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 13:15:15 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:21:27 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/tserver/CompactionQueue.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/747a1901/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
index bbb6536,1e7c086..f87131e
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/CompactionQueue.java
@@@ -48,9 -35,15 +48,15 @@@ class CompactionQueue extends AbstractQ
if (task.size() == 0)
return null;
- Comparable min = Collections.min(task);
- Iterator<Comparable> iterator = task.iterator();
+ TraceRunnable min = Collections.min(task, comparator);
- task.remove(min);
- return min;
++ Iterator<TraceRunnable> iterator = task.iterator();
+ while (iterator.hasNext()) {
+ if (iterator.next() == min) {
+ iterator.remove();
- return (Runnable) min;
++ return min;
+ }
+ }
+ throw new IllegalStateException("Minimum object found, but not there when removing");
}
@Override
[4/7] accumulo git commit: Merge branch '1.7' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch '1.7' of https://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/01234bef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/01234bef
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/01234bef
Branch: refs/heads/master
Commit: 01234bef3a6ff8d456830245d64a0747b0d1a1ae
Parents: 747a190 0013e46
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 14:22:14 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:22:14 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/7] accumulo git commit: Merge branch '1.6' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Posted by ec...@apache.org.
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a922ed79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a922ed79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a922ed79
Branch: refs/heads/master
Commit: a922ed791acbda208529230c4c161bab285cbb91
Parents: fbb082d 4b5ea53
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 14:22:04 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:22:04 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/7] accumulo git commit: ACCUMULO-4016 wrapper classes should
forward to underlying methods
Posted by ec...@apache.org.
ACCUMULO-4016 wrapper classes should forward to underlying methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a39b3f6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a39b3f6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a39b3f6b
Branch: refs/heads/master
Commit: a39b3f6be7eace0c8980517800ce068bb6cc1afc
Parents: a922ed7
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 14:40:48 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:40:48 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/trace/instrument/TraceRunnable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a39b3f6b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
index 3b7d4f6..45df0fe 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/TraceRunnable.java
@@ -51,7 +51,7 @@ public class TraceRunnable implements Runnable, Comparable<TraceRunnable> {
@Override
public boolean equals(Object o) {
if (o instanceof TraceRunnable) {
- return 0 == this.compareTo((TraceRunnable) o);
+ return runnable.equals(((TraceRunnable) o).runnable);
}
return false;
[7/7] 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/49b44e4e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49b44e4e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49b44e4e
Branch: refs/heads/master
Commit: 49b44e4eb1b66052cebc612040dc4e77051c89ec
Parents: 8f6ab6d 4623103
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Oct 2 14:42:31 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Oct 2 14:42:31 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------