[5/6] cassandra 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/5e631a8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e631a8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e631a8f Branch: refs/heads/cassandra-2.1 Commit: 5e631a8fda383d912271a0f517438f5ec2f21846 Parents: 2a4daaf 1611ef3 Author: Robert Stupp sn...@snazy.de Authored: Thu May 14 10:37:22 2015 +0200 Committer: Robert Stupp sn...@snazy.de Committed: Thu May 14 10:39:04 2015 +0200 -- CHANGES.txt | 1 + tools/bin/token-generator | 53 +++--- tools/bin/token-generator.bat | 34 3 files changed, 73 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e631a8f/CHANGES.txt -- diff --cc CHANGES.txt index 033d75d,cee28bc..46a1374 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,28 -1,7 +1,29 @@@ -2.0.16: +2.1.6 + * Failure detector detects and ignores local pauses (CASSANDRA-9183) + * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) + * Add missing consistency levels to cassandra-stess (CASSANDRA-9361) + * Fix commitlog getCompletedTasks to not increment (CASSANDRA-9339) + * Fix for harmless exceptions logged as ERROR (CASSANDRA-8564) + * Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606) + * Improve sstable exclusion from partition tombstones (CASSANDRA-9298) + * Validate the indexed column rather than the cell's contents for 2i (CASSANDRA-9057) + * Add support for top-k custom 2i queries (CASSANDRA-8717) + * Fix error when dropping table during compaction (CASSANDRA-9251) + * cassandra-stress supports validation operations over user profiles (CASSANDRA-8773) + * Add support for rate limiting log messages (CASSANDRA-9029) + * Log the partition key with tombstone warnings (CASSANDRA-8561) + * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271) + * Fix PITR commitlog replay (CASSANDRA-9195) + * GCInspector logs very different times (CASSANDRA-9124) + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261) + * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151) + * Repair waits for anticompaction to finish (CASSANDRA-9097) + * Fix streaming not holding ref when stream error (CASSANDRA-9295) +Merged from 2.0: + * token-generator - generated tokens too long (CASSANDRA-9300) - -2.0.15: * Fix counting of tombstones for TombstoneOverwhelmingException (CASSANDRA-9299) * Fix ReconnectableSnitch reconnecting to peers during upgrade (CASSANDRA-6702) * Include keyspace and table name in error log for collections over the size
[5/6] cassandra 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/98eb8ba5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98eb8ba5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98eb8ba5 Branch: refs/heads/cassandra-2.1 Commit: 98eb8ba52d2210938b575b5a445164835c74dca8 Parents: 19540f0 33cf701 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue May 12 14:39:49 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue May 12 14:39:49 2015 -0500 -- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/98eb8ba5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/index/SecondaryIndex.java
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c5ce66f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c5ce66f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c5ce66f
Branch: refs/heads/cassandra-2.1
Commit: 8c5ce66fe32c8bfdc7712b70164948e82592f91e
Parents: b14236f9 6ab0c30
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu May 7 11:57:52 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu May 7 11:57:52 2015 +0100
--
CHANGES.txt | 2 ++
.../cassandra/db/index/SecondaryIndex.java | 13
.../db/index/SecondaryIndexManager.java | 4 ++--
.../cassandra/db/ColumnFamilyStoreTest.java | 21 +---
.../db/index/PerRowSecondaryIndexTest.java | 20 +--
5 files changed, 40 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5ce66f/CHANGES.txt
--
diff --cc CHANGES.txt
index 6363974,d76606c..41e0340
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,22 @@@
+2.1.6
+ * Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
+ * Validate the indexed column rather than the cell's contents for 2i
(CASSANDRA-9057)
+ * Add support for top-k custom 2i queries (CASSANDRA-8717)
+ * Fix error when dropping table during compaction (CASSANDRA-9251)
+ * cassandra-stress supports validation operations over user profiles
(CASSANDRA-8773)
+ * Add support for rate limiting log messages (CASSANDRA-9029)
+ * Log the partition key with tombstone warnings (CASSANDRA-8561)
+ * Reduce runWithCompactionsDisabled poll interval to 1ms (CASSANDRA-9271)
+ * Fix PITR commitlog replay (CASSANDRA-9195)
+ * GCInspector logs very different times (CASSANDRA-9124)
+ * Fix deleting from an empty list (CASSANDRA-9198)
+ * Update tuple and collection types that use a user-defined type when that
UDT
+ is modified (CASSANDRA-9148, CASSANDRA-9192)
+ * Use higher timeout for prepair and snapshot in repair (CASSANDRA-9261)
+ * Fix anticompaction blocking ANTI_ENTROPY stage (CASSANDRA-9151)
+Merged from 2.0:
+ 2.0.15:
+ * Overload SecondaryIndex#indexes to accept the column definition
(CASSANDRA-9314)
* (cqlsh) Add SERIAL and LOCAL_SERIAL consistency levels (CASSANDRA-8051)
* Fix index selection during rebuild with certain table layouts
(CASSANDRA-9281)
* Fix partition-level-delete-only workload accounting (CASSANDRA-9194)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5ce66f/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index 20fdcec,789cc29..2dc0a22
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@@ -304,11 -290,32 +304,24 @@@ public abstract class SecondaryInde
}
/**
- * Returns true if the provided column name is indexed by this secondary
index.
+ * Returns true if the provided cell name is indexed by this secondary
index.
+ *
+ * The default implementation checks whether the name is one the
columnDef name,
+ * but this should be overriden but subclass if needed.
*/
-public boolean indexes(ByteBuffer name)
-{
-for (ColumnDefinition columnDef : columnDefs)
-{
-if (baseCfs.getComparator().compare(columnDef.name, name) == 0)
-return true;
-}
-return false;
-}
-
+public abstract boolean indexes(CellName name);
+
/**
+ * Returns true if the provided column definition is indexed by this
secondary index.
+ *
+ * The default implementation checks whether it is contained in this
index column definitions set.
+ */
+ public boolean indexes(ColumnDefinition cdef)
+ {
+ return columnDefs.contains(cdef);
+ }
+
+ /**
* This is the primary way to create a secondary index instance for a CF
column.
* It will validate the index_options before initializing.
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c5ce66f/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
[5/6] cassandra 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/0276c2aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0276c2aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0276c2aa Branch: refs/heads/cassandra-2.1 Commit: 0276c2aab72c7b18b9015b0491013d958dafc46a Parents: 6d06f32 a11bc78 Author: Yuki Morishita yu...@apache.org Authored: Fri May 1 16:56:30 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri May 1 16:56:30 2015 -0500 -- CHANGES.txt | 1 + .../cassandra/streaming/messages/IncomingFileMessage.java | 7 +++ 2 files changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0276c2aa/CHANGES.txt -- diff --cc CHANGES.txt index a6e4e41,e9287ec..a8cd1db --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,93 -4,10 +13,94 @@@ Merged from 2.0 * Allow scrub to handle corrupted compressed chunks (CASSANDRA-9140) * Fix assertion error when resetlocalschema is run during repair (CASSANDRA-9249) * Disable single sstable tombstone compactions for DTCS by default (CASSANDRA-9234) - * Do more agressive ttl expiration checks to be able to - drop more sstables (CASSANDRA-8243) * IncomingTcpConnection thread is not named (CASSANDRA-9262) * Close incoming connections when MessagingService is stopped (CASSANDRA-9238) ++ * Fix streaming hang when retrying (CASSANDRA-9132) + + +2.1.5 + * Re-add deprecated cold_reads_to_omit param for backwards compat (CASSANDRA-9203) + * Make anticompaction visible in compactionstats (CASSANDRA-9098) + * Improve nodetool getendpoints documentation about the partition + key parameter (CASSANDRA-6458) + * Don't check other keyspaces for schema changes when an user-defined + type is altered (CASSANDRA-9187) + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348) + * Limit major sstable operations to their canonical representation (CASSANDRA-8669) + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125) + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080) + * Add generate-idea-files target to build.xml (CASSANDRA-9123) + * Do not load read meter for offline operations (CASSANDRA-9082) + * cqlsh: Make CompositeType data readable (CASSANDRA-8919) + * cqlsh: Fix display of triggers (CASSANDRA-9081) + * Fix NullPointerException when deleting or setting an element by index on + a null list collection (CASSANDRA-9077) + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/Memtable.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f9c9ce5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f9c9ce5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f9c9ce5
Branch: refs/heads/cassandra-2.1
Commit: 4f9c9ce55fd9993d06bf6dc4d9193e973fb8515f
Parents: db127a1 f0c7a6f
Author: Benedict Elliott Smith bened...@apache.org
Authored: Fri May 1 11:33:40 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Fri May 1 11:33:40 2015 +0100
--
CHANGES.txt| 1 +
src/java/org/apache/cassandra/db/Memtable.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f9c9ce5/CHANGES.txt
--
diff --cc CHANGES.txt
index c063368,dfdad51..59b1182
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
-2.0.15:
+2.1.6
+ * Fix PITR commitlog replay (CASSANDRA-9195)
+ * GCInspector logs very different times (CASSANDRA-9124)
+ * Fix deleting from an empty list (CASSANDRA-9198)
+ * Update tuple and collection types that use a user-defined type when that
UDT
+ is modified (CASSANDRA-9148, CASSANDRA-9192)
+Merged from 2.0:
+ * Fix partition-level-delete-only workload accounting (CASSANDRA-9194)
* Allow scrub to handle corrupted compressed chunks (CASSANDRA-9140)
* Fix assertion error when resetlocalschema is run during repair
(CASSANDRA-9249)
* Disable single sstable tombstone compactions for DTCS by default
(CASSANDRA-9234)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f9c9ce5/src/java/org/apache/cassandra/db/Memtable.java
--
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index eb04bea,897d94e..9a8596a
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -151,62 -182,45 +151,64 @@@ public class Memtabl
}
}
-public void updateLiveRatio() throws RuntimeException
+public boolean isLive()
{
-if (!MemoryMeter.isInitialized())
-{
-// hack for openjdk. we log a warning about this in the startup
script too.
-logger.error(MemoryMeter uninitialized (jamm not specified as
java agent); assuming liveRatio of {}.
- + Usually this means cassandra-env.sh disabled
jamm because you are using a buggy JRE;
- + upgrade to the Sun JRE instead, liveRatio);
-return;
-}
+return allocator.isLive();
+}
-if (!meteringInProgress.add(cfs))
-{
-logger.debug(Metering already pending or active for {}; skipping
liveRatio update, cfs);
-return;
-}
+public boolean isClean()
+{
+return rows.isEmpty();
+}
-meterExecutor.submit(new MeteringRunnable(cfs));
+public boolean isCleanAfter(ReplayPosition position)
+{
+return isClean() || (position != null
minReplayPosition.compareTo(position) = 0);
}
-private long resolve(DecoratedKey key, ColumnFamily cf,
SecondaryIndexManager.Updater indexer)
+/**
+ * @return true if this memtable is expired. Expiration time is
determined by CF's memtable_flush_period_in_ms.
+ */
+public boolean isExpired()
+{
+int period = cfs.metadata.getMemtableFlushPeriod();
+return period 0 (System.nanoTime() - creationNano =
TimeUnit.MILLISECONDS.toNanos(period));
+}
+
+/**
+ * Should only be called by ColumnFamilyStore.apply via Keyspace.apply,
which supplies the appropriate
+ * OpOrdering.
+ *
+ * replayPosition should only be null if this is a secondary index, in
which case it is *expected* to be null
+ */
+long put(DecoratedKey key, ColumnFamily cf, SecondaryIndexManager.Updater
indexer, OpOrder.Group opGroup)
{
-AtomicSortedColumns previous = rows.get(key);
+AtomicBTreeColumns previous = rows.get(key);
+ long initialSize = 0;
if (previous == null)
{
-AtomicSortedColumns empty =
cf.cloneMeShallow(AtomicSortedColumns.factory, false);
+AtomicBTreeColumns empty =
cf.cloneMeShallow(AtomicBTreeColumns.factory, false);
+final DecoratedKey cloneKey = allocator.clone(key, opGroup);
// We'll add the columns later. This avoids wasting works if we
get beaten in the putIfAbsent
-previous = rows.putIfAbsent(new
[5/6] cassandra 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/8322d18e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8322d18e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8322d18e Branch: refs/heads/cassandra-2.1 Commit: 8322d18e1da5b55cfe044459c4626aaa467ff02f Parents: ea1beda 58f25d5 Author: Robert Stupp sn...@snazy.de Authored: Wed Apr 29 18:51:42 2015 +0200 Committer: Robert Stupp sn...@snazy.de Committed: Wed Apr 29 18:51:42 2015 +0200 -- CHANGES.txt | 4 src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 2 +- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8322d18e/CHANGES.txt -- diff --cc CHANGES.txt index a19fa69,213f226..c23b99f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,88 -1,5 +1,92 @@@ -2.0.15: ++2.1.6 ++Merged from 2.0: + * IncomingTcpConnection thread is not named (CASSANDRA-9262) ++ +2.1.5 + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Re-add deprecated cold_reads_to_omit param for backwards compat (CASSANDRA-9203) + * Make anticompaction visible in compactionstats (CASSANDRA-9098) + * Improve nodetool getendpoints documentation about the partition + key parameter (CASSANDRA-6458) + * Don't check other keyspaces for schema changes when an user-defined + type is altered (CASSANDRA-9187) + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348) + * Limit major sstable operations to their canonical representation (CASSANDRA-8669) + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125) + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080) + * Add generate-idea-files target to build.xml (CASSANDRA-9123) + * Do not load read meter for offline operations (CASSANDRA-9082) + * cqlsh: Make CompositeType data readable (CASSANDRA-8919) + * cqlsh: Fix display of triggers (CASSANDRA-9081) + * Fix NullPointerException when deleting or setting an element by index on + a null list collection (CASSANDRA-9077) + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + *
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/net/IncomingTcpConnection.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bcdd0fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bcdd0fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bcdd0fb Branch: refs/heads/cassandra-2.1 Commit: 9bcdd0fb78d38cc5f8e5eda02334366373ca1243 Parents: 2200f7b cefaa4e Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Apr 29 16:06:02 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Apr 29 16:06:02 2015 -0500 -- CHANGES.txt | 1 + .../gms/GossipDigestSynVerbHandler.java | 8 src/java/org/apache/cassandra/gms/Gossiper.java | 26 - .../net/IncomingStreamingConnection.java| 31 .../cassandra/net/IncomingTcpConnection.java| 39 +--- .../apache/cassandra/net/MessagingService.java | 11 +- 6 files changed, 59 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bcdd0fb/CHANGES.txt -- diff --cc CHANGES.txt index 7d0eae4,3df91ce..ac68df9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,93 -1,6 +1,94 @@@ -2.0.15: +2.1.6 + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) +Merged from 2.0: * IncomingTcpConnection thread is not named (CASSANDRA-9262) + * Close incoming connections when MessagingService is stopped (CASSANDRA-9238) + +2.1.5 + * Re-add deprecated cold_reads_to_omit param for backwards compat (CASSANDRA-9203) + * Make anticompaction visible in compactionstats (CASSANDRA-9098) + * Improve nodetool getendpoints documentation about the partition + key parameter (CASSANDRA-6458) + * Don't check other keyspaces for schema changes when an user-defined + type is altered (CASSANDRA-9187) + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348) + * Limit major sstable operations to their canonical representation (CASSANDRA-8669) + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125) + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080) + * Add generate-idea-files target to build.xml (CASSANDRA-9123) + * Do not load read meter for offline operations (CASSANDRA-9082) + * cqlsh: Make CompositeType data readable (CASSANDRA-8919) + * cqlsh: Fix display of triggers (CASSANDRA-9081) + * Fix NullPointerException when deleting or setting an element by index on + a null list collection (CASSANDRA-9077) + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Use
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/ea1beda0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea1beda0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea1beda0 Branch: refs/heads/cassandra-2.1 Commit: ea1beda01f55f14a4ab8aac24c8772a263ca202c Parents: 7043a66 08dbbd6 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Apr 27 14:38:30 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Apr 27 14:38:30 2015 -0500 -- CHANGES.txt | 1 + .../gms/GossipDigestSynVerbHandler.java | 8 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 26 3 files changed, 35 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea1beda0/CHANGES.txt -- diff --cc CHANGES.txt index b63c19c,c54bc45..a19fa69 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,88 -1,5 +1,89 @@@ -2.0.15: +2.1.5 + * Fix deleting from an empty list (CASSANDRA-9198) + * Update tuple and collection types that use a user-defined type when that UDT + is modified (CASSANDRA-9148, CASSANDRA-9192) + * Re-add deprecated cold_reads_to_omit param for backwards compat (CASSANDRA-9203) + * Make anticompaction visible in compactionstats (CASSANDRA-9098) + * Improve nodetool getendpoints documentation about the partition + key parameter (CASSANDRA-6458) + * Don't check other keyspaces for schema changes when an user-defined + type is altered (CASSANDRA-9187) + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348) + * Limit major sstable operations to their canonical representation (CASSANDRA-8669) + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125) + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080) + * Add generate-idea-files target to build.xml (CASSANDRA-9123) + * Do not load read meter for offline operations (CASSANDRA-9082) + * cqlsh: Make CompositeType data readable (CASSANDRA-8919) + * cqlsh: Fix display of triggers (CASSANDRA-9081) + * Fix NullPointerException when deleting or setting an element by index on + a null list collection (CASSANDRA-9077) + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs
[5/6] cassandra 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/b4fae855 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4fae855 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4fae855 Branch: refs/heads/cassandra-2.1 Commit: b4fae85578b1bd31d162be9cb58b03c0be9f853f Parents: 5d88ff4 724384a Author: Jonathan Ellis jbel...@apache.org Authored: Fri Apr 17 11:24:19 2015 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Apr 17 11:24:19 2015 -0500 -- src/java/org/apache/cassandra/utils/MurmurHash.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4fae855/src/java/org/apache/cassandra/utils/MurmurHash.java --
[5/6] cassandra 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/f7884c50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7884c50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7884c50 Branch: refs/heads/cassandra-2.1 Commit: f7884c50e81f1c52ca46fd87cf18ddc0de71a33c Parents: 4f2c372 84b2846 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Apr 15 09:35:48 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Apr 15 09:35:48 2015 -0500 -- src/java/org/apache/cassandra/gms/Gossiper.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7884c50/src/java/org/apache/cassandra/gms/Gossiper.java --
[5/6] cassandra 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/3c17ac6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c17ac6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c17ac6e Branch: refs/heads/cassandra-2.1 Commit: 3c17ac6e1c3da822013c99a179e9e4030b5086f9 Parents: 7b50213 a64bc43 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Apr 15 10:40:25 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Apr 15 10:40:25 2015 -0500 -- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c17ac6e/src/java/org/apache/cassandra/gms/Gossiper.java --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f2c3728 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f2c3728 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f2c3728 Branch: refs/heads/cassandra-2.1 Commit: 4f2c37289712f6b416a89b48614bf4c7039324b1 Parents: 9d3dfd0 b2c62bb Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Apr 15 09:32:33 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Apr 15 09:32:33 2015 -0500 -- CHANGES.txt | 1 + .../gms/GossipShutdownVerbHandler.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 86 ++-- .../apache/cassandra/gms/HeartBeatState.java| 5 ++ .../apache/cassandra/gms/VersionedValue.java| 6 ++ .../cassandra/service/StorageService.java | 13 ++- 6 files changed, 101 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f2c3728/CHANGES.txt -- diff --cc CHANGES.txt index 7ebaa89,460b07c..f17d7e3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,82 -1,5 +1,83 @@@ -2.0.15: +2.1.5 + * Don't check other keyspaces for schema changes when an user-defined + type is altered (CASSANDRA-9187) + * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348) + * Limit major sstable operations to their canonical representation (CASSANDRA-8669) + * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125) + * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080) + * Add generate-idea-files target to build.xml (CASSANDRA-9123) + * Do not load read meter for offline operations (CASSANDRA-9082) + * cqlsh: Make CompositeType data readable (CASSANDRA-8919) + * cqlsh: Fix display of triggers (CASSANDRA-9081) + * Fix NullPointerException when deleting or setting an element by index on + a null list collection (CASSANDRA-9077) + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856) + * Fix parallelism adjustment in
[5/6] cassandra 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/1c0a8d58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c0a8d58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c0a8d58 Branch: refs/heads/cassandra-2.1 Commit: 1c0a8d58aabf6ff39ff416363e4bce081bb43ad0 Parents: e8cdaf1 59ba098 Author: Yuki Morishita yu...@apache.org Authored: Tue Apr 7 13:09:45 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Tue Apr 7 13:09:45 2015 -0500 -- --
[5/6] cassandra 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/9449a701
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9449a701
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9449a701
Branch: refs/heads/cassandra-2.1
Commit: 9449a70162879884745a950666bfae0969b2608f
Parents: 49d64c2 2e6492a
Author: Yuki Morishita yu...@apache.org
Authored: Fri Apr 3 09:19:31 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Apr 3 09:19:31 2015 -0500
--
.../cassandra/db/compaction/LazilyCompactedRow.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9449a701/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 88c87a4,9962d3f..56a4ede
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -156,12 -141,14 +156,18 @@@ public class LazilyCompactedRow extend
// blindly updating everything wouldn't be correct
DataOutputBuffer out = new DataOutputBuffer();
++// initialize indexBuilder for the benefit of its tombstoneTracker,
used by our reducing iterator
++indexBuilder = new ColumnIndex.Builder(emptyColumnFamily,
key.getKey(), out);
++
try
{
DeletionTime.serializer.serialize(emptyColumnFamily.deletionInfo().getTopLevelDeletion(),
out);
+
// do not update digest in case of missing or purged row level
tombstones, see CASSANDRA-8979
- if (emptyColumnFamily.deletionInfo().getTopLevelDeletion() !=
DeletionTime.LIVE)
+ // - digest for non-empty rows needs to be updated with deletion
in any case to match digest with versions before patch
+ // - empty rows must not update digest in case of LIVE delete
status to avoid mismatches with non-existing rows
+ // this will however introduce in return a digest mismatch for
versions before patch (which would update digest in any case)
-if (iter.hasNext() ||
emptyColumnFamily.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
++if (merger.hasNext() ||
emptyColumnFamily.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
{
digest.update(out.getData(), 0, out.getLength());
}
@@@ -171,10 -158,10 +177,8 @@@
throw new AssertionError(e);
}
--// initialize indexBuilder for the benefit of its tombstoneTracker,
used by our reducing iterator
- indexBuilder = new ColumnIndex.Builder(emptyColumnFamily,
key.getKey(), out);
-indexBuilder = new ColumnIndex.Builder(emptyColumnFamily, key.key,
out);
-while (iter.hasNext())
-iter.next().updateDigest(digest);
+while (merger.hasNext())
+merger.next().updateDigest(digest);
close();
}
[5/6] cassandra 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/beb5ffd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beb5ffd0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/beb5ffd0 Branch: refs/heads/cassandra-2.1 Commit: beb5ffd0785c1be2564a5e1f09b2907f573d83d2 Parents: 730cc60 38a04ea Author: T Jake Luciani j...@apache.org Authored: Wed Apr 1 10:49:53 2015 -0400 Committer: T Jake Luciani j...@apache.org Committed: Wed Apr 1 10:49:53 2015 -0400 -- --
[5/6] cassandra 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/3575cd35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3575cd35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3575cd35 Branch: refs/heads/cassandra-2.1 Commit: 3575cd35637dc678e3203bee26820a3c98fa05dd Parents: 5abab57 1e09482 Author: Robert Stupp sn...@snazy.de Authored: Tue Mar 31 10:50:06 2015 +0200 Committer: Robert Stupp sn...@snazy.de Committed: Tue Mar 31 10:50:06 2015 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3575cd35/CHANGES.txt -- diff --cc CHANGES.txt index 00b632d,bab9421..1e86fb7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,69 -1,6 +1,70 @@@ -2.0.14: - * disk full when running cleanup (CASSANDRA-9036) +2.1.4 + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + *
[5/6] cassandra 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/a2b66bf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2b66bf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2b66bf1 Branch: refs/heads/cassandra-2.1 Commit: a2b66bf1066a385181a56390b7859a0694b5756d Parents: 3575cd3 c94da6c Author: Robert Stupp sn...@snazy.de Authored: Tue Mar 31 11:21:15 2015 +0200 Committer: Robert Stupp sn...@snazy.de Committed: Tue Mar 31 11:21:15 2015 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cache/AutoSavingCache.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2b66bf1/CHANGES.txt -- diff --cc CHANGES.txt index 1e86fb7,ed40a78..e3b5363 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,70 -1,7 +1,71 @@@ -2.0.14: +2.1.4 + * Buffer bloom filter serialization (CASSANDRA-9066) + * Fix anti-compaction target bloom filter size (CASSANDRA-9060) + * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047) + * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034) + * Avoid overwriting index summaries for sstables with an older format that + does not support downsampling; rebuild summaries on startup when this + is detected (CASSANDRA-8993) + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool
[5/6] cassandra 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/c9b83e0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9b83e0a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9b83e0a Branch: refs/heads/cassandra-2.1 Commit: c9b83e0a811635428735a0b9e217cb106e499bea Parents: eed27ac 74bfa77 Author: Yuki Morishita yu...@apache.org Authored: Tue Mar 31 11:57:31 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Tue Mar 31 11:57:31 2015 -0500 -- --
[5/6] cassandra 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/5abab57b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abab57b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abab57b Branch: refs/heads/cassandra-2.1 Commit: 5abab57b93817dfac939eb13eac812091d3655c6 Parents: 6ee4b09 0ff9c3c Author: Yuki Morishita yu...@apache.org Authored: Mon Mar 30 17:02:11 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Mon Mar 30 17:02:11 2015 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/CHANGES.txt -- diff --cc CHANGES.txt index bd5e277,539c4c8..00b632d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -87,6 -24,10 +87,7 @@@ Merged from 2.0 * Fix CQLSSTableWriter throwing exception and spawning threads (CASSANDRA-8808) * Fix MT mismatch between empty and GC-able data (CASSANDRA-8979) + * Fix incorrect validation when snapshotting single table (CASSANDRA-8056) - - -2.0.13: * Add offline tool to relevel sstables (CASSANDRA-8301) * Preserve stream ID for more protocol errors (CASSANDRA-8848) * Fix combining token() function with multi-column relations on http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/src/java/org/apache/cassandra/service/StorageService.java --
[5/6] cassandra 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/7b1331fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b1331fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b1331fe
Branch: refs/heads/cassandra-2.1
Commit: 7b1331fed57203170e5d7a573dfa6113bfe6a3c0
Parents: 8715fff 102f59c
Author: Robert Stupp sn...@snazy.de
Authored: Sat Mar 28 12:20:01 2015 +0100
Committer: Robert Stupp sn...@snazy.de
Committed: Sat Mar 28 12:20:01 2015 +0100
--
src/java/org/apache/cassandra/db/Directories.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1331fe/src/java/org/apache/cassandra/db/Directories.java
--
diff --cc src/java/org/apache/cassandra/db/Directories.java
index 6af3082,a4ea1f2..7bb7e2e
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -285,10 -251,13 +285,13 @@@ public class Directorie
// pick directories with enough space and so that resulting sstable
dirs aren't blacklisted for writes.
boolean tooBig = false;
-for (DataDirectory dataDir : dataFileLocations)
+for (DataDirectory dataDir : dataDirectories)
{
if
(BlacklistedDirectories.isUnwritable(getLocationForDisk(dataDir)))
+ {
+ logger.debug(removing blacklisted candidate {},
dataDir.location);
continue;
+ }
DataDirectoryCandidate candidate = new
DataDirectoryCandidate(dataDir);
// exclude directory if its total writeSize does not fit to data
directory
if (candidate.availableSpace writeSize)
[5/6] cassandra 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/89a8f4a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89a8f4a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89a8f4a7
Branch: refs/heads/cassandra-2.1
Commit: 89a8f4a7e96b11a1ac13414cd4565a5b0b1f05f4
Parents: f7856c2 e2ad896
Author: Yuki Morishita yu...@apache.org
Authored: Fri Mar 27 13:35:29 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Mar 27 13:35:29 2015 -0500
--
CHANGES.txt | 1 +
.../db/compaction/LazilyCompactedRow.java| 7 ++-
.../org/apache/cassandra/repair/Validator.java | 19 ---
3 files changed, 23 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a8f4a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 3f5571e,9494f61..64fa75f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -83,6 -23,10 +83,7 @@@ Merged from 2.0
* Add ability to limit number of native connections (CASSANDRA-8086)
* Fix CQLSSTableWriter throwing exception and spawning threads
(CASSANDRA-8808)
+ * Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
-
-
-2.0.13:
* Add offline tool to relevel sstables (CASSANDRA-8301)
* Preserve stream ID for more protocol errors (CASSANDRA-8848)
* Fix combining token() function with multi-column relations on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a8f4a7/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index f61225a,b562ba5..88c87a4
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -159,7 -141,11 +159,12 @@@ public class LazilyCompactedRow extend
try
{
DeletionTime.serializer.serialize(emptyColumnFamily.deletionInfo().getTopLevelDeletion(),
out);
- digest.update(out.getData(), 0, out.getLength());
++
+ // do not update digest in case of missing or purged row level
tombstones, see CASSANDRA-8979
+ if (emptyColumnFamily.deletionInfo().getTopLevelDeletion() !=
DeletionTime.LIVE)
+ {
+ digest.update(out.getData(), 0, out.getLength());
+ }
}
catch (IOException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a8f4a7/src/java/org/apache/cassandra/repair/Validator.java
--
diff --cc src/java/org/apache/cassandra/repair/Validator.java
index 641717e,5aa0cfe..8f8bf6d
--- a/src/java/org/apache/cassandra/repair/Validator.java
+++ b/src/java/org/apache/cassandra/repair/Validator.java
@@@ -24,11 -24,12 +24,11 @@@ import java.util.List
import java.util.Random;
import com.google.common.annotations.VisibleForTesting;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.compaction.AbstractCompactedRow;
@@@ -186,7 -201,15 +191,15 @@@ public class Validator implements Runna
// MerkleTree uses XOR internally, so we want lots of output bits here
CountingDigest digest = new
CountingDigest(FBUtilities.newMessageDigest(SHA-256));
row.update(digest);
- return new MerkleTree.RowHash(row.key.getToken(), digest.digest(),
digest.count);
+ // only return new hash for merkle tree in case digest was updated -
see CASSANDRA-8979
+ if (digest.count 0)
+ {
-return new MerkleTree.RowHash(row.key.token, digest.digest(),
digest.count);
++return new MerkleTree.RowHash(row.key.getToken(),
digest.digest(), digest.count);
+ }
+ else
+ {
+ return null;
+ }
}
/**
[5/6] cassandra 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/8715fff2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8715fff2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8715fff2 Branch: refs/heads/cassandra-2.1 Commit: 8715fff24e8e233556bd052990b1bfbcd0f0acb8 Parents: a23960e 4e7fbfe Author: Yuki Morishita yu...@apache.org Authored: Fri Mar 27 16:31:03 2015 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri Mar 27 16:31:03 2015 -0500 -- --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/f9c57a59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9c57a59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9c57a59 Branch: refs/heads/cassandra-2.1 Commit: f9c57a597ab738d13273dd61cdad6a5068e7561d Parents: 768f83d b296c55 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 25 10:11:25 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 25 10:11:25 2015 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9c57a59/CHANGES.txt -- diff --cc CHANGES.txt index f4d4008,e17e82f..a8eda63 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,64 -1,8 +1,65 @@@ -2.0.14: +2.1.4 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool netstats (CASSANDRA-8886) + * IndexSummaryBuilder utilises offheap memory, and shares data between + each IndexSummary opened from it (CASSANDRA-8757) + * markCompacting only succeeds if the exact SSTableReader instances being + marked are in the live set (CASSANDRA-8689) + * cassandra-stress support for varint (CASSANDRA-8882) + * Fix Adler32 digest for compressed sstables
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/768f83d2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/768f83d2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/768f83d2 Branch: refs/heads/cassandra-2.1 Commit: 768f83d2561372be8bbc9aeb42560c77c5c51999 Parents: 86a3802 7c98030 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 25 09:36:40 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 25 09:36:40 2015 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/768f83d2/CHANGES.txt -- diff --cc CHANGES.txt index 02bd7b0,fecc7e3..f4d4008 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,63 -1,7 +1,64 @@@ -2.0.14: +2.1.4 + * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool netstats (CASSANDRA-8886) + * IndexSummaryBuilder utilises offheap memory, and shares data between + each IndexSummary opened from it (CASSANDRA-8757) + * markCompacting only succeeds if the exact SSTableReader instances being + marked are in the live set (CASSANDRA-8689) + *
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/86a38029 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86a38029 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86a38029 Branch: refs/heads/cassandra-2.1 Commit: 86a3802941067376bcf36c3a9930a7d443e8a6bf Parents: c397165 495ae9c Author: Robert Stupp sn...@snazy.de Authored: Wed Mar 25 11:37:13 2015 +0100 Committer: Robert Stupp sn...@snazy.de Committed: Wed Mar 25 11:40:57 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/metrics/ConnectionMetrics.java| 2 +- src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java | 4 ++-- src/java/org/apache/cassandra/metrics/StreamingMetrics.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86a38029/CHANGES.txt -- diff --cc CHANGES.txt index 2000bd0,bcc59fc..02bd7b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,62 -1,6 +1,63 @@@ -2.0.14: - * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027) +2.1.4 * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) + * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085) + * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900) + * Check for overlap with non-early sstables in LCS (CASSANDRA-8739) + * Only calculate max purgable timestamp if we have to (CASSANDRA-8914) + * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225) + * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993) + * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746) + * SSTableScanner enforces its bounds (CASSANDRA-8946) + * Cleanup cell equality (CASSANDRA-8947) + * Introduce intra-cluster message coalescing (CASSANDRA-8692) + * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839) + * Don't check if an sstable is live for offline compactions (CASSANDRA-8841) + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) + * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) + * Allow invalidating permissions and cache time (CASSANDRA-8722) + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool netstats (CASSANDRA-8886) + * IndexSummaryBuilder utilises offheap memory, and shares data between + each IndexSummary opened from it (CASSANDRA-8757) + * markCompacting only
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/77d58f90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d58f90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d58f90
Branch: refs/heads/cassandra-2.1
Commit: 77d58f900efac62c7c8dcc63c3de5ecb0fe4e343
Parents: 89cdfd8 b2aa67e
Author: Brandon Williams brandonwilli...@apache.org
Authored: Tue Mar 17 14:34:26 2015 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Tue Mar 17 14:34:26 2015 -0500
--
CHANGES.txt | 1 +
build.xml | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d58f90/CHANGES.txt
--
diff --cc CHANGES.txt
index 30bf698,f10a89a..6b8618b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,5 +1,51 @@@
-2.0.14:
+2.1.4
+ * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
+ * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
+ * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
+ * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
+ * Allow invalidating permissions and cache time (CASSANDRA-8722)
+ * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
+ are executed (CASSANDRA-8418)
+ * Fix cassandra-stress so it respects the CL passed in user mode
(CASSANDRA-8948)
+ * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
+ * cassandra-stress reports per-operation statistics, plus misc
(CASSANDRA-8769)
+ * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
+ * Use long for key count in cfstats (CASSANDRA-8913)
+ * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
+ * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
+ * Make EstimatedHistogram#percentile() use ceil instead of floor
(CASSANDRA-8883)
+ * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
+ * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
+ * Pick sstables for validation as late as possible inc repairs
(CASSANDRA-8366)
+ * 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)
+ * Improve assertions in Memory (CASSANDRA-8792)
+ * Fix SSTableRewriter cleanup (CASSANDRA-8802)
+ * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
+ * 'nodetool info' prints exception against older node (CASSANDRA-8796)
+ * Ensure SSTableReader.last corresponds exactly with the file end
(CASSANDRA-8750)
+ * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
+ * Enforce SSTableReader.first/last (CASSANDRA-8744)
+ * Cleanup SegmentedFile API (CASSANDRA-8749)
+ * Avoid overlap with early compaction replacement (CASSANDRA-8683)
+ * Safer Resource Management++ (CASSANDRA-8707)
+ * Write partition size estimates into a system table (CASSANDRA-7688)
+ * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+ (CASSANDRA-8154)
+ * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
+ * IndexSummaryBuilder utilises offheap memory, and shares data between
+ each IndexSummary opened from it (CASSANDRA-8757)
+ * markCompacting only succeeds if the exact SSTableReader instances being
+ marked are in the live set (CASSANDRA-8689)
+ * cassandra-stress support for varint (CASSANDRA-8882)
+ * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
+ * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
+Merged from 2.0:
+ * Allow specifying the tmp dir (CASSANDRA-7712)
* Improve compaction estimated tasks estimation (CASSANDRA-8904)
* Fix duplicate up/down messages sent to native clients (CASSANDRA-7816)
* Expose commit log archive status via JMX (CASSANDRA-8734)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/77d58f90/build.xml
--
diff --cc build.xml
index 4ced4e2,f5e14ba..bdb3646
--- a/build.xml
+++ b/build.xml
@@@ -1182,21 -1099,8 +1183,22 @@@
jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
+ jvmarg value=-Djava.io.tmpdir=${tmp.dir}/
/testmacro
+fileset
[5/6] cassandra 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/1376b8ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1376b8ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1376b8ef Branch: refs/heads/cassandra-2.1 Commit: 1376b8efff9768ec941d5f41adc7b9b6cc4b9e72 Parents: cbd4de8 2199a87 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Mar 13 08:02:46 2015 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Mar 13 08:02:46 2015 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/gms/EndpointState.java | 12 ++ src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++- 3 files changed, 32 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1376b8ef/CHANGES.txt -- diff --cc CHANGES.txt index cd4b551,8843908..cd29e9d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,5 +1,47 @@@ +2.1.4 + * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 + are executed (CASSANDRA-8418) + * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948) + * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786) + * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769) + * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523) + * Use long for key count in cfstats (CASSANDRA-8913) + * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832) + * Remove cold_reads_to_omit from STCS (CASSANDRA-8860) + * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883) + * Fix top partitions reporting wrong cardinality (CASSANDRA-8834) + * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067) + * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366) + * 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) + * Improve assertions in Memory (CASSANDRA-8792) + * Fix SSTableRewriter cleanup (CASSANDRA-8802) + * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) + * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747) + * Enforce SSTableReader.first/last (CASSANDRA-8744) + * Cleanup SegmentedFile API (CASSANDRA-8749) + * Avoid overlap with early compaction replacement (CASSANDRA-8683) + * Safer Resource Management++ (CASSANDRA-8707) + * Write partition size estimates into a system table (CASSANDRA-7688) + * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output + (CASSANDRA-8154) + * Show progress of streaming in nodetool netstats (CASSANDRA-8886) + * IndexSummaryBuilder utilises offheap memory, and shares data between + each IndexSummary opened from it (CASSANDRA-8757) + * markCompacting only succeeds if the exact SSTableReader instances being + marked are in the live set (CASSANDRA-8689) + * cassandra-stress support for varint (CASSANDRA-8882) + * Fix Adler32 digest for compressed sstables (CASSANDRA-8778) + * Add nodetool statushandoff/statusbackup (CASSANDRA-8912) +Merged from 2.0: 2.0.14: + * Fix duplicate up/down messages sent to native clients (CASSANDRA-7816) * Expose commit log archive status via JMX (CASSANDRA-8734) * Provide better exceptions for invalid replication strategy parameters (CASSANDRA-8909) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1376b8ef/src/java/org/apache/cassandra/gms/EndpointState.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1376b8ef/src/java/org/apache/cassandra/gms/Gossiper.java -- diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index a7c58fc,97dc506..ac98c53 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -47,10 -48,7 +48,8 @@@ import org.apache.cassandra.net.Message import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities;
[5/6] cassandra 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/ecf48dd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecf48dd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecf48dd7 Branch: refs/heads/cassandra-2.1 Commit: ecf48dd79d29ba80008afa26fd40c3fc6d9509ac Parents: b1c2536 fb67c41 Author: Yuki Morishita yu...@apache.org Authored: Thu Mar 5 11:48:22 2015 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Thu Mar 5 11:48:22 2015 -0600 -- CHANGES.txt | 2 + .../cql3/statements/UpdateStatement.java| 29 - .../cassandra/io/sstable/CQLSSTableWriter.java | 56 + .../io/sstable/CQLSSTableWriterClientTest.java | 116 +++ .../io/sstable/CQLSSTableWriterTest.java| 21 +++- 5 files changed, 195 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecf48dd7/CHANGES.txt -- diff --cc CHANGES.txt index aa2e1f9,faa14d5..ea79e22 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -42,105 -10,10 +42,107 @@@ Merged from 2.0 table with ASC ordering and paging (CASSANDRA-8767) * AssertionError: Memory was freed when running cleanup (CASSANDRA-8716) * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406) - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() - (CASSANDRA-8748) * Fix some multi-column relations with indexes on some clustering columns (CASSANDRA-8275) + * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() + (CASSANDRA-8748) + * Throw OOM if allocating memory fails to return a valid pointer (CASSANDRA-8726) + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException (CASSANDRA-8619) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableSimpleUnsortedWriter.close() terminates if + disk writer has crashed (CASSANDRA-8807) ++ * Fix CQLSSTableWriter throwing exception and spawning threads ++ (CASSANDRA-8808) + + +2.1.3 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719) + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685) + * Don't use the shared ref in sstableloader (CASSANDRA-8704) + * Purge internal prepared statements if related tables or + keyspaces are dropped (CASSANDRA-8693) + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638) + * Stop compactions before exiting offline tools (CASSANDRA-8623) + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933) + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695) + * Safer Resource Management (CASSANDRA-7705) + * Make sure we compact highly overlapping cold sstables with + STCS (CASSANDRA-8635) + * rpc_interface and listen_interface generate NPE on startup when specified + interface doesn't exist (CASSANDRA-8677) + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms (CASSANDRA-8514) + * Switch from yammer metrics for nodetool cf/proxy histograms (CASSANDRA-8662) + * Make sure we don't add tmplink files to the compaction + strategy (CASSANDRA-8580) + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372) + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563) + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706) + * Add tooling to detect hot partitions (CASSANDRA-7974) + * Fix cassandra-stress user-mode truncation of partition generation (CASSANDRA-8608) + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267) + * Don't allow starting multiple inc repairs on the same sstables (CASSANDRA-8316) + * Invalidate prepared BATCH statements when related tables + or keyspaces are dropped (CASSANDRA-8652) + * Fix missing results in secondary index queries on collections + with ALLOW FILTERING (CASSANDRA-8421) + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627) + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618) + * Fix NPE when passing wrong argument in ALTER TABLE statement (CASSANDRA-8355) + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599) + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537) + * Fix case-sensitivity of index name on CREATE and DROP INDEX + statements (CASSANDRA-8365) + * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192) + * Use the correct repairedAt value when closing writer (CASSANDRA-8570) + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512) + * Properly calculate expected write size during compaction (CASSANDRA-8532) + * Invalidate affected
[5/6] cassandra 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/322e8f05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322e8f05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322e8f05
Branch: refs/heads/cassandra-2.1
Commit: 322e8f05958c4a025079f1c1c428df8224b10e0d
Parents: 2215c49 98502e0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Feb 26 09:48:50 2015 -0800
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Feb 26 09:48:50 2015 -0800
--
build.xml | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/322e8f05/build.xml
--
diff --cc build.xml
index e969085,78c6db3..4ced4e2
--- a/build.xml
+++ b/build.xml
@@@ -1183,22 -1099,11 +1183,25 @@@
jvmarg value=-Dcassandra.ring_delay_ms=1000/
jvmarg value=-Dcassandra.tolerate_sstable_size=true/
/testmacro
+fileset dir=${test.unit.src}
+exclude name=**/pig/*.java /
+/fileset
+ /target
+
+ target name=testlist
+testmacro suitename=${testlist.name} inputdir=${test.unit.src}
filelist=${test.file.list} poffset=${testlist.offset} exclude=**/*.java
timeout=${test.timeout}
+ jvmarg value=-Dlegacy-sstable-root=${test.data}/legacy-sstables/
+ jvmarg value=-Dcorrupt-sstable-root=${test.data}/corrupt-sstables/
+ jvmarg
value=-Dmigration-sstable-root=${test.data}/migration-sstables/
+ jvmarg value=-Dcassandra.ring_delay_ms=1000/
+ jvmarg value=-Dcassandra.tolerate_sstable_size=true/
+ jvmarg
value=-Dcassandra.config.loader=org.apache.cassandra.OffsetAwareConfigurationLoader/
+/testmacro
/target
+ !-- Use this with an FQDN for test class, and a csv list of methods like
this:
+ ant testsome
-Dtest.name=org.apache.cassandra.service.StorageServiceServerTest
-Dtest.methods=testRegularMode,testGetAllRangesEmpty
+ --
target name=testsome depends=build-test description=Execute specific
unit tests
testmacro suitename=unit inputdir=${test.unit.src}
exclude=**/pig/*.java timeout=${test.timeout}
test name=${test.name} methods=${test.methods}/
[5/6] cassandra 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/3b3570c8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b3570c8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b3570c8
Branch: refs/heads/cassandra-2.1
Commit: 3b3570c8ca02031d2e3ef1687356bfc7d211bbb7
Parents: ca63607 da9f030
Author: Yuki Morishita yu...@apache.org
Authored: Wed Feb 25 08:57:37 2015 -0800
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Feb 25 08:57:37 2015 -0800
--
src/java/org/apache/cassandra/streaming/StreamManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3570c8/src/java/org/apache/cassandra/streaming/StreamManager.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamManager.java
index f40be99,4871078..728631d
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@@ -63,7 -63,7 +63,7 @@@ public class StreamManager implements S
public static class StreamRateLimiter
{
- private static final double ONE_MEGA_BIT = (1024 * 1024) / 8; // from
bits
-private static final double BYTES_PER_MEGABIT = 1024 * 1024 / 8;
++private static final double BYTES_PER_MEGABIT = (1024 * 1024) / 8; //
from bits
private static final RateLimiter limiter =
RateLimiter.create(Double.MAX_VALUE);
private static final RateLimiter interDCLimiter =
RateLimiter.create(Double.MAX_VALUE);
private final boolean isLocalDC;
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/9d421f35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d421f35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d421f35 Branch: refs/heads/cassandra-2.1 Commit: 9d421f35491008c61510ae0fd5ffebc14f420dc0 Parents: 52d19e2 6214e35 Author: Benedict Elliott Smith bened...@apache.org Authored: Thu Feb 19 11:59:40 2015 + Committer: Benedict Elliott Smith bened...@apache.org Committed: Thu Feb 19 11:59:40 2015 + -- CHANGES.txt | 3 +++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 21 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d421f35/CHANGES.txt -- diff --cc CHANGES.txt index acb0497,09d6d2f..1238173 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,101 -5,9 +18,104 @@@ Merged from 2.0 table with ASC ordering and paging (CASSANDRA-8767) * AssertionError: Memory was freed when running cleanup (CASSANDRA-8716) * Make it possible to set max_sstable_age to fractional days (CASSANDRA-8406) - * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() (CASSANDRA-8748) * Fix some multi-column relations with indexes on some clustering columns (CASSANDRA-8275) + * Fix memory leak in SSTableSimple*Writer and SSTableReader.validate() (CASSANDRA-8748) + * Throw OOM if allocating memory fails to return a valid pointer (CASSANDRA-8726) + * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException (CASSANDRA-8619) ++ * 'nodetool info' prints exception against older node (CASSANDRA-8796) ++ * Ensure SSTableSimpleUnsortedWriter.close() terminates if ++ disk writer has crashed (CASSANDRA-8807) + + +2.1.3 + * Fix HSHA/offheap_objects corruption (CASSANDRA-8719) + * Upgrade libthrift to 0.9.2 (CASSANDRA-8685) + * Don't use the shared ref in sstableloader (CASSANDRA-8704) + * Purge internal prepared statements if related tables or + keyspaces are dropped (CASSANDRA-8693) + * (cqlsh) Handle unicode BOM at start of files (CASSANDRA-8638) + * Stop compactions before exiting offline tools (CASSANDRA-8623) + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933) + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695) + * Safer Resource Management (CASSANDRA-7705) + * Make sure we compact highly overlapping cold sstables with + STCS (CASSANDRA-8635) + * rpc_interface and listen_interface generate NPE on startup when specified + interface doesn't exist (CASSANDRA-8677) + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms (CASSANDRA-8514) + * Switch from yammer metrics for nodetool cf/proxy histograms (CASSANDRA-8662) + * Make sure we don't add tmplink files to the compaction + strategy (CASSANDRA-8580) + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372) + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563) + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6706) + * Add tooling to detect hot partitions (CASSANDRA-7974) + * Fix cassandra-stress user-mode truncation of partition generation (CASSANDRA-8608) + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267) + * Don't allow starting multiple inc repairs on the same sstables (CASSANDRA-8316) + * Invalidate prepared BATCH statements when related tables + or keyspaces are dropped (CASSANDRA-8652) + * Fix missing results in secondary index queries on collections + with ALLOW FILTERING (CASSANDRA-8421) + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627) + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618) + * Fix NPE when passing wrong argument in ALTER TABLE statement (CASSANDRA-8355) + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599) + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537) + * Fix case-sensitivity of index name on CREATE and DROP INDEX + statements (CASSANDRA-8365) + * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192) + * Use the correct repairedAt value when closing writer (CASSANDRA-8570) + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512) + * Properly calculate expected write size during compaction (CASSANDRA-8532) + * Invalidate affected prepared statements when a table's columns + are altered (CASSANDRA-7910) + * Stress - user defined writes should populate sequentally (CASSANDRA-8524) + * Fix regression in SSTableRewriter causing some rows to become unreadable
[5/6] cassandra 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/cd9da447 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd9da447 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd9da447 Branch: refs/heads/cassandra-2.1 Commit: cd9da447b644744ec344b9d763574e49da29b470 Parents: 9ad7978 7f10cbd Author: Robert Stupp sn...@snazy.de Authored: Tue Feb 17 17:27:46 2015 +0100 Committer: Robert Stupp sn...@snazy.de Committed: Tue Feb 17 17:27:46 2015 +0100 -- --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableReader.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15c92c38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15c92c38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15c92c38 Branch: refs/heads/cassandra-2.1 Commit: 15c92c386049b77ff56d9ac3cc3e9f403374f181 Parents: d6200a8 b1825e6 Author: Benedict Elliott Smith bened...@apache.org Authored: Fri Feb 13 10:42:21 2015 + Committer: Benedict Elliott Smith bened...@apache.org Committed: Fri Feb 13 10:42:21 2015 + -- --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: conf/cassandra.yaml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69d07fb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69d07fb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69d07fb0 Branch: refs/heads/cassandra-2.1 Commit: 69d07fb03f4357bcb0eb9d138af317c1172f28ca Parents: 97da271 ce8501b Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Feb 10 12:07:38 2015 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Feb 10 12:07:38 2015 -0600 -- conf/cassandra-env.sh | 1 + conf/cassandra.yaml | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69d07fb0/conf/cassandra-env.sh -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/69d07fb0/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index 0b114aa,99f13a6..f337067 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -398,20 -333,18 +399,22 @@@ native_transport_port: 904 # Whether to start the thrift rpc server. start_rpc: true -# The address to bind the Thrift RPC service and native transport -# server -- clients connect here. +# The address or interface to bind the Thrift RPC service and native transport +# server to. +# +# Set rpc_address OR rpc_interface, not both. Interfaces must correspond +# to a single address, IP aliasing is not supported. # -# Leaving this blank has the same effect it does for ListenAddress, +# Leaving rpc_address blank has the same effect as on listen_address # (i.e. it will be based on the configured hostname of the node). # -# Note that unlike ListenAddress above, it is allowed to specify 0.0.0.0 -# here if you want to listen on all interfaces, but that will break clients -# that rely on node auto-discovery. +# Note that unlike listen_address, you can specify 0.0.0.0, but you must also +# set broadcast_rpc_address to a value other than 0.0.0.0. + # + # For security reasons, you should not expose this port to the internet. Firewall it if needed. rpc_address: localhost +# rpc_interface: eth1 + # port for Thrift to listen for clients on rpc_port: 9160
[5/6] cassandra 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/88b226b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b226b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b226b1 Branch: refs/heads/cassandra-2.1 Commit: 88b226b1186f2b94c0e3d4611defe4da7a60cc80 Parents: 69d07fb 28c380c Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Feb 10 12:19:51 2015 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Feb 10 12:19:51 2015 -0600 -- conf/cassandra.yaml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b226b1/conf/cassandra.yaml -- diff --cc conf/cassandra.yaml index f337067,163ae9e..094a196 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@@ -354,14 -292,13 +355,15 @@@ storage_port: 700 # SSL port, for encrypted communication. Unused unless enabled in # encryption_options + # For security reasons, you should not expose this port to the internet. Firewall it if needed. ssl_storage_port: 7001 -# Address to bind to and tell other Cassandra nodes to connect to. You -# _must_ change this if you want multiple nodes to be able to -# communicate! -# +# Address or interface to bind to and tell other Cassandra nodes to connect to. +# You _must_ change this if you want multiple nodes to be able to communicate! +# +# Set listen_address OR listen_interface, not both. Interfaces must correspond +# to a single address, IP aliasing is not supported. +# # Leaving it blank leaves it up to InetAddress.getLocalHost(). This # will always do the Right Thing _if_ the node is properly configured # (hostname, name resolution, etc), and the Right Thing is to use the
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/2a283e10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a283e10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a283e10 Branch: refs/heads/cassandra-2.1 Commit: 2a283e10f9183d9a0138e7622ca135cd3b001ac2 Parents: 9c38a10 2dd6944 Author: Yuki Morishita yu...@apache.org Authored: Sun Feb 1 16:10:31 2015 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Sun Feb 1 16:10:31 2015 -0600 -- CHANGES.txt| 2 +- src/java/org/apache/cassandra/db/Keyspace.java | 7 ++- 2 files changed, 3 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/CHANGES.txt -- diff --cc CHANGES.txt index 129e1c9,9e9b772..40d844c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -90,7 -5,10 +90,7 @@@ Merged from 2.0 (CASSANDRA-8619) * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645) * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666) - * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645) + * Fix isClientMode check in Keyspace (CASSANDRA-8687) - - -2.0.12: * Use more efficient slice size for querying internal secondary index tables (CASSANDRA-8550) * Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a283e10/src/java/org/apache/cassandra/db/Keyspace.java -- diff --cc src/java/org/apache/cassandra/db/Keyspace.java index d27424e,38b7c2b..d92eea4 --- a/src/java/org/apache/cassandra/db/Keyspace.java +++ b/src/java/org/apache/cassandra/db/Keyspace.java @@@ -35,12 -30,8 +35,9 @@@ import com.google.common.collect.Iterab import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.CFMetaData; - import org.apache.cassandra.config.DatabaseDescriptor; - import org.apache.cassandra.config.KSMetaData; - import org.apache.cassandra.config.Schema; + import org.apache.cassandra.config.*; import org.apache.cassandra.db.commitlog.CommitLog; +import org.apache.cassandra.db.commitlog.ReplayPosition; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexManager;
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/2bff135c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bff135c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bff135c Branch: refs/heads/cassandra-2.1 Commit: 2bff135cde13fd321ddbbbe107164bcef2cca0d8 Parents: 1650dd5 31324ee Author: Benedict Elliott Smith bened...@apache.org Authored: Wed Jan 28 22:59:24 2015 + Committer: Benedict Elliott Smith bened...@apache.org Committed: Wed Jan 28 22:59:24 2015 + -- CHANGES.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bff135c/CHANGES.txt -- diff --cc CHANGES.txt index 553356a,7fa5f63..d273350 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,86 -1,10 +1,89 @@@ +2.1.3 - * Fix SSTableSimpleUnsortedWriter ConcurrentModificationException (CASSANDRA-8619) + * Update tools/stress/README.txt to match current behaviour (CASSANDRA-7933) + * Fix schema from Thrift conversion with empty metadata (CASSANDRA-8695) + * Safer Resource Management (CASSANDRA-7705) + * Make sure we compact highly overlapping cold sstables with + STCS (CASSANDRA-8635) + * rpc_interface and listen_interface generate NPE on startup when specified + interface doesn't exist (CASSANDRA-8677) + * Fix ArrayIndexOutOfBoundsException in nodetool cfhistograms (CASSANDRA-8514) + * Switch from yammer metrics for nodetool cf/proxy histograms (CASSANDRA-8662) + * Make sure we don't add tmplink files to the compaction + strategy (CASSANDRA-8580) + * (cqlsh) Handle maps with blob keys (CASSANDRA-8372) + * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563) + * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707) + * Add tooling to detect hot partitions (CASSANDRA-7974) + * Fix cassandra-stress user-mode truncation of partition generation (CASSANDRA-8608) + * Only stream from unrepaired sstables during inc repair (CASSANDRA-8267) + * Don't allow starting multiple inc repairs on the same sstables (CASSANDRA-8316) + * Invalidate prepared BATCH statements when related tables + or keyspaces are dropped (CASSANDRA-8652) + * Fix missing results in secondary index queries on collections + with ALLOW FILTERING (CASSANDRA-8421) + * Expose EstimatedHistogram metrics for range slices (CASSANDRA-8627) + * (cqlsh) Escape clqshrc passwords properly (CASSANDRA-8618) + * Fix NPE when passing wrong argument in ALTER TABLE statement (CASSANDRA-8355) + * Pig: Refactor and deprecate CqlStorage (CASSANDRA-8599) + * Don't reuse the same cleanup strategy for all sstables (CASSANDRA-8537) + * Fix case-sensitivity of index name on CREATE and DROP INDEX + statements (CASSANDRA-8365) + * Better detection/logging for corruption in compressed sstables (CASSANDRA-8192) + * Use the correct repairedAt value when closing writer (CASSANDRA-8570) + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512) + * Properly calculate expected write size during compaction (CASSANDRA-8532) + * Invalidate affected prepared statements when a table's columns + are altered (CASSANDRA-7910) + * Stress - user defined writes should populate sequentally (CASSANDRA-8524) + * Fix regression in SSTableRewriter causing some rows to become unreadable + during compaction (CASSANDRA-8429) + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510) + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression + is disabled (CASSANDRA-8288) + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623) + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463) + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507) + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370) + * Make sstablescrub check leveled manifest again (CASSANDRA-8432) + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458) + * Disable mmap on Windows (CASSANDRA-6993) + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253) + * Add auth support to cassandra-stress (CASSANDRA-7985) + * Fix ArrayIndexOutOfBoundsException when generating error message + for some CQL syntax errors (CASSANDRA-8455) + * Scale memtable slab allocation logarithmically (CASSANDRA-7882) + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964) + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926) + * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383) + * Make read defrag async to reclaim
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: test/long/org/apache/cassandra/db/LongFlushMemtableTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bda32583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda32583 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda32583 Branch: refs/heads/cassandra-2.1 Commit: bda32583f239f65d3249f309bc190414cfa2e903 Parents: ffd0ae4 d47d2b1 Author: Benedict Elliott Smith bened...@apache.org Authored: Wed Jan 28 22:39:30 2015 + Committer: Benedict Elliott Smith bened...@apache.org Committed: Wed Jan 28 22:39:30 2015 + -- --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a5f79eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a5f79eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a5f79eb
Branch: refs/heads/cassandra-2.1
Commit: 3a5f79eb5856c714a94a05c17409221fd3ace1b0
Parents: 136abcc 2bf63f6
Author: Yuki Morishita yu...@apache.org
Authored: Fri Jan 23 09:15:03 2015 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Fri Jan 23 09:15:03 2015 -0600
--
.../cassandra/config/DatabaseDescriptor.java | 18 --
.../org/apache/cassandra/tools/SSTableExport.java | 2 +-
.../org/apache/cassandra/tools/SSTableImport.java | 2 +-
.../cassandra/tools/StandaloneScrubber.java | 2 +-
.../cassandra/tools/StandaloneSplitter.java | 2 +-
.../cassandra/tools/StandaloneUpgrader.java | 2 +-
6 files changed, 21 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/SSTableExport.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/SSTableImport.java
--
diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java
index bdbebc1,3135fe6..87d52be
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@@ -501,7 -540,12 +501,7 @@@ public class SSTableImpor
isSorted = true;
}
- DatabaseDescriptor.loadSchemas();
-if (cmd.hasOption(OLD_SC_FORMAT_OPTION))
-{
-oldSCFormat = true;
-}
-
+ DatabaseDescriptor.loadSchemas(false);
if (Schema.instance.getNonSystemKeyspaces().size() 1)
{
String msg = no non-system keyspaces are defined;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a5f79eb/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
--
[5/6] cassandra 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/f136bacb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f136bacb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f136bacb Branch: refs/heads/cassandra-2.1 Commit: f136bacb925722cfad4a08dc3bbead4ae6ae2c09 Parents: 75378c2 9e5a4fa Author: Yuki Morishita yu...@apache.org Authored: Mon Jan 12 11:51:00 2015 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Mon Jan 12 11:51:00 2015 -0600 -- tools/bin/sstablemetadata | 37 - 1 file changed, 20 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f136bacb/tools/bin/sstablemetadata --
[5/6] cassandra 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/e9061922 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9061922 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9061922 Branch: refs/heads/trunk Commit: e9061922da418930dd1d607da7f2499dc067bac2 Parents: 49d5c8d e4fc395 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Fri Jan 9 19:58:44 2015 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Fri Jan 9 19:58:44 2015 -0500 -- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessageOut.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/CHANGES.txt -- diff --cc CHANGES.txt index abe3fce,fc43dfa..55ca55d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -96,36 -44,7 +96,36 @@@ Merged from 2.0 * Avoid overlap in L1 when L0 contains many nonoverlapping sstables (CASSANDRA-8211) * Improve PropertyFileSnitch logging (CASSANDRA-8183) - * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164) + * Add DC-aware sequential repair (CASSANDRA-8193) + * Use live sstables in snapshot repair if possible (CASSANDRA-8312) - ++ * Fix hints serialized size calculation (CASSANDRA-8587) + +2.1.2 + * (cqlsh) parse_for_table_meta errors out on queries with undefined + grammars (CASSANDRA-8262) + * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258) + * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209) + * Optimize partitioner tokens (CASSANDRA-8230) + * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004) + * Make cache serializers pluggable (CASSANDRA-8096) + * Fix issues with CONTAINS (KEY) queries on secondary indexes + (CASSANDRA-8147) + * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239) + * Fix default timestamp in QueryOptions (CASSANDRA-8246) + * Set socket timeout when reading remote version (CASSANDRA-8188) + * Refactor how we track live size (CASSANDRA-7852) + * Make sure unfinished compaction files are removed (CASSANDRA-8124) + * Fix shutdown when run as Windows service (CASSANDRA-8136) + * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031) + * Fix race in RecoveryManagerTest (CASSANDRA-8176) + * Avoid IllegalArgumentException while sorting sstables in + IndexSummaryManager (CASSANDRA-8182) + * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579) + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927) + * Fix installing as service on Windows (CASSANDRA-8115) + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) +Merged from 2.0: * Correctly handle non-text column names in cql3 (CASSANDRA-8178) * Fix deletion for indexes on primary key columns (CASSANDRA-8206) * Add 'nodetool statusgossip' (CASSANDRA-8125) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/src/java/org/apache/cassandra/net/MessageOut.java --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
test/unit/org/apache/cassandra/db/DirectoriesTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ac5ee66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ac5ee66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ac5ee66
Branch: refs/heads/cassandra-2.1
Commit: 5ac5ee666d754e39db8dcad474a51e140f3511ef
Parents: dcc90ef ad37533
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jan 7 22:13:15 2015 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jan 7 22:13:15 2015 -0600
--
.../apache/cassandra/db/DirectoriesTest.java| 25
1 file changed, 10 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ac5ee66/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 34d10d2,c4471e5..b1c51ee
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -19,19 -19,13 +19,21 @@@ package org.apache.cassandra.db
import java.io.File;
import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+ import org.apache.commons.lang3.StringUtils;
+
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@@ -42,7 -35,8 +44,8 @@@ import org.apache.cassandra.db.Director
import org.apache.cassandra.io.sstable.Component;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.io.FSWriteError;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@@ -194,20 -193,18 +197,18 @@@ public class DirectoriesTes
try
{
DatabaseDescriptor.setDiskFailurePolicy(DiskFailurePolicy.best_effort);
-
- for (DataDirectory dd : Directories.dataDirectories)
+ // Fake a Directory creation failure
-if (Directories.dataFileLocations.length 0)
++if (Directories.dataDirectories.length 0)
{
- dd.location.setExecutable(false);
- dd.location.setWritable(false);
+ String[] path = new String[] {KS, bad};
-File dir = new
File(Directories.dataFileLocations[0].location, StringUtils.join(path,
File.separator));
++File dir = new File(Directories.dataDirectories[0].location,
StringUtils.join(path, File.separator));
+ FileUtils.handleFSError(new FSWriteError(new
IOException(Unable to create directory + dir), dir));
}
- // nested folders in /tmp is enough to fail on *nix but we need
to pass the 255 char limit to get a failure on Windows and blacklist
- CFMetaData cfm = new CFMetaData(KS,
badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbad,
ColumnFamilyType.Standard, null);
- Directories dir = new Directories(cfm);
-
- for (File file : dir.getCFDirectories())
-for (DataDirectory dd : Directories.dataFileLocations)
++for (DataDirectory dd : Directories.dataDirectories)
{
+ File file = new File(dd.location, new File(KS,
bad).getPath());
-Assert.assertTrue(BlacklistedDirectories.isUnwritable(file));
+assertTrue(BlacklistedDirectories.isUnwritable(file));
}
}
finally
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java src/java/org/apache/cassandra/io/compress/CompressionMetadata.java src/java/org/apache/cassandra/io/sstable/SSTableWriter.java src/java/org/apache/cassandra/io/util/SequentialWriter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55750e07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55750e07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55750e07 Branch: refs/heads/cassandra-2.1 Commit: 55750e07d20b76bf2c9f07575bfcb9193734bf24 Parents: edf48f8 3679b1b Author: Benedict Elliott Smith bened...@apache.org Authored: Wed Jan 7 13:05:16 2015 + Committer: Benedict Elliott Smith bened...@apache.org Committed: Wed Jan 7 13:05:16 2015 + -- CHANGES.txt | 3 ++ .../io/compress/CompressedSequentialWriter.java | 6 +++ .../io/compress/CompressionMetadata.java| 9 + .../cassandra/io/sstable/SSTableWriter.java | 21 ++- .../io/util/ChecksummedSequentialWriter.java| 6 +++ .../cassandra/io/util/SequentialWriter.java | 39 6 files changed, 67 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55750e07/CHANGES.txt -- diff --cc CHANGES.txt index 1c1bfe2,7aad4c0..372972d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,51 -1,5 +1,54 @@@ +2.1.3 + * (cqlsh) Handle a schema mismatch being detected on startup (CASSANDRA-8512) + * Properly calculate expected write size during compaction (CASSANDRA-8532) + * Invalidate affected prepared statements when a table's columns + are altered (CASSANDRA-7910) + * Stress - user defined writes should populate sequentally (CASSANDRA-8524) + * Fix regression in SSTableRewriter causing some rows to become unreadable + during compaction (CASSANDRA-8429) + * Run major compactions for repaired/unrepaired in parallel (CASSANDRA-8510) + * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression + is disabled (CASSANDRA-8288) + * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623) + * Make sure we set lastCompactedKey correctly (CASSANDRA-8463) + * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507) + * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370) + * Make sstablescrub check leveled manifest again (CASSANDRA-8432) + * Check first/last keys in sstable when giving out positions (CASSANDRA-8458) + * Disable mmap on Windows (CASSANDRA-6993) + * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253) + * Add auth support to cassandra-stress (CASSANDRA-7985) + * Fix ArrayIndexOutOfBoundsException when generating error message + for some CQL syntax errors (CASSANDRA-8455) + * Scale memtable slab allocation logarithmically (CASSANDRA-7882) + * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964) + * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926) + * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383) + * Make read defrag async to reclaim memtables (CASSANDRA-8459) + * Remove tmplink files for offline compactions (CASSANDRA-8321) + * Reduce maxHintsInProgress (CASSANDRA-8415) + * BTree updates may call provided update function twice (CASSANDRA-8018) + * Release sstable references after anticompaction (CASSANDRA-8386) + * Handle abort() in SSTableRewriter properly (CASSANDRA-8320) + * Fix high size calculations for prepared statements (CASSANDRA-8231) + * Centralize shared executors (CASSANDRA-8055) + * Fix filtering for CONTAINS (KEY) relations on frozen collection + clustering columns when the query is restricted to a single + partition (CASSANDRA-8203) + * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243) + * Add more log info if readMeter is null (CASSANDRA-8238) + * add check of the system wall clock time at startup (CASSANDRA-8305) + * Support for frozen collections (CASSANDRA-7859) + * Fix overflow on histogram computation (CASSANDRA-8028) + * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801) + * Fix incremental repair not remove parent session on remote (CASSANDRA-8291) + * Improve JBOD disk utilization (CASSANDRA-7386) + * Log failed host when preparing incremental repair (CASSANDRA-8228) + * Force config client mode in CQLSSTableWriter (CASSANDRA-8281) +Merged from 2.0: ++=== + 2.0.12: + * Ensure SSTableWriter cleans up properly after failure (CASSANDRA-8499) * Increase bf true positive count on key cache hit
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
src/java/org/apache/cassandra/service/StorageServiceMBean.java
src/java/org/apache/cassandra/tools/NodeProbe.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f8b43d4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8b43d4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8b43d4a
Branch: refs/heads/cassandra-2.1
Commit: f8b43d4a811b0a7d9e88fb19d0aa4a6bf9117cc7
Parents: 136042e e20810c
Author: Yuki Morishita yu...@apache.org
Authored: Tue Jan 6 14:26:05 2015 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Jan 6 14:26:05 2015 -0600
--
.../cassandra/service/StorageService.java | 22 ++--
.../cassandra/service/StorageServiceMBean.java | 9
.../org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 23 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8b43d4a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index cc23712,8085d7b..b961381
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2495,39 -2412,27 +2495,43 @@@ public class StorageService extends Not
sendNotification(jmxNotification);
}
-public int forceRepairAsync(final String keyspace, final boolean
isSequential, final CollectionString dataCenters, final CollectionString
hosts, final boolean primaryRange, final String... columnFamilies)
+public int forceRepairAsync(String keyspace, boolean isSequential,
CollectionString dataCenters, CollectionString hosts, boolean primaryRange,
boolean fullRepair, String... columnFamilies) throws IOException
{
- return forceRepairAsync(keyspace, isSequential ?
RepairParallelism.SEQUENTIAL : RepairParallelism.PARALLEL, dataCenters, hosts,
primaryRange, fullRepair, columnFamilies);
-return forceRepairAsync(keyspace, isSequential ?
RepairParallelism.SEQUENTIAL.ordinal() : RepairParallelism.PARALLEL.ordinal(),
dataCenters, hosts, primaryRange, columnFamilies);
++return forceRepairAsync(keyspace, isSequential ?
RepairParallelism.SEQUENTIAL.ordinal() : RepairParallelism.PARALLEL.ordinal(),
dataCenters, hosts, primaryRange, fullRepair, columnFamilies);
}
- public int forceRepairAsync(String keyspace, RepairParallelism
parallelismDegree, CollectionString dataCenters, CollectionString hosts,
boolean primaryRange, boolean fullRepair, String... columnFamilies)
-public int forceRepairAsync(final String keyspace, final int
parallelismDegree, final CollectionString dataCenters, final
CollectionString hosts, final boolean primaryRange, final String...
columnFamilies)
++public int forceRepairAsync(String keyspace, int parallelismDegree,
CollectionString dataCenters, CollectionString hosts, boolean primaryRange,
boolean fullRepair, String... columnFamilies)
{
+ if (parallelismDegree 0 || parallelismDegree
RepairParallelism.values().length - 1)
+ {
+ throw new IllegalArgumentException(Invalid parallelism degree
specified: + parallelismDegree);
+ }
-// when repairing only primary range, dataCenter nor hosts can be set
-if (primaryRange (dataCenters != null || hosts != null))
+CollectionRangeToken ranges;
+if (primaryRange)
+{
+// when repairing only primary range, neither dataCenters nor
hosts can be set
+if (dataCenters == null hosts == null)
+ranges = getPrimaryRanges(keyspace);
+// except dataCenters only contain local DC (i.e. -local)
+else if (dataCenters != null dataCenters.size() == 1
dataCenters.contains(DatabaseDescriptor.getLocalDataCenter()))
+ranges = getPrimaryRangesWithinDC(keyspace);
+else
+throw new IllegalArgumentException(You need to run primary
range repair on all nodes in the cluster.);
+}
+else
{
-throw new IllegalArgumentException(You need to run primary range
repair on all nodes in the cluster.);
+ ranges = getLocalRanges(keyspace);
}
-final CollectionRangeToken ranges = primaryRange ?
getLocalPrimaryRanges(keyspace) : getLocalRanges(keyspace);
-return forceRepairAsync(keyspace,
RepairParallelism.values()[parallelismDegree], dataCenters, hosts, ranges,
columnFamilies);
+
- return
[5/6] cassandra 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/136042ec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136042ec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/136042ec Branch: refs/heads/cassandra-2.1 Commit: 136042ec3985bbacfcf55333ef5668779d2744fe Parents: e83304d eb9c5bb Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Jan 6 09:31:05 2015 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Jan 6 09:31:05 2015 -0600 -- .../apache/cassandra/gms/FailureDetector.java | 8 +++ .../apache/cassandra/gms/ArrivalWindowTest.java | 24 +++- 2 files changed, 22 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/136042ec/src/java/org/apache/cassandra/gms/FailureDetector.java --
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7a0cd9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7a0cd9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7a0cd9e
Branch: refs/heads/cassandra-2.1
Commit: b7a0cd9e6037a0fb21a5fb64310c50cd39e35496
Parents: 587657d ceed3a2
Author: Yuki Morishita yu...@apache.org
Authored: Thu Dec 4 17:26:59 2014 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Thu Dec 4 17:26:59 2014 -0600
--
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 36 ++--
2 files changed, 34 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7a0cd9e/CHANGES.txt
--
diff --cc CHANGES.txt
index 041c1e1,79c2d81..145347b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,35 -16,7 +33,36 @@@ Merged from 2.0
* Avoid overlap in L1 when L0 contains many nonoverlapping
sstables (CASSANDRA-8211)
* Improve PropertyFileSnitch logging (CASSANDRA-8183)
- * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164)
+ * Add DC-aware sequential repair (CASSANDRA-8193)
++ * Use live sstables in snapshot repair if possible (CASSANDRA-8312)
+
+
+2.1.2
+ * (cqlsh) parse_for_table_meta errors out on queries with undefined
+ grammars (CASSANDRA-8262)
+ * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
+ * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
+ * Optimize partitioner tokens (CASSANDRA-8230)
+ * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
+ * Make cache serializers pluggable (CASSANDRA-8096)
+ * Fix issues with CONTAINS (KEY) queries on secondary indexes
+ (CASSANDRA-8147)
+ * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239)
+ * Fix default timestamp in QueryOptions (CASSANDRA-8246)
+ * Set socket timeout when reading remote version (CASSANDRA-8188)
+ * Refactor how we track live size (CASSANDRA-7852)
+ * Make sure unfinished compaction files are removed (CASSANDRA-8124)
+ * Fix shutdown when run as Windows service (CASSANDRA-8136)
+ * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031)
+ * Fix race in RecoveryManagerTest (CASSANDRA-8176)
+ * Avoid IllegalArgumentException while sorting sstables in
+ IndexSummaryManager (CASSANDRA-8182)
+ * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579)
+ * Add 'die' policy for commit log and disk failure (CASSANDRA-7927)
+ * Fix installing as service on Windows (CASSANDRA-8115)
+ * Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
+ * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
+Merged from 2.0:
* Correctly handle non-text column names in cql3 (CASSANDRA-8178)
* Fix deletion for indexes on primary key columns (CASSANDRA-8206)
* Add 'nodetool statusgossip' (CASSANDRA-8125)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7a0cd9e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0507973,b5c6c98..be89318
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -2165,32 -1838,42 +2165,62 @@@ public class ColumnFamilyStore implemen
}
}
+private void writeSnapshotManifest(final JSONArray filesJSONArr, final
String snapshotName)
+{
+final File manifestFile =
directories.getSnapshotManifestFile(snapshotName);
+final JSONObject manifestJSON = new JSONObject();
+manifestJSON.put(files, filesJSONArr);
+
+try
+{
+if (!manifestFile.getParentFile().exists())
+manifestFile.getParentFile().mkdirs();
+PrintStream out = new PrintStream(manifestFile);
+out.println(manifestJSON.toJSONString());
+out.close();
+}
+catch (IOException e)
+{
+throw new FSWriteError(e, manifestFile);
+}
+}
+
public ListSSTableReader getSnapshotSSTableReader(String tag) throws
IOException
{
+ MapInteger, SSTableReader active = new HashMap();
+ for (SSTableReader sstable : data.getView().sstables)
+ active.put(sstable.descriptor.generation, sstable);
MapDescriptor, SetComponent snapshots =
directories.sstableLister().snapshots(tag).list();
- ListSSTableReader readers = new
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/9a4712e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4712e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4712e4 Branch: refs/heads/cassandra-2.1 Commit: 9a4712e4dc191d8182389fd4da0f18d46c91fdc7 Parents: 6853d5c d8642ae Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Dec 1 10:36:33 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Dec 1 10:36:33 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 25 +++- .../cassandra/service/StorageService.java | 4 3 files changed, 29 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/CHANGES.txt -- diff --cc CHANGES.txt index 2f11996,57c0a26..d454ba2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -2.0.12: +2.1.3 + * Handle abort() in SSTableRewriter properly (CASSANDRA-8320) + * Fix high size calculations for prepared statements (CASSANDRA-8231) + * Centralize shared executors (CASSANDRA-8055) + * Fix filtering for CONTAINS (KEY) relations on frozen collection + clustering columns when the query is restricted to a single + partition (CASSANDRA-8203) + * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243) + * Add more log info if readMeter is null (CASSANDRA-8238) + * add check of the system wall clock time at startup (CASSANDRA-8305) + * Support for frozen collections (CASSANDRA-7859) + * Fix overflow on histogram computation (CASSANDRA-8028) + * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801) + * Fix incremental repair not remove parent session on remote (CASSANDRA-8291) + * Improve JBOD disk utilization (CASSANDRA-7386) + * Log failed host when preparing incremental repair (CASSANDRA-8228) +Merged from 2.0: + * Increase quarantine delay on replacement (CASSANDRA-8260) * Expose off-heap memory usage stats (CASSANDRA-7897) * Ignore Paxos commits for truncated tables (CASSANDRA-7538) * Validate size of indexed column values (CASSANDRA-8280) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/gms/Gossiper.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4712e4/src/java/org/apache/cassandra/service/StorageService.java --
[5/6] cassandra 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/c8848bc5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8848bc5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8848bc5 Branch: refs/heads/cassandra-2.1 Commit: c8848bc5ba3c213189c40c28f8bb692b12007944 Parents: dd1dd8e eb0424e Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Dec 1 13:44:52 2014 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Dec 1 13:44:52 2014 -0600 -- --
[5/6] cassandra 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/3faff8b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faff8b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3faff8b1 Branch: refs/heads/cassandra-2.1 Commit: 3faff8b15f7d543e535fe981c06713afaa906be8 Parents: e0dff2b 8b5cf64 Author: Yuki Morishita yu...@apache.org Authored: Tue Nov 25 19:48:11 2014 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Tue Nov 25 19:48:11 2014 -0600 -- --
