You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/23 16:31:58 UTC
[01/10] git commit: backport CASSANDRA-6079
Updated Branches:
refs/heads/cassandra-1.2 7fdcbd0b4 -> 2980796a7
refs/heads/cassandra-2.0 5dc508645 -> 5176ce715
refs/heads/trunk bbab80ff3 -> 64309eeb8
backport CASSANDRA-6079
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2980796a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2980796a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2980796a
Branch: refs/heads/cassandra-1.2
Commit: 2980796a7df00499f6011c1d5db349521c9c5a50
Parents: 7fdcbd0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:30:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:30:22 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/BatchlogManager.java | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b4681ae..124b3e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java
index c56e106..2488458 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -17,13 +17,16 @@
*/
package org.apache.cassandra.db;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -35,6 +38,7 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.QueryProcessor;
@@ -70,6 +74,8 @@ public class BatchlogManager implements BatchlogManagerMBean
private final AtomicLong totalBatchesReplayed = new AtomicLong();
private final AtomicBoolean isReplaying = new AtomicBoolean();
+ private static final ScheduledExecutorService batchlogTasks = new DebuggableScheduledThreadPoolExecutor("BatchlogTasks");
+
public void start()
{
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -89,7 +95,8 @@ public class BatchlogManager implements BatchlogManagerMBean
replayAllFailedBatches();
}
};
- StorageService.optionalTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
+
+ batchlogTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
}
public int countAllBatches()
[09/10] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5176ce71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5176ce71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5176ce71
Branch: refs/heads/trunk
Commit: 5176ce71558946a210ff03c0c8f4b0af563e9942
Parents: 1202953
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:31:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:42 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5176ce71/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 39aebc8..bae83ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
2.0.2
* Move batchlog replay to its own executor (CASSANDRA-6079)
- * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
Merged from 1.2:
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
[04/10] git commit: CHANGES
Posted by jb...@apache.org.
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27227b02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27227b02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27227b02
Branch: refs/heads/cassandra-2.0
Commit: 27227b02e646a8b4a3e37a156e2a89f7f8d1bfe6
Parents: 5dc5086
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:25:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:06 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27227b02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0403381..a33c688 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
2.0.2
* Move batchlog replay to its own executor (CASSANDRA-6079)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+Merged from 1.2:
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
2.0.1
@@ -38,11 +41,6 @@
* Support named bind variables in CQL (CASSANDRA-6033)
Merged from 1.2:
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
- * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
- * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
-
-
-1.2.10
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1202953d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1202953d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1202953d
Branch: refs/heads/cassandra-2.0
Commit: 1202953d9ec2e9d98c4b8cf3a1e6db02f6d6cd55
Parents: 27227b0 2980796
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:31:10 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:10 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1202953d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a33c688,124b3e4..39aebc8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,11 +1,47 @@@
-1.2.11
- * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+2.0.2
+ * Move batchlog replay to its own executor (CASSANDRA-6079)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+Merged from 1.2:
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
-1.2.10
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[02/10] git commit: backport CASSANDRA-6079
Posted by jb...@apache.org.
backport CASSANDRA-6079
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2980796a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2980796a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2980796a
Branch: refs/heads/cassandra-2.0
Commit: 2980796a7df00499f6011c1d5db349521c9c5a50
Parents: 7fdcbd0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:30:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:30:22 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/BatchlogManager.java | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b4681ae..124b3e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java
index c56e106..2488458 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -17,13 +17,16 @@
*/
package org.apache.cassandra.db;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -35,6 +38,7 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.QueryProcessor;
@@ -70,6 +74,8 @@ public class BatchlogManager implements BatchlogManagerMBean
private final AtomicLong totalBatchesReplayed = new AtomicLong();
private final AtomicBoolean isReplaying = new AtomicBoolean();
+ private static final ScheduledExecutorService batchlogTasks = new DebuggableScheduledThreadPoolExecutor("BatchlogTasks");
+
public void start()
{
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -89,7 +95,8 @@ public class BatchlogManager implements BatchlogManagerMBean
replayAllFailedBatches();
}
};
- StorageService.optionalTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
+
+ batchlogTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
}
public int countAllBatches()
[08/10] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5176ce71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5176ce71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5176ce71
Branch: refs/heads/cassandra-2.0
Commit: 5176ce71558946a210ff03c0c8f4b0af563e9942
Parents: 1202953
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:31:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:42 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5176ce71/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 39aebc8..bae83ca 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
2.0.2
* Move batchlog replay to its own executor (CASSANDRA-6079)
- * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
Merged from 1.2:
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1202953d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1202953d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1202953d
Branch: refs/heads/trunk
Commit: 1202953d9ec2e9d98c4b8cf3a1e6db02f6d6cd55
Parents: 27227b0 2980796
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:31:10 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:10 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1202953d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a33c688,124b3e4..39aebc8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,11 +1,47 @@@
-1.2.11
- * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+2.0.2
+ * Move batchlog replay to its own executor (CASSANDRA-6079)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+Merged from 1.2:
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
-1.2.10
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[03/10] git commit: backport CASSANDRA-6079
Posted by jb...@apache.org.
backport CASSANDRA-6079
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2980796a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2980796a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2980796a
Branch: refs/heads/trunk
Commit: 2980796a7df00499f6011c1d5db349521c9c5a50
Parents: 7fdcbd0
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:30:22 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:30:22 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/BatchlogManager.java | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b4681ae..124b3e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
* Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2980796a/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BatchlogManager.java b/src/java/org/apache/cassandra/db/BatchlogManager.java
index c56e106..2488458 100644
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@ -17,13 +17,16 @@
*/
package org.apache.cassandra.db;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -35,6 +38,7 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.QueryProcessor;
@@ -70,6 +74,8 @@ public class BatchlogManager implements BatchlogManagerMBean
private final AtomicLong totalBatchesReplayed = new AtomicLong();
private final AtomicBoolean isReplaying = new AtomicBoolean();
+ private static final ScheduledExecutorService batchlogTasks = new DebuggableScheduledThreadPoolExecutor("BatchlogTasks");
+
public void start()
{
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -89,7 +95,8 @@ public class BatchlogManager implements BatchlogManagerMBean
replayAllFailedBatches();
}
};
- StorageService.optionalTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
+
+ batchlogTasks.scheduleWithFixedDelay(runnable, StorageService.RING_DELAY, REPLAY_INTERVAL, TimeUnit.MILLISECONDS);
}
public int countAllBatches()
[10/10] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64309eeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64309eeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64309eeb
Branch: refs/heads/trunk
Commit: 64309eeb8adebc5106c4e51da22b2f4920f1385e
Parents: bbab80f 5176ce7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:31:50 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:50 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64309eeb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index be19c73,bae83ca..9917ec1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,9 +1,17 @@@
+2.1
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+
+
2.0.2
* Move batchlog replay to its own executor (CASSANDRA-6079)
+ Merged from 1.2:
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
[05/10] git commit: CHANGES
Posted by jb...@apache.org.
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27227b02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27227b02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27227b02
Branch: refs/heads/trunk
Commit: 27227b02e646a8b4a3e37a156e2a89f7f8d1bfe6
Parents: 5dc5086
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 23 09:25:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 23 09:31:06 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27227b02/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0403381..a33c688 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
2.0.2
* Move batchlog replay to its own executor (CASSANDRA-6079)
* Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+Merged from 1.2:
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
2.0.1
@@ -38,11 +41,6 @@
* Support named bind variables in CQL (CASSANDRA-6033)
Merged from 1.2:
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
- * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
- * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
-
-
-1.2.10
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)