subject:"\[2\/4\] git commit\: Merge branch 'cassandra\-2.0' into cassandra\-2.1.0"

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-09-04 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java


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

Branch: refs/heads/trunk
Commit: 37c6b2f2260fa7447d3fea9f0f3c2b4102028e91
Parents: 1908ae3 77b036a
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Sep 4 15:04:37 2014 -0400
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Sep 4 15:04:37 2014 -0400

--
 .../org/apache/cassandra/config/CFMetaData.java | 21 
 .../cql3/statements/CreateTableStatement.java   |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37c6b2f2/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 7466b56,e726957..c7b48e3
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -483,26 -449,27 +483,26 @@@ public final class CFMetaDat
  public CFMetaData memtableFlushPeriod(int prop) {memtableFlushPeriod = 
prop; return this;}
  public CFMetaData defaultTimeToLive(int prop) {defaultTimeToLive = prop; 
return this;}
  public CFMetaData speculativeRetry(SpeculativeRetry prop) 
{speculativeRetry = prop; return this;}
 -public CFMetaData populateIoCacheOnFlush(boolean prop) 
{populateIoCacheOnFlush = prop; return this;}
 -public CFMetaData droppedColumns(MapByteBuffer, Long cols) 
{droppedColumns = cols; return this;}
 +public CFMetaData droppedColumns(MapColumnIdentifier, Long cols) 
{droppedColumns = cols; return this;}
  public CFMetaData triggers(MapString, TriggerDefinition prop) {triggers 
= prop; return this;}
- public CFMetaData setDense(Boolean prop) {isDense = prop; return this;}
+ public CFMetaData isDense(Boolean prop) {isDense = prop; return this;}
  
 -public CFMetaData(String keyspace, String name, ColumnFamilyType type, 
AbstractType? comp, AbstractType? subcc)
 -{
 -this(keyspace, name, type, makeComparator(type, comp, subcc));
 -}
 -
 -public CFMetaData(String keyspace, String name, ColumnFamilyType type, 
AbstractType? comp)
 +/**
 + * Create new ColumnFamily metadata with generated random ID.
 + * When loading from existing schema, use CFMetaData
 + *
 + * @param keyspace keyspace name
 + * @param name column family name
 + * @param comp default comparator
 + */
 +public CFMetaData(String keyspace, String name, ColumnFamilyType type, 
CellNameType comp)
  {
 -this(keyspace, name, type, comp, getId(keyspace, name));
 +this(keyspace, name, type, comp, UUIDGen.getTimeUUID());
  }
  
 -@VisibleForTesting
 -CFMetaData(String keyspace, String name, ColumnFamilyType type, 
AbstractType? comp,  UUID id)
 +private CFMetaData(String keyspace, String name, ColumnFamilyType type, 
CellNameType comp, UUID id)
  {
 -// (subcc may be null for non-supercolumns)
 -// (comp may also be null for custom indexes, which is kind of broken 
if you ask me)
 -
 +cfId = id;
  ksName = keyspace;
  cfName = name;
  cfType = type;
@@@ -657,13 -599,13 +657,13 @@@
.bloomFilterFpChance(oldCFMD.bloomFilterFpChance)
.caching(oldCFMD.caching)
.defaultTimeToLive(oldCFMD.defaultTimeToLive)
 -  .indexInterval(oldCFMD.indexInterval)
 +  .minIndexInterval(oldCFMD.minIndexInterval)
 +  .maxIndexInterval(oldCFMD.maxIndexInterval)
.speculativeRetry(oldCFMD.speculativeRetry)
.memtableFlushPeriod(oldCFMD.memtableFlushPeriod)
 -  .populateIoCacheOnFlush(oldCFMD.populateIoCacheOnFlush)
.droppedColumns(new HashMap(oldCFMD.droppedColumns))
.triggers(new HashMap(oldCFMD.triggers))
-   .setDense(oldCFMD.isDense)
+   .isDense(oldCFMD.isDense)
.rebuild();
  }
  
@@@ -880,47 -786,55 +880,52 @@@
  return droppedColumns;
  }
  
+ public Boolean getIsDense()
+ {
+ return isDense;
+ }
+ 
 -public boolean equals(Object obj)
 +@Override
 +public boolean equals(Object o)
  {
 -if (obj == this)
 -{
 +if (this

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-09-03 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: 1908ae3bc5d03a3239daea61c09f69ba19921805
Parents: 0de4135 aae9b91
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Sep 3 12:53:56 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Sep 3 12:53:56 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-28 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.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/69a25cd0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69a25cd0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69a25cd0

Branch: refs/heads/trunk
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Aug 28 16:36:40 2014 +0300

--
 CHANGES.txt  | 1 +
 conf/cassandra-env.sh| 2 +-
 .../apache/cassandra/cql3/statements/AlterTableStatement.java| 4 
 3 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/CHANGES.txt
--
diff --cc CHANGES.txt
index 18c0a96,20874ac..d7a4536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.0.11:
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/conf/cassandra-env.sh
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index be28943,698c8b8..f286f31
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -108,6 -109,10 +108,10 @@@ public class AlterTableStatement extend
  }
  }
  
+ // Cannot re-add a dropped counter column. See #7831.
 -if (meta.getDefaultValidator().isCommutative()  
meta.getDroppedColumns().containsKey(columnName.key))
++if (meta.isCounter()  
meta.getDroppedColumns().containsKey(columnName))
+ throw new InvalidRequestException(String.format(Cannot 
re-add previously dropped counter column %s, columnName));
+ 
  AbstractType? type = validator.getType();
  if (type instanceof CollectionType)
  {

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-26 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.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/cb4bc276
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb4bc276
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb4bc276

Branch: refs/heads/trunk
Commit: cb4bc2764cec95ade336f12e23f52a3c368b9218
Parents: 4dc3a6e 9219361
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 26 19:13:17 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 26 19:13:17 2014 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  5 +++
 .../org/apache/cassandra/cql3/CQLTester.java|  7 +
 .../apache/cassandra/cql3/CreateTableTest.java  | 32 
 4 files changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb4bc276/CHANGES.txt
--
diff --cc CHANGES.txt
index a9ab462,9c6bd61..32c46bf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.0.11:
 +2.1.0
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
 (CASSANDRA-7722)
   * Always send Paxos commit to all replicas (CASSANDRA-7479)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb4bc276/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index aa8bc57,fc8e8c3..7466b56
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -2219,9 -2159,14 +2219,14 @@@ public final class CFMetaDat
  {
  // Non-REGULAR ColumnDefinition are not thrift compatible 
per-se, but it's ok because they hold metadata
  // this is only of use to CQL3, so we will just skip them in 
toThrift.
 -if (def.type == ColumnDefinition.Type.REGULAR  
!def.isThriftCompatible())
 +if (def.kind == ColumnDefinition.Kind.REGULAR  
!def.isThriftCompatible())
  return false;
  }
+ 
+ // The table might also have no REGULAR columns (be PK-only), but 
still be thrift incompatible. See #7832.
 -if (isCQL3OnlyPKComparator(comparator)  !isDense)
++if (isCQL3OnlyPKComparator(comparator.asAbstractType())  !isDense)
+ return false;
+ 
  return true;
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb4bc276/test/unit/org/apache/cassandra/cql3/CQLTester.java
--
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 3dbff1e,000..c412fe3
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -1,627 -1,0 +1,634 @@@
 +/*
 + * 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.cql3;
 +
 +import java.io.File;
 +import java.nio.ByteBuffer;
 +import java.util.*;
 +import java.util.concurrent.CountDownLatch;
 +import java.util.concurrent.ExecutionException;
 +import java.util.concurrent.TimeUnit;
 +import java.util.concurrent.atomic.AtomicInteger;
 +
 +import com.google.common.base.Objects;
 +import com.google.common.collect.ImmutableSet;
 +import org.junit.AfterClass;
 +import org.junit.After;
 +import org.junit.Assert;
 +import org.junit.BeforeClass;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-23 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: baae9b6c1239a89829feaac1a428f4629d0032b9
Parents: 508db1e 618441b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Aug 23 18:26:34 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Aug 23 18:26:34 2014 +0300

--
 src/java/org/apache/cassandra/config/CFMetaData.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/baae9b6c/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 70cd648,eaec9c3..aa8bc57
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -945,11 -855,12 +945,12 @@@ public final class CFMetaDat
  .append(memtableFlushPeriod)
  .append(caching)
  .append(defaultTimeToLive)
 -.append(indexInterval)
 +.append(minIndexInterval)
 +.append(maxIndexInterval)
  .append(speculativeRetry)
 -.append(populateIoCacheOnFlush)
  .append(droppedColumns)
  .append(triggers)
+ .append(isDense)
  .toHashCode();
  }

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-21 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: a0923dbc0461352cc2f735dee8260b68f015063c
Parents: a41d527 e4d5eda
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Aug 21 14:20:49 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Aug 21 14:20:49 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-20 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1.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/39b81967
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b81967
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b81967

Branch: refs/heads/trunk
Commit: 39b81967f18e1210a64fa98a1b84037235a09b9c
Parents: af188ed 76adf0e
Author: Marcus Eriksson marc...@apache.org
Authored: Wed Aug 20 08:25:16 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Wed Aug 20 08:25:16 2014 +0200

--
 CHANGES.txt |  2 ++
 .../compress/CompressedInputStream.java | 17 +--
 .../compress/CompressedInputStreamTest.java | 23 +++-
 3 files changed, 35 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b81967/CHANGES.txt
--
diff --cc CHANGES.txt
index 183d849,c8f7591..873eb78
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,20 +1,39 @@@
 -2.0.10
 +2.1.0
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Throw EOFException if we run out of chunks in compressed datafile
+(CASSANDRA-7664)
 - * Throw InvalidRequestException when queries contain relations on entire
 -   collection columns (CASSANDRA-7506)
   * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
   * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
 - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 +Merged from 1.2:
 + * Validate empty cell names from counter updates (CASSANDRA-7798)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b81967/test/unit/org/apache/cassandra/streaming/compress/CompressedInputStreamTest.java
--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-20 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0

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


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

Branch: refs/heads/trunk
Commit: c8a8bfc1e7e89ea27143660c2d738f7fc2ea1a13
Parents: 39b8196 eeb0d4c
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 20 15:47:37 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 20 15:47:37 2014 +0300

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-20 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/cql3/TypeTest.java


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

Branch: refs/heads/trunk
Commit: d3450570ca89ce358355003ef5476dec3fad3e91
Parents: 45159ae a4e108c
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 20 11:13:44 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 20 11:13:44 2014 -0500

--
 CHANGES.txt |  4 ++-
 .../cassandra/db/marshal/ReversedType.java  |  9 +
 .../org/apache/cassandra/cql3/CQLTester.java|  7 
 .../org/apache/cassandra/cql3/TypeTest.java | 37 +++-
 4 files changed, 55 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3450570/CHANGES.txt
--
diff --cc CHANGES.txt
index ebd74b2,94bdd89..8fac3b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,24 +1,42 @@@
 +2.1.0
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
- Merged from 2.0:
+ 2.0.10
+  * Fix ALTER clustering column type from DateType to TimestampType when
+using DESC clustering order (CASSANRDA-7797)
 - * Stop inheriting liveRatio and liveRatioComputedAt from previous
 -   memtables (CASSANDRA-7796)
   * Throw EOFException if we run out of chunks in compressed datafile
 (CASSANDRA-7664)
 - * Throw InvalidRequestException when queries contain relations on entire
 -   collection columns (CASSANDRA-7506)
   * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
   * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
 - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795)
 +Merged from 1.2:
 + * Validate empty cell names from counter updates (CASSANDRA-7798)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3450570/src/java/org/apache/cassandra/db/marshal/ReversedType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3450570/test/unit/org/apache/cassandra/cql3/CQLTester.java
--
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 442c8b1,000..3dbff1e
mode 100644,00..100644
---

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-19 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0

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


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

Branch: refs/heads/trunk
Commit: 579222e9d5e37dacaeb5f82a58211cfe5b0a3855
Parents: fabdd43 7554eb5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Aug 19 16:19:12 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Aug 19 16:19:12 2014 +0300

--
 CHANGES.txt |  2 +-
 .../db/index/SecondaryIndexManager.java | 28 +---
 2 files changed, 13 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/579222e9/CHANGES.txt
--
diff --cc CHANGES.txt
index 8aafd98,0ac1fb6..ca58708
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,16 +1,33 @@@
 -2.0.10
 +2.1.0
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787)
 - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
   * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
-- * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/579222e9/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index c184097,a54882d..07fd568
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -472,25 -452,21 +472,21 @@@ public class SecondaryIndexManage
  // Update entire row only once per row level index
  SetClass? extends SecondaryIndex cleanedRowLevelIndexes = null;
  
 -for (Column column : indexedColumnsInRow)
 +for (Cell cell : indexedColumnsInRow)
  {
- // TODO: this is probably incorrect, we should pull all indexes
- ColumnDefinition cDef = 
baseCfs.metadata.getColumnDefinition(cell.name());
- SecondaryIndex index = indexesByColumn.get(cDef.name.bytes);
- if (index == null)
- continue;
- 
- if (index instanceof PerRowSecondaryIndex)
- {
- if (cleanedRowLevelIndexes == null)
- cleanedRowLevelIndexes = new HashSet();
- 
- if

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-19 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: 853e7727c3c57b75a9516baccca362b738e4e949
Parents: 579222e 296903b
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 19 11:15:27 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 19 11:15:27 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-18 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java


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

Branch: refs/heads/cassandra-2.1
Commit: e85078519c6dd175856b5cf5783ca177bb136d99
Parents: cb772e5 700e816
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 10:15:32 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 10:15:32 2014 +0200

--
 CHANGES.txt   |  7 +++
 .../cassandra/cql3/statements/BatchStatement.java |  3 +++
 .../cql3/statements/ModificationStatement.java| 18 --
 3 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8507851/CHANGES.txt
--
diff --cc CHANGES.txt
index eeb115f,f489702..78ef5df
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,13 +1,31 @@@
 -2.0.10
++2.1.0
++Merged from 2.0:
+  * Properly reject operations on list index with conditions (CASSANDRA-7499)
+  * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
++
++
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
+  * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8507851/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 88d23ca,cbe3016..90be914
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@@ -124,32 -124,10 +124,35 @@@ public class BatchStatement implements 
  if (timestampSet  statement.isTimestampSet())
  throw new InvalidRequestException(Timestamp must be set 
either on BATCH or individual statements);
  
 -statement.validate(state);
 +if (type == Type.COUNTER  !statement.isCounter())
 +throw new InvalidRequestException(Cannot include non-counter 
statement in a counter batch);
 +
 +if (type == Type.LOGGED  statement.isCounter())
 +throw new InvalidRequestException(Cannot include a counter 
statement in a logged batch);
 +
 +if (statement.isCounter())
 +hasCounters = true;
 +else
 +hasNonCounters = true;
 +}
 +
 +if (hasCounters  hasNonCounters)
 +throw new InvalidRequestException(Counter and non-counter 
mutations cannot exist in the same batch);
  
 -if

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-18 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/CFMetaData.java
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java


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

Branch: refs/heads/trunk
Commit: 1f5401066cc1fca3a56ca79a1b5fba74581c4a64
Parents: e850785 c44526b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 18 12:23:56 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 18 12:23:56 2014 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 42 ++--
 .../cql3/statements/CreateTableStatement.java   |  9 -
 3 files changed, 39 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f540106/CHANGES.txt
--
diff --cc CHANGES.txt
index 78ef5df,6b610d7..f1edef4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,14 +1,32 @@@
 -2.0.10
 +2.1.0
 +Merged from 2.0:
+  * Fix dropping collection when it's the last regular column (CASSANDRA-7744)
   * Properly reject operations on list index with conditions (CASSANDRA-7499)
   * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 +
 +
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
   * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f540106/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 83c1267,296ecce..fa5bda4
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -154,8 -113,8 +154,9 @@@ public final class CFMetaDat
  public static final CFMetaData SchemaColumnFamiliesCf = compile(CREATE 
TABLE  + SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF +  (
  + 
keyspace_name text,
  + 
columnfamily_name text,
 ++ cf_id 
uuid, // post-2.1 UUID cfid
  + type 
text,
+ + 
is_dense boolean,
  + 
comparator text,
  + 
subcomparator text,
  + 
comment text,
@@@ -445,11 -407,16 +446,16 @@@
  public

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-15 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1.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/e9d0214a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9d0214a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9d0214a

Branch: refs/heads/trunk
Commit: e9d0214a16dbb45b39ddb1c3ff7c44ecc23cb8f3
Parents: d7f7eec ad6ba3d
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 15 13:27:47 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 15 13:27:47 2014 -0400

--
 CHANGES.txt |  1 +
 .../cassandra/io/util/RandomAccessReader.java   |  5 +-
 .../io/util/BufferedRandomAccessFileTest.java   | 70 
 3 files changed, 75 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9d0214a/CHANGES.txt
--
diff --cc CHANGES.txt
index 7c54a9e,4306de5..dfe9c47
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,10 +1,21 @@@
 -2.0.10
 +2.1.0-rc6
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
+  * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9d0214a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9d0214a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-15 Thread benedict

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/StreamTransferTask.java
test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java


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

Branch: refs/heads/trunk
Commit: c01df31443c70cdaedd0ff55c0da16c72dbdf019
Parents: d087317 8e42d5f
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat Aug 16 12:17:06 2014 +0700
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat Aug 16 12:17:06 2014 +0700

--
 CHANGES.txt |  5 ++
 .../cassandra/streaming/StreamTransferTask.java | 83 
 .../streaming/StreamTransferTaskTest.java   | 17 +++-
 3 files changed, 67 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c01df314/CHANGES.txt
--
diff --cc CHANGES.txt
index eeb115f,cf4a115..f6d35d3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,13 +1,29 @@@
 +2.1.0-rc6
 + * Fix OOM issue from netty caching over time (CASSANDRA-7743)
 + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477)
 + * Invalidate all caches on table drop (CASSANDRA-7561)
 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
 + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
 + * Add tracing entries about concurrent range requests (CASSANDRA-7599)
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
 +Merged from 2.0:
++===
+ 2.0.10
+  * Fix race condition in StreamTransferTask that could lead to
+infinite loops and premature sstable deletion (CASSANDRA-7704)
+  * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222)
   * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756)
 - * (cqlsh) cqlsh should automatically disable tracing when selecting
 -   from system_traces (CASSANDRA-7641)
 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
 + * Clone token map outside of hot gossip loops (CASSANDRA-7758)
   * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c01df314/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
--
diff --cc src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 48a7d89,629c6bb..6e8c886
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@@ -47,10 -49,10 +49,10 @@@ public class StreamTransferTask extend
  super(session, cfId);
  }
  
- public void addTransferFile(SSTableReader sstable, long estimatedKeys, 
ListPairLong, Long sections, long repairedAt)
 -public synchronized void addTransferFile(SSTableReader sstable, long 
estimatedKeys, ListPairLong, Long sections)
++public synchronized void addTransferFile(SSTableReader sstable, long 
estimatedKeys, ListPairLong, Long sections, long repairedAt)
  {
  assert sstable != null  cfId.equals(sstable.metadata.cfId);
 -OutgoingFileMessage message = new OutgoingFileMessage(sstable, 
sequenceNumber.getAndIncrement(), estimatedKeys, sections);
 +OutgoingFileMessage message = new OutgoingFileMessage(sstable, 
sequenceNumber.getAndIncrement(), estimatedKeys, sections, repairedAt);
  files.put(message.header.sequenceNumber, message);
  totalSize += message.header.size();
  }

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-13 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeCmd.java


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

Branch: refs/heads/trunk
Commit: 0623ea86aa501ad2c33a02da057ade091d14457a
Parents: f067617 74f3204
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Aug 13 11:34:26 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Aug 13 11:34:26 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: 3e2e4dd907c934d4b15b17ed49ea0d47ca8fbc7b
Parents: a1348aa 9be6576
Author: Jake Luciani j...@apache.org
Authored: Tue Aug 12 09:56:09 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Aug 12 09:56:09 2014 -0400

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/trunk
Commit: bb55843c1c1d23cf169af2abc5ea4647a84a943f
Parents: c7834d3 6caf426
Author: Jake Luciani j...@apache.org
Authored: Tue Aug 12 10:26:06 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Tue Aug 12 10:26:06 2014 -0400

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

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


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

Branch: refs/heads/trunk
Commit: fbe7b909be2ab187d73bcf3d4b6dfcbba7c3d629
Parents: 0471f40 f7e8803
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 12 18:20:14 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 12 18:20:14 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe7b909/CHANGES.txt
--
diff --cc CHANGES.txt
index 7e04bcb,d42c100..2970632
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -2.0.10
 +2.1.0-rc6
 + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 + * Remove netty buffer ref-counting (CASSANDRA-7735)
 + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 + * Include stress yaml example in release and deb (CASSANDRA-7717)
 + * workaround for netty issue causing corrupted data off the wire 
(CASSANDRA-7695)
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
+  * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
   * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
   * Give CRR a default input_cql Statement (CASSANDRA-7226)
   * Better error message when adding a collection with the same name

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe7b909/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index d1511ba,3162fd1..b4ba643
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -925,9 -829,11 +925,12 @@@ public class DatabaseDescripto
  return getTruncateRpcTimeout();
  case READ_REPAIR:
  case MUTATION:
+ case PAXOS_COMMIT:
+ case PAXOS_PREPARE:
+ case PAXOS_PROPOSE:
 -case COUNTER_MUTATION:
  return getWriteRpcTimeout();
 +case COUNTER_MUTATION:
 +return getCounterWriteRpcTimeout();
  default:
  return getRpcTimeout();
  }

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-12 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
pylib/cqlshlib/test/test_cqlsh_output.py
pylib/cqlshlib/test/test_keyspace_init.cql


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

Branch: refs/heads/trunk
Commit: 2db047b09fcc952c0768fbe634539e55a971b6cc
Parents: 59a8e1c 0edd5ee
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 12 15:14:14 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 12 15:14:14 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-11 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.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/4c387e46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c387e46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c387e46

Branch: refs/heads/trunk
Commit: 4c387e46dd8a1da699487c6a5432643eb0972bd1
Parents: ef08f94 2692c29
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 11 17:32:03 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 11 17:32:03 2014 +0300

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-07 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/SSTableExport.java


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

Branch: refs/heads/trunk
Commit: eea547c62097ef645a4683026169d770216019e5
Parents: e0c4c6e f3f69cb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 7 16:18:24 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 7 16:18:24 2014 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/tools/SSTableExport.java   | 131 +++
 2 files changed, 74 insertions(+), 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eea547c6/CHANGES.txt
--
diff --cc CHANGES.txt
index ecc4da2,4392159..1043016
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,70 -1,17 +1,71 @@@
 -2.0.10
 +2.1.0-final
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
+  * Minor leak in sstable2jon (CASSANDRA-7709)
   * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
 - * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 - * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 - * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
   * Update java driver (for hadoop) (CASSANDRA-7618)
 - * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
 +
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-05 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
build.xml


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

Branch: refs/heads/trunk
Commit: 95d289b8494264475eaa05b633a7a12a74c0f411
Parents: 1c3de27 5151fd5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Aug 5 10:21:48 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Aug 5 10:21:48 2014 +0200

--
 CHANGES.txt  | 1 +
 build.xml| 2 +-
 .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java| 8 
 3 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95d289b8/CHANGES.txt
--
diff --cc CHANGES.txt
index b0b5166,20330f8..a8c9ca4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,12 +1,65 @@@
 -2.0.10
 +2.1.0-final
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 +Merged from 2.0:
+  * Update java driver (for hadoop) (CASSANDRA-7618)
 - * Fix truncate to always flush (CASSANDRA-7511)
 + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
 +
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-04 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/trunk
Commit: 5f4cd8a5d4d17675ac6d720928faa8f7c0740a8a
Parents: 7f6632f 21db1a0
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Aug 4 21:21:05 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Aug 4 21:21:48 2014 +0300

--
 CHANGES.txt | 55 ---
 1 file changed, 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f4cd8a5/CHANGES.txt
--
diff --cc CHANGES.txt
index 5033722,3471bcc..b87dc0b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -112,101 -24,26 +112,46 @@@ Merged from 2.0
   * Backport CASSANDRA-6747 (CASSANDRA-7560)
   * Track max/min timestamps for range tombstones (CASSANDRA-7647)
   * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 -Merged from 1.2:
 - * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
 - * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 - * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 - * Set correct stream ID on responses when non-Exception Throwables
 -   are thrown while handling native protocol messages (CASSANDRA-7470)
  
  
--2.0.9
-- * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
-- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
-- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
-- * Fix native protocol CAS batches (CASSANDRA-7337)
-  * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
-  * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
-  * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
-  * Don't fail streams on failure detector downs (CASSANDRA-3569)
-  * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
-  * Reduce run time for CQL tests (CASSANDRA-7327)
-  * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
-  * RefCount native frames from netty (CASSANDRA-7245)
-  * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
-  * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
-  * Fix schema change response in native protocol v3 (CASSANDRA-7413)
- Merged from 2.0:
-  * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
-- * Add per-CF range read request latency metrics (CASSANDRA-7338)
-- * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
-  * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
-  * Fix infinite loop on exception while streaming (CASSANDRA-7330)
-  * Account for range tombstones in min/max column names (CASSANDRA-7235)
-  * Improve sub range repair validation (CASSANDRA-7317)
-  * Accept subtypes for function results, type casts (CASSANDRA-6766)
-  * Support DISTINCT for static columns and fix behaviour when DISTINC is
-not use (CASSANDRA-7305).
-  * Refuse range queries with strict bounds on compact tables since they
-are broken (CASSANDRA-7059)
- Merged from 1.2:
-  * Expose global ColumnFamily metrics (CASSANDRA-7273)
- ||| merged common ancestors
- 1.2.17
- ===
- 
- 1.2.17
-  cassandra-1.2
-  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
-  * Expose global ColumnFamily metrics (CASSANDRA-7273)
-  * Handle possible integer overflow in FastByteArrayOutputStream 
(CASSANDRA-7373)
-  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
-  * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
-  * reduce failure detector initial value to 2s (CASSANDRA-7307)
-  * Fix problem truncating on a node that was previously in a dead state 
(CASSANDRA-7318)
-  * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
-  * Track metrics at a keyspace level (CASSANDRA-6539)
-  * Add replace_address_first_boot flag to only replace if not bootstrapped
-(CASSANDRA-7356)
-  * Enable keepalive for native protocol (CASSANDRA-7380)
-  * Check internal addresses for seeds (CASSANDRA-6523)
-  * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)
-  * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
-  * Fix RangeTombstone copy bug (CASSANDRA-7371)
- 
- 
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-08-01 Thread jake

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/DataTracker.java
test/unit/org/apache/cassandra/db/CommitLogTest.java


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

Branch: refs/heads/trunk
Commit: 18ce8c72a355949ffd8cdc8c083f3edf85c449d1
Parents: 1921b98 60eab4e
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 1 11:16:57 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 1 11:16:57 2014 -0400

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 +++
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 +++---
 test/conf/cassandra.yaml|  1 +
 .../org/apache/cassandra/db/CommitLogTest.java  | 32 
 5 files changed, 44 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce8c72/CHANGES.txt
--
diff --cc CHANGES.txt
index fcd,33bab82..7823f87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,11 +1,49 @@@
 -2.0.10
 - * Fix truncate to always flush (CASSANDRA-7511)
 +2.1.0-final
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 +Merged from 2.0:
++ * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ce8c72/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-31 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1.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/ef099c31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef099c31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef099c31

Branch: refs/heads/trunk
Commit: ef099c317a59ac3161713d1cf6f2b113129bba09
Parents: cde5666 1a0aaf0
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 31 08:00:03 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 31 08:00:03 2014 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cache/AutoSavingCache.java | 23 
 2 files changed, 15 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef099c31/CHANGES.txt
--
diff --cc CHANGES.txt
index 3b2f35c,1fcb556..0ce0eaa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,10 +1,45 @@@
 -2.0.10
 +2.1.0-final
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 +Merged from 2.0:
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
++ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef099c31/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-31 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
test/unit/org/apache/cassandra/service/MoveTest.java


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

Branch: refs/heads/trunk
Commit: 85bcd2d744ceb3f0d0cef8de6c165c5c2f53b602
Parents: 8e4415b 1879d99
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 31 15:42:02 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 31 15:42:02 2014 -0500

--
 test/unit/org/apache/cassandra/service/MoveTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85bcd2d7/test/unit/org/apache/cassandra/service/MoveTest.java
--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-29 Thread aleksey

Merge branch 'cassandra-2.0' into cassandra-2.1.0

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


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

Branch: refs/heads/trunk
Commit: 65a4f5dc728f2785256ab1a94e9428a662eff145
Parents: ee62ae1 a5cc16d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jul 29 19:27:33 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jul 29 19:27:33 2014 +0300

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-24 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.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/72676dd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72676dd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72676dd4

Branch: refs/heads/trunk
Commit: 72676dd48dab90ac3d63fc677efcbb706f1913ee
Parents: dceed39 67ce78f
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 24 17:40:55 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 24 17:40:55 2014 -0500

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/72676dd4/CHANGES.txt
--
diff --cc CHANGES.txt
index 5619fda,7819ccb..772e1f6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,7 +1,30 @@@
 -2.0.10
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 +2.1.0-final
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 +Merged from 2.0:
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
++ * Always merge ranges owned by a single node (CASSANDRA-6930)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
 +   (CASSANDRA-7551)
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
 + * Add missing table name to DROP INDEX responses and notifications 
(CASSANDRA-7539)
 + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
 + * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
 + * Support conditional updates, tuple type, and the v3 protocol in cqlsh 
(CASSANDRA-7509)
 + * Handle queries on multiple secondary index types (CASSANDRA-7525)
 + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
 + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
 +Merged from 2.0:
   * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
   * Fix range merging when DES scores are zero (CASSANDRA-7535)
   * Warn when SSL certificates have expired (CASSANDRA-7528)

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-24 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.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/17b26a2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17b26a2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17b26a2a

Branch: refs/heads/cassandra-2.1
Commit: 17b26a2ae783dab18a7947f6eaf1b7e91dec94ab
Parents: 72676dd 59c7e25
Author: Tyler Hobbs ty...@datastax.com
Authored: Thu Jul 24 17:59:23 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Thu Jul 24 17:59:23 2014 -0500

--

--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-22 Thread tylerhobbs

Merge branch 'cassandra-2.0' into cassandra-2.1.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/e740c297
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e740c297
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e740c297

Branch: refs/heads/trunk
Commit: e740c297951603947f6aa293a8ffa4c372ed3aef
Parents: df7bd7f 9906a4e
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Jul 22 12:04:34 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Jul 22 12:04:34 2014 -0500

--
 doc/cql/CQL.textile | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e740c297/doc/cql/CQL.textile
--

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-09 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


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

Branch: refs/heads/trunk
Commit: ce46d6619b05465a89ffaaf8fb3e4c2c1f1e547b
Parents: eb4032e 6893130
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Jul 9 18:22:04 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Jul 9 18:22:04 2014 +0200

--
 CHANGES.txt |   2 +
 .../cql3/statements/SelectStatement.java|  17 +-
 .../cassandra/cql3/StaticColumnsQueryTest.java  | 263 +++
 3 files changed, 277 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce46d661/CHANGES.txt
--
diff --cc CHANGES.txt
index 7fff2d4,3553e4a..e459638
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,4 +1,27 @@@
 -2.0.10
 +2.1.0-final
 + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
 + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
++Merged from 2.0:
++ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 +
 +
 +2.1.0-rc3
 + * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
 + * Introduce CQL support for stress tool (CASSANDRA-6146)
 + * Fix ClassCastException processing expired messages (CASSANDRA-7496)
 + * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
 + * Remove left-over populate_io_cache_on_flush and replicate_on_write
 +   uses (CASSANDRA-7493)
 + * (Windows) handle spaces in path names (CASSANDRA-7451)
 + * Ensure writes have completed after dropping a table, before recycling
 +   commit log segments (CASSANDRA-7437)
 + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
 + * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502)
 + * Properly reject unknown UDT field (CASSANDRA-7484)
 +Merged from 2.0:
 + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 + * Support DISTINCT for static columns and fix behaviour when DISTINC is
 +   not use (CASSANDRA-7305).
   * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
   * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
   * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce46d661/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index c9572c2,523302f..e4ef0a8
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -460,13 -469,20 +460,20 @@@ public class SelectStatement implement
  if (startBounds.size() == 1)
  {
  ColumnSlice slice = new ColumnSlice(startBounds.get(0), 
endBounds.get(0));
 -if (slice.isAlwaysEmpty(cfDef.cfm.comparator, isReversed))
 +if (slice.isAlwaysEmpty(cfm.comparator, isReversed))
  return staticSlice == null ? null : 
sliceFilter(staticSlice, limit, toGroup);
  
- return staticSlice == null
-  ? sliceFilter(slice, limit, toGroup)
-  : (slice.includes(cfm.comparator, staticSlice.finish) ? 
sliceFilter(new ColumnSlice(staticSlice.start, slice.finish), limit, toGroup)
-: 
sliceFilter(new ColumnSlice[]{ staticSlice, slice }, limit, toGroup));
+ if (staticSlice == null)
+ return sliceFilter(slice, limit, toGroup);
+ 
+ if (isReversed)
 -return 
slice.includes(cfDef.cfm.comparator.reverseComparator, staticSlice.start)
++return slice.includes(cfm.comparator.reverseComparator(), 
staticSlice.start)
+ ? sliceFilter(new ColumnSlice(slice.start, 
staticSlice.finish), limit, toGroup)
+ : sliceFilter(new ColumnSlice[]{ slice, 
staticSlice }, limit, toGroup);
+ else
 -return slice.includes(cfDef.cfm.comparator, 
staticSlice.finish)
++return slice.includes(cfm.comparator, staticSlice.finish)
+ ? sliceFilter(new ColumnSlice(staticSlice.start, 
slice.finish),

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-07-03 Thread marcuse

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
CHANGES.txt
NEWS.txt
src/java/org/apache/cassandra/db/compaction/LeveledManifest.java


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

Branch: refs/heads/trunk
Commit: 8c4ffbe6577f3862ee0123199893097154431448
Parents: ea38ddc f39cb07
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Jul 3 14:29:31 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Jul 3 14:29:31 2014 +0200

--
 CHANGES.txt | 1 +
 NEWS.txt| 9 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 +
 .../org/apache/cassandra/db/compaction/LeveledManifest.java | 5 -
 4 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c4ffbe6/CHANGES.txt
--
diff --cc CHANGES.txt
index 22c4123,94bea7b..75a1786
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,37 -7,31 +15,38 @@@ Merged from 2.0
   * Make sure high level sstables get compacted (CASSANDRA-7414)
   * Fix AssertionError when using empty clustering columns and static columns
 (CASSANDRA-7455)
 - * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+  * Add option to disable STCS in L0 (CASSANDRA-6621)
 -Merged from 1.2:
 + * Upgrade to snappy-java 1.0.5.2 (CASSANDRA-7476)
  
  
 -2.0.9
 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8c4ffbe6/NEWS.txt
--
diff --cc NEWS.txt
index 2cbd963,ea085ae..c35bc11
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,64 -13,15 +13,73 @@@

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

2014-06-30 Thread slebresne

Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java


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

Branch: refs/heads/trunk
Commit: 0bbfabb5d6106a8cc831c6d63f630825ef9ec23a
Parents: 4cc4acb a9c71e4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jun 30 16:47:29 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jun 30 16:47:29 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bbfabb5/CHANGES.txt
--
diff --cc CHANGES.txt
index c2e5a00,094f2a4..46e7475
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,37 -4,31 +9,39 @@@ Merged from 2.0
 operations to incorrect become full QUORUM (CASSANDRA-7345)
   * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
   * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
 + * Commit disk failure policy (CASSANDRA-7429)
   * Make sure high level sstables get compacted (CASSANDRA-7414)
+  * Fix AssertionError when using empty clustering columns and static columns
+(CASSANDRA-7455)
  
 -
 -2.0.9
 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
 - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 +2.1.0-rc2
 + * Fix heap size calculation for CompoundSparseCellName and 
 +   CompoundSparseCellName.WithCollection (CASSANDRA-7421)
 + * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
 + * Modify reconcile logic to always pick a tombstone over a counter cell
 +   (CASSANDRA-7346)
 + * Avoid incremental compaction on Windows (CASSANDRA-7365)
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 + * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
 + * Fix schema change response in native protocol v3 (CASSANDRA-7413)
 +Merged from 2.0:
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
   * Account for range tombstones in min/max column names (CASSANDRA-7235)
   * Improve sub range repair validation (CASSANDRA-7317)
   * Accept subtypes for function results, type casts (CASSANDRA-6766)

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0

34 matches

Site Navigation

Mail list logo

Footer information