[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e22170e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e22170e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e22170e9 Branch: refs/heads/trunk Commit: e22170e990fb3b3cbafc2c7d747531981918714c Parents: 9df02b9 de2c449 Author: Aleksey Yeschenko Authored: Mon Aug 15 18:33:14 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Aug 15 18:34:27 2016 +0100 -- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- .../cassandra/db/ColumnFamilyStoreCQLHelperTest.java | 10 ++ 3 files changed, 14 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e22170e9/CHANGES.txt -- diff --cc CHANGES.txt index 9d80f94,05d09dc..a281b47 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,45 -1,5 +1,46 @@@ +3.10 + * Make decommission operation resumable (CASSANDRA-12008) + * Add support to one-way targeted repair (CASSANDRA-9876) + * Remove clientutil jar (CASSANDRA-11635) + * Fix compaction throughput throttle (CASSANDRA-12366) + * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358) + * Cassandra stress should dump all setting on startup (CASSANDRA-11914) + * Make it possible to compact a given token range (CASSANDRA-10643) + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179) + * Collect metrics on queries by consistency level (CASSANDRA-7384) + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707) + * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228) + * Upgrade to OHC 0.4.4 (CASSANDRA-12133) + * Add version command to cassandra-stress (CASSANDRA-12258) + * Create compaction-stress tool (CASSANDRA-11844) + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019) - * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142) + * Support filtering on non-PRIMARY KEY columns in the CREATE + MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368) + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004) + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174) + * Faster write path (CASSANDRA-12269) + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424) + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) ++Merged from 3.0: ++ * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE statements (CASSANDRA-7190) + + 3.9 * Fix value skipping with counter columns (CASSANDRA-11726) + * Restore resumable hints delivery (CASSANDRA-11960) * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e22170e9/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index b92aedb,aa79e90..06dff0f --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -1775,7 -1754,6 +1775,8 @@@ public class ColumnFamilyStore implemen } writeSnapshotManifest(filesJSONArr, snapshotName); - writeSnapshotSchema(snapshotName); ++if (!Schema.SYSTEM_KEYSPACE_NAMES.contains(metadata.ksName) && !Schema.REPLICATED_SYSTEM_KEYSPACE_NAMES
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21bde4c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21bde4c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21bde4c2 Branch: refs/heads/trunk Commit: 21bde4c20557ab055c5aeeedc8f0bceab8fc7fba Parents: 8f46980 02f48c8 Author: Yuki Morishita Authored: Thu Aug 11 11:06:25 2016 -0500 Committer: Yuki Morishita Committed: Thu Aug 11 11:06:25 2016 -0500 -- CHANGES.txt| 1 + .../cassandra/utils/RMIServerSocketFactoryImpl.java| 13 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21bde4c2/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f469806 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f469806 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f469806 Branch: refs/heads/trunk Commit: 8f469806565b6baa1e26d2c604feaa195760aa09 Parents: 22a9bf0 6a846e6 Author: Yuki Morishita Authored: Thu Aug 11 10:11:56 2016 -0500 Committer: Yuki Morishita Committed: Thu Aug 11 10:11:56 2016 -0500 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eda4b58e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eda4b58e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eda4b58e
Branch: refs/heads/trunk
Commit: eda4b58e1d891e0ad42320c7251af8e6626f36e9
Parents: f467c85 15fd71f
Author: Stefania Alborghetti
Authored: Thu Aug 11 09:11:32 2016 +0800
Committer: Stefania Alborghetti
Committed: Thu Aug 11 09:11:32 2016 +0800
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eda4b58e/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eda4b58e/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 43a726b,2913dc9..036d522
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -174,15 -170,7 +174,13 @@@ public class CompactionTask extends Abs
AbstractCompactionStrategy.ScannerList scanners =
strategy.getScanners(actuallyCompact);
CompactionIterator ci = new
CompactionIterator(compactionType, scanners.scanners, controller, nowInSec,
taskId))
{
- if (collector != null)
- collector.beginCompaction(ci);
long lastCheckObsoletion = start;
+inputSizeBytes = scanners.getTotalCompressedSize();
+double compressionRatio = scanners.getCompressionRatio();
+if (compressionRatio ==
MetadataCollector.NO_COMPRESSION_RATIO)
+compressionRatio = 1.0;
+
+long lastBytesScanned = 0;
if (!controller.cfs.getCompactionStrategyManager().isActive())
throw new
CompactionInterruptedException(ci.getCompactionInfo());
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0565690d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0565690d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0565690d Branch: refs/heads/trunk Commit: 0565690ded9d1922cf318d170d83cbc94888d2be Parents: e9132b2 02ebf87 Author: Aleksey Yeschenko Authored: Mon Aug 8 18:41:32 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Aug 8 18:41:32 2016 +0100 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Ninja-fix test build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b905bb5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b905bb5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b905bb5 Branch: refs/heads/trunk Commit: 4b905bb5866cd60a6c3c3c8a7609eae4e8e6cc57 Parents: 624ed78 4805108 Author: Sylvain Lebresne Authored: Fri Aug 5 16:26:01 2016 +0200 Committer: Sylvain Lebresne Committed: Fri Aug 5 16:26:01 2016 +0200 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: NullPointerException during compaction on table with static columns Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fe43094 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fe43094 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fe43094 Branch: refs/heads/trunk Commit: 7fe4309430e22bd4d17c7fd91f281bb4d0878ffa Parents: 78e9180 21c92ca Author: Sylvain Lebresne Authored: Fri Aug 5 15:03:19 2016 +0200 Committer: Sylvain Lebresne Committed: Fri Aug 5 15:03:19 2016 +0200 -- CHANGES.txt| 1 + .../cassandra/cql3/validation/entities/StaticColumnsTest.java | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fe43094/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4410263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4410263 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4410263 Branch: refs/heads/trunk Commit: d4410263db587b4250fb1a9b4bc73d14c52f4fc0 Parents: 4e21f72 042e1f7 Author: Stefania Alborghetti Authored: Thu Aug 4 08:51:14 2016 +0800 Committer: Stefania Alborghetti Committed: Thu Aug 4 08:51:14 2016 +0800 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4410263/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Super columns are broken after upgrading to 3.0 on thrift Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cc0d152 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc0d152 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc0d152 Branch: refs/heads/trunk Commit: 5cc0d152bde6eb027bf7c1e86f0bc4256e688daa Parents: a69d13b 1323ad0 Author: Sylvain Lebresne Authored: Wed Aug 3 17:29:44 2016 +0200 Committer: Sylvain Lebresne Committed: Wed Aug 3 17:29:44 2016 +0200 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc0d152/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc0d152/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f1501d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f1501d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f1501d9 Branch: refs/heads/trunk Commit: 8f1501d9c3331b11886bb19e458a2b6881407993 Parents: b637fee 245fc2a Author: Sam Tunnicliffe Authored: Tue Aug 2 09:16:55 2016 +0100 Committer: Sam Tunnicliffe Committed: Tue Aug 2 09:16:55 2016 +0100 -- .../apache/cassandra/index/CustomIndexTest.java | 38 1 file changed, 23 insertions(+), 15 deletions(-) --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ad33534 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ad33534 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ad33534 Branch: refs/heads/trunk Commit: 4ad335348677c2ff3c80cf58bcd21715abbf4a2b Parents: a123e98 5fb6f95 Author: Robert Stupp Authored: Sat Jul 30 11:32:49 2016 +0200 Committer: Robert Stupp Committed: Sat Jul 30 11:32:49 2016 +0200 -- .../apache/cassandra/db/ColumnFamilyStore.java | 27 +--- 1 file changed, 18 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ad33534/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb05059 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb05059 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb05059 Branch: refs/heads/trunk Commit: cfb05059271db9ca2e52dba4ea41cc03051345d0 Parents: 094f5f9 68b3f6e Author: Sylvain Lebresne Authored: Thu Jul 28 16:34:36 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jul 28 16:34:36 2016 +0200 -- CHANGES.txt | 1 + .../ReplicationAwareTokenAllocatorTest.java | 15 ++ test/unit/org/apache/cassandra/Util.java| 56 3 files changed, 72 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb05059/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb05059/test/unit/org/apache/cassandra/Util.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Exception when computing read-repair for range tombstones Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/094f5f9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/094f5f9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/094f5f9a Branch: refs/heads/trunk Commit: 094f5f9a20b70f4997f35a057b75f6dad2886df4 Parents: 9b44a30 561b07e Author: Sylvain Lebresne Authored: Thu Jul 28 15:48:30 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jul 28 15:48:30 2016 +0200 -- CHANGES.txt | 1 + .../db/rows/UnfilteredRowIterators.java | 45 ++- .../apache/cassandra/service/DataResolver.java | 102 +-- .../cassandra/service/DataResolverTest.java | 126 ++- 4 files changed, 259 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/094f5f9a/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Lost counter writes in compact table and static columns Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b44a30b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b44a30b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b44a30b Branch: refs/heads/trunk Commit: 9b44a30bbd1351ab2d21849c1f783d5aa8fb1f87 Parents: 5051c0f f0fd9ad Author: Sylvain Lebresne Authored: Thu Jul 28 10:22:11 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jul 28 10:22:11 2016 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/UpdateParameters.java | 17 + .../apache/cassandra/db/CounterMutation.java| 3 ++- .../db/partitions/PartitionUpdate.java | 20 4 files changed, 24 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b44a30b/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b44a30b/src/java/org/apache/cassandra/db/CounterMutation.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/503148b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503148b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/503148b3 Branch: refs/heads/trunk Commit: 503148b3d47f0d7f9ac76c8e718d2f5e86000dcc Parents: 425fcad d22e390 Author: Josh McKenzie Authored: Wed Jul 27 12:16:30 2016 -0400 Committer: Josh McKenzie Committed: Wed Jul 27 12:16:30 2016 -0400 -- conf/cassandra-env.ps1 | 10 ++ 1 file changed, 10 insertions(+) --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/425fcad4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/425fcad4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/425fcad4 Branch: refs/heads/trunk Commit: 425fcad4648e5ee54b053b7e6b77826c542f52ca Parents: 6284b6d 04a0c00 Author: Josh McKenzie Authored: Wed Jul 27 11:42:34 2016 -0400 Committer: Josh McKenzie Committed: Wed Jul 27 11:42:34 2016 -0400 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: AssertionError with MVs on updating a row that isn't indexed due to a null value Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/472a7c55 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/472a7c55 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/472a7c55 Branch: refs/heads/trunk Commit: 472a7c55bcfbefef12e1405d306d7eda7854545e Parents: a59689a e9e6a0d Author: Sylvain Lebresne Authored: Wed Jul 27 11:29:56 2016 +0200 Committer: Sylvain Lebresne Committed: Wed Jul 27 11:29:56 2016 +0200 -- CHANGES.txt | 1 + .../cassandra/db/view/ViewUpdateGenerator.java | 4 +-- .../org/apache/cassandra/cql3/ViewTest.java | 29 3 files changed, 32 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/472a7c55/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/472a7c55/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/accf7a47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/accf7a47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/accf7a47 Branch: refs/heads/trunk Commit: accf7a4724e244d6f1ba921cb11d2554dbb54a76 Parents: d8ca69c 67909ea Author: Carl Yeksigian Authored: Tue Jul 26 09:59:43 2016 -0400 Committer: Carl Yeksigian Committed: Tue Jul 26 10:00:04 2016 -0400 -- CHANGES.txt | 2 +- .../apache/cassandra/service/AbstractReadExecutor.java| 10 -- 2 files changed, 9 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/accf7a47/CHANGES.txt -- diff --cc CHANGES.txt index ed165e2,50f7a6d..c586d10 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,3 +1,20 @@@ +3.10 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424) + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) + + - 3.9 * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8ca69c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8ca69c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8ca69c0 Branch: refs/heads/trunk Commit: d8ca69c01dd32489e661cfb4ea19d47261d8ac87 Parents: 0f64618 79fbdbe Author: Carl Yeksigian Authored: Tue Jul 26 08:59:12 2016 -0400 Committer: Carl Yeksigian Committed: Tue Jul 26 08:59:12 2016 -0400 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/config/Config.java| 1 + .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 10 ++ src/java/org/apache/cassandra/db/Directories.java | 3 ++- .../apache/cassandra/db/compaction/CompactionTask.java | 6 ++ 7 files changed, 38 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ca69c0/src/java/org/apache/cassandra/db/Directories.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7dcbd64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7dcbd64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7dcbd64 Branch: refs/heads/trunk Commit: e7dcbd64a88fdb8852a24847e83df0342d396bea Parents: 29bd15e 5e111e6 Author: Aleksey Yeschenko Authored: Thu Jul 21 15:03:55 2016 +0100 Committer: Aleksey Yeschenko Committed: Thu Jul 21 15:03:55 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 -- 2 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7dcbd64/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7dcbd64/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: NullPointerExpception when reading/compacting table Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6f5009f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6f5009f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6f5009f Branch: refs/heads/trunk Commit: a6f5009f658a6e5ce35de2b5f803a0b81c076378 Parents: a41fb50 43d726b Author: Sylvain Lebresne Authored: Wed Jul 20 14:29:28 2016 +0200 Committer: Sylvain Lebresne Committed: Wed Jul 20 14:29:28 2016 +0200 -- CHANGES.txt | 1 + .../db/partitions/AbstractBTreePartition.java | 2 +- .../cassandra/db/partitions/PurgeFunction.java | 15 - .../cassandra/db/rows/BaseRowIterator.java | 2 +- src/java/org/apache/cassandra/db/rows/Row.java | 13 +--- .../apache/cassandra/db/transform/BaseRows.java | 2 +- .../apache/cassandra/db/transform/Filter.java | 12 +++ .../validation/entities/StaticColumnsTest.java | 22 8 files changed, 54 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5009f/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d14052e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d14052e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d14052e9 Branch: refs/heads/trunk Commit: d14052e99c742985402fa1c8c392ae6de64f4680 Parents: 3163793 4bd4be8 Author: Sam Tunnicliffe Authored: Tue Jul 19 18:57:32 2016 +0100 Committer: Sam Tunnicliffe Committed: Tue Jul 19 18:57:32 2016 +0100 -- --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Fix problem with undeleteable rows on upgrade to new sstable format. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d314b605 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d314b605 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d314b605 Branch: refs/heads/trunk Commit: d314b60576c7a55fd24c141262ef3383b7118dba Parents: 249a155 d4ced24 Author: Sylvain Lebresne Authored: Tue Jul 19 12:04:33 2016 +0200 Committer: Sylvain Lebresne Committed: Tue Jul 19 12:04:33 2016 +0200 -- CHANGES.txt | 3 +- .../org/apache/cassandra/db/LegacyLayout.java | 19 +++- .../cassandra/db/compaction/Scrubber.java | 50 +-- .../io/sstable/SSTableIdentityIterator.java | 9 +- .../lb-1-big-CompressionInfo.db | Bin 0 -> 43 bytes .../cf_with_duplicates_2_0/lb-1-big-Data.db | Bin 0 -> 84 bytes .../lb-1-big-Digest.adler32 | 1 + .../cf_with_duplicates_2_0/lb-1-big-Filter.db | Bin 0 -> 16 bytes .../cf_with_duplicates_2_0/lb-1-big-Index.db| Bin 0 -> 18 bytes .../lb-1-big-Statistics.db | Bin 0 -> 4474 bytes .../cf_with_duplicates_2_0/lb-1-big-Summary.db | Bin 0 -> 84 bytes .../cf_with_duplicates_2_0/lb-1-big-TOC.txt | 8 ++ .../mb-3-big-CompressionInfo.db | Bin 0 -> 51 bytes .../cf_with_duplicates_3_0/mb-3-big-Data.db | Bin 0 -> 72 bytes .../mb-3-big-Digest.crc32 | 1 + .../cf_with_duplicates_3_0/mb-3-big-Filter.db | Bin 0 -> 16 bytes .../cf_with_duplicates_3_0/mb-3-big-Index.db| Bin 0 -> 8 bytes .../mb-3-big-Statistics.db | Bin 0 -> 4664 bytes .../cf_with_duplicates_3_0/mb-3-big-Summary.db | Bin 0 -> 56 bytes .../cf_with_duplicates_3_0/mb-3-big-TOC.txt | 8 ++ .../unit/org/apache/cassandra/db/ScrubTest.java | 87 ++- 21 files changed, 174 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d314b605/CHANGES.txt -- diff --cc CHANGES.txt index c974467,780ea96..7d30aa4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,6 +1,21 @@@ +3.10 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + + 3.9 - + Merged from 3.0: + * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144) 3.8 * Fix hdr logging for single operation workloads (CASSANDRA-12145)
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3bb14ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3bb14ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3bb14ac Branch: refs/heads/trunk Commit: c3bb14acef7a24414cc5cd513a5833f19cc37719 Parents: ec02e6a 371a147 Author: Aleksey Yeschenko Authored: Mon Jul 11 14:37:17 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Jul 11 14:37:17 2016 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CompactTables.java | 7 ++- 2 files changed, 3 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3bb14ac/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec02e6a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec02e6a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec02e6a2 Branch: refs/heads/trunk Commit: ec02e6a25704f79ae5fda1aeaf0d515528c38929 Parents: 997cb66 314f60a Author: Aleksey Yeschenko Authored: Mon Jul 11 14:32:40 2016 +0100 Committer: Aleksey Yeschenko Committed: Mon Jul 11 14:32:40 2016 +0100 -- CHANGES.txt | 2 + .../cassandra/schema/LegacySchemaMigrator.java | 81 ++-- 2 files changed, 59 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec02e6a2/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4e73877 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4e73877 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4e73877 Branch: refs/heads/trunk Commit: a4e7387772d5e57d737c8a780d552263ed51bd4a Parents: 5fae533 5ad1763 Author: Sam Tunnicliffe Authored: Wed Jul 6 12:12:21 2016 +0100 Committer: Sam Tunnicliffe Committed: Wed Jul 6 12:12:21 2016 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 16 +++- 2 files changed, 8 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4e73877/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49c954e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49c954e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49c954e7 Branch: refs/heads/trunk Commit: 49c954e7ae4fbb9461b2f1a9eaf285546b3b718f Parents: c57d0d4 237330a Author: Carl Yeksigian Authored: Tue Jul 5 12:25:34 2016 -0400 Committer: Carl Yeksigian Committed: Tue Jul 5 12:25:34 2016 -0400 -- .../cql3/statements/CreateViewStatement.java| 2 +- .../org/apache/cassandra/cql3/ViewTest.java | 31 2 files changed, 32 insertions(+), 1 deletion(-) --
[6/6] cassandra git commit: Merge branch cassandra-3.9 into trunk
Merge branch cassandra-3.9 into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2aa665aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2aa665aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2aa665aa Branch: refs/heads/trunk Commit: 2aa665aa00faa01be4aee4bc3560d3a26a7dc46a Parents: dec1bdb 0702e45 Author: Benjamin Lerer Authored: Mon Jul 4 14:44:06 2016 +0200 Committer: Benjamin Lerer Committed: Mon Jul 4 14:44:26 2016 +0200 -- CHANGES.txt | 1 + .../ClusteringColumnRestrictions.java | 20 ++-- .../restrictions/MultiColumnRestriction.java| 2 +- .../SelectMultiColumnRelationTest.java | 27 ++ .../cql3/validation/operations/SelectTest.java | 54 5 files changed, 86 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2aa665aa/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Exclude static columns from digest on empty static row Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7f4600b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7f4600b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7f4600b Branch: refs/heads/trunk Commit: c7f4600be3cb8e816158674599287b7279fb8ff0 Parents: db174f3 3dceaab Author: Sylvain Lebresne Authored: Thu Jun 30 16:54:00 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 30 16:54:00 2016 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/PartitionColumns.java | 7 --- .../cassandra/db/partitions/PartitionIterators.java | 11 --- .../org/apache/cassandra/db/rows/RowIterators.java| 9 ++--- .../cassandra/db/rows/UnfilteredRowIterators.java | 14 +- 5 files changed, 20 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7f4600b/CHANGES.txt -- diff --cc CHANGES.txt index 6068b14,475365f..44b6699 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,6 +1,9 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 Merged from 3.0: + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Fix EOF exception when altering column type (CASSANDRA-11820) Merged from 2.2: * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Avoid deserialization error after altering column type Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9242c85c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9242c85c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9242c85c Branch: refs/heads/trunk Commit: 9242c85cf48bbfe7e46fde180576315370c66b0c Parents: e423527 1f014b2 Author: Sylvain Lebresne Authored: Thu Jun 30 11:16:17 2016 +0200 Committer: Sylvain Lebresne Committed: Thu Jun 30 11:16:17 2016 +0200 -- CHANGES.txt | 2 + .../apache/cassandra/db/rows/BufferCell.java| 1 - src/java/org/apache/cassandra/db/rows/Cell.java | 16 +++ .../cassandra/db/rows/UnfilteredSerializer.java | 30 + .../org/apache/cassandra/cql3/CQLTester.java| 39 +++-- .../cql3/validation/operations/AlterTest.java | 46 +--- 6 files changed, 97 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9242c85c/CHANGES.txt -- diff --cc CHANGES.txt index 81740ab,ed884a9..6068b14 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,6 +1,9 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 + Merged from 3.0: + * Fix EOF exception when altering column type (CASSANDRA-11820) Merged from 2.2: * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1:
