[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61543b4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61543b4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61543b4c
Branch: refs/heads/trunk
Commit: 61543b4c0080e1c2048ff43ae33d4cfc240accbb
Parents: 2015072 1cf9863
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 26 15:28:28 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 26 15:30:34 2014 +0200
--
CHANGES.txt | 1 +
.../db/compaction/LazilyCompactedRow.java | 7 ++-
.../apache/cassandra/db/RangeTombstoneTest.java | 58
3 files changed, 63 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61543b4c/CHANGES.txt
--
diff --cc CHANGES.txt
index e716cb5,badb45e..7a59744
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -85,37 -11,15 +85,38 @@@ Merged from 1.2
are thrown while handling native protocol messages (CASSANDRA-7470)
* Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543)
* Fix race in background compaction check (CASSANDRA-7745)
+ * Don't clear out range tombstones during compaction (CASSANDRA-7808)
-1.2.18
- * Support Thrift tables clustering columns on CqlPagingInputFormat
(CASSANDRA-7445)
- * Fix compilation with java 6 broke by CASSANDRA-7147
-
-
-1.2.17
+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)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * 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)
+ * Support DISTINCT for static columns and fix behaviour when DISTINC is
+ not use (CASSANDRA-7305).
+ * Refuse range queries with strict bounds on compact tables since they
+ are broken (CASSANDRA-7059)
+Merged from 1.2:
+ * Expose global ColumnFamily metrics (CASSANDRA-7273)
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
* Expose global ColumnFamily metrics (CASSANDRA-7273)
* Handle possible integer overflow in FastByteArrayOutputStream
(CASSANDRA-7373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61543b4c/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 1da1757,4360b0b..e3f18bd
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -192,14 -220,26 +192,14 @@@ public class LazilyCompactedRow extend
private class Reducer extends MergeIterator.ReducerOnDiskAtom,
OnDiskAtom
{
// all columns reduced together will have the same name, so there
will only be one column
-// in the container; we just want to leverage the conflict resolution
code from CF
-ColumnFamily container = emptyColumnFamily.cloneMeShallow();
+// in the container; we just want to leverage the conflict resolution
code from CF.
+// (Note that we add the row tombstone in getReduced.)
-
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5d1adb4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5d1adb4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5d1adb4
Branch: refs/heads/trunk
Commit: d5d1adb4407f226c23257c300d9184c0abe32aa9
Parents: 4b6d6eb 73eb68c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Aug 5 13:57:39 2014 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Aug 5 13:57:39 2014 -0500
--
.../cassandra/locator/SimpleSeedProvider.java | 27
1 file changed, 22 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5d1adb4/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
--
diff --cc src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index a9ca15b,6c426bd..eda9fff
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@@ -50,8 -61,22 +61,14 @@@ public class SimpleSeedProvider impleme
}
catch (Exception e)
{
- throw new AssertionError(e);
+ logger.warn(Could not refresh seeds from configuration file:
{}, e);
}
+ return Collections.unmodifiableList(seeds);
+ }
+
+ private ListInetAddress loadSeeds() throws IOException,
ConfigurationException
+ {
-InputStream input;
-URL url = DatabaseDescriptor.getStorageConfigURL();
-input = url.openStream();
-org.yaml.snakeyaml.constructor.Constructor constructor = new
org.yaml.snakeyaml.constructor.Constructor(Config.class);
-TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class);
-seedDesc.putMapPropertyType(parameters, String.class, String.class);
-constructor.addTypeDescription(seedDesc);
-Yaml yaml = new Yaml(new Loader(constructor));
-Config conf = (Config)yaml.load(input);
++Config conf = DatabaseDescriptor.loadConfig();
String[] hosts =
conf.seed_provider.parameters.get(seeds).split(,, -1);
ListInetAddress seeds = new ArrayListInetAddress(hosts.length);
for (String host : hosts)
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/c8f596ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8f596ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8f596ac Branch: refs/heads/trunk Commit: c8f596ac8dd2b2a1a700b9cdd9738361a7cad126 Parents: 025c07e 7065b1b Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jun 12 18:48:24 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jun 12 18:48:24 2014 -0500 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/fe5de338 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe5de338 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe5de338 Branch: refs/heads/trunk Commit: fe5de33838c5d7ca5ec1000140d9778a9767fe34 Parents: 6e0ce7a 31414fb Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Feb 7 08:35:02 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Feb 7 08:35:02 2014 -0600 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/34112efa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34112efa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34112efa Branch: refs/heads/trunk Commit: 34112efa4b23db02c8c99f5bce02afbb1f98c64b Parents: 723fcd1 ed5cac1 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Feb 4 18:33:33 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Feb 4 18:33:33 2014 -0600 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/b40b98d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b40b98d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b40b98d3 Branch: refs/heads/trunk Commit: b40b98d361bab28dcf5bd3902aa306ee3e852d30 Parents: 7ae6178 c612a36 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jan 24 12:50:24 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jan 24 12:50:24 2014 -0600 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/15cd55fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15cd55fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15cd55fe Branch: refs/heads/trunk Commit: 15cd55fe17074bfb9099bd9c50d4fe6f8ce685e7 Parents: 4be6200 5977e7b Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jan 10 12:49:22 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jan 10 12:49:22 2014 -0600 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/fc9709cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9709cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9709cd Branch: refs/heads/trunk Commit: fc9709cdfe6076bf7b6653a1797299c197be8619 Parents: 604e31b 2f63bba Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Dec 30 09:52:31 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Dec 30 09:52:31 2013 -0600 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/f97eeac2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f97eeac2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f97eeac2 Branch: refs/heads/trunk Commit: f97eeac26885187d2dd9634cde040a30434fdcf3 Parents: 854de4e c040759 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Oct 23 10:34:35 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Oct 23 10:34:35 2013 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/hadoop/ConfigHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97eeac2/CHANGES.txt -- diff --cc CHANGES.txt index 9f7f3f0,63627e1..ece28ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -7,39 -4,10 +7,40 @@@ Merged from 1.2 * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) * add windows bat files for shell commands (CASSANDRA-6145) * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) + * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214) -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97eeac2/src/java/org/apache/cassandra/hadoop/ConfigHelper.java --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/b0590c44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0590c44 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0590c44 Branch: refs/heads/trunk Commit: b0590c4480dbb5bb05c0ad28e223d20a0d9c9f09 Parents: 886f16c 5c0c84b Author: Jason Brown jasedbr...@gmail.com Authored: Thu Oct 17 14:00:33 2013 -0700 Committer: Jason Brown jasedbr...@gmail.com Committed: Thu Oct 17 14:00:33 2013 -0700 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/15aeb5c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15aeb5c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15aeb5c8 Branch: refs/heads/trunk Commit: 15aeb5c81226738cf7eb372d26fc95a1370e1994 Parents: 52b4fc3 d014e4c Author: Jonathan Ellis jbel...@apache.org Authored: Mon Sep 23 17:13:25 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Sep 23 17:13:25 2013 -0500 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15aeb5c8/CHANGES.txt -- diff --cc CHANGES.txt index aef45ba,cecb88a..b03d094 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,8 +1,12 @@@ -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) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) +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) + * Move batchlog replay to its own executor (CASSANDRA-6079) * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/fc1a7206 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1a7206 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc1a7206 Branch: refs/heads/trunk Commit: fc1a7206fe15882fd64e7ba8eb68ba9dc320275f Parents: 1e0d951 07b4878 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Sep 17 17:17:23 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Sep 17 17:17:23 2013 -0500 -- --
[5/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
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/14e7895e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14e7895e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14e7895e
Branch: refs/heads/trunk
Commit: 14e7895e59c63f510a586e2847226e3aa5c8a30b
Parents: c7a835d 196038b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 3 16:35:27 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 3 16:35:27 2013 +0200
--
build.xml | 2 +-
lib/netty-3.5.9.Final.jar | Bin 1128961 - 0 bytes
lib/netty-3.6.6.Final.jar | Bin 0 - 1206119 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14e7895e/build.xml
--
diff --cc build.xml
index 291b603,9e1de8d..74b3d0b
--- a/build.xml
+++ b/build.xml
@@@ -372,10 -379,14 +372,10 @@@
dependency groupId=log4j artifactId=log4j version=1.2.16 /
dependency groupId=org.apache.cassandra
artifactId=cassandra-all version=${version} /
dependency groupId=org.apache.cassandra
artifactId=cassandra-thrift version=${version} /
- dependency groupId=com.yammer.metrics artifactId=metrics-core
version=2.0.3 /
+ dependency groupId=com.yammer.metrics artifactId=metrics-core
version=2.2.0 /
dependency groupId=edu.stanford.ppl artifactId=snaptree
version=0.1 /
dependency groupId=org.mindrot artifactId=jbcrypt
version=0.3m /
- dependency groupId=io.netty artifactId=netty
version=3.5.9.Final /
+ dependency groupId=io.netty artifactId=netty
version=3.6.6.Final /
/dependencyManagement
developer id=alakshman name=Avinash Lakshman/
developer id=antelder name=Anthony Elder/
