[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2017-06-15 Thread mshuler 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b8ae9f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b8ae9f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b8ae9f0

Branch: refs/heads/trunk
Commit: 5b8ae9f03943f167932b896c657f25b0d9c3448d
Parents: 1f54aa4 13e153b
Author: Michael Shuler 
Authored: Thu Jun 15 14:06:30 2017 -0500
Committer: Michael Shuler 
Committed: Thu Jun 15 14:06:30 2017 -0500

--
 build.properties.default | 2 +-
 build.xml| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b8ae9f0/build.xml
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2017-02-09 Thread snazy 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a696ab33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a696ab33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a696ab33

Branch: refs/heads/trunk
Commit: a696ab33ba17672efa125ae137458c1abcf9c116
Parents: 74fdfe0 f0f9cf2
Author: Robert Stupp 
Authored: Thu Feb 9 20:38:17 2017 +0100
Committer: Robert Stupp 
Committed: Thu Feb 9 20:38:17 2017 +0100

--
 CHANGES.txt |   1 +
 build.xml   |   2 +-
 lib/licenses/netty-all-4.0.23.Final.txt | 202 ---
 lib/licenses/netty-all-4.0.44.Final.txt | 202 +++
 lib/netty-all-4.0.23.Final.jar  | Bin 1779991 -> 0 bytes
 lib/netty-all-4.0.44.Final.jar  | Bin 0 -> 2342652 bytes
 .../org/apache/cassandra/transport/Message.java |  12 +-
 7 files changed, 212 insertions(+), 207 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a696ab33/CHANGES.txt
--
diff --cc CHANGES.txt
index 1f638da,c8419ab..d8c1625
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,47 -12,6 +49,48 @@@ Merged from 2.2
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
   * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
 +Merged from 2.1:
++ * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
 + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
 +
 +
 +
 +3.0.10
 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039)
 + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
 + * Pass root cause to CorruptBlockException when uncompression failed 
(CASSANDRA-12889)
 + * Fix partition count log during compaction (CASSANDRA-12184)
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
   * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
   * Fail repair if participant dies during sync or anticompaction 
(CASSANDRA-12901)
   * cqlsh COPY: unprotected pk values before converting them if not using 
prepared statements (CASSANDRA-12863)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a696ab33/build.xml

[3/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2017-01-11 Thread blerer 
Merge branch cassandra-2.2 into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/219f6ee8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/219f6ee8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/219f6ee8

Branch: refs/heads/cassandra-3.11
Commit: 219f6ee825f968420e34ed4e3ce0a7571495e975
Parents: 15b5280 b45cb10
Author: Benjamin Lerer 
Authored: Wed Jan 11 21:11:15 2017 +0100
Committer: Benjamin Lerer 
Committed: Wed Jan 11 21:11:22 2017 +0100

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-10-10 Thread mshuler 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84552867
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84552867
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84552867

Branch: refs/heads/trunk
Commit: 84552867b2ad920bbdd648c45423ff4d4d8b75d7
Parents: 2f0e365 c5fdb32
Author: Michael Shuler 
Authored: Mon Oct 10 17:10:44 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 10 17:10:44 2016 -0500

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-01-15 Thread jake 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7aa4dc52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aa4dc52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7aa4dc52

Branch: refs/heads/trunk
Commit: 7aa4dc5250ede812da73cffa0f715b83d340e2b3
Parents: 5e5ea772 e2050c9
Author: T Jake Luciani 
Authored: Fri Jan 15 09:46:36 2016 -0500
Committer: T Jake Luciani 
Committed: Fri Jan 15 09:46:36 2016 -0500

--
 CHANGES.txt |   1 +
 .../cassandra/service/StorageService.java   | 103 ---
 2 files changed, 69 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa4dc52/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa4dc52/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a501425,34419e9..b3ea8cc
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -37,8 -51,6 +52,7 @@@ import java.util.concurrent.TimeUnit
  import java.util.concurrent.TimeoutException;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.concurrent.atomic.AtomicInteger;
- 
 +import javax.annotation.Nullable;
  import javax.management.JMX;
  import javax.management.MBeanServer;
  import javax.management.NotificationBroadcasterSupport;
@@@ -46,19 -58,56 +60,58 @@@ import javax.management.ObjectName
  import javax.management.openmbean.TabularData;
  import javax.management.openmbean.TabularDataSupport;
  
+ import com.google.common.annotations.VisibleForTesting;
+ import com.google.common.base.Predicate;
+ import com.google.common.collect.ArrayListMultimap;
+ import com.google.common.collect.Collections2;
+ import com.google.common.collect.HashMultimap;
+ import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
+ import com.google.common.collect.Maps;
+ import com.google.common.collect.Multimap;
+ import com.google.common.collect.Sets;
+ import com.google.common.util.concurrent.FutureCallback;
+ import com.google.common.util.concurrent.Futures;
+ import com.google.common.util.concurrent.ListenableFuture;
+ import com.google.common.util.concurrent.Uninterruptibles;
+ import org.apache.commons.lang3.StringUtils;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+ import ch.qos.logback.classic.LoggerContext;
+ import ch.qos.logback.classic.jmx.JMXConfiguratorMBean;
+ import ch.qos.logback.classic.spi.ILoggingEvent;
+ import ch.qos.logback.core.Appender;
  import org.apache.cassandra.auth.AuthKeyspace;
  import org.apache.cassandra.auth.AuthMigrationListener;
++import org.apache.cassandra.batchlog.BatchRemoveVerbHandler;
++import org.apache.cassandra.batchlog.BatchStoreVerbHandler;
++import org.apache.cassandra.batchlog.BatchlogManager;
  import org.apache.cassandra.concurrent.ScheduledExecutors;
  import org.apache.cassandra.concurrent.Stage;
  import org.apache.cassandra.concurrent.StageManager;
- import org.apache.cassandra.config.*;
- import org.apache.cassandra.db.*;
- import org.apache.cassandra.batchlog.BatchStoreVerbHandler;
- import org.apache.cassandra.batchlog.BatchRemoveVerbHandler;
- import org.apache.cassandra.batchlog.BatchlogManager;
+ 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.db.BatchlogManager;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.CounterMutationVerbHandler;
+ import org.apache.cassandra.db.DecoratedKey;
+ import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
 -import org.apache.cassandra.db.HintedHandOffManager;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.MigrationRequestVerbHandler;
+ import org.apache.cassandra.db.MutationVerbHandler;
++import org.apache.cassandra.db.RangeSliceVerbHandler;
++import org.apache.cassandra.db.ReadCommandVerbHandler;
+ import org.apache.cassandra.db.ReadRepairVerbHandler;
 -import org.apache.cassandra.db.ReadVerbHandler;
+ import org.apache.cassandra.db.SchemaCheckVerbHandler;
+ import org.apache.cassandra.db.SizeEstimatesRecorder;
+ import org.apache.cassandra.db.SnapshotDetailsTabularData;
+ import org.apache.cassandra.db.SystemKeyspace;
+ import org.apache.cassandra.db.TruncateVerbHandler;
  import org.apache.cassandra.db.commitlog.

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-12-03 Thread blerer 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b01e8fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b01e8fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b01e8fc

Branch: refs/heads/trunk
Commit: 4b01e8fc5c6931516ced47a08e1e6fdaaee7ed0f
Parents: fffa6d8 7e3e119
Author: Benjamin Lerer 
Authored: Thu Dec 3 21:36:33 2015 +0100
Committer: Benjamin Lerer 
Committed: Thu Dec 3 21:36:33 2015 +0100

--
 CHANGES.txt   | 1 +
 .../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +--
 2 files changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b01e8fc/CHANGES.txt
--
diff --cc CHANGES.txt
index 507a709,7932f51..dd5d22b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,8 -13,18 +28,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 - * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
  Merged from 2.1:
++ * Fix Stress profile parsing on Windows (CASSANDRA-10808)
   * Fix incremental repair hang when replica is down (CASSANDRA-10288)
 - * Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
   * Optimize the way we check if a token is repaired in anticompaction 
(CASSANDRA-10768)
   * Add proper error handling to stream receiver (CASSANDRA-10774)
   * Warn or fail when changing cluster topology live (CASSANDRA-10243)

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-12-02 Thread tylerhobbs 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7068fd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7068fd7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7068fd7

Branch: refs/heads/trunk
Commit: d7068fd72e4597112dc91011da87d58bdb9c0c3b
Parents: a9a2d75 e491f05
Author: Tyler Hobbs 
Authored: Wed Dec 2 15:32:40 2015 -0600
Committer: Tyler Hobbs 
Committed: Wed Dec 2 15:32:40 2015 -0600

--
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7068fd7/build.xml
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-12-02 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb6973a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6973a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb6973a6

Branch: refs/heads/trunk
Commit: bb6973a6fe132249031a281788f232c975e3456f
Parents: b950c38 882df8a
Author: Marcus Eriksson 
Authored: Wed Dec 2 15:09:09 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Dec 2 15:09:09 2015 +0100

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-12-02 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad84add7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad84add7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad84add7

Branch: refs/heads/trunk
Commit: ad84add7268ae31f4af681ec9f726a2efe532cda
Parents: f7aaea0 9f19dd4
Author: Marcus Eriksson 
Authored: Wed Dec 2 08:55:36 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Dec 2 08:55:36 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java|  4 +-
 src/java/org/apache/cassandra/dht/Range.java| 42 +
 .../org/apache/cassandra/dht/RangeTest.java | 65 
 4 files changed, 110 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84add7/CHANGES.txt
--
diff --cc CHANGES.txt
index 1af2745,eaad3a2..1b3838d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,7 -8,17 +24,8 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 - * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
  Merged from 2.1:
+  * Optimize the way we check if a token is repaired in anticompaction 
(CASSANDRA-10768)
   * Add proper error handling to stream receiver (CASSANDRA-10774)
   * Warn or fail when changing cluster topology live (CASSANDRA-10243)
   * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad84add7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 7cf78bc,65f93c0..3ce7d2c
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1193,31 -1208,35 +1193,31 @@@ public class CompactionManager implemen
  logger.info("Anticompacting {}", anticompactionGroup);
  Set sstableAsSet = anticompactionGroup.originals();
  
 -File destination = 
cfs.directories.getWriteableLocationAsFile(cfs.getExpectedCompactedFileSize(sstableAsSet,
 OperationType.ANTICOMPACTION));
 +File destination = 
cfs.getDirectories().getWriteableLocationAsFile(cfs.getExpectedCompactedFileSize(sstableAsSet,
 OperationType.ANTICOMPACTION));
  long repairedKeyCount = 0;
  long unrepairedKeyCount = 0;
 -AbstractCompactionStrategy strategy = cfs.getCompactionStrategy();
 -try (SSTableRewriter repairedSSTableWriter = new SSTableRewriter(cfs, 
anticompactionGroup, groupMaxDataAge, false, false);
 - SSTableRewriter unRepairedSSTableWriter = new 
SSTableRewriter(cfs, anticompactionGroup, groupMaxDataAge, false, false);
 +int nowInSec = FBUtilities.nowInSeconds();
 +
 +CompactionStrategyManager strategy = 
cfs.getCompactionStrategyManager();
 +try (SSTableRewriter repairedSSTableWriter = new 
SSTableRewriter(anticompactionGroup, groupMaxDataAge, false, false);
 + SSTableRewriter unRepairedSSTableWriter = new 
SSTableRewriter(anticompactionGroup, groupMaxDataAge, false, false);
   AbstractCompactionStrategy.ScannerList scanners = 
strategy.getScanners(anticompactionGroup.originals());
 - CompactionController controller = new CompactionController(cfs, 
sstableAsSet, getDefaultGcBefore(cfs)))
 + CompactionController controller = new CompactionController(cfs, 
sstableAsSet, getDefaultGcBefore(cfs, nowInSec));
 + CompactionIterator ci = new 
CompactionIterator(OperationType.ANTICOMPACTION, scanners.scanners, controller, 
nowInSec, UUIDGen.getTimeUUID(), metrics))
  {
 -int expectedBloomFilterSize = 
Math.max(cfs.metadata.getMinIndexInterval(), 
(int)(SSTableReader.getApproximateKeyCount(sstableAsSet)));
 -
 -
repairedSSTableWriter.switchWriter(CompactionManager

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-27 Thread snazy 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56965fd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56965fd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56965fd6

Branch: refs/heads/trunk
Commit: 56965fd6ff94e79d0f00ae9eac2e9bda48c69129
Parents: c35af2a 432a8a4
Author: Robert Stupp 
Authored: Fri Nov 27 13:53:20 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 13:53:20 2015 +0100

--
 CHANGES.txt |   1 +
 NEWS.txt|   6 +
 src/java/org/apache/cassandra/gms/Gossiper.java |  28 +-
 .../locator/GossipingPropertyFileSnitch.java| 107 ++
 .../cassandra/locator/PropertyFileSnitch.java   |  74 +++-
 .../cassandra/locator/SnitchProperties.java |   5 +
 .../cassandra/service/CassandraDaemon.java  |  17 +-
 .../cassandra/service/MigrationManager.java |   4 +-
 .../apache/cassandra/service/StorageProxy.java  |   8 +-
 .../cassandra/service/StorageService.java   |  28 +-
 .../GossipingPropertyFileSnitchTest.java|  35 +-
 .../locator/PropertyFileSnitchTest.java | 334 +++
 12 files changed, 493 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/CHANGES.txt
--
diff --cc CHANGES.txt
index 97c0eae,ce82bd0..592cff8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,7 -7,16 +19,8 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Warn or fail when changing cluster topology live (CASSANDRA-10243)
   * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213)
   * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing 
KS (CASSANDRA-10658)
   * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/NEWS.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/gms/Gossiper.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/MigrationManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/StorageProxy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/src/java/org/apache/cassandra/service/StorageService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/56965fd6/test/unit/org/apache/cassandra/locator/GossipingPropertyFileSnitchTest.java
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-27 Thread snazy 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b166f5f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b166f5f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b166f5f3

Branch: refs/heads/trunk
Commit: b166f5f3fe3f460a878cd9d3bc37e69ffdada513
Parents: c7724e6 d44dbe1
Author: Robert Stupp 
Authored: Fri Nov 27 12:58:46 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 12:58:46 2015 +0100

--
 CHANGES.txt | 1 +
 debian/init | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b166f5f3/CHANGES.txt
--
diff --cc CHANGES.txt
index 252972c,39ce927..472ed45
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,7 -6,16 +18,8 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Status command in debian/ubuntu init script doesn't work (CASSANDRA-10213)
   * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing 
KS (CASSANDRA-10658)
   * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)
   * Force encoding when computing statement ids (CASSANDRA-10755)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b166f5f3/debian/init
--

[3/5] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2015-11-27 Thread blerer 
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b430eee/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index df8e38d,000..ba2c680
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@@ -1,1012 -1,0 +1,1052 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.index;
 +
 +import java.lang.reflect.Constructor;
 +import java.util.*;
 +import java.util.concurrent.*;
 +import java.util.function.Function;
 +import java.util.stream.Collectors;
 +import java.util.stream.Stream;
 +
 +import com.google.common.base.Joiner;
 +import com.google.common.base.Strings;
 +import com.google.common.collect.ImmutableSet;
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Maps;
++import com.google.common.collect.Sets;
 +import com.google.common.primitives.Longs;
 +import com.google.common.util.concurrent.Futures;
 +import com.google.common.util.concurrent.MoreExecutors;
 +import org.apache.commons.lang3.StringUtils;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.concurrent.StageManager;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.cql3.statements.IndexTarget;
 +import org.apache.cassandra.db.*;
 +import org.apache.cassandra.db.compaction.CompactionManager;
 +import org.apache.cassandra.db.filter.RowFilter;
 +import org.apache.cassandra.db.lifecycle.SSTableSet;
 +import org.apache.cassandra.db.lifecycle.View;
 +import org.apache.cassandra.db.partitions.PartitionUpdate;
 +import org.apache.cassandra.db.rows.*;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.index.internal.CassandraIndex;
 +import org.apache.cassandra.index.transactions.*;
 +import org.apache.cassandra.io.sstable.ReducingKeyIterator;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.IndexMetadata;
 +import org.apache.cassandra.schema.Indexes;
 +import org.apache.cassandra.tracing.Tracing;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.concurrent.OpOrder;
 +import org.apache.cassandra.utils.concurrent.Refs;
 +
 +/**
 + * Handles the core maintenance functionality associated with indexes: 
adding/removing them to or from
 + * a table, (re)building during bootstrap or other streaming operations, 
flushing, reloading metadata
 + * and so on.
 + *
 + * The Index interface defines a number of methods which return Callable. 
These are primarily the
 + * management tasks for an index implementation. Most of them are currently 
executed in a blocking
 + * fashion via submission to SIM's blockingExecutor. This provides the 
desired behaviour in pretty
 + * much all cases, as tasks like flushing an index needs to be executed 
synchronously to avoid potentially
 + * deadlocking on the FlushWriter or PostFlusher. Several of these 
Callable returning methods on Index could
 + * then be defined with as void and called directly from SIM (rather than 
being run via the executor service).
 + * Separating the task defintion from execution gives us greater flexibility 
though, so that in future, for example,
 + * if the flush process allows it we leave open the possibility of executing 
more of these tasks asynchronously.
 + *
 + * The primary exception to the above is the Callable returned from 
Index#addIndexedColumn. This may
 + * involve a significant effort, building a new index over any existing data. 
We perform this task asynchronously;
 + * as it is called as part of a schema update, which we do not want to block 
for a long period. Building non-custom
 + * indexes is performed on the CompactionManager.
 + *
 + * This class also provides instances of processors which listen to updates 
to the base table and forwa

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-27 Thread snazy 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8091d5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8091d5f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8091d5f

Branch: refs/heads/trunk
Commit: e8091d5f72ca1d19872201c3a672f3afd5c1d0c5
Parents: 489d647 db97083
Author: Robert Stupp 
Authored: Fri Nov 27 09:30:23 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 09:30:45 2015 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/DeletionTime.java | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8091d5f/CHANGES.txt
--
diff --cc CHANGES.txt
index 729264c,8779275..bc183fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,7 -5,16 +17,8 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749)
   * Force encoding when computing statement ids (CASSANDRA-10755)
   * Properly reject counters as map keys (CASSANDRA-10760)
   * Fix the sstable-needs-cleanup check (CASSANDRA-10740)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8091d5f/src/java/org/apache/cassandra/db/DeletionTime.java
--
diff --cc src/java/org/apache/cassandra/db/DeletionTime.java
index 919c603,99cfe35..652689c
--- a/src/java/org/apache/cassandra/db/DeletionTime.java
+++ b/src/java/org/apache/cassandra/db/DeletionTime.java
@@@ -23,16 -23,15 +23,15 @@@ import java.security.MessageDigest
  import com.google.common.base.Objects;
  
  import org.apache.cassandra.cache.IMeasurableMemory;
 +import org.apache.cassandra.db.rows.Cell;
  import org.apache.cassandra.io.ISerializer;
 +import org.apache.cassandra.io.util.DataInputPlus;
  import org.apache.cassandra.io.util.DataOutputPlus;
--import org.apache.cassandra.io.util.FileUtils;
 +import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.ObjectSizes;
 -import org.codehaus.jackson.annotate.JsonIgnore;
  
  /**
 - * A top-level (row) tombstone.
 + * Information on deletion of a storage engine object.
   */
  public class DeletionTime implements Comparable, 
IMeasurableMemory
  {
@@@ -112,14 -96,14 +111,14 @@@
  
  public int compareTo(DeletionTime dt)
  {
 -if (markedForDeleteAt < dt.markedForDeleteAt)
 +if (markedForDeleteAt() < dt.markedForDeleteAt())
  return -1;
 -else if (markedForDeleteAt > dt.markedForDeleteAt)
 +else if (markedForDeleteAt() > dt.markedForDeleteAt())
  return 1;
 -else if (localDeletionTime < dt.localDeletionTime)
 +else if (localDeletionTime() < dt.localDeletionTime())
  return -1;
 -else if (localDeletionTime > dt.localDeletionTime)
 +else if (localDeletionTime() > dt.localDeletionTime())
- return -1;
+ return 1;
  else
  return 0;
  }

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-26 Thread slebresne 
Merge branch 'cassandra-2.2' into cassandra-3.0

is merge is necessary,


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3bfd2

Branch: refs/heads/trunk
Commit: 64a3bfd29290f53db1e730e955bd401bc68310e3
Parents: 2cbd776 8bfdd65
Author: Sylvain Lebresne 
Authored: Thu Nov 26 10:42:22 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Nov 26 10:42:22 2015 +0100

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/CHANGES.txt
--
diff --cc CHANGES.txt
index bd7006e,237c251..04cda25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,9 -4,19 +14,10 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Properly reject counters as map keys (CASSANDRA-10760)
   * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
   * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
 - * Make paging logic consistent between searcher impls (CASSANDRA-10683)
   * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
   * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
   * Try next replica if not possible to connect to primary replica on

http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/src/java/org/apache/cassandra/cql3/CQL3Type.java
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-25 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71bca780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bca780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71bca780

Branch: refs/heads/trunk
Commit: 71bca78006829221c92cc336878da36bb846d28e
Parents: 5fd6c54 96b7603
Author: Marcus Eriksson 
Authored: Thu Nov 26 08:36:33 2015 +0100
Committer: Marcus Eriksson 
Committed: Thu Nov 26 08:36:33 2015 +0100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java|  6 +-
 .../org/apache/cassandra/db/CleanupTest.java| 77 
 3 files changed, 82 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/CHANGES.txt
--
diff --cc CHANGES.txt
index f95f079,a548c9f..db6c72f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,8 -3,18 +13,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
   * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
 - * Make paging logic consistent between searcher impls (CASSANDRA-10683)
   * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
   * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
   * Try next replica if not possible to connect to primary replica on

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index a4aca7f,0115ad9..167f3b0
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -32,15 -35,19 +35,17 @@@ import org.junit.Test
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 -import org.apache.cassandra.config.KSMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
  import org.apache.cassandra.cql3.Operator;
 -import org.apache.cassandra.db.filter.IDiskAtomFilter;
 -import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
  import org.apache.cassandra.db.compaction.CompactionManager;
 -import org.apache.cassandra.db.index.SecondaryIndex;
 +import org.apache.cassandra.db.filter.RowFilter;
  import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
+ import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
 -import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.dht.Token;
  import org.apache.cassandra.locator.TokenMetadata;
 +import org.apache.cassandra.schema.KeyspaceParams;
  import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
@@@ -165,10 -182,83 +170,82 @@@ public class CleanupTes
  tmd.updateNormalToken(new BytesToken(tk2), 
InetAddress.getByName("127.0.0.2"));
  CompactionManager.instance.performCleanup(cfs);
  
 -rows = Util.getRangeSlice(cfs);
 -assertEquals(0, rows.size());
 +assertEquals(0, Util.getAll(Util.cmd(cfs).build()).size());
  }
  
+ @Test
+ public void testNeedsCleanup() throws Exception
+ {
+ // setup
+ StorageService.instance.getTokenMetadata().clearUnsafe();
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
 -ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF1);
 -fillCF(cfs, LOOPS);
++ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
++fillCF(cfs, "val", LOOPS);
+ 
+ // prepare SSTable and some useful tokens
 -SSTableReader ssTable = cfs.getSSTables().iterator

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-25 Thread tylerhobbs 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545

Branch: refs/heads/trunk
Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b
Parents: 9b3b3ca cd75ecd
Author: Tyler Hobbs 
Authored: Wed Nov 25 17:53:15 2015 -0600
Committer: Tyler Hobbs 
Committed: Wed Nov 25 17:53:15 2015 -0600

--
 pylib/cqlshlib/formatting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-23 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fe790d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fe790d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fe790d7

Branch: refs/heads/trunk
Commit: 9fe790d751ab7a7aa32c85f065e3eab21d2b7c89
Parents: 174a0aa 2aa8342
Author: Aleksey Yeschenko 
Authored: Mon Nov 23 17:14:38 2015 +
Committer: Aleksey Yeschenko 
Committed: Mon Nov 23 17:14:38 2015 +

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-20 Thread slebresne 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a0615b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a0615b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a0615b4

Branch: refs/heads/trunk
Commit: 8a0615b4a7d1fa6864b95e1bb72a5417a54472e2
Parents: 039ff1f da4b971
Author: Sylvain Lebresne 
Authored: Fri Nov 20 14:01:17 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 14:01:17 2015 +0100

--
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a0615b4/CHANGES.txt
--
diff --cc CHANGES.txt
index c3469bc,17c5047..d6f0379
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,7 -3,17 +9,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Try next replica if not possible to connect to primary replica on
+ColumnFamilyRecordReader (CASSANDRA-2388)
   * Limit window size in DTCS (CASSANDRA-10280)
   * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
   * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-20 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1c3c674
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1c3c674
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1c3c674

Branch: refs/heads/trunk
Commit: d1c3c674fa32ee37334a10eaf42d7a37489e2668
Parents: f4ae344 bdd88a2
Author: Marcus Eriksson 
Authored: Fri Nov 20 12:04:17 2015 +0100
Committer: Marcus Eriksson 
Committed: Fri Nov 20 12:04:17 2015 +0100

--
 NEWS.txt | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1c3c674/NEWS.txt
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-20 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4ae3448
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4ae3448
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4ae3448

Branch: refs/heads/trunk
Commit: f4ae344871bbf6a57e4e4d40ec92527a172402a7
Parents: 747e5fd 073f062
Author: Marcus Eriksson 
Authored: Fri Nov 20 11:06:48 2015 +0100
Committer: Marcus Eriksson 
Committed: Fri Nov 20 11:06:48 2015 +0100

--
 CHANGES.txt |  1 +
 pylib/cqlshlib/cql3handling.py  |  1 +
 .../DateTieredCompactionStrategy.java   | 34 +++-
 .../DateTieredCompactionStrategyOptions.java| 30 +++--
 .../DateTieredCompactionStrategyTest.java   | 34 
 5 files changed, 70 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ae3448/CHANGES.txt
--
diff --cc CHANGES.txt
index 5e44f27,867226f..c3469bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,10 -3,21 +9,11 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Limit window size in DTCS (CASSANDRA-10280)
   * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
   * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
 - * Don't remove level info when running upgradesstables (CASSANDRA-10692)
   * Create compression chunk for sending file only (CASSANDRA-10680)
 - * Make buffered read size configurable (CASSANDRA-10249)
   * Forbid compact clustering column type changes in ALTER TABLE 
(CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ae3448/pylib/cqlshlib/cql3handling.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ae3448/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ae3448/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 01a6dfa,2fab014..22b4829
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -221,12 -231,12 +231,12 @@@ public class DateTieredCompactionStrate
  }
  cfs.forceBlockingFlush();
  
 -List sstrs = new ArrayList<>(cfs.getSSTables());
 +List sstrs = new ArrayList<>(cfs.getLiveSSTables());
  
- List newBucket = 
newestBucket(Collections.singletonList(sstrs.subList(0, 2)), 4, 32, 9, 10, new 
SizeTieredCompactionStrategyOptions());
+ List newBucket = 
newestBucket(Collections.singletonList(sstrs.subList(0, 2)), 4, 32, 9, 10, 
Long.MAX_VALUE, new SizeTieredCompactionStrategyOptions());
  assertTrue("incoming bucket should not be accepted when it has below 
the min threshold SSTables", newBucket.isEmpty());
  
- newBucket = newestBucket(Collections.singletonList(sstrs.subList(0, 
2)), 4, 32, 10, 10, new SizeTieredCompactionStrategyOptions());
+ newBucket = newestBucket(Collections.singletonList(sstrs.subList(0, 
2)), 4, 32, 10, 10, Long.MAX_VALUE, new SizeTieredCompactionStrategyOptions());
  assertFalse("non-incoming bucket should be accepted when it has at 
least 2 SSTables", newBucket.isEmpty());
  
  assertEquals("an sstable with a single value should have equal 
min/max timestamps", sstrs.get(0).getMinTimestamp(), 
sstrs.get(0).getMaxTimestamp());

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-19 Thread snazy 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/747e5fd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747e5fd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/747e5fd4

Branch: refs/heads/trunk
Commit: 747e5fd4ad54c9d5d691897db941dd10aa5bdabc
Parents: 46da70e 95feab6
Author: Robert Stupp 
Authored: Thu Nov 19 11:11:24 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 11:11:24 2015 +0100

--
 CHANGES.txt   | 1 +
 bin/sstableloader | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/747e5fd4/CHANGES.txt
--
diff --cc CHANGES.txt
index 2a9fbe7,14e8c3d..5e44f27
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -3,20 +9,10 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
   * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
 - * Don't remove level info when running upgradesstables (CASSANDRA-10692)
   * Create compression chunk for sending file only (CASSANDRA-10680)
 - * Make buffered read size configurable (CASSANDRA-10249)
   * Forbid compact clustering column type changes in ALTER TABLE 
(CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-18 Thread marcuse 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12fd5d27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12fd5d27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12fd5d27

Branch: refs/heads/trunk
Commit: 12fd5d270a8de2bcf34b082b410448eba02be4c4
Parents: 2753f95 d09b6c6
Author: Marcus Eriksson 
Authored: Wed Nov 18 14:00:02 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Nov 18 14:00:02 2015 +0100

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-18 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2753f95e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2753f95e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2753f95e

Branch: refs/heads/trunk
Commit: 2753f95e61d01f25360e1610b63319acde304c3c
Parents: 5cc02dd 077f9bf
Author: Aleksey Yeschenko 
Authored: Wed Nov 18 12:53:39 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 18 12:53:39 2015 +

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-17 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63a9f9b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63a9f9b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63a9f9b8

Branch: refs/heads/trunk
Commit: 63a9f9b8ff6bc93899a76886e4ca41e8ebe35946
Parents: aa21bd2 afe3fe3
Author: Aleksey Yeschenko 
Authored: Tue Nov 17 18:57:01 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 17 18:57:01 2015 +

--

--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-17 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa21bd29
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa21bd29
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa21bd29

Branch: refs/heads/trunk
Commit: aa21bd295adcaeb4899d0800a184508ab2997bfd
Parents: 9a78608 a68f8bd
Author: Aleksey Yeschenko 
Authored: Tue Nov 17 16:52:16 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 17 16:52:16 2015 +

--
 CHANGES.txt  | 1 +
 .../cassandra/cql3/statements/AlterTableStatement.java   | 3 +++
 .../cassandra/cql3/validation/operations/AlterTest.java  | 8 
 3 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa21bd29/CHANGES.txt
--
diff --cc CHANGES.txt
index 13647cc,fb8f89a..b68cf0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -3,19 +9,10 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Forbid compact clustering column type changes in ALTER TABLE 
(CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)
 - * Shutdown compaction in drain to prevent leak (CASSANDRA-10079)
   * Invalidate cache after stream receive task is completed (CASSANDRA-10341)
   * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
   * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa21bd29/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 879f618,7f2fe3a..a9b9d37
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -332,50 -286,6 +332,53 @@@ public class AlterTableStatement extend
  return true;
  }
  
 +private static void validateAlter(CFMetaData cfm, ColumnDefinition def, 
AbstractType validatorType)
 +{
 +switch (def.kind)
 +{
 +case PARTITION_KEY:
 +if (validatorType instanceof CounterColumnType)
 +throw new InvalidRequestException(String.format("counter 
type is not supported for PRIMARY KEY part %s", def.name));
 +
 +AbstractType currentType = 
cfm.getKeyValidatorAsClusteringComparator().subtype(def.position());
 +if (!validatorType.isValueCompatibleWith(currentType))
 +throw new ConfigurationException(String.format("Cannot 
change %s from type %s to type %s: types are incompatible.",
 +   def.name,
 +   
currentType.asCQL3Type(),
 +   
validatorType.asCQL3Type()));
 +break;
 +case CLUSTERING:
++if (!cfm.isCQLTable())
++throw new InvalidRequestException(String.format("Cannot 
alter clustering column %s in a non-CQL3 table", def.name));
++
 +AbstractType oldType = 
cfm.comparator.subtype(def.position());
 +// Note that CFMetaData.validateCompatibility already 
validate the change we're about to do. However, the error message it
 +// sends is a bit cryptic for a CQL3 user, so validating here 
for a sake of returning a better error message
 +// Do note that we need isCompatibleWith here, not just 
isValueCompatibleWith.
 +if (!validatorType.isCompatibleWith(oldType))
 +{
 +throw new ConfigurationException(String.format("Cannot 
change %s from type %s to type %s: types are not order-compatible.",
 +

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-12 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f056a91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f056a91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f056a91

Branch: refs/heads/trunk
Commit: 9f056a91754b3516ad1521d32abb075b554e62c3
Parents: b54836b 84d4488
Author: Aleksey Yeschenko 
Authored: Thu Nov 12 18:05:54 2015 +
Committer: Aleksey Yeschenko 
Committed: Thu Nov 12 18:05:54 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   |  5 +++
 .../cassandra/service/StorageServiceMBean.java  |  5 +++
 .../org/apache/cassandra/tools/NodeProbe.java   | 12 +++
 .../org/apache/cassandra/tools/NodeTool.java|  3 +-
 .../tools/nodetool/RefreshSizeEstimates.java| 33 
 6 files changed, 58 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f056a91/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f1b163,9c834f3..d554323
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,51 -1,6 +1,52 @@@
 -2.2.4
 +3.0.1
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 +Merged from 2.1:
++ * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)
 + * Invalidate cache after stream receive task is completed (CASSANDRA-10341)
 + * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
 + * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 +
 +
 +3.0
 + * Fix AssertionError while flushing memtable due to materialized views
 +   incorrectly inserting empty rows (CASSANDRA-10614)
 + * Store UDA initcond as CQL literal in the schema table, instead of a blob 
(CASSANDRA-10650)
 + * Don't use -1 for the position of partition key in schema (CASSANDRA-10491)
 + * Fix distinct queries in mixed version cluster (CASSANDRA-10573)
 + * Skip sstable on clustering in names query (CASSANDRA-10571)
 + * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
 + * Fix bootstrapping with MVs (CASSANDRA-10621)
 + * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
 + * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates 
(CASSANDRA-10600)
 + * Fix reading of legacy sstables (CASSANDRA-10590)
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
 + * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
   * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f056a91/src/java/org/apache/cassandra/service/StorageService.java
---

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-09 Thread aleksey 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2043324
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2043324
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2043324

Branch: refs/heads/trunk
Commit: a20433245c42f089ad21caed85629434742407e9
Parents: f2af290 b0def95
Author: Aleksey Yeschenko 
Authored: Mon Nov 9 15:42:00 2015 +
Committer: Aleksey Yeschenko 
Committed: Mon Nov 9 15:42:00 2015 +

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2043324/CHANGES.txt
--
diff --cc CHANGES.txt
index 3662e6e,fa868fe..0f59b5f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -39,7 -4,12 +39,8 @@@ Merged from 2.2
   * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
 - * Improve json2sstable error reporting on nonexistent columns 
(CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format 
(CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring 
(CASSANDRA-9912)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2043324/src/java/org/apache/cassandra/net/MessagingService.java
--

[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-10-21 Thread slebresne 
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9413211
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9413211
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9413211

Branch: refs/heads/trunk
Commit: c9413211ced86c4b69b1bbf61d5f990d0d56961a
Parents: 8be382a 20d5508
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:33:20 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:33:20 2015 +0200

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9413211/CHANGES.txt
--
diff --cc CHANGES.txt
index c86fb1f,ed28f2e..0c5c9c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,11 +1,10 @@@
 -2.2.4
 +3.0
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
-  * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-8821)
+  * Avoid repetition of JVM_OPTS in debian package (CASSANDRA-10251)
   * Fix potential NPE from handling result of SIM.highestSelectivityIndex 
(CASSANDRA-10550)
   * Fix paging issues with partitions containing only static columns data 
(CASSANDRA-10381)
   * Fix conditions on static columns (CASSANDRA-10264)