[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d087317f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d087317f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d087317f Branch: refs/heads/trunk Commit: d087317fdd0a2b35c0ee7473d6c83f0b24ced27d Parents: f2d6057 115bbe4 Author: Mikhail Stepura mish...@apache.org Authored: Fri Aug 15 14:55:25 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Fri Aug 15 14:55:25 2014 -0700 -- --
[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62838b93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62838b93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62838b93
Branch: refs/heads/cassandra-2.1
Commit: 62838b93b13f9029665b30af24a9576ae3d01ab6
Parents: 72241f6 f92291c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 17:53:40 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 17:53:40 2014 -0500
--
conf/cassandra-env.sh | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62838b93/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 1a8f08d,5e2fb87..be84e6e
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -217,9 -212,12 +217,13 @@@ JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThre
JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
JVM_OPTS=$JVM_OPTS -XX:+UseTLAB
+JVM_OPTS=$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler
# note: bash evals '1.7.x' as '1.7' so this is really a = 1.7 jvm check
+ if { [ $JVM_VERSION \ 1.7 ] [ $JVM_VERSION \ 1.8.0 ] [
$JVM_PATCH_VERSION -ge 60 ]; } || [ $JVM_VERSION \ 1.8 ] ; then
+ JVM_OPTS=$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled
-XX:+CMSEdenChunksRecordAlways
+ fi
+
if [ $JVM_ARCH = 64-Bit ] ; then
JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
fi
[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f6632f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f6632f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f6632f7 Branch: refs/heads/cassandra-2.1 Commit: 7f6632f7f5a19cde5debabe1a2c49c159b71db1d Parents: 381dd89 23402f4 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Aug 4 12:19:55 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Aug 4 12:19:55 2014 -0500 -- --
[08/11] git commit: merge from 2.0
merge from 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83ac8a63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83ac8a63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83ac8a63 Branch: refs/heads/trunk Commit: 83ac8a631ed46bde023779d4ddb0fa0624f64965 Parents: 380583b a454461 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jul 11 23:50:46 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jul 11 23:50:46 2014 -0500 -- CHANGES.txt | 1 + examples/hadoop_cql3_word_count/bin/word_count| 0 examples/hadoop_cql3_word_count/bin/word_count_counters | 0 examples/hadoop_cql3_word_count/bin/word_count_setup | 0 .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 7 ++- 5 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83ac8a63/CHANGES.txt -- diff --cc CHANGES.txt index c0fd4c0,e1c8922..d3390f9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,6 +1,32 @@@ -2.0.10 +2.1.0-final + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) +Merged from 2.0: + * Fix range merging when DES scores are zero (CASSANDRA-7535) * Warn when SSL certificates have expired (CASSANDRA-7528) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) +Merged from 1.2: + * Set correct stream ID on responses when non-Exception Throwables + are thrown while handling native protocol messages (CASSANDRA-7470) + + +2.1.0-rc3 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403) + * Introduce CQL support for stress tool (CASSANDRA-6146) + * Fix ClassCastException processing expired messages (CASSANDRA-7496) + * Fix prepared marker for collections inside UDT (CASSANDRA-7472) + * Remove left-over populate_io_cache_on_flush and replicate_on_write + uses (CASSANDRA-7493) + * (Windows) handle spaces in path names (CASSANDRA-7451) + * Ensure writes have completed after dropping a table, before recycling + commit log segments (CASSANDRA-7437) + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493) + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502) + * Properly reject unknown UDT field (CASSANDRA-7484) +Merged from 2.0: + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) + * Support DISTINCT for static columns and fix behaviour when DISTINC is + not use (CASSANDRA-7305). * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd6a766f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd6a766f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd6a766f Branch: refs/heads/trunk Commit: bd6a766f983789ca315b218781d2b347c2e09248 Parents: 8aa2b79 536ae7a Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jun 27 10:27:03 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jun 27 10:27:03 2014 -0500 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 3 +++ src/java/org/apache/cassandra/transport/Frame.java| 7 --- src/java/org/apache/cassandra/transport/Message.java | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd6a766f/CHANGES.txt -- diff --cc CHANGES.txt index 95921ff,e722392..47a5992 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -6,36 -2,30 +6,38 @@@ Merged from 2.0 * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) -2.0.9 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) +2.1.0-rc2 + * Fix heap size calculation for CompoundSparseCellName and + CompoundSparseCellName.WithCollection (CASSANDRA-7421) + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351) + * Modify reconcile logic to always pick a tombstone over a counter cell + (CASSANDRA-7346) + * Avoid incremental compaction on Windows (CASSANDRA-7365) + * Fix exception when querying a composite-keyed table with a collection index + (CASSANDRA-7372) + * Use node's host id in place of counter ids (CASSANDRA-7366) * Fix native protocol CAS batches (CASSANDRA-7337) + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) + * Don't fail streams on failure detector downs (CASSANDRA-3569) + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314) + * Reduce run time for CQL tests (CASSANDRA-7327) + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353) + * RefCount native frames from netty (CASSANDRA-7245) + * Use tarball dir instead of /var for default paths (CASSANDRA-7136) + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193) + * Fix schema change response in native protocol v3 (CASSANDRA-7413) +Merged from 2.0: + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) * Add per-CF range read request latency metrics (CASSANDRA-7338) * 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) * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) * Fix infinite loop on exception while streaming (CASSANDRA-7330) - * Reference sstables before populating key cache (CASSANDRA-7234) * Account for range tombstones in min/max column names (CASSANDRA-7235) * Improve sub range repair validation (CASSANDRA-7317) * Accept subtypes for function results, type casts (CASSANDRA-6766) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd6a766f/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd6a766f/src/java/org/apache/cassandra/transport/Frame.java --
[08/11] git commit: merge from 1.2
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/7d8a56df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d8a56df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d8a56df
Branch: refs/heads/trunk
Commit: 7d8a56df3df26be7537f2a5158469629c34b911c
Parents: 71c8912 92b3622
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 3 12:12:11 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 3 12:12:11 2013 -0500
--
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d8a56df/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 6c8e636,9b559e5..d16bef9
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -963,29 -637,35 +963,29 @@@ public class StorageProxy implements St
IteratorInetAddress iter = targets.iterator();
InetAddress target = iter.next();
-// direct writes to local DC or old Cassandra versions
-if (localDC || MessagingService.instance().getVersion(target)
MessagingService.VERSION_11)
+// Add the other destinations of the same message as a FORWARD_HEADER
entry
+DataOutputBuffer out = new DataOutputBuffer();
+try
{
-// yes, the loop and non-loop code here are the same; this is
clunky but we want to avoid
-// creating a second iterator since we already have a perfectly
good one
-MessagingService.instance().sendRR(message, target, handler,
message.getTimeout(), handler.consistencyLevel);
+out.writeInt(targets.size() - 1);
while (iter.hasNext())
{
-target = iter.next();
-MessagingService.instance().sendRR(message, target, handler);
+InetAddress destination = iter.next();
+CompactEndpointSerializationHelper.serialize(destination,
out);
- int id = MessagingService.instance().addCallback(handler,
message, destination, message.getTimeout());
++int id = MessagingService.instance().addCallback(handler,
message, destination, message.getTimeout(), handler.consistencyLevel);
+out.writeInt(id);
+logger.trace(Adding FWD message to {}@{}, id, destination);
}
-return;
+message = message.withParameter(RowMutation.FORWARD_TO,
out.getData());
+// send the combined message + forward headers
+int id = MessagingService.instance().sendRR(message, target,
handler);
+logger.trace(Sending message to {}@{}, id, target);
}
-
-// Add all the other destinations of the same message as a
FORWARD_HEADER entry
-FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
-DataOutputStream dos = new DataOutputStream(bos);
-dos.writeInt(targets.size() - 1);
-while (iter.hasNext())
+catch (IOException e)
{
-InetAddress destination = iter.next();
-CompactEndpointSerializationHelper.serialize(destination, dos);
-String id = MessagingService.instance().addCallback(handler,
message, destination, message.getTimeout());
-dos.writeUTF(id);
+// DataOutputBuffer is in-memory, doesn't throw IOException
+throw new AssertionError(e);
}
-message = message.withParameter(RowMutation.FORWARD_TO,
bos.toByteArray());
-// send the combined message + forward headers
-Tracing.trace(Enqueuing message to {}, target);
-MessagingService.instance().sendRR(message, target, handler);
}
private static void insertLocal(final RowMutation rm, final
AbstractWriteResponseHandler responseHandler)
[08/11] git commit: Merge branch 'cassandra-2.0' into trunk
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/bab62d56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab62d56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab62d56 Branch: refs/heads/trunk Commit: bab62d560628e115b6ee86e9b24b7dccc3e288bc Parents: 108b4db 7af56b5 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Sep 24 10:46:56 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Sep 24 10:46:56 2013 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 --- 2 files changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[08/11] git commit: merge
merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/950efdef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/950efdef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/950efdef Branch: refs/heads/cassandra-1.2 Commit: 950efdef9c6406d80268aed2ce7713ef5d396a9a Parents: 40669a3 9d0eec2 Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 21 13:53:00 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 21 13:53:00 2013 -0500 -- CHANGES.txt|1 + examples/pig/test/test_storage.pig |2 +- .../cassandra/hadoop/pig/CassandraStorage.java | 23 ++ 3 files changed, 12 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/950efdef/CHANGES.txt -- diff --cc CHANGES.txt index 103f659,24e9163..25290cd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,8 +1,9 @@@ 1.2.6 * Write row markers when serializing schema (CASSANDRA-5572) * Check only SSTables for the requested range when streaming (CASSANDRA-5569) -Merged from 1.1 +Merged from 1.1: + * Remove buggy thrift max message length option (CASSANDRA-5529) + * Fix NPE in Pig's widerow mode (CASSANDRA-5488) 1.2.5
