subject:"\[3\/4\] cassandra git commit\: Merge branch cassandra\-2.2 into cassandra\-3.0"

[3/4] 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/cassandra-3.X
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/4] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2016-06-21 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/723a143c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/723a143c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/723a143c

Branch: refs/heads/trunk
Commit: 723a143c9d71ba8b3450cad8a0ad178f133a3869
Parents: b657223 5a09627
Author: Benjamin Lerer 
Authored: Tue Jun 21 16:28:25 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Jun 21 16:30:06 2016 +0200

--
 .../operations/InsertUpdateIfConditionTest.java | 290 +++
 1 file changed, 290 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/723a143c/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
index 2d59a11,fc6cc2e..a1ee4f8
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
@@@ -23,10 -23,8 +23,11 @@@ import org.junit.Test
  import org.apache.cassandra.cql3.CQLTester;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.exceptions.SyntaxException;
 +import org.apache.cassandra.schema.SchemaKeyspace;
  
 +import static java.lang.String.format;
  import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertThat;
  import static org.junit.Assert.assertTrue;
  
  public class InsertUpdateIfConditionTest extends CQLTester
@@@ -1018,10 -979,295 +1019,299 @@@
  
  // drop and confirm
  execute("DROP TYPE IF EXISTS mytype");
 -assertEmpty(execute("SELECT type_name from system.schema_usertypes 
where keyspace_name = ? and type_name = ?", KEYSPACE, "mytype"));
 +assertEmpty(execute(format("SELECT type_name from %s.%s where 
keyspace_name = ? and type_name = ?",
 +   SchemaKeyspace.NAME,
 +   SchemaKeyspace.TYPES),
 +KEYSPACE,
 +"mytype"));
  }
+ 
+ @Test
+ public void testConditionalUpdatesOnStaticColumns() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, s int static, d text, 
PRIMARY KEY (a, b))");
+ 
+ // pre-existing row
+ execute("INSERT INTO %s (a, b, s, d) values (6, 6, 100, 'a')");
+ assertRows(execute("UPDATE %s SET s = 6 WHERE a = 6 IF s = 100"),
+row(true));
+ assertRows(execute("SELECT * FROM %s WHERE a = 6"),
+row(6, 6, 6, "a"));
+ 
+ // pre-existing row with null in the static column
+ execute("INSERT INTO %s (a, b, d) values (7, 7, 'a')");
+ assertRows(execute("UPDATE %s SET s = 7 WHERE a = 7 IF s = NULL"),
+row(true));
+ assertRows(execute("SELECT * FROM %s WHERE a = 7"),
+row(7, 7, 7, "a"));
+ 
+ // deleting row before CAS
+ execute("DELETE FROM %s WHERE a = 8;");
+ assertRows(execute("UPDATE %s SET s = 8 WHERE a = 8 IF s = NULL"),
+row(true));
+ assertRows(execute("SELECT * FROM %s WHERE a = 8"),
+row(8, null, 8, null));
+ }
+ 
+ @Test
+ public void testConditionalUpdatesWithNullValues() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, s int static, d text, 
PRIMARY KEY (a, b))");
+ 
+ // pre-populate, leave out static column
+ for (int i = 1; i <= 5; i++)
+ execute("INSERT INTO %s (a, b) VALUES (?, ?)", i, i);
+ 
+ conditionalUpdatesWithNonExistingOrNullValues();
+ 
+ // rejected: IN doesn't contain null
+ assertRows(execute("UPDATE %s SET s = 30 WHERE a = 3 IF s IN 
(10,20,30)"),
+row(false));
+ assertRows(execute("SELECT * FROM %s WHERE a = 3"),
+row(3, 3, null, null));
+ 
+ // rejected: comparing number with NULL always returns false
+ for (String operator: new String[] { ">", "<", ">=", "<=", "="})
+ {
+ assertRows(execute("UPDATE %s SET s = 50 WHERE a = 5 IF s " + 
operator + " 3"),
+row(false));
+ assertRows(execute("SELECT * FROM %s WHERE a = 5"),
+row(5, 5, null, null));
+ }
+ 
+ }
+ 
+ @Test
+ public void testConditionalUpdatesWithNonExistingValues() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a int, b int, s int static, d text, 
PRIMARY KEY

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

2016-04-28 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/7927ace3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7927ace3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7927ace3

Branch: refs/heads/trunk
Commit: 7927ace3ea302806de751543710f85692c4615df
Parents: b360653 c8d9555
Author: Benjamin Lerer 
Authored: Thu Apr 28 11:13:18 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Apr 28 11:13:18 2016 +0200

--
 .../SelectMultiColumnRelationTest.java  | 1678 +-
 .../cql3/validation/operations/SelectTest.java  |   72 +
 2 files changed, 918 insertions(+), 832 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7927ace3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7927ace3/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
--

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

2016-04-20 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: dab1d578d75151c597dc1e611b430ae99134f72c
Parents: 14f08e6 e865e39
Author: Tyler Hobbs 
Authored: Wed Apr 20 13:57:29 2016 -0500
Committer: Tyler Hobbs 
Committed: Wed Apr 20 13:57:29 2016 -0500

--

--

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

2016-04-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/5135905a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5135905a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5135905a

Branch: refs/heads/trunk
Commit: 5135905a0f38fe5048cbd02f44d11a2784b99bc1
Parents: 04a75a6 e22faeb
Author: Benjamin Lerer 
Authored: Mon Apr 11 09:45:53 2016 +0200
Committer: Benjamin Lerer 
Committed: Mon Apr 11 09:46:07 2016 +0200

--
 src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5135905a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index 851c84e,7592f48..b488013
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -256,12 -256,12 +256,12 @@@ public class CommitLog implements Commi
  {
  assert mutation != null;
  
 -long size = Mutation.serializer.serializedSize(mutation, 
MessagingService.current_version);
 +int size = (int) Mutation.serializer.serializedSize(mutation, 
MessagingService.current_version);
  
 -long totalSize = size + ENTRY_OVERHEAD_SIZE;
 +int totalSize = size + ENTRY_OVERHEAD_SIZE;
  if (totalSize > MAX_MUTATION_SIZE)
  {
- throw new IllegalArgumentException(String.format("Mutation of %s 
bytes is too large for the maxiumum size of %s",
+ throw new IllegalArgumentException(String.format("Mutation of %s 
bytes is too large for the maximum size of %s",
   totalSize, 
MAX_MUTATION_SIZE));
  }

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

2016-02-10 Thread yukim

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/71171bba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71171bba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71171bba

Branch: refs/heads/cassandra-3.0
Commit: 71171bba60eb9305ce5b2cc6a3ec3af5e3e56f82
Parents: 1f62608 d719506
Author: Yuki Morishita 
Authored: Wed Feb 10 17:37:49 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 10 17:37:49 2016 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/service/StorageService.java   | 32 +++-
 2 files changed, 19 insertions(+), 14 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71171bba/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 288a82e,d305021..259bd10
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -4153,9 -4073,10 +4156,10 @@@ public class StorageService extends Not
  for (Collection endpoints : 
sortedDcsToEndpoints.values())
  endpointsGroupedByDc.add(endpoints);
  
 -Map tokenOwnership = 
getPartitioner().describeOwnership(tokenMetadata.sortedTokens());
 +Map tokenOwnership = 
tokenMetadata.partitioner.describeOwnership(tokenMetadata.sortedTokens());
  LinkedHashMap finalOwnership = 
Maps.newLinkedHashMap();
  
+ Multimap endpointToRanges = 
strategy.getAddressRanges();
  // calculate ownership per dc
  for (Collection endpoints : endpointsGroupedByDc)
  {

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

2016-02-05 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/11bddad5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11bddad5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11bddad5

Branch: refs/heads/trunk
Commit: 11bddad51f1d313bf2161a535bae68ec97ff34ca
Parents: 0663ebb 6622970
Author: Tyler Hobbs 
Authored: Fri Feb 5 16:34:47 2016 -0600
Committer: Tyler Hobbs 
Committed: Fri Feb 5 16:34:47 2016 -0600

--
 conf/cqlshrc.sample | 199 ---
 1 file changed, 172 insertions(+), 27 deletions(-)
--

[3/4] 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/cassandra-3.3
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;

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

2016-01-15 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/e0c27bce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c27bce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0c27bce

Branch: refs/heads/cassandra-3.3
Commit: e0c27bcecbddde536878f897ee19deae9da0a2a0
Parents: 58643b0 ee1c145
Author: Marcus Eriksson 
Authored: Fri Jan 15 09:31:18 2016 +0100
Committer: Marcus Eriksson 
Committed: Fri Jan 15 09:31:18 2016 +0100

--
 CHANGES.txt| 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


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

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

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

2015-12-29 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/fe62557e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe62557e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe62557e

Branch: refs/heads/trunk
Commit: fe62557ef3ec9cc7ed653600f627f9fe1e9876c0
Parents: 21191e6 450091b
Author: Marcus Eriksson 
Authored: Tue Dec 29 13:46:24 2015 +0100
Committer: Marcus Eriksson 
Committed: Tue Dec 29 13:46:24 2015 +0100

--

--

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

2015-12-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/d5326d4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5326d4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5326d4a

Branch: refs/heads/trunk
Commit: d5326d4aa5d1d89d36c0600508323ccf8fa109da
Parents: 2800bf1 c26b397
Author: Aleksey Yeschenko 
Authored: Fri Dec 18 23:39:09 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Dec 18 23:39:09 2015 +

--
 CHANGES.txt | 1 +
 .../apache/cassandra/db/commitlog/CommitLogArchiver.java| 9 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--

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

2015-12-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/942e5e59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/942e5e59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/942e5e59

Branch: refs/heads/trunk
Commit: 942e5e599d5bb3184213419ff8a4fffd63eaca20
Parents: db40ef8 de55c39
Author: T Jake Luciani 
Authored: Tue Dec 15 14:17:26 2015 -0500
Committer: T Jake Luciani 
Committed: Tue Dec 15 14:17:26 2015 -0500

--

--

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

2015-12-15 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/db40ef83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db40ef83
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db40ef83

Branch: refs/heads/trunk
Commit: db40ef8398e34618086184487ffcc3310830cec7
Parents: 71bac92 85c7241
Author: Marcus Eriksson 
Authored: Tue Dec 15 10:25:33 2015 +0100
Committer: Marcus Eriksson 
Committed: Tue Dec 15 10:25:33 2015 +0100

--
 CHANGES.txt |   1 +
 .../cql3/statements/CreateTableStatement.java   |   7 +-
 .../cql3/statements/CreateViewStatement.java|   1 +
 .../cql3/statements/TableAttributes.java|  19 
 .../operations/DropRecreateAndRestoreTest.java  | 104 +++
 5 files changed, 130 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/db40ef83/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 1363bee,1b3665c..c19f970
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@@ -37,35 -38,48 +37,37 @@@ import org.apache.cassandra.service.Cli
  import org.apache.cassandra.service.MigrationManager;
  import org.apache.cassandra.service.QueryState;
  import org.apache.cassandra.transport.Event;
 -import org.apache.cassandra.utils.ByteBufferUtil;
  
 -/** A CREATE TABLE parsed from a CQL query statement. */
 +/** A {@code CREATE TABLE} parsed from a CQL query statement. */
  public class CreateTableStatement extends SchemaAlteringStatement
  {
 -public CellNameType comparator;
 -private AbstractType defaultValidator;
 -private AbstractType keyValidator;
 +private List keyTypes;
 +private List clusteringTypes;
  
 -private final List keyAliases = new ArrayList();
 -private final List columnAliases = new 
ArrayList();
 -private ByteBuffer valueAlias;
 +private final Map collections = new 
HashMap<>();
 +
 +private final List keyAliases = new ArrayList<>();
 +private final List columnAliases = new ArrayList<>();
  
  private boolean isDense;
 +private boolean isCompound;
 +private boolean hasCounters;
  
  // use a TreeMap to preserve ordering across JDK versions (see 
CASSANDRA-9492)
 -private final Map columns = new 
TreeMap<>(new Comparator()
 -{
 -public int compare(ColumnIdentifier o1, ColumnIdentifier o2)
 -{
 -return o1.bytes.compareTo(o2.bytes);
 -}
 -});
 +private final Map columns = new 
TreeMap<>((o1, o2) -> o1.bytes.compareTo(o2.bytes));
 +
  private final Set staticColumns;
 -private final CFPropDefs properties;
 +private final TableParams params;
  private final boolean ifNotExists;
+ private final UUID id;
  
- public CreateTableStatement(CFName name, TableParams params, boolean 
ifNotExists, Set staticColumns)
 -public CreateTableStatement(CFName name, CFPropDefs properties, boolean 
ifNotExists, Set staticColumns, UUID id)
++public CreateTableStatement(CFName name, TableParams params, boolean 
ifNotExists, Set staticColumns, UUID id)
  {
  super(name);
 -this.properties = properties;
 +this.params = params;
  this.ifNotExists = ifNotExists;
  this.staticColumns = staticColumns;
+ this.id = id;
 -
 -if (!this.properties.hasProperty(CFPropDefs.KW_COMPRESSION) && 
CFMetaData.DEFAULT_COMPRESSOR != null)
 -this.properties.addProperty(CFPropDefs.KW_COMPRESSION,
 -new HashMap()
 -{{
 -
put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR);
 -}});
  }
  
  public void checkAccess(ClientState state) throws UnauthorizedException, 
InvalidRequestException
@@@ -109,49 -144,9 +111,50 @@@
  }
  }
  
 +public CFMetaData.Builder metadataBuilder()
 +{
 +CFMetaData.Builder builder = CFMetaData.Builder.create(keyspace(), 
columnFamily(), isDense, isCompound, hasCounters);
++builder.withId(id);
 +for (int i =

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

2015-12-14 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/94e8d62c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94e8d62c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94e8d62c

Branch: refs/heads/trunk
Commit: 94e8d62cf8cea8918b01b038746be4b4e03af515
Parents: a8b9e53 263763a
Author: Benjamin Lerer 
Authored: Mon Dec 14 10:29:07 2015 +0100
Committer: Benjamin Lerer 
Committed: Mon Dec 14 10:29:17 2015 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/stress/generate/values/Generator.java|  4 ++--
 .../apache/cassandra/stress/generate/values/Lists.java | 13 +++--
 .../apache/cassandra/stress/generate/values/Sets.java  | 10 +-
 4 files changed, 15 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e8d62c/CHANGES.txt
--
diff --cc CHANGES.txt
index e20f5ed,592ba0a..c30d35d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,40 -5,12 +6,41 @@@ Merged from 2.
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * Make Stress compiles within eclipse (CASSANDRA-10807)
   * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 - * Fix Stress profile parsing on Windows (CASSANDRA-10808)
  
 -2.2.4
 +3.0.1
 + * Avoid MV race during node decommission (CASSANDRA-10674)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Handle single-column deletions correction in materialized views
 +   when the column is part of the view primary key (CASSANDRA-10796)
 + * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
 + * Fix bug with range tombstones on reverse queries and test coverage for
 +   AbstractBTreePartition (CASSANDRA-10059)
 + * Remove 64k limit on collection elements (CASSANDRA-10374)
 + * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
 + * Fix NPE on stream read error (CASSANDRA-10771)
 + * Normalize cqlsh DESC output (CASSANDRA-10431)
 + * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
 + * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
 + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
 + * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
   * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
   * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)

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

2015-12-11 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/37ca86b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37ca86b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37ca86b9

Branch: refs/heads/trunk
Commit: 37ca86b9469c478c87e8c651eb33389d78ea1edf
Parents: a7a0388 b4d3ac4
Author: Sylvain Lebresne 
Authored: Fri Dec 11 10:31:38 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Dec 11 10:31:38 2015 +0100

--
 .../cassandra/service/StorageService.java   | 40 +++-
 1 file changed, 22 insertions(+), 18 deletions(-)
--


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

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

2015-12-11 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/65885e7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65885e7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65885e7f

Branch: refs/heads/trunk
Commit: 65885e7fc356c342331aec11667b5abdc28897b6
Parents: b55523e f166749
Author: Marcus Eriksson 
Authored: Fri Dec 11 17:34:21 2015 +0100
Committer: Marcus Eriksson 
Committed: Fri Dec 11 17:37:41 2015 +0100

--
 CHANGES.txt |   3 +
 .../cassandra/db/compaction/CompactionInfo.java |  14 +-
 .../db/compaction/CompactionManager.java|  15 +
 .../cassandra/db/compaction/OperationType.java  |   3 +-
 .../io/sstable/IndexSummaryManager.java | 279 +--
 .../io/sstable/IndexSummaryRedistribution.java  | 349 +++
 .../io/sstable/IndexSummaryManagerTest.java |  80 -
 7 files changed, 462 insertions(+), 281 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65885e7f/CHANGES.txt
--
diff --cc CHANGES.txt
index 9c01160,5da0d42..5932dbb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,13 +1,37 @@@
 -2.2.5
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
++3.0.2
+ Merged from 2.1:
+  * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 - * Fix Stress profile parsing on Windows (CASSANDRA-10808)
 -
 -2.2.4
 +3.0.1
 + * Avoid MV race during node decommission (CASSANDRA-10674)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Handle single-column deletions correction in materialized views
 +   when the column is part of the view primary key (CASSANDRA-10796)
 + * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
 + * Fix bug with range tombstones on reverse queries and test coverage for
 +   AbstractBTreePartition (CASSANDRA-10059)
 + * Remove 64k limit on collection elements (CASSANDRA-10374)
 + * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
 + * Fix NPE on stream read error (CASSANDRA-10771)
 + * Normalize cqlsh DESC output (CASSANDRA-10431)
 + * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
 + * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
 + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
 + * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
   * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
   * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65885e7f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 3ce7d2c,ba9c25e..bd950e3
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -50,11 -47,7 +50,12 @@@ import org.apache.cassandra.db.view.Vie
  import org.apache.cassandra.dht.Bounds;
  import org.apache.cassandra.dht.Range;
  import org.apache.cassandra.dht.Token;
 -import org.apache.cassandra.io.sstable.*;
 +import org.apache.cassandra.index.SecondaryIndexBuilder;
 +import org.apache.cassandra.io.sstable.Descriptor;
 +import

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

2015-12-11 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/c0d47bed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0d47bed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0d47bed

Branch: refs/heads/trunk
Commit: c0d47bed9d5103ecbc5f99dd420dc3198cdd176f
Parents: d55a51e 6ff7c9c
Author: Robert Stupp 
Authored: Fri Dec 11 16:51:14 2015 -0600
Committer: Robert Stupp 
Committed: Fri Dec 11 16:51:14 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0d47bed/CHANGES.txt
--
diff --cc CHANGES.txt
index a71ecbd,d44a47b..e20f5ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,39 -5,11 +6,40 @@@ Merged from 2.
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
+  * Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 - * Fix Stress profile parsing on Windows (CASSANDRA-10808)
  
 -2.2.4
 +3.0.1
 + * Avoid MV race during node decommission (CASSANDRA-10674)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Handle single-column deletions correction in materialized views
 +   when the column is part of the view primary key (CASSANDRA-10796)
 + * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
 + * Fix bug with range tombstones on reverse queries and test coverage for
 +   AbstractBTreePartition (CASSANDRA-10059)
 + * Remove 64k limit on collection elements (CASSANDRA-10374)
 + * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
 + * Fix NPE on stream read error (CASSANDRA-10771)
 + * Normalize cqlsh DESC output (CASSANDRA-10431)
 + * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
 + * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
 + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
 + * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large 
buffers (CASSANDRA-10592)
   * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
   * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)

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

[3/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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)));
 -
 -

[3/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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

[3/4] 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/cassandra-3.1
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/4] 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


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

Branch: refs/heads/cassandra-3.1
Commit: f4dab0f9b3a037c952aaa71219987eb4f44535e5
Parents: 64a3bfd e4f3dba
Author: Sylvain Lebresne 
Authored: Thu Nov 26 15:44:18 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Nov 26 15:44:18 2015 +0100

--
 CHANGES.txt|  1 +
 src/java/org/apache/cassandra/utils/MD5Digest.java | 10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4dab0f9/CHANGES.txt
--
diff --cc CHANGES.txt
index 04cda25,d31645a..eab04fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,7 -4,16 +14,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:
+  * Force encoding when computing statement ids (CASSANDRA-10755)
   * 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)

[3/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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
 -

[3/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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

[3/4] 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/cassandra-3.1
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/4] 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/cassandra-3.1
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)

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

2015-11-06 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/7fd2eaa7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fd2eaa7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fd2eaa7

Branch: refs/heads/trunk
Commit: 7fd2eaa727bbacf6a3cea8d41e02e804bf9cdd56
Parents: 97dc8d5 59a3221
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 19:22:44 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 19:22:44 2015 +

--

--

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

2015-11-05 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/cc4d759c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc4d759c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc4d759c

Branch: refs/heads/trunk
Commit: cc4d759c9023878760b0cbef854938cd302609d1
Parents: 02a53fa 801c50e
Author: Aleksey Yeschenko 
Authored: Fri Nov 6 00:12:29 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Nov 6 00:12:29 2015 +

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/SizeEstimatesRecorder.java  |  5 +++--
 .../org/apache/cassandra/db/SystemKeyspace.java | 16 
 .../apache/cassandra/service/StorageService.java|  5 +
 4 files changed, 5 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/CHANGES.txt
--
diff --cc CHANGES.txt
index 6873edd,538d5e4..433bc85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,12 +1,36 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 +3.0
 + * 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:
   * 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:
+  * 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)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc4d759c/src/java/org/apache/cassandra/db/SystemKeyspace.java
--

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

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

2015-11-04 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/d2b7864f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2b7864f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2b7864f

Branch: refs/heads/trunk
Commit: d2b7864fe9b9f5f740e7f76f0d31b8bbd31b45c9
Parents: c0c9555 b4b2684
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 12:59:27 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 12:59:27 2015 +

--
 CHANGES.txt| 2 ++
 conf/logback-tools.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2b7864f/CHANGES.txt
--
diff --cc CHANGES.txt
index e9f92c6,f25ac7e..dfb0f17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,13 +1,30 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
 + * 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)
 + * 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:
   * 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 logback-tools.xml incorrectly configured for outputing to System.err
+(CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)
   * Add validation method to PerRowSecondaryIndex (CASSANDRA-10092)
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)

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

2015-11-04 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/8f985852
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f985852
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f985852

Branch: refs/heads/trunk
Commit: 8f985852f11c9501137c150b0f25cfd0c17d3db8
Parents: 1492be0 5a2d529
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:05:00 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:05:00 2015 +

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/CHANGES.txt
--
diff --cc CHANGES.txt
index 61cc92e,60bf565..eb575e8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,12 +1,30 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
 + * 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)
 + * 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:
   * 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:
+  * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err
 (CASSANDRA-9937)
   * Fix streaming to catch exception so retry not fail (CASSANDRA-10557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index fb1edf6,45ed493..75c2fd9
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2159,13 -2144,12 +2159,14 @@@ public class StorageService extends Not
  private void excise(Collection tokens, InetAddress endpoint)
  {
  logger.info("Removing tokens {} for {}", tokens, endpoint);
 -HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
 +
 +if (tokenMetadata.isMember(endpoint))
 +HintsService.instance.excise(tokenMetadata.getHostId(endpoint));
 +
  removeEndpoint(endpoint);
  tokenMetadata.removeEndpoint(endpoint);
- tokenMetadata.removeBootstrapTokens(tokens);
+ if (tokens != null)
+ tokenMetadata.removeBootstrapTokens(tokens);
 -
  notifyLeft(endpoint);
  PendingRangeCalculatorService.instance.update();
  }

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

2015-10-30 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/33f1edcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33f1edcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33f1edcc

Branch: refs/heads/trunk
Commit: 33f1edcce97779c971d4f78712a9a8bf014ffbbc
Parents: ad007f0 6e92962
Author: Sylvain Lebresne 
Authored: Fri Oct 30 09:49:33 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Oct 30 09:49:33 2015 +0100

--
 doc/native_protocol_v3.spec | 11 ---
 doc/native_protocol_v4.spec |  6 +-
 2 files changed, 13 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f1edcc/doc/native_protocol_v3.spec
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f1edcc/doc/native_protocol_v4.spec
--

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

2015-10-28 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/69037275
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69037275
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69037275

Branch: refs/heads/trunk
Commit: 69037275568d6fd753ee2ee40e7a5ac1751f459b
Parents: 13e9fd5 734a3bf
Author: Robert Stupp 
Authored: Wed Oct 28 14:20:02 2015 +0100
Committer: Robert Stupp 
Committed: Wed Oct 28 14:20:02 2015 +0100

--
 CHANGES.txt | 2 +-
 NEWS.txt| 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69037275/CHANGES.txt
--
diff --cc CHANGES.txt
index 76b1a55,c4f606f..b4cc43b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,13 +1,20 @@@
 -2.2.4
 +3.0
 + * 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)
-  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
 + * 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:
   * 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:
+  * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Do STCS in DTCS windows (CASSANDRA-10276)
 - * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501)
   * 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)

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

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

2015-10-28 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/27ca4915
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ca4915
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27ca4915

Branch: refs/heads/trunk
Commit: 27ca4915e9a08c9582ebf077f2cc66821494f0b9
Parents: d856d3d 5a356a7
Author: Marcus Eriksson 
Authored: Wed Oct 28 09:04:30 2015 +0100
Committer: Marcus Eriksson 
Committed: Wed Oct 28 09:04:30 2015 +0100

--
 CHANGES.txt |  1 +
 .../DateTieredCompactionStrategy.java   | 46 +++-
 .../DateTieredCompactionStrategyTest.java   | 73 ++--
 3 files changed, 82 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27ca4915/CHANGES.txt
--
diff --cc CHANGES.txt
index f8dffb0,9021e9d..9b81b6e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,12 +1,18 @@@
 -2.2.4
 +3.0
 + * 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)
 + * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
 + * 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:
   * 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:
+  * Do STCS in DTCS windows (CASSANDRA-10276)
 - * Don't try to get ancestors from half-renamed sstables (CASSANDRA-10501)
   * 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27ca4915/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index cfb0079,fe8f135..65fec2b
--- 
a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@@ -380,7 -389,7 +390,7 @@@ public class DateTieredCompactionStrate
  if (modifier == null)
  return null;
  
- return Arrays.asList(new CompactionTask(cfs, 
modifier, gcBefore));
 -return Collections.singleton(new 
CompactionTask(cfs, modifier, gcBefore, false));
++return Collections.singleton(new 
CompactionTask(cfs, modifier, gcBefore));
  }
  
  @Override
@@@ -428,9 -437,11 +438,11 @@@
  Map uncheckedOptions = 
AbstractCompactionStrategy.validateOptions(options);
  uncheckedOptions = 
DateTieredCompactionStrategyOptions.validateOptions(options, uncheckedOptions);
  
 -uncheckedOptions.remove(CFPropDefs.KW_MINCOMPACTIONTHRESHOLD);
 -uncheckedOptions.remove(CFPropDefs.KW_MAXCOMPACTIONTHRESHOLD);
 +
uncheckedOptions.remove(CompactionParams.Option.MIN_THRESHOLD.toString());
 +
uncheckedOptions.remove(CompactionParams.Option.MAX_THRESHOLD.toString());
  
+ uncheckedOptions = 
SizeTieredCompactionStrategyOptions.validateOptions(options, uncheckedOptions);
+ 
  return uncheckedOptions;
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27ca4915/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
index 003a1cf,2824d3a..01a6dfa
--- 
a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
@@@ -32,10 -32,11 +32,11 @@@ import org.apache.cassandra.Util
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.DecoratedKey;

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

2015-10-27 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/95e16005
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95e16005
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95e16005

Branch: refs/heads/trunk
Commit: 95e16005e8e02f24f3aa8681cbdc4b647dfa4be2
Parents: 6094974 b06c637
Author: Marcus Eriksson 
Authored: Tue Oct 27 12:10:31 2015 +0100
Committer: Marcus Eriksson 
Committed: Tue Oct 27 12:10:31 2015 +0100

--

--

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

2015-10-21 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/bc5f1673
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc5f1673
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc5f1673

Branch: refs/heads/trunk
Commit: bc5f16736654de4e352a415a6f34bc37120865e0
Parents: 1fe594d 12e38f7
Author: Aleksey Yeschenko 
Authored: Wed Oct 21 21:10:21 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Oct 21 21:10:21 2015 +0100

--
 NEWS.txt   | 4 ++--
 conf/cassandra.yaml| 2 +-
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc5f1673/conf/cassandra.yaml
--

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

[3/4] 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

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 8be382a7ed99b72f2c0fb0d07ad53d0696bb6de3
Parents: 73d9a80 d3085b1
Author: Sylvain Lebresne 
Authored: Wed Oct 21 14:29:58 2015 +0200
Committer: Sylvain Lebresne 
Committed: Wed Oct 21 14:29:58 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8be382a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 69e616f,120be92..c86fb1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,12 +1,11 @@@
 -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)
+  * 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)
   * AssertionError: attempted to delete non-existing file CommitLog 
(CASSANDRA-10377)

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

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

2015-10-20 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/1b5e3a9b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b5e3a9b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b5e3a9b

Branch: refs/heads/trunk
Commit: 1b5e3a9b1be0c945782492e269acb4ea44730ad3
Parents: a880739 98be5de
Author: blerer 
Authored: Tue Oct 20 14:38:51 2015 +0200
Committer: blerer 
Committed: Tue Oct 20 14:39:39 2015 +0200

--
 CHANGES.txt |  1 +
 .../service/pager/AbstractQueryPager.java   | 21 ++--
 .../service/pager/RangeSliceQueryPager.java |  5 +++--
 .../service/pager/SinglePartitionPager.java |  3 +--
 4 files changed, 24 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b5e3a9b/CHANGES.txt
--
diff --cc CHANGES.txt
index 25ad1fb,458d0d5..616ff47
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,20 +1,36 @@@
 -2.2.4
 +3.0
 +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:
+  * Fix paging issues with partitions containing only static columns data 
(CASSANDRA-10381)
   * Fix conditions on static columns (CASSANDRA-10264)
   * AssertionError: attempted to delete non-existing file CommitLog 
(CASSANDRA-10377)
 - * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
 - * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 - * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
  
  
 -2.2.3
 +3.0-rc2
 + * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes 
(CASSANDRA-10473)
 + * Remove circular references in SegmentedFile (CASSANDRA-10543)
 + * Ensure validation of indexed values only occurs once per-partition 
(CASSANDRA-10536)
 + * Fix handling of static columns for range tombstones in thrift 
(CASSANDRA-10174)
 + * Support empty ColumnFilter for backward compatility on empty IN 
(CASSANDRA-10471)
 + * Remove Pig support (CASSANDRA-10542)
 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b5e3a9b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
--
diff --cc src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
index b92d1e1,2a35e4b..bdebd43
--- a/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
@@@ -17,179 -17,381 +17,196 @@@
   */
  package org.apache.cassandra.service.pager;
  
 -import java.util.*;
 +import java.util.NoSuchElementException;
  
 -import com.google.common.annotations.VisibleForTesting;
 -
--import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.ColumnDefinition;
 -import org.apache.cassandra.config.Schema;
  import org.apache.cassandra.db.*;
 -import org.apache.cassandra.db.filter.ColumnCounter;
 -import org.apache.cassandra.db.filter.IDiskAtomFilter;
 +import org.apache.cassandra.db.rows.*;
 +import

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

2015-10-20 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/a8807391
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8807391
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8807391

Branch: refs/heads/trunk
Commit: a880739187ea5521e8e558a19871985a846b330e
Parents: fa909cc a337907
Author: blerer 
Authored: Tue Oct 20 14:09:16 2015 +0200
Committer: blerer 
Committed: Tue Oct 20 14:10:15 2015 +0200

--
 CHANGES.txt |  1 +
 pylib/cqlshlib/cql3handling.py  |  4 ++--
 .../org/apache/cassandra/cql3/Operations.java   | 16 -
 .../cql3/statements/DeleteStatement.java|  7 +++---
 .../cql3/statements/ModificationStatement.java  | 21 +---
 .../cql3/statements/UpdateStatement.java| 25 ++--
 .../operations/InsertUpdateIfConditionTest.java | 11 +
 7 files changed, 57 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8807391/CHANGES.txt
--
diff --cc CHANGES.txt
index 5a118ca,261a53a..25ad1fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,19 +1,35 @@@
 -2.2.4
 +3.0
 +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:
+  * Fix conditions on static columns (CASSANDRA-10264)
   * AssertionError: attempted to delete non-existing file CommitLog 
(CASSANDRA-10377)
 - * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
 - * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 - * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
  
  
 -2.2.3
 +3.0-rc2
 + * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes 
(CASSANDRA-10473)
 + * Remove circular references in SegmentedFile (CASSANDRA-10543)
 + * Ensure validation of indexed values only occurs once per-partition 
(CASSANDRA-10536)
 + * Fix handling of static columns for range tombstones in thrift 
(CASSANDRA-10174)
 + * Support empty ColumnFilter for backward compatility on empty IN 
(CASSANDRA-10471)
 + * Remove Pig support (CASSANDRA-10542)
 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8807391/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index 1398e0d,b4edac1..42e542f
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -894,7 -874,7 +894,7 @@@ syntax_rules += r''
 ;
   ::=   ( "AND"  )*
 ;
-- ::=  ( "["  "]" )? ( ( "=" | "<" | ">" | "<=" | 
">=" | "!=" ) 
++ ::=  ( "["  "]" )? (("=" | "<" | ">" | "<=" | ">=" 
| "!=") 
   | "IN" "("  ( ","  
)* ")")
;
  '''

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8807391/src/java/org/apache/cassandra/cql3/Operations.java
--
diff --cc src/java/org/apache/cassandra/cql3/Operations.java
index c4cade1,000..0ef8517

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

2015-10-17 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/10c65d43
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10c65d43
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10c65d43

Branch: refs/heads/trunk
Commit: 10c65d434c317b2c5462a3c2c428befd12986f7f
Parents: 56a06d7 20ce2cf
Author: Robert Stupp 
Authored: Sat Oct 17 11:38:38 2015 +0200
Committer: Robert Stupp 
Committed: Sat Oct 17 11:39:37 2015 +0200

--
 CHANGES.txt |  5 +
 .../cassandra/db/commitlog/CommitLogSegmentManager.java | 12 +---
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c65d43/CHANGES.txt
--
diff --cc CHANGES.txt
index 33c360e,889438f..9b86ebd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,15 +1,31 @@@
 -2.2.4
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
++3.0
+ Merged from 2.1:
+  * AssertionError: attempted to delete non-existing file CommitLog 
(CASSANDRA-10377)
 - * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
 - * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
 - * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
+ 
+ 
 -2.2.3
 +3.0-rc2
 + * Fix SELECT DISTINCT queries between 2.2.2 nodes and 3.0 nodes 
(CASSANDRA-10473)
 + * Remove circular references in SegmentedFile (CASSANDRA-10543)
 + * Ensure validation of indexed values only occurs once per-partition 
(CASSANDRA-10536)
 + * Fix handling of static columns for range tombstones in thrift 
(CASSANDRA-10174)
 + * Support empty ColumnFilter for backward compatility on empty IN 
(CASSANDRA-10471)
 + * Remove Pig support (CASSANDRA-10542)
 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522)
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10c65d43/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
--

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

2015-10-16 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/f3143e62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3143e62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3143e62

Branch: refs/heads/trunk
Commit: f3143e624cb73e86ea11dd2f9994c70008fc26aa
Parents: a52597d 94a7d06
Author: blerer 
Authored: Fri Oct 16 11:56:46 2015 +0200
Committer: blerer 
Committed: Fri Oct 16 11:57:22 2015 +0200

--
 pylib/cqlshlib/cql3handling.py  |   8 +-
 pylib/cqlshlib/cqlhandling.py   |  10 ++
 pylib/cqlshlib/test/run_cqlsh.py|   2 +-
 pylib/cqlshlib/test/test_cql_parsing.py | 240 +--
 4 files changed, 137 insertions(+), 123 deletions(-)
--


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

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

2015-10-15 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/6a1c1d90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a1c1d90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a1c1d90

Branch: refs/heads/trunk
Commit: 6a1c1d900925cb0532633c943e7c4325edc8f64c
Parents: b42a0cf 3b7ccdf
Author: Marcus Eriksson 
Authored: Thu Oct 15 15:35:53 2015 +0200
Committer: Marcus Eriksson 
Committed: Thu Oct 15 15:35:53 2015 +0200

--

--

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

2015-10-14 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/f21c8885
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f21c8885
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f21c8885

Branch: refs/heads/trunk
Commit: f21c888510b0dbbea1a63459476f2dc54093de63
Parents: 6d0c96c 7cab327
Author: Aleksey Yeschenko 
Authored: Wed Oct 14 16:02:56 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Oct 14 16:02:56 2015 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt| 20 
 conf/cassandra-rackdc.properties|  4 ++--
 conf/cassandra.yaml |  3 +++
 .../org/apache/cassandra/db/SystemKeyspace.java | 14 ++
 .../cassandra/service/CassandraDaemon.java  | 13 +
 6 files changed, 53 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f21c8885/CHANGES.txt
--
diff --cc CHANGES.txt
index d0b90ef,57c6ff9..1a43cfc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,40 -8,27 +12,41 @@@ Merged from 2.2
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 - * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
  Merged from 2.1:
 - * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
++ * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
 + * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161, 
CASSANDRA-10507)
  
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes

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

2015-10-14 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/dea36bd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dea36bd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dea36bd6

Branch: refs/heads/trunk
Commit: dea36bd6875634414247131b151e892d5bf42447
Parents: 0556fbf 8a94432
Author: Aleksey Yeschenko 
Authored: Wed Oct 14 16:57:28 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Oct 14 16:57:28 2015 +0100

--

--

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

2015-10-14 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/trunk
Commit: ebb2b1bedaf86195b144d519a3826adafe1327b5
Parents: dea36bd 25366f7
Author: Tyler Hobbs 
Authored: Wed Oct 14 11:21:28 2015 -0500
Committer: Tyler Hobbs 
Committed: Wed Oct 14 11:21:28 2015 -0500

--
 CHANGES.txt  | 1 +
 pylib/cqlshlib/formatting.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebb2b1be/CHANGES.txt
--
diff --cc CHANGES.txt
index 49a3c57,c02e2fa..54b505a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,6 +1,22 @@@
 -2.2.4
 +3.0-rc2
 + * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
 + * Preserve case of quoted Role & User names (CASSANDRA-10394)
 + * cqlsh pg-style-strings broken (CASSANDRA-10484)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
  Merged from 2.1:
+  * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)
   * Don't allow startup if the node's rack has changed (CASSANDRA-10242)
   * (cqlsh) show partial trace if incomplete after max_trace_wait 
(CASSANDRA-7645)

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

2015-10-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/a9db74b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9db74b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9db74b3

Branch: refs/heads/trunk
Commit: a9db74b30fc44970ed988199ad0cc7213fdd67aa
Parents: cf365e3 82dabe0
Author: Robert Stupp 
Authored: Fri Oct 9 13:14:53 2015 +0200
Committer: Robert Stupp 
Committed: Fri Oct 9 13:14:53 2015 +0200

--
 CHANGES.txt   | 4 +++-
 conf/cassandra-env.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9db74b3/CHANGES.txt
--
diff --cc CHANGES.txt
index f8da643,d57cc07..fa74c69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,24 +1,46 @@@
 -2.2.3
 +3.0
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
+ Merged from 2.1:
+  * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
+  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161)
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
-  * Mark nodes as dead even if they've already left (CASSANDRA-10205)
   * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes
 share an rpc_address (CASSANDRA-10052)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9db74b3/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index fd348fe,ca5f17a..0a5bada
--- a/conf/cassandra-env.sh
+++

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

2015-10-01 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/1f99e703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f99e703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f99e703

Branch: refs/heads/trunk
Commit: 1f99e70393c20bdf4fb4705bd4ba965e780c7c28
Parents: 40f4daa 8123b3b
Author: Robert Stupp 
Authored: Thu Oct 1 14:17:04 2015 +0200
Committer: Robert Stupp 
Committed: Thu Oct 1 14:17:04 2015 +0200

--
 CHANGES.txt |  1 +
 .../hadoop/cql3/CqlBulkOutputFormat.java| 32 
 .../hadoop/cql3/CqlBulkRecordWriter.java| 13 +++-
 3 files changed, 45 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f99e703/CHANGES.txt
--
diff --cc CHANGES.txt
index 96ce6a5,9c70c74..53269e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,17 +1,37 @@@
 -2.2.2
 +3.0
 +Merged from 2.2:
   * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
+  * Bulk Loader API could not tolerate even node failure (CASSANDRA-10347)
   * Avoid misleading pushed notifications when multiple nodes
 share an rpc_address (CASSANDRA-10052)
   * Fix dropping undroppable when message queue is full (CASSANDRA-10113)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f99e703/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
--

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

2015-10-01 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/service/StorageService.java


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

Branch: refs/heads/trunk
Commit: 80355a105f5b7552b2ecd40939b83ff47d7eea56
Parents: 1f99e70 74bc1cc
Author: T Jake Luciani 
Authored: Thu Oct 1 09:12:36 2015 -0400
Committer: T Jake Luciani 
Committed: Thu Oct 1 09:12:36 2015 -0400

--
 src/java/org/apache/cassandra/service/StorageService.java | 7 ++-
 .../org/apache/cassandra/service/StorageServiceMBean.java | 4 
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 76299b7,d426cbc..9153cd8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -405,10 -421,10 +405,10 @@@ public class StorageService extends Not
  {
  throw new IllegalStateException("No configured daemon");
  }
- 
+ 
  try
  {
 -daemon.nativeServer.start();
 +daemon.startNativeTransport();
  }
  catch (Exception e)
  {
@@@ -1571,11 -1555,11 +1571,16 @@@
  return 
getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
  }
  
 +public UUID getLocalHostUUID()
 +{
 +return 
getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress());
 +}
 +
+ public Map getHostIdMap()
+ {
+ return getEndpointToHostId();
+ }
+ 
  public Map getEndpointToHostId()
  {
  Map mapOut = new HashMap<>();

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80355a10/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--

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

2015-09-30 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/a039b7df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a039b7df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a039b7df

Branch: refs/heads/trunk
Commit: a039b7df55d8f5d765e1462eace23646eee7b82f
Parents: 3ae01dd 7452b20
Author: Tyler Hobbs 
Authored: Wed Sep 30 10:50:03 2015 -0500
Committer: Tyler Hobbs 
Committed: Wed Sep 30 10:50:03 2015 -0500

--
 CHANGES.txt |  2 +
 .../org/apache/cassandra/transport/Event.java   | 29 +---
 .../org/apache/cassandra/transport/Server.java  | 71 +---
 3 files changed, 70 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/CHANGES.txt
--
diff --cc CHANGES.txt
index cbd4632,45070b2..96ce6a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,18 +1,38 @@@
 -2.2.2
 +3.0
 +Merged from 2.2:
   * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
+  * Avoid misleading pushed notifications when multiple nodes
+share an rpc_address (CASSANDRA-10052)
   * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
   * Fix potential ClassCastException during paging (CASSANDRA-10352)
   * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/src/java/org/apache/cassandra/transport/Event.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a039b7df/src/java/org/apache/cassandra/transport/Server.java
--

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

2015-09-18 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/e6f23e63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6f23e63
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6f23e63

Branch: refs/heads/trunk
Commit: e6f23e63c58368871a085201f73f139e112d4b3a
Parents: 6e5d16b 1de63e9
Author: Robert Stupp 
Authored: Fri Sep 18 09:52:08 2015 +0200
Committer: Robert Stupp 
Committed: Fri Sep 18 09:52:08 2015 +0200

--
 CHANGES.txt |  1 +
 .../cql3/statements/AlterTypeStatement.java |  6 ++-
 .../cassandra/db/marshal/AbstractType.java  |  8 
 .../cassandra/db/marshal/CompositeType.java | 11 +
 .../apache/cassandra/db/marshal/ListType.java   |  6 +++
 .../apache/cassandra/db/marshal/MapType.java|  6 +++
 .../cassandra/db/marshal/ReversedType.java  |  5 ++
 .../apache/cassandra/db/marshal/SetType.java|  6 +++
 .../apache/cassandra/db/marshal/TupleType.java  | 11 +
 .../cql3/validation/entities/UserTypesTest.java | 49 
 10 files changed, 108 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f23e63/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a630fd,97858c5..a1ba955
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,15 +1,19 @@@
 -2.2.2
 +3.0.0-rc1
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
+  * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
   * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
   * Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
   * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f23e63/src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6f23e63/src/java/org/apache/cassandra/db/marshal/AbstractType.java
--
diff --cc src/java/org/apache/cassandra/db/marshal/AbstractType.java
index 02a5539,b90e127..5c46823
--- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
@@@ -357,50 -296,14 +357,58 @@@ public abstract class AbstractType i
  }
  
  /**
 +* The length of values for this type if all values are of fixed length, 
-1 otherwise.
 + */
 +protected int valueLengthIfFixed()
 +{
 +return -1;
 +}
 +
 +// This assumes that no empty values are passed
 +public void writeValue(ByteBuffer value, DataOutputPlus out) throws 
IOException
 +{
 +assert value.hasRemaining();
 +if (valueLengthIfFixed() >= 0)
 +out.write(value);
 +else
 +ByteBufferUtil.writeWithVIntLength(value, out);
 +}
 +
 +public long writtenLength(ByteBuffer value)
 +{
 +assert value.hasRemaining();
 +return valueLengthIfFixed() >= 0
 + ? value.remaining()
 + : TypeSizes.sizeofWithVIntLength(value);
 +}
 +
 +public ByteBuffer readValue(DataInputPlus in) throws IOException
 +{
 +

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

2015-09-17 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/6e5d16b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e5d16b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e5d16b3

Branch: refs/heads/trunk
Commit: 6e5d16b373a53dabb0419a5b5a061a93a690d277
Parents: 90661a3 93745c0
Author: Robert Stupp 
Authored: Thu Sep 17 23:24:14 2015 +0200
Committer: Robert Stupp 
Committed: Thu Sep 17 23:24:14 2015 +0200

--
 CHANGES.txt |  2 +-
 .../apache/cassandra/cache/AutoSavingCache.java | 50 ++--
 .../apache/cassandra/cql3/KeyCacheCqlTest.java  |  1 +
 3 files changed, 37 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5d16b3/CHANGES.txt
--
diff --cc CHANGES.txt
index 0cbe919,59a50a5..6a630fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,15 +1,19 @@@
 -2.2.2
 +3.0.0-rc1
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
 - * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
 - * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
 - * Fix repair hang when snapshot failed (CASSANDRA-10057)
 - * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 -   (CASSANDRA-10199)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
  Merged from 2.1:
-  * Fix cache handling of 2i and base tables (CASSANDRA-10155)
+  * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
   * Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
   * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)
   * BATCH statement is broken in cqlsh (CASSANDRA-10272)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5d16b3/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 4558bb7,48d60b7..58ddc2c
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -187,7 -185,16 +187,16 @@@ public class AutoSavingCache>> futures = new 
ArrayDeque>>();
  while (in.available() > 0)
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5d16b3/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java
--

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

2015-09-15 Thread brandonwilliams

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java


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

Branch: refs/heads/trunk
Commit: 0afe4beebafc00c920f05a88e7eec96f2bf306ee
Parents: 753a943 8cad732
Author: Brandon Williams 
Authored: Tue Sep 15 21:23:47 2015 -0500
Committer: Brandon Williams 
Committed: Tue Sep 15 21:23:47 2015 -0500

--
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 59 ++--
 1 file changed, 16 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0afe4bee/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
--
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 70429a8,36da92d..7699f29
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@@ -18,46 -18,16 +18,18 @@@
  package org.apache.cassandra.hadoop.cql3;
  
  import java.io.IOException;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.Random;
- import java.util.Set;
- import java.util.concurrent.Callable;
- import java.util.concurrent.ExecutorService;
- import java.util.concurrent.Future;
- import java.util.concurrent.LinkedBlockingQueue;
- import java.util.concurrent.ThreadPoolExecutor;
- import java.util.concurrent.TimeUnit;
- 
++import java.util.*;
++import java.util.concurrent.*
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
- import com.datastax.driver.core.Host;
- import com.datastax.driver.core.Metadata;
- import com.datastax.driver.core.ResultSet;
- import com.datastax.driver.core.Session;
- import com.datastax.driver.core.TokenRange;
 -import org.apache.cassandra.hadoop.HadoopCompat;
 -import org.apache.cassandra.hadoop.AbstractColumnFamilyInputFormat;
 -import org.apache.cassandra.hadoop.ReporterWrapper;
 -import org.apache.hadoop.mapred.InputSplit;
 -import org.apache.hadoop.mapred.JobConf;
 -import org.apache.hadoop.mapred.RecordReader;
 -import org.apache.hadoop.mapred.Reporter;
 -import org.apache.hadoop.mapreduce.TaskAttemptContext;
 -import org.apache.hadoop.mapreduce.TaskAttemptID;
++import com.datastax.driver.core.*;
 +import org.apache.cassandra.db.SystemKeyspace;
- import org.apache.cassandra.dht.ByteOrderedPartitioner;
- import org.apache.cassandra.dht.IPartitioner;
- import org.apache.cassandra.dht.OrderPreservingPartitioner;
- import org.apache.cassandra.dht.Range;
- import org.apache.cassandra.dht.Token;
- import org.apache.cassandra.hadoop.ColumnFamilySplit;
- import org.apache.cassandra.hadoop.ConfigHelper;
- import org.apache.cassandra.hadoop.HadoopCompat;
- import org.apache.cassandra.thrift.KeyRange;
++import org.apache.cassandra.dht.*;
++import org.apache.cassandra.hadoop.*;
 +import org.apache.hadoop.conf.Configuration;
- import org.apache.hadoop.mapred.InputSplit;
- import org.apache.hadoop.mapred.JobConf;
- import org.apache.hadoop.mapred.RecordReader;
- import org.apache.hadoop.mapred.Reporter;
- import org.apache.hadoop.mapreduce.JobContext;
- import org.apache.hadoop.mapreduce.TaskAttemptContext;
- import org.apache.hadoop.mapreduce.TaskAttemptID;
++import org.apache.hadoop.mapred.*;
++import org.apache.hadoop.mapreduce.*;
  
  import com.datastax.driver.core.Row;

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

2015-09-15 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/7ca4db0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ca4db0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ca4db0a

Branch: refs/heads/trunk
Commit: 7ca4db0a117b02457f73ebdbb10e6919f1535245
Parents: 7f5580b cd4a1e6
Author: Aleksey Yeschenko 
Authored: Tue Sep 15 16:16:33 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Sep 15 16:16:33 2015 +0100

--
 CHANGES.txt |   1 +
 .../hadoop/cql3/CqlBulkRecordWriter.java|  13 +-
 .../cassandra/hadoop/pig/CqlNativeStorage.java  | 171 ---
 test/conf/cassandra_pig.yaml|  41 +
 .../org/apache/cassandra/pig/CqlTableTest.java  |  35 
 .../org/apache/cassandra/pig/PigTestBase.java   |   3 +-
 6 files changed, 203 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca4db0a/CHANGES.txt
--
diff --cc CHANGES.txt
index cf982dd,b0ade42..54d4ddf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,8 +1,46 @@@
 -2.2.2
 +3.0.0-rc1
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
 +Merged from 2.1:
++ * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)
 + * BATCH statement is broken in cqlsh (CASSANDRA-10272)
 + * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066)
 + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
 + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
 +   have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
 +
 +
 +3.0.0-beta2
 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220)
 + * Fix backward compatibility issue due to AbstractBounds serialization bug 
(CASSANDRA-9857)
 + * Fix startup error when upgrading nodes (CASSANDRA-10136)
 + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation 
(CASSANDRA-10147)
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
   * Cancel transaction for sstables we wont redistribute index summary
 for (CASSANDRA-10270)
 - * Handle missing RoleManager in config after upgrade to 2.2 
(CASSANDRA-10209) 
   * Retry snapshot deletion after compaction and gc on Windows 
(CASSANDRA-10222)
   * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ca4db0a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
--
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
index 3e69c2d,9e6e23b..4552d87
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
@@@ -31,8 -31,10 +31,9 @@@ import org.slf4j.LoggerFactory
  import

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

2015-09-11 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/Config.java


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

Branch: refs/heads/trunk
Commit: 00264e854731aea93a8485b497b6f6fd9680f7d9
Parents: 0790e48 53d0449
Author: Joshua McKenzie 
Authored: Fri Sep 11 13:13:03 2015 -0400
Committer: Joshua McKenzie 
Committed: Fri Sep 11 13:13:03 2015 -0400

--
 CHANGES.txt |  1 +
 NEWS.txt|  2 ++
 conf/cassandra.yaml |  5 +
 src/java/org/apache/cassandra/config/Config.java|  2 ++
 .../apache/cassandra/config/DatabaseDescriptor.java | 11 +++
 .../org/apache/cassandra/service/GCInspector.java   | 16 +++-
 6 files changed, 32 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00264e85/CHANGES.txt
--
diff --cc CHANGES.txt
index 3397369,ffae4d9..d367b85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,6 -9,11 +43,7 @@@ Merged from 2.2
   * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 (CASSANDRA-10199)
  Merged from 2.1:
+  * Added configurable warning threshold for GC duration (CASSANDRA-8907)
 - * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066)
 - * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
 - * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
 -   have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
   * Fix handling of streaming EOF (CASSANDRA-10206)
   * Only check KeyCache when it is enabled
   * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00264e85/NEWS.txt
--
diff --cc NEWS.txt
index 1af1bd5,198e8e9..4b35f71
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,32 -13,9 +13,34 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +3.0
 +===
  
 -2.2.2
 -=
 +New features
 +
 +   - Support for IN restrictions on any partition key component or clustering 
key
 + as well as support for EQ and IN multicolumn restrictions has been added 
to
 + UPDATE and DELETE statement.
 +   - Support for single-column and multi-colum slice restrictions (>, >=, <= 
and <)
 + has been added to DELETE statements
 +   - nodetool rebuild_index accepts the index argument without
 + the redundant table name
 +   - Materialized Views, which allow for server-side denormalization, is now
 + available. Materialized views provide an alternative to secondary indexes
 + for non-primary key queries, and perform much better for indexing high
 + cardinality columns.
 + See 
http://www.datastax.com/dev/blog/new-in-cassandra-3-0-materialized-views
 +   - Hinted handoff has been completely rewritten. Hints are now stored in 
flat
 + files, with less overhead for storage and more efficient dispatch.
 + See CASSANDRA-6230 for full details.
 +   - Option to not purge unrepaired tombstones. To avoid users having data 
resurrected
 + if repair has not been run within gc_grace_seconds, an option has been 
added to
 + only allow tombstones from repaired sstables to be purged. To enable, 
set the
 + compaction option 'only_purge_repaired_tombstones':true but keep in mind 
that if
 + you do not run repair for a long time, you will keep all tombstones 
around which
 + can cause other problems.
++   - Enabled warning on GC taking longer than 1000ms. See
++ cassandra.yaml:gc_warn_threshold_in_ms
  
  Upgrading
  -

http://git-wip-us.apache.org/repos/asf/cassandra/blob/00264e85/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 28caa1e,ab8e8d1..f03a2f9
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -905,16 -853,18 +905,21 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
+ # GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
+ # Adjust the threshold based on your application throughput requirement
+ # By default, Cassandra logs GC Pauses greater than 200 ms at INFO level
 -# gc_warn_threshold_in_ms: 1000
++gc_warn_threshold_in_ms: 1000
+ 
  # UDFs (user defined

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

2015-09-11 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/0b990b79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b990b79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b990b79

Branch: refs/heads/trunk
Commit: 0b990b79854a744e054990438067fa08bfca7bc7
Parents: 665f747 0d5908b
Author: Sylvain Lebresne 
Authored: Fri Sep 11 18:42:05 2015 +0200
Committer: Sylvain Lebresne 
Committed: Fri Sep 11 18:42:05 2015 +0200

--
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b990b79/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--

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

2015-09-10 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java


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

Branch: refs/heads/trunk
Commit: 9f0509ee358e0fa1e4eafd53015ea534ec212ccf
Parents: 8324818 362da9b
Author: Marcus Eriksson 
Authored: Thu Sep 10 14:39:01 2015 +0200
Committer: Marcus Eriksson 
Committed: Thu Sep 10 14:39:01 2015 +0200

--
 .../db/compaction/CompactionManager.java| 28 +---
 .../db/compaction/AntiCompactionTest.java   |  4 +--
 2 files changed, 20 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f0509ee/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index a3167f9,7c3fbc2..cd82b19
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@@ -299,21 -289,21 +299,21 @@@ public class AntiCompactionTes
  {
  generateSStable(store,Integer.toString(table));
  }
 -Collection sstables = store.getUnrepairedSSTables();
 -assertEquals(store.getSSTables().size(), sstables.size());
 -
 +Collection sstables = getUnrepairedSSTables(store);
 +assertEquals(store.getLiveSSTables().size(), sstables.size());
 +
- Range range = new Range(new 
BytesToken("-10".getBytes()), new BytesToken("-1".getBytes()));
+ Range range = new Range(new 
BytesToken("-1".getBytes()), new BytesToken("-10".getBytes()));
  List ranges = Arrays.asList(range);
  
  
  try (LifecycleTransaction txn = 
store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
   Refs refs = Refs.ref(sstables))
  {
- CompactionManager.instance.performAnticompaction(store, ranges, 
refs, txn, 0);
+ CompactionManager.instance.performAnticompaction(store, ranges, 
refs, txn, 1);
  }
  
 -assertThat(store.getSSTables().size(), is(10));
 -assertThat(Iterables.get(store.getSSTables(), 0).isRepaired(), 
is(false));
 +assertThat(store.getLiveSSTables().size(), is(10));
 +assertThat(Iterables.get(store.getLiveSSTables(), 0).isRepaired(), 
is(false));
  }
  
  private ColumnFamilyStore prepareColumnFamilyStore()

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

2015-09-01 Thread jasobrown

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/5f02f202
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f02f202
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f02f202

Branch: refs/heads/trunk
Commit: 5f02f202f85a6e65ded436c9471c4001d71927af
Parents: ae669b0 45dd5d1
Author: Jason Brown 
Authored: Tue Sep 1 22:23:34 2015 -0700
Committer: Jason Brown 
Committed: Tue Sep 1 22:23:34 2015 -0700

--
 src/java/org/apache/cassandra/net/MessageDeliveryTask.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

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

2015-08-25 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/cfb7ec17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb7ec17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb7ec17

Branch: refs/heads/trunk
Commit: cfb7ec17ffaedd0e8c65c6e1e3df78a7618a3c88
Parents: ee9807e d1d10fa
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 25 12:48:16 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 25 12:48:16 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb7ec17/CHANGES.txt
--
diff --cc CHANGES.txt
index b14a5a6,34615db..508f869
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,6 +1,38 @@@
 -2.2.1
 +3.0.0-beta2
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
 + * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
-  * Avoid returning Permission.None when system_auth.permissions table does not
-exist (CASSANDRA-10168)
++ * Avoid returning Permission.NONE when failing to query users table 
(CASSANDRA-10168)
   * add CLEAR cqlsh command (CASSANDRA-10086)
   * Support string literals as Role names for compatibility (CASSANDRA-10135)
 +
 +
 +3.0.0-beta1
 + * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
 + * Fix throwing ReadFailure instead of ReadTimeout on range queries 
(CASSANDRA-10125)
 + * Rewrite hinted handoff (CASSANDRA-6230)
 + * Fix query on static compact tables (CASSANDRA-10093)
 + * Fix race during construction of commit log (CASSANDRA-10049)
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 + * SequentialWriter should extend BufferedDataOutputStreamPlus 
(CASSANDRA-9500)
 + * Use the same repairedAt timestamp within incremental repair session 
(CASSANDRA-9111)
 +Merged from 2.2:
   * Allow count(*) and count(1) to be use as normal aggregation 
(CASSANDRA-10114)
   * An NPE is thrown if the column name is unknown for an IN relation 
(CASSANDRA-10043)
   * Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)

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

2015-08-10 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java

src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java


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

Branch: refs/heads/trunk
Commit: 929438b8be32e38f6d921bfdc4a011cd526dfeb7
Parents: e389dc4 9c3b967
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 10 09:12:52 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Aug 10 09:13:01 2015 +0200

--
 CHANGES.txt |  1 +
 NEWS.txt|  3 +-
 .../org/apache/cassandra/config/CFMetaData.java |  7 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  | 29 ++-
 .../cassandra/db/ColumnFamilyStoreMBean.java| 19 +++--
 .../compaction/CompactionStrategyManager.java   | 51 +---
 .../db/compaction/CompactionsCQLTest.java   | 81 +++-
 7 files changed, 166 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/929438b8/CHANGES.txt
--
diff --cc CHANGES.txt
index 7cb9f16,772455c..639dd59
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,39 -13,6 +19,40 @@@ Merged from 2.1
 when both exist (CASSANDRA-9777)
   * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
   * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 +Merged from 2.0:
 + * Don't cast expected bf size to an int (CASSANDRA-9959)
 +
 +
 +3.0.0-alpha1
 + * Implement proper sandboxing for UDFs (CASSANDRA-9402)
 + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825,
 +   9848, 9705, 9859, 9867, 9874, 9828, 9801)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * Undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499, 9865)
 + * Materialized Views (CASSANDRA-6477)
 +Merged from 2.2:
 + * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 + * UDF / UDA execution time in trace (CASSANDRA-9723)
 + * Fix broken internode SSL (CASSANDRA-9884)
 +Merged from 2.1:
++ * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
   * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
   * Add consistency level to tracing ouput (CASSANDRA-9827)
   * Remove repair snapshot leftover on startup (CASSANDRA-7357)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/929438b8/NEWS.txt
--
diff --cc NEWS.txt
index 0fa4ded,ccc5cc8..5a690bd
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,55 -13,6 +13,56 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +3.0
 +===
 +
 +New features
 +
 +   - Materialized Views, which allow for server-side denormalization, is now
 + available. Materialized views provide an alternative to secondary indexes
 + for non-primary key queries, and perform much better for indexing high
 + cardinality columns.
 + See 
http://www.datastax.com/dev/blog/new-in-cassandra-3-0-materialized-views
 +
 +
 +Upgrading
 +-
 +   - 3.0 requires Java 8u20 or later.
 +   - The default JVM GC has been changed to G1GC.
 +   - The default JVM flag

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

2015-08-10 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
NEWS.txt
src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java


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

Branch: refs/heads/trunk
Commit: 2dfcb221c6db589c1e91aa122fd727f417098568
Parents: 929438b 2dd8101
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Aug 10 09:33:54 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Aug 10 09:33:54 2015 +0200

--
 NEWS.txt|  4 +++-
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++--
 .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 12 ++--
 .../cassandra/db/compaction/CompactionsCQLTest.java | 11 +--
 4 files changed, 20 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dfcb221/NEWS.txt
--
diff --cc NEWS.txt
index 5a690bd,d0a6d9d..4a59553
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,56 -13,6 +13,56 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +3.0
 +===
 +
 +New features
 +
 +   - Materialized Views, which allow for server-side denormalization, is now
 + available. Materialized views provide an alternative to secondary indexes
 + for non-primary key queries, and perform much better for indexing high
 + cardinality columns.
 + See 
http://www.datastax.com/dev/blog/new-in-cassandra-3-0-materialized-views
 +
 +
 +Upgrading
 +-
 +   - 3.0 requires Java 8u20 or later.
 +   - The default JVM GC has been changed to G1GC.
 +   - The default JVM flag -XX:+PerfDisableSharedMem will cause the following 
tools JVM
 + to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party 
tools like Jolokia.
 + If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 +   - New write stages have been added for batchlog and materialized view 
mutations
 + you can set their size in cassandra.yaml
 +   - User defined functions are now executed in a sandbox.
 + To use UDFs and UDAs, you have to enable them in cassandra.yaml.
 +   - New SSTable version 'la' with improved bloom-filter false-positive 
handling
 + compared to previous version 'ka' used in 2.2 and 2.1. Running 
sstableupgrade
 + is not necessary but recommended.
 +   - Before upgrading to 3.0, make sure that your cluster is in complete 
agreement
 + (schema versions outputted by `nodetool describecluster` are all the 
same).
 +   - Schema metadata is now stored in the new `system_schema` keyspace, and
 + legacy `system.schema_*` tables are now gone; see CASSANDRA-6717 for 
details.
 +   - Pig's CassandraStorage has been removed. Use CqlNativeStorage instead.
 +   - Hadoop BulkOutputFormat and BulkRecordWriter have been removed; use
 + CqlBulkOutputFormat and CqlBulkRecordWriter instead.
 +   - Hadoop ColumnFamilyInputFormat and ColumnFamilyOutputFormat have been 
removed;
 + use CqlInputFormat and CqlOutputFormat instead.
 +   - Hadoop ColumnFamilyRecordReader and ColumnFamilyRecordWriter have been 
removed;
 + use CqlRecordReader and CqlRecordWriter instead.
 +   - hinted_handoff_enabled in cassandra.yaml no longer supports a list of 
data centers.
 + To specify a list of excluded data centers when hinted_handoff_enabled 
is set to true,
 + use hinted_handoff_disabled_datacenters, see CASSANDRA-9035 for details.
 +   - The `sstable_compression` and `chunk_length_kb` compression options have 
been deprecated.
 + The new options are `class` and `chunk_length_in_kb`. Disabling 
compression should now
 + be done by setting the new option `enabled` to `false`.
 +   - Only map syntax is now allowed for caching options. 
ALL/NONE/KEYS_ONLY/ROWS_ONLY syntax
 + has been deprecated since 2.1.0 and is being removed in 3.0.0.
 +   - Batchlog entries are now stored in a new table - system.batches.
 + The old one has been deprecated.
 +   - JMX methods set/getCompactionStrategyClass have been removed, use
-  set/getLocalCompactionStrategy or set/getLocalCompactionStrategyJson 
instead.
++ set/getCompactionParameters or set/getCompactionParametersJson instead.
 +
  2.2
  ===
  
@@@ -161,8 -111,9 +161,10 @@@ Upgradin
  - Commit log files are no longer recycled by default, due to negative
performance implications. This can be

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

2015-08-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/f568a5d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f568a5d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f568a5d8

Branch: refs/heads/trunk
Commit: f568a5d8a8fc2d165801e792f1133ac111c4df27
Parents: 8984ca7 0b99d33
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Aug 9 23:04:01 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Aug 9 23:04:01 2015 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/net/MessagingService.java  | 16 
 .../org/apache/cassandra/net/WriteCallbackInfo.java | 11 ++-
 .../org/apache/cassandra/service/StorageProxy.java  | 12 
 4 files changed, 27 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f568a5d8/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ba7b4e,a913fe7..7cb9f16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,11 +1,18 @@@
 -2.2.1
 +3.0.0-beta1
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
+  * Write hints for paxos commits (CASSANDRA-7342)
   * (cqlsh) Fix timestamps before 1970 on Windows, always
 use UTC for timestamp display (CASSANDRA-1)
   * (cqlsh) Avoid overwriting new config file with old config

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f568a5d8/src/java/org/apache/cassandra/net/MessagingService.java
--
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 25eb0d0,f8fd6fd..0505445
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -625,9 -617,7 +624,10 @@@ public final class MessagingService imp
 ConsistencyLevel consistencyLevel,
 boolean allowHints)
  {
 -assert message.verb == Verb.MUTATION || message.verb == 
Verb.COUNTER_MUTATION || message.verb == Verb.PAXOS_COMMIT;
 +assert message.verb == Verb.MUTATION
-|| message.verb == Verb.BATCHLOG_MUTATION
-|| message.verb == Verb.COUNTER_MUTATION;
++|| message.verb == Verb.BATCHLOG_MUTATION
++|| message.verb == Verb.COUNTER_MUTATION
++|| message.verb == Verb.PAXOS_COMMIT;
  int messageId = nextId();
  
  CallbackInfo previous = callbacks.put(messageId,

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

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

2015-08-07 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/dfc1a445
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfc1a445
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfc1a445

Branch: refs/heads/trunk
Commit: dfc1a445081315e394c55e39e0ac55875acb2b2d
Parents: 10e4781 ce7159e
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Aug 7 15:50:07 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Aug 7 15:50:07 2015 -0500

--
 NEWS.txt | 24 
 pylib/cqlshlib/formatting.py | 28 
 pylib/cqlshlib/util.py   | 15 +++
 3 files changed, 43 insertions(+), 24 deletions(-)
--


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

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

2015-08-07 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/69f0b893
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69f0b893
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69f0b893

Branch: refs/heads/trunk
Commit: 69f0b8936b660fda91b316c73de9294b898e47c8
Parents: dfc1a44 67903d7
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Aug 7 15:53:04 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Aug 7 15:53:04 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69f0b893/CHANGES.txt
--
diff --cc CHANGES.txt
index f5cf1b2,705e560..216d3f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,12 +1,18 @@@
 -2.2.1
 +3.0.0-beta1
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
+  * (cqlsh) Fix timestamps before 1970 on Windows, always
+use UTC for timestamp display (CASSANDRA-1)
   * (cqlsh) Avoid overwriting new config file with old config
 when both exist (CASSANDRA-9777)
   * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)

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

2015-08-07 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java


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

Branch: refs/heads/trunk
Commit: 5285000908e486ae80ef1a289e8a055d65d5dd7f
Parents: 0a94c7a bf08e66
Author: Marcus Eriksson marc...@apache.org
Authored: Fri Aug 7 08:23:36 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Fri Aug 7 08:23:36 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/52850009/CHANGES.txt
--
diff --cc CHANGES.txt
index a894297,6e17be0..9aca2ce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,6 +1,45 @@@
 -2.2.1
 +3.0.0-beta1
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 +Merged from 2.1:
++ * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
 + * Cannot replace token does not exist - DN node removed as Fat Client 
(CASSANDRA-9871)
 +Merged from 2.0:
 + * Don't cast expected bf size to an int (CASSANDRA-9959)
 +
 +
 +3.0.0-alpha1
 + * Implement proper sandboxing for UDFs (CASSANDRA-9402)
 + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
 + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
 + * Metrics should use up to date nomenclature (CASSANDRA-9448)
 + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
 + * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
 + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 
9825,
 +   9848, 9705, 9859, 9867, 9874, 9828, 9801)
 + * Update Guava to 18.0 (CASSANDRA-9653)
 + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
 + * New option for cassandra-stress to leave a ratio of columns null 
(CASSANDRA-9522)
 + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 + * Undeprecate cache recentHitRate (CASSANDRA-6591)
 + * Add support for selectively varint encoding fields (CASSANDRA-9499, 9865)
 + * Materialized Views (CASSANDRA-6477)
 +Merged from 2.2:
   * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
   * UDF / UDA execution time in trace (CASSANDRA-9723)
   * Fix broken internode SSL (CASSANDRA-9884)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/52850009/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 255f9a0,5e8c521..beb2b93
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1600,9 -2363,10 +1600,10 @@@ public class ColumnFamilyStore implemen
  if (logger.isDebugEnabled())
  logger.debug(using snapshot sstable {}, 
entries.getKey());
  // open without tracking hotness
 -sstable = SSTableReader.open(entries.getKey(), 
entries.getValue(), metadata, partitioner, true, false);
 +sstable = SSTableReader.open(entries.getKey(), 
entries.getValue(), metadata, true, false);
- // This is technically not necessary since it's a 
snapshot but makes things easier
  refs.tryRef(sstable);
+ // release the self ref as we never add the snapshot 
sstable to DataTracker where it is otherwise released

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

2015-08-07 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/a8b8515c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8b8515c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8b8515c

Branch: refs/heads/trunk
Commit: a8b8515c84bfdb9960751567baf92804611b5cd8
Parents: 3be99ee 5b68b2d
Author: Tyler Hobbs tylerlho...@gmail.com
Authored: Fri Aug 7 11:45:22 2015 -0500
Committer: Tyler Hobbs tylerlho...@gmail.com
Committed: Fri Aug 7 11:45:22 2015 -0500

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


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

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

2015-08-04 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java


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

Branch: refs/heads/trunk
Commit: 6932bd879857b3b603c2d0ee284f26426b68fe6a
Parents: 72f5fbd 5c59d5a
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 4 09:55:19 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 4 09:55:19 2015 +0200

--
 .../db/compaction/CompactionsCQLTest.java   | 113 ++-
 1 file changed, 108 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6932bd87/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
index a06d4a5,58fc062..0db231e
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
@@@ -27,19 -29,125 +29,120 @@@ import static org.junit.Assert.assertTr
  public class CompactionsCQLTest extends CQLTester
  {
  @Test
- public void testTriggerMinorCompaction() throws Throwable
+ public void testTriggerMinorCompactionSTCS() throws Throwable
  {
- createTable(CREATE TABLE %s (id text PRIMARY KEY););
- 
assertTrue(Keyspace.open(KEYSPACE).getColumnFamilyStore(currentTable()).getCompactionStrategyManager().isEnabled());
+ createTable(CREATE TABLE %s (id text PRIMARY KEY)  WITH compaction = 
{'class':'SizeTieredCompactionStrategy', 'min_threshold':2};);
 -
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
++
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
  execute(insert into %s (id) values ('1'));
  flush();
  execute(insert into %s (id) values ('1'));
  flush();
+ Thread.sleep(1000);
+ assertTrue(minorWasTriggered(KEYSPACE, currentTable()));
+ }
+ 
+ @Test
+ public void testTriggerMinorCompactionLCS() throws Throwable
+ {
+ createTable(CREATE TABLE %s (id text PRIMARY KEY) WITH compaction = 
{'class':'LeveledCompactionStrategy', 'sstable_size_in_mb':1};);
 -
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
++
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
+ execute(insert into %s (id) values ('1'));
+ flush();
+ execute(insert into %s (id) values ('1'));
+ flush();
+ Thread.sleep(1000);
+ assertTrue(minorWasTriggered(KEYSPACE, currentTable()));
+ }
+ 
+ 
+ @Test
+ public void testTriggerMinorCompactionDTCS() throws Throwable
+ {
+ createTable(CREATE TABLE %s (id text PRIMARY KEY) WITH compaction = 
{'class':'DateTieredCompactionStrategy', 'min_threshold':2};);
 -
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
++
assertTrue(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
+ execute(insert into %s (id) values ('1'));
+ flush();
+ execute(insert into %s (id) values ('1'));
+ flush();
+ Thread.sleep(1000);
+ assertTrue(minorWasTriggered(KEYSPACE, currentTable()));
+ }
+ 
+ @Test
+ public void testTriggerNoMinorCompactionSTCSDisabled() throws Throwable
+ {
+ createTable(CREATE TABLE %s (id text PRIMARY KEY)  WITH compaction = 
{'class':'SizeTieredCompactionStrategy', 'min_threshold':2, 'enabled':false};);
 -
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
++
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
  execute(insert into %s (id) values ('1'));
  flush();
  execute(insert into %s (id) values ('1'));
  flush();
  Thread.sleep(1000);
+ assertFalse(minorWasTriggered(KEYSPACE, currentTable()));
+ }
+ 
+ @Test
+ public void testTriggerMinorCompactionSTCSNodetoolEnabled() throws 
Throwable
+ {
+ createTable(CREATE TABLE %s (id text PRIMARY KEY)  WITH compaction = 
{'class':'SizeTieredCompactionStrategy', 'min_threshold':2, 'enabled':false};);
 -
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategy().isEnabled());
++
assertFalse(getCurrentColumnFamilyStore().getCompactionStrategyManager().isEnabled());
+

78 matches

Mail list logo