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 2015/02/26 06:24:02 UTC
[1/3] cassandra git commit: fix commitlog getPendingTasks to not
increment patch by jbellis for CASSANDRA-8862
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3b3570c8c -> 2215c491c
refs/heads/trunk 7f8a09840 -> 2c15d8212
fix commitlog getPendingTasks to not increment
patch by jbellis for CASSANDRA-8862
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2215c491
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2215c491
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2215c491
Branch: refs/heads/cassandra-2.1
Commit: 2215c491c904560a3b2575830b0cfb3e9200b350
Parents: 3b3570c8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 25 21:19:02 2015 -0800
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 25 21:23:45 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 6 +++---
.../cassandra/db/commitlog/AbstractCommitLogService.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 70641fd..ec5e233 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
2.1.4
- * Fix parallelism adjustment in range and secondary index
- queries when the first fetch does not satisfy the
- limit (CASSANDRA-8856)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
* Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
* Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
* Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 59bf691..517ebe3 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -182,6 +182,6 @@ public abstract class AbstractCommitLogService
public long getPendingTasks()
{
- return pending.incrementAndGet();
+ return pending.get();
}
}
\ No newline at end of file
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c15d821
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c15d821
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c15d821
Branch: refs/heads/trunk
Commit: 2c15d8212020022f0cf9e101772169b5dc541ae4
Parents: 7f8a098 2215c49
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 25 21:23:55 2015 -0800
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 25 21:23:55 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 6 +++---
.../cassandra/db/commitlog/AbstractCommitLogService.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c15d821/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 534a838,ec5e233..fe2ce4f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,7 +1,68 @@@
+3.0
+ * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760)
+ * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
+ * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
+ * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
+ * Support direct buffer decompression for reads (CASSANDRA-8464)
+ * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
+ * Group sstables for anticompaction correctly (CASSANDRA-8578)
+ * Add ReadFailureException to native protocol, respond
+ immediately when replicas encounter errors while handling
+ a read request (CASSANDRA-7886)
+ * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
+ * Allow mixing token and partition key restrictions (CASSANDRA-7016)
+ * Support index key/value entries on map collections (CASSANDRA-8473)
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
+ APIs (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any partition key column (CASSANDRA-7855)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063, 7813, 7708)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+ * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
+ * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
+
+
2.1.4
- * Fix parallelism adjustment in range and secondary index
- queries when the first fetch does not satisfy the
- limit (CASSANDRA-8856)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
* Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
* Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
* Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c15d821/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
[2/3] cassandra git commit: fix commitlog getPendingTasks to not
increment patch by jbellis for CASSANDRA-8862
Posted by jb...@apache.org.
fix commitlog getPendingTasks to not increment
patch by jbellis for CASSANDRA-8862
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2215c491
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2215c491
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2215c491
Branch: refs/heads/trunk
Commit: 2215c491c904560a3b2575830b0cfb3e9200b350
Parents: 3b3570c8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 25 21:19:02 2015 -0800
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 25 21:23:45 2015 -0800
----------------------------------------------------------------------
CHANGES.txt | 6 +++---
.../cassandra/db/commitlog/AbstractCommitLogService.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 70641fd..ec5e233 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
2.1.4
- * Fix parallelism adjustment in range and secondary index
- queries when the first fetch does not satisfy the
- limit (CASSANDRA-8856)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
* Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
* Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
* Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2215c491/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
index 59bf691..517ebe3 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogService.java
@@ -182,6 +182,6 @@ public abstract class AbstractCommitLogService
public long getPendingTasks()
{
- return pending.incrementAndGet();
+ return pending.get();
}
}
\ No newline at end of file