You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/05/30 22:52:12 UTC
[1/2] git commit: Fix NPE in
StreamTransferTask.createMessageForRetry()
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9141f7ba7 -> 90477c310
Fix NPE in StreamTransferTask.createMessageForRetry()
patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/886d9fce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/886d9fce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/886d9fce
Branch: refs/heads/cassandra-2.1
Commit: 886d9fce46b369807071c5fc87204bb552db906d
Parents: 8480fa7
Author: Josh McKenzie <jo...@datastax.com>
Authored: Fri May 30 23:49:09 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 30 23:49:09 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/886d9fce/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 14b43e5..d1d1030 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
* Add conditional CREATE/DROP USER support (CASSANDRA-7264)
* Swap local and global default read repair chances (CASSANDRA-7320)
* Add missing iso8601 patterns for date strings (CASSANDRA-6973)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/886d9fce/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 7d0cc87..a543d01 100644
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@ -99,11 +99,12 @@ public class StreamTransferTask extends StreamTask
return new ArrayList<>(files.values());
}
- public OutgoingFileMessage createMessageForRetry(int sequenceNumber)
+ public synchronized OutgoingFileMessage createMessageForRetry(int sequenceNumber)
{
// remove previous time out task to be rescheduled later
ScheduledFuture future = timeoutTasks.get(sequenceNumber);
- future.cancel(false);
+ if (future != null)
+ future.cancel(false);
return files.get(sequenceNumber);
}
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90477c31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90477c31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90477c31
Branch: refs/heads/cassandra-2.1
Commit: 90477c3107e6cc2e5ffd815c820af38c5e0539dc
Parents: 9141f7b 886d9fc
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri May 30 23:51:58 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri May 30 23:51:58 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90477c31/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5293580,d1d1030..a849897
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,21 +1,51 @@@
-2.0.9
+2.1.0
++Merged from 2.0:
+ * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
- * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
- * Swap local and global default read repair chances (CASSANDRA-7320)
- * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
- * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
- * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
- * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
- * Add authentication support to shuffle (CASSANDRA-6484)
- * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
Merged from 1.2:
- * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
- * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
+* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
-2.0.8
+2.1.0-rc1
+ * Revert flush directory (CASSANDRA-6357)
+ * More efficient executor service for fast operations (CASSANDRA-4718)
+ * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
+ * Support more concurrent requests in native protocol (CASSANDRA-7231)
+ * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
+ * Change concurrent_compactors defaults (CASSANDRA-7139)
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+ * remove unused classes (CASSANDRA-7197)
+ * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
+ * Add validate method to CollectionType (CASSANDRA-7208)
+ * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
+ * Fix nodetool netstats (CASSANDRA-7270)
+ * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
+ * Use prepared statements internally (CASSANDRA-6975)
+ * Fix broken paging state with prepared statement (CASSANDRA-7120)
+ * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
+ * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
+ * Backport Thrift MultiSliceRequest (CASSANDRA-7027)
+ * Handle overlapping MultiSlices (CASSANDRA-7279)
+ * Fix DataOutputTest on Windows (CASSANDRA-7265)
+ * Embedded sets in user defined data-types are not updating (CASSANDRA-7267)
+ * Add tuple type to CQL/native protocol (CASSANDRA-7248)
+ * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322)
+Merged from 2.0:
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
+ * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
+ * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
* Always reallocate buffers in HSHA (CASSANDRA-6285)
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90477c31/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------