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

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

2018-12-30 Thread jzhuang

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7b1454f3e139dd8a6b42145af314b730f6c68ed0
Parents: e2ee204 7bb2b7a
Author: Jay Zhuang 
Authored: Sun Dec 30 22:27:58 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 22:28:20 2018 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1454f3/CHANGES.txt
--
diff --cc CHANGES.txt
index d29cdc1,398a70e..64e989b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,15 +1,72 @@@
 -2.2.14
 +3.0.18
 + * Streaming needs to synchronise access to LifecycleTransaction 
(CASSANDRA-14554)
 + * Fix cassandra-stress write hang with default options (CASSANDRA-14616)
 + * Differentiate between slices and RTs when decoding legacy bounds 
(CASSANDRA-14919)
 + * CommitLogReplayer.handleReplayError should print stack traces 
(CASSANDRA-14589)
 + * Netty epoll IOExceptions caused by unclean client disconnects being logged 
at INFO (CASSANDRA-14909)
 + * Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty 
(CASSANDRA-14588)
 + * RangeTombstoneList doesn't properly clean up mergeable or superseded rts 
in some cases (CASSANDRA-14894)
 + * Fix handling of collection tombstones for dropped columns from legacy 
sstables (CASSANDRA-14912)
 + * Throw exception if Columns serialized subset encode more columns than 
possible (CASSANDRA-14591)
 + * Drop/add column name with different Kind can result in corruption 
(CASSANDRA-14843)
 + * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 
(CASSANDRA-14873)
 + * Move TWCS message 'No compaction necessary for bucket size' to Trace level 
(CASSANDRA-14884)
 + * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
 + * Dropped columns can cause reverse sstable iteration to return prematurely 
(CASSANDRA-14838)
 + * Legacy sstables with  multi block range tombstones create invalid bound 
sequences (CASSANDRA-14823)
 + * Expand range tombstone validation checks to multiple interim request 
stages (CASSANDRA-14824)
 + * Reverse order reads can return incomplete results (CASSANDRA-14803)
 + * Avoid calling iter.next() in a loop when notifying indexers about range 
tombstones (CASSANDRA-14794)
 + * Fix purging semi-expired RT boundaries in reversed iterators 
(CASSANDRA-14672)
 + * DESC order reads can fail to return the last Unfiltered in the partition 
(CASSANDRA-14766)
 + * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} 
messages (CASSANDRA-14568)
 + * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Handle failures in parallelAllSSTableOperation 
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
 + * Improve TokenMetaData cache populating performance avoid long locking 
(CASSANDRA-14660)
 + * Backport: Flush netty client messages immediately (not by default) 
(CASSANDRA-13651)
 + * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
 + * sstableloader should use discovered broadcast address to connect 
intra-cluster (CASSANDRA-14522)
 + * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
 + Merged from 2.2:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * MigrationManager attempts to pull schema from different major version 
nodes (CASSANDRA-14928)
 - * Don't skip entire sstables when reading backwards with mixed clustering 
column order
 -   (CASSANDRA-14910)
 - * Cannot perform slice reads in reverse direction against tables with 
clustering columns
 -   in mixed order (CASSANDRA-14899)
   * Fix incorrect cqlsh results when selecting same columns multiple times 
(CASSANDRA-13262)
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error

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

2018-12-30 Thread jzhuang

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: e2ee204580a0ee87b36e1df6aa2717830dfb33d0
Parents: 23d722e a6196a3
Author: Jay Zhuang 
Authored: Sun Dec 30 21:41:28 2018 -0800
Committer: Jay Zhuang 
Committed: Sun Dec 30 21:49:33 2018 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 47 
 .../cassandra/service/StorageService.java   | 78 
 .../cassandra/service/StorageServiceMBean.java  |  7 ++
 .../org/apache/cassandra/tools/NodeProbe.java   |  5 ++
 .../apache/cassandra/tools/nodetool/Join.java   |  1 +
 6 files changed, 126 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/CHANGES.txt
--
diff --cc CHANGES.txt
index 8fd0200,16695c8..d29cdc1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -33,39 -8,8 +33,40 @@@
   * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
+  * Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2ee2045/src/java/org/apache/cassandra/service/CassandraDaemon.java
--
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 177f8e3,e250050..6869d2c
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -609,26 -597,6 +633,49 @@@ public class CassandraDaemo
  }
  }
  
 +public void startNativeTransport()
 +{
++// We only start transports if bootstrap has completed and we're not 
in survey mode, OR if we are in
++// survey mode and

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

2017-02-10 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 9fca3cb1503e6d811f685088f881d04b09679212
Parents: e885886 7680aeb
Author: Benjamin Lerer 
Authored: Fri Feb 10 10:40:24 2017 +0100
Committer: Benjamin Lerer 
Committed: Fri Feb 10 10:40:24 2017 +0100

--
 CHANGES.txt|  2 ++
 .../db/commitlog/MemoryMappedSegment.java  | 17 ++---
 2 files changed, 4 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fca3cb1/CHANGES.txt
--
diff --cc CHANGES.txt
index ae7b069,4295dd8..2345a4e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,7 +1,46 @@@
 +3.0.11
 + * Reloading logback.xml does not work (CASSANDRA-13173)
 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 
(CASSANDRA-13109)
 + * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
 + * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
 + * Abort or retry on failed hints delivery (CASSANDRA-13124)
 + * Fix handling of partition with partition-level deletion plus
 +   live rows in sstabledump (CASSANDRA-13177)
 + * Provide user workaround when system_schema.columns does not contain entries
 +   for a table that's in system_schema.tables (CASSANDRA-13180)
 + * Dump threads when unit tests time out (CASSANDRA-13117)
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+ 2.2.9
+  * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
   * Fix speculative retry bugs (CASSANDRA-13009)
 - * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
 + * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
   * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
   * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9fca3cb1/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
--

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

2017-01-27 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 714edbce9a38c70a0f031a73d3c1a20f7f2b4bb3
Parents: e1da99a 70e33d9
Author: Benjamin Lerer 
Authored: Fri Jan 27 15:26:18 2017 +0100
Committer: Benjamin Lerer 
Committed: Fri Jan 27 15:29:40 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/ColumnCondition.java  |  62 ++-
 .../operations/InsertUpdateIfConditionTest.java | 162 ++-
 3 files changed, 215 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/714edbce/CHANGES.txt
--
diff --cc CHANGES.txt
index 3796a8d,c5e5335..547fc07
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,5 +1,33 @@@
 -2.2.9
 +3.0.11
 + * Better error when modifying function permissions without explicit keyspace 
(CASSANDRA-12925)
 + * Indexer is not correctly invoked when building indexes over sstables 
(CASSANDRA-13075)
 + * Read repair is not blocking repair to finish in foreground repair 
(CASSANDRA-13115)
 + * Stress daemon help is incorrect (CASSANDRA-12563)
 + * Remove ALTER TYPE support (CASSANDRA-12443)
 + * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Replace empty strings with null values if they cannot be converted 
(CASSANDRA-12794)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
 + * Add parent repair session id to anticompaction log message 
(CASSANDRA-12186)
 + * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
 + * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
 + * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
 + * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)
 + * Nodetool compactionstats fails with NullPointerException (CASSANDRA-13021)
 + * Thread local pools never cleaned up (CASSANDRA-13033)
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
 + * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
 + * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
   * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
   * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/714edbce/src/java/org/apache/cassandra/cql3/ColumnCondition.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnCondition.java
index b13e534,3412e71..60e67f3
--- a/src/java/org/apache/cassandra/cql3/ColumnCondition.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnCondition.java
@@@ -23,8 -23,16 +23,9 @@@ import java.util.*
  import com.google.common.collect.Iterators;
  
  import org.apache.cassandra.config.ColumnDefinition;
+ import org.apache.cassandra.cql3.Term.Terminal;
  import org.apache.cassandra.cql3.functions.Function;
 -import org.apache.cassandra.db.Cell;
 -import org.apache.cassandra.db.ColumnFamily;
 -import org.apache.cassandra.db.composites.CellName;
 -import org.apache.cassandra.db.composites.CellNameType;
 -import org.apache.cassandra.db.composites.Composite;
 -import org.apache.cassandra.db.filter.ColumnSlice;
 +import org.apache.cassandra.db.rows.*;
  import org.apache.cassandra.db.marshal.*;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.transport.Server;

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

2016-12-12 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: da94781a2c20394c1fc4f3d488a694ddad45228f
Parents: 6bd402d 9a5aef0
Author: Benjamin Lerer 
Authored: Mon Dec 12 13:26:35 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Dec 12 13:46:24 2016 +0100

--
 CHANGES.txt |   1 +
 .../operations/InsertUpdateIfConditionTest.java | 126 +++
 2 files changed, 76 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/da94781a/CHANGES.txt
--
diff --cc CHANGES.txt
index 266849a,134a37d..bbd47c1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -2.2.9
 +3.0.11
 + * Set RPC_READY to false when draining or if a node is marked as shutdown 
(CASSANDRA-12781)
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Test bind parameters and unset parameters in InsertUpdateIfConditionTest 
(CASSANDRA-12980)
   * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)
   * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/da94781a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
index ec81cf2,4a209e6..f1dc9a2
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java
@@@ -23,11 -23,8 +23,10 @@@ import org.junit.Test
  import org.apache.cassandra.cql3.CQLTester;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.exceptions.SyntaxException;
 +import org.apache.cassandra.schema.SchemaKeyspace;
  
 +import static java.lang.String.format;
  import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertThat;
  import static org.junit.Assert.assertTrue;
  
  public class InsertUpdateIfConditionTest extends CQLTester
@@@ -111,13 -111,8 +113,13 @@@
  // Shouldn't apply
  assertRows(execute("UPDATE %s SET v1 = 3, v2 = 'bar' WHERE k = 0 IF 
EXISTS"), row(false));
  
- // Shouldn't apply
+ // Should apply
 +assertEmpty(execute("SELECT * FROM %s WHERE k = 0"));
- assertRows(execute("DELETE FROM %s WHERE k = 0 IF v1 IN (null)"), 
row(true));
+ assertRows(execute("DELETE FROM %s WHERE k = 0 IF v1 IN (?)", 
(Integer) null), row(true));
 +
 +createTable(" CREATE TABLE %s (k int, c int, v1 text, PRIMARY KEY(k, 
c))");
 +assertInvalidMessage("IN on the clustering key columns is not 
supported with conditional updates",
 + "UPDATE %s SET v1 = 'A' WHERE k = 0 AND c IN (1, 
2) IF EXISTS");
  }
  
  /**
@@@ -194,58 -191,33 +209,61 @@@
  assertRows(execute("DELETE FROM %s WHERE k='k' AND i=0 IF EXISTS"), 
row(false));
  
  // CASSANDRA-6430
 -assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY 
columns with equality relations in order to use IF conditions, but column 'i' 
is not restricted",
 +assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY 
columns with equality relations in order to delete non static columns",
   "DELETE FROM %s WHERE k = 'k' IF EXISTS");
 -assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY 
columns with equality relations in order to use IF conditions, but column 'i' 
is not restricted",
 +assertInvalidMessage("DELETE statements must restrict all PRIMARY KEY 
columns with

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

2016-12-09 Thread paulo

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 752f5d566a5fd01518071943beda9945e0703cef
Parents: d9b06e8 dd41526
Author: Paulo Motta 
Authored: Thu Dec 8 17:24:22 2016 -0200
Committer: Paulo Motta 
Committed: Thu Dec 8 17:24:22 2016 -0200

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/config/Config.java   | 6 +-
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java   | 5 +
 .../org/apache/cassandra/net/OutboundTcpConnectionPool.java| 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/CHANGES.txt
--
diff --cc CHANGES.txt
index 21cf5be,6b2a9c0..1da48bd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.2.9
 +3.0.11
 + * CQL often queries static columns unnecessarily (CASSANDRA-12768)
 + * Make sure sstables only get committed when it's safe to discard commit log 
records (CASSANDRA-12956)
 + * Reject default_time_to_live option when creating or altering MVs 
(CASSANDRA-12868)
 + * Nodetool should use a more sane max heap size (CASSANDRA-12739)
 + * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
 + * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
 + * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
 + * Reenable HeapPool (CASSANDRA-12900)
 +Merged from 2.2:
+  * Do not specify local address on outgoing connection when 
listen_on_broadcast_address is set (CASSANDRA-12673)
   * Use saved tokens when setting local tokens on StorageService.joinRing 
(CASSANDRA-12935)
   * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
   * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/Config.java
--

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

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

2016-11-08 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 472f61613e4bf2a2f492f49300e6e3d06c5ad728
Parents: 92594d8 3de6e9d
Author: Benjamin Lerer 
Authored: Tue Nov 8 18:01:55 2016 +0100
Committer: Benjamin Lerer 
Committed: Tue Nov 8 18:01:55 2016 +0100

--
 CHANGES.txt  | 1 +
 test/unit/org/apache/cassandra/Util.java | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/CHANGES.txt
--
diff --cc CHANGES.txt
index d3043b8,b550885..cc5b003
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -2.2.9
 +3.0.10
 + * Batch with multiple conditional updates for the same partition causes 
AssertionError (CASSANDRA-12867)
 + * Make AbstractReplicationStrategy extendable from outside its package 
(CASSANDRA-12788)
 + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
 + * Don't tell users to turn off consistent rangemovements during rebuild. 
(CASSANDRA-12296)
 + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
 + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
 + * Fix ViewTest.testCompaction (CASSANDRA-12789)
 + * Improve avg aggregate functions (CASSANDRA-12417)
 + * Preserve quoted reserved keyword column names in MV creation 
(CASSANDRA-11803)
 + * nodetool stopdaemon errors out (CASSANDRA-12646)
 + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268)
 + * mx4j does not work in 3.0.8 (CASSANDRA-12274)
 + * Abort cqlsh copy-from in case of no answer after prolonged period of time 
(CASSANDRA-12740)
 + * Avoid sstable corrupt exception due to dropped static column 
(CASSANDRA-12582)
 + * Make stress use client mode to avoid checking commit log size on startup 
(CASSANDRA-12478)
 + * Fix exceptions with new vnode allocation (CASSANDRA-12715)
 + * Unify drain and shutdown processes (CASSANDRA-12509)
 + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
 + * Fix failure in LogTransactionTest (CASSANDRA-12632)
 + * Fix potentially incomplete non-frozen UDT values when querying with the
 +   full primary key specified (CASSANDRA-12605)
 + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() 
(CASSANDRA-11670)
 + * Establish consistent distinction between non-existing partition and NULL 
value for LWTs on static columns (CASSANDRA-12060)
 + * Extend ColumnIdentifier.internedInstances key to include the type that 
generated the byte buffer (CASSANDRA-12516)
 + * Backport CASSANDRA-10756 (race condition in NativeTransportService 
shutdown) (CASSANDRA-12472)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 + * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
 + * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
 +Merged from 2.2:
+  * Fix Util.spinAssertEquals (CASSANDRA-12283)
   * Fix potential NPE for compactionstats (CASSANDRA-12462)
   * Prepare legacy authenticate statement if credentials table initialised 
after node startup (CASSANDRA-12813)
   * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 
(CASSANDRA-12754)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/472f6161/test/unit/org/apache/cassandra/Util.java
--
diff --cc test/unit/org/apache/cassandra/Util.java
index d04ca9b,f6b4771..e8b42bc
--- a/test/unit/org/apache/cassandra/Util.java
+++ b/test/unit/org/apache/cassandra/Util.java
@@@ -28,29 -27,21 +28,31 @@@ import java.nio.ByteBuffer
  import java.util.*;
  import java.util.concurrent.Callable;
  import java.util.concurrent.Future;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.function.Supplier;
  
 -import com.google.common.base.Supplier;
 +import com.google.common.base.Function;
 +import com.google.common.base.Preconditions;
 +import com.google.common.collect.Iterators;
 +import org.apache.commons.lang3.StringUtils;
 +
 +import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.config.DatabaseDescriptor;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
+ 
  import org.apache.cassandra.db.*;
 -import

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

2016-09-27 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b7fc5dc1c74b20fc1250c738631487db98b72e50
Parents: b7da003 6dc595d
Author: Benjamin Lerer 
Authored: Tue Sep 27 14:06:08 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Sep 27 14:08:50 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/marshal/UserType.java   |  6 +--
 .../cassandra/serializers/ListSerializer.java   | 10 -
 .../cassandra/serializers/MapSerializer.java| 10 -
 .../cassandra/serializers/SetSerializer.java| 11 -
 .../cassandra/serializers/UTF8Serializer.java   |  3 ++
 .../validation/entities/CollectionsTest.java| 42 
 .../cql3/validation/entities/TupleTypeTest.java | 10 +
 .../cql3/validation/entities/UserTypesTest.java | 11 +
 9 files changed, 98 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7fc5dc1/CHANGES.txt
--
diff --cc CHANGES.txt
index 0524e49,998849e..576dfb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,64 -7,6 +9,65 @@@ Merged from 2.2
   * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
   * Decrement pending range calculator jobs counter in finally block
(CASSANDRA-12554)
 +Merged from 2.1:
++ * Make Collections deserialization more robust (CASSANDRA-12618)
 + * Add system property to set the max number of native transport requests in 
queue (CASSANDRA-11363)
 +
 +
 +3.0.9
 + * Handle composite prefixes with final EOC=0 as in 2.x and refactor 
LegacyLayout.decodeBound (CASSANDRA-12423)
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
 + * select_distinct_with_deletions_test failing on non-vnode environments 
(CASSANDRA-11126)
 + * Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
 + * Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
 + * Add option to state current gc_grace_seconds to tools/bin/sstablemetadata 
(CASSANDRA-12208)
 + * Fix file system race condition that may cause LogAwareFileLister to fail 
to classify files (CASSANDRA-11889)
 + * Fix file handle leaks due to simultaneous compaction/repair and
 +   listing snapshots, calculating snapshot sizes, or making schema
 +   changes (CASSANDRA-11594)
 + * Fix nodetool repair exits with 0 for some errors (CASSANDRA-12508)
 + * Do not shut down BatchlogManager twice during drain (CASSANDRA-12504)
 + * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
 + * Calculate last compacted key on startup (CASSANDRA-6216)
 + * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade

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

2016-08-30 Thread dbrosius

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 4133c74a9cde484ec081d37b9423d0d4eacc333a
Parents: 3483418 ac24b88
Author: Dave Brosius 
Authored: Tue Aug 30 22:37:54 2016 -0400
Committer: Dave Brosius 
Committed: Tue Aug 30 22:37:54 2016 -0400

--
 .../metrics/DecayingEstimatedHistogramReservoir.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

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

2016-08-12 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5fdb90e12b04fa4209993f609206e6920138d851
Parents: 5cef78a 91f7387
Author: Tyler Hobbs 
Authored: Fri Aug 12 18:29:36 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Aug 12 18:29:36 2016 -0500

--
 CHANGES.txt |  1 +
 NEWS.txt|  4 +--
 .../cassandra/config/DatabaseDescriptor.java|  6 ++--
 .../cassandra/locator/Ec2MultiRegionSnitch.java |  6 +++-
 .../cassandra/service/StorageService.java   |  4 +--
 .../org/apache/cassandra/transport/Server.java  |  2 +-
 .../org/apache/cassandra/utils/FBUtilities.java | 20 
 .../apache/cassandra/utils/FBUtilitiesTest.java | 32 
 8 files changed, 67 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/CHANGES.txt
--
diff --cc CHANGES.txt
index cccb62d,394598a..7ba8370
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,5 +1,41 @@@
 -2.2.8
 +3.0.9
 + * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Only set broadcast_rpc_address on Ec2MultiRegionSnitch if it's not set 
(CASSANDRA-11357)
   * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
   * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
   * Add decay to histograms and timers used for metrics (CASSANDRA-11752)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fdb90e1/NEWS.txt
--
diff --cc NEWS.txt
index 56dd6ea,f0712eb..6b8dfd3
---

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

2016-08-12 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: c85749e2bc5c65a03b00994565cd0b6b1a642e65
Parents: 2a828af e86d531
Author: Benjamin Lerer 
Authored: Fri Aug 12 15:34:01 2016 +0200
Committer: Benjamin Lerer 
Committed: Fri Aug 12 15:37:13 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/service/StorageProxy.java  | 49 +---
 2 files changed, 34 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c85749e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 3ce9f9e,ddc6720..959b967
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,5 +1,40 @@@
 -2.2.8
 +3.0.9
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Update StorageProxy range metrics for timeouts, failures and unavailables 
(CASSANDRA-9507)
   * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
   * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
   * Fix hanging stream session (CASSANDRA-10992)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c85749e2/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 483da67,7b7979d..8a151f2
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -1955,201 -1716,267 +1955,218 @@@ public class StorageProxy implements St
  }
  }
  
 -public static List getRangeSlice(AbstractRangeCommand command, 
ConsistencyLevel consistency_level)
 -throws UnavailableException, ReadFailureException, ReadTimeoutException
 +

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

2016-08-11 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 2a828afdbfc7410b288c1681506dcbeecb9df3c2
Parents: 19245e5 5b38d3a
Author: Tyler Hobbs 
Authored: Thu Aug 11 13:46:47 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu Aug 11 13:46:47 2016 -0500

--
 CHANGES.txt | 1 +
 build.xml   | 4 
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a828afd/CHANGES.txt
--
diff --cc CHANGES.txt
index 0a1d406,14bed81..3ce9f9e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,8 +1,42 @@@
 -2.2.8
 +3.0.9
 + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 + * Backport CASSANDRA-12002 (CASSANDRA-12177)
 + * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 + * Fix potential bad messaging service message for paged range reads
 +   within mixed-version 3.x clusters (CASSANDRA-12249)
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
   * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
   * Fix hanging stream session (CASSANDRA-10992)
 - * Add byteman support for testing (CASSANDRA-12377)
   * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
   * Restore JVM metric export for metric reporters (CASSANDRA-12312)
   * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)

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

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

2016-08-05 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 2d73f3bc47482b3cb838e5a6833ea1b21dd38e9e
Parents: 1cce9eb dc8a017
Author: Tyler Hobbs 
Authored: Fri Aug 5 16:34:04 2016 -0500
Committer: Tyler Hobbs 
Committed: Fri Aug 5 16:34:04 2016 -0500

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/marshal/ByteType.java   | 19 ++---
 .../apache/cassandra/db/marshal/ShortType.java  | 19 ++---
 .../cql3/validation/entities/JsonTest.java  | 76 
 4 files changed, 85 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d73f3bc/CHANGES.txt
--
diff --cc CHANGES.txt
index c051662,5ac79cf..78bd32d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,8 +1,37 @@@
 -2.2.8
 +3.0.9
 + * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
 + * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
 + * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)
 + * Fix upgrade of super columns on thrift (CASSANDRA-12335)
 + * Fixed flacky BlacklistingCompactionsTest, switched to fixed size types and 
increased corruption size (CASSANDRA-12359)
 + * Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness 
(CASSANDRA-12277)
 + * Exception when computing read-repair for range tombstones (CASSANDRA-12263)
 + * Lost counter writes in compact table and static columns (CASSANDRA-12219)
 + * AssertionError with MVs on updating a row that isn't indexed due to a null 
value (CASSANDRA-12247)
 + * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
 + * Add option to override compaction space check (CASSANDRA-12180)
 + * Faster startup by only scanning each directory for temporary files once 
(CASSANDRA-12114)
 + * Respond with v1/v2 protocol header when responding to driver that attempts
 +   to connect with too low of a protocol version (CASSANDRA-11464)
 + * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
 + * Fix problem with undeleteable rows on upgrade to new sstable format 
(CASSANDRA-12144)
 + * Fix paging logic for deleted partitions with static columns 
(CASSANDRA-12107)
 + * Wait until the message is being send to decide which serializer must be 
used (CASSANDRA-11393)
 + * Fix migration of static thrift column names with non-text comparators 
(CASSANDRA-12147)
 + * Fix upgrading sparse tables that are incorrectly marked as dense 
(CASSANDRA-11315)
 + * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
 + * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
 + * Avoid missing sstables when getting the canonical sstables 
(CASSANDRA-11996)
 + * Always select the live sstables when getting sstables in bounds 
(CASSANDRA-11944)
 + * Fix column ordering of results with static columns for Thrift requests in
 +   a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
 +   those static columns in query results (CASSANDRA-12123)
 + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
 + * Fix EOF exception when altering column type (CASSANDRA-11820)
 +Merged from 2.2:
+  * Fix INSERT JSON, fromJson() support of smallint, tinyint types 
(CASSANDRA-12371)
   * Restore JVM metric export for metric reporters (CASSANDRA-12312)
   * Release sstables of failed stream sessions only when outgoing transfers 
are finished (CASSANDRA-11345)
 - * Revert CASSANDRA-11427 (CASSANDRA-12351)
   * Wait for tracing events before returning response and query at same 
consistency level client side (CASSANDRA-11465)
   * cqlsh copyutil should get host metadata by connected address 
(CASSANDRA-11979)
   * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d73f3bc/src/java/org/apache/cassandra/db/marshal/ByteType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d73f3bc/src/java/org/apache/cassandra/db/marshal/ShortType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d73f3bc/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
--

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

2016-06-21 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 621d08a1464d43d828c8eceed57f45268e89a3c3
Parents: 723a143 9e85e85
Author: Tyler Hobbs 
Authored: Tue Jun 21 11:13:12 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Jun 21 11:13:12 2016 -0500

--
 CHANGES.txt |  2 +
 .../apache/cassandra/schema/TableParams.java|  7 ++-
 .../cassandra/utils/BloomCalculations.java  | 15 +-
 .../schema/CreateTableValidationTest.java   | 51 
 4 files changed, 71 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/621d08a1/CHANGES.txt
--
diff --cc CHANGES.txt
index cc682c4,36009c5..134a5e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,9 +1,35 @@@
 -2.2.7
 +3.0.8
 + * Fix upgrading schema with super columns with non-text subcomparators 
(CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
+  * Validate bloom_filter_fp_chance against lowest supported
+value when the table is created (CASSANDRA-11920)
 - * RandomAccessReader: call isEOF() only when rebuffering, not for every read 
operation (CASSANDRA-12013)
   * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
   * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
 +Merged from 2.1:
 + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934)
 + * Allow LWT operation on static column with only partition keys 
(CASSANDRA-10532)
 + * Create interval tree over canonical sstables to avoid missing sstables 
during streaming (CASSANDRA-11886)
 + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
 +
 +
 +3.0.7
 + * Fix legacy serialization of Thrift-generated non-compound range tombstones
 +   when communicating with 2.x nodes (CASSANDRA-11930)
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
   * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/621d08a1/src/java/org/apache/cassandra/schema/TableParams.java
--
diff --cc src/java/org/apache/cassandra/schema/TableParams.java
index 7e44e73,000..29d3e29
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/schema/TableParams.java
+++ b/src/java/org/apache/cassandra/schema/TableParams.java
@@@ -1,377 -1,0 +1,380 @@@
 +/*
 + * 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.schema;
 +
 +import java.nio.ByteBuffer;
 +import

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

2016-06-02 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 1e82695115c7f191d4de60a92f7b9fd078ebbc68
Parents: 7eb4647 6c445d6
Author: Benjamin Lerer 
Authored: Thu Jun 2 12:36:14 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Jun 2 12:44:45 2016 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/db/commitlog/CommitLog.java   |  71 +-
 .../db/commitlog/CommitLogSegment.java  |   7 +-
 .../db/commitlog/CommitLogSegmentManager.java   |  37 +++---
 .../db/commitlog/CompressedSegment.java |   6 +-
 .../db/commitlog/CommitLogStressTest.java   |   2 +-
 .../db/RecoveryManagerFlushedTest.java  |  38 +-
 .../db/RecoveryManagerMissingHeaderTest.java|  36 -
 .../cassandra/db/RecoveryManagerTest.java   |  47 +--
 .../db/RecoveryManagerTruncateTest.java |  42 +-
 .../db/commitlog/CommitLogDescriptorTest.java   | 102 ++
 .../cassandra/db/commitlog/CommitLogTest.java   | 132 +++
 .../db/commitlog/CommitLogUpgradeTestMaker.java |   2 +-
 13 files changed, 389 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e826951/CHANGES.txt
--
diff --cc CHANGES.txt
index 0cafa83,9752d16..70da4ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.7
 +3.0.7
 + * Fix Directories instantiations where CFS.initialDirectories should be used 
(CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build 
(CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
+  * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
   * Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
   * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e826951/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLog.java
index c0e12c5,460ecfe..dcdd855
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@@ -70,11 -70,10 +70,10 @@@ public class CommitLog implements Commi
  final CommitLogMetrics metrics;
  final AbstractCommitLogService executor;
  
- final ICompressor compressor;
- public ParameterizedClass compressorClass;
+ volatile Configuration configuration;
  final public String location;
  
 -static private CommitLog construct()
 +private static CommitLog construct()
  {
  CommitLog log = new 
CommitLog(DatabaseDescriptor.getCommitLogLocation(), 
CommitLogArchiver.construct());
  
@@@ -433,6 -432,14 +431,14 @@@
  }
  
  /**
+  * FOR TESTING PURPOSES.
+  */
+ public void resetConfiguration()
+ {
 -this.configuration = new 
Configuration(DatabaseDescriptor.getCommitLogCompression());
++configuration = new 
Configuration(DatabaseDescriptor.getCommitLogCompression());
+ }
+ 
+ /**
   * FOR TESTING PURPOSES.  See CommitLogAllocator
   */
  public int restartUnsafe() throws IOException
@@@ -487,4 -494,59 +493,59 @@@
  throw new 
AssertionError(DatabaseDescriptor.getCommitFailurePolicy());
  }
  }
+ 
+ public static final class Configuration
+ {
+ /**
+  * The compressor class.
+  */
+ private final ParameterizedClass compressorClass;
+ 
+ /**
+  * The compressor used to compress the segments.
+  */
+ private final

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

2016-05-27 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 6f02446f3e09e0238c11bb7f63920ffba8a1d070
Parents: 5794fb3 6add3c9
Author: Benjamin Lerer 
Authored: Fri May 27 11:07:26 2016 +0200
Committer: Benjamin Lerer 
Committed: Fri May 27 11:07:26 2016 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/commitlog/CommitLog.java|  8 ++--
 .../cassandra/db/commitlog/CommitLogSegment.java| 16 +++-
 3 files changed, 18 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f02446f/CHANGES.txt
--
diff --cc CHANGES.txt
index 97893c9,7215836..3d166aa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,10 +1,48 @@@
 -2.2.7
 +3.0.7
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption 
detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
+  * Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
   * Enable client encryption in sstableloader with cli options 
(CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
 + * Backport CASSANDRA-11578 (CASSANDRA-11750)
 + * Clear out parent repair session if repair coordinator dies 
(CASSANDRA-11824)
 + * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
 + * Do not consider local node a valid source during replace (CASSANDRA-11848)
 + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair 
(CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * Fix paging for range queries where all clustering columns are specified 
(CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f02446f/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f02446f/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
--

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

2016-05-05 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: d689da3677f20160c077e96028b83e69fe0206f9
Parents: 5980b33 5de9de1
Author: Tyler Hobbs 
Authored: Thu May 5 11:34:56 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu May 5 11:34:56 2016 -0500

--
 CHANGES.txt|  1 +
 bin/cqlsh.py   | 20 ++--
 pylib/cqlshlib/copyutil.py | 16 ++--
 3 files changed, 25 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d689da36/CHANGES.txt
--
diff --cc CHANGES.txt
index 860a4c2,a46aa56..0679e11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,8 +1,27 @@@
 -2.2.7
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * Fix paging for range queries where all clustering columns are specified 
(CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 - * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
   * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
   * JSON datetime formatting needs timezone (CASSANDRA-11137)
   * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d689da36/bin/cqlsh.py
--

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

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

2016-05-04 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7480202e540f86ae4ff02c9a67253d90ad8dde29
Parents: c7d216e b189a7f
Author: Benjamin Lerer 
Authored: Wed May 4 17:17:08 2016 +0200
Committer: Benjamin Lerer 
Committed: Wed May 4 17:17:08 2016 +0200

--
 CHANGES.txt |   1 +
 .../org/apache/cassandra/utils/HeapUtils.java   | 205 +++
 .../cassandra/utils/JVMStabilityInspector.java  |   5 +-
 3 files changed, 209 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7480202e/CHANGES.txt
--
diff --cc CHANGES.txt
index f947568,7c7295d..31e46d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
 -2.2.7
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods 
(CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types 
(CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * Fix paging for range queries where all clustering columns are specified 
(CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries 
(CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to 
determine disk consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another 
(CASSANDRA-10120)
 +Merged from 2.2:
+  * Produce a heap dump when exiting on OOM (CASSANDRA-9861)
 - * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427)
   * Restore ability to filter on clustering columns when using a 2i 
(CASSANDRA-11510)
   * JSON datetime formatting needs timezone (CASSANDRA-11137)
   * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7480202e/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java
--

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

2016-04-28 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

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

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


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

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

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

2016-04-21 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d8d920dce9044a064691ee30ef7de3bd4cad
Parents: caae987 c42f5f6
Author: Tyler Hobbs 
Authored: Thu Apr 21 15:32:51 2016 -0500
Committer: Tyler Hobbs 
Committed: Thu Apr 21 15:32:51 2016 -0500

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

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

2016-04-14 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0818e1b16af36adb2fbbd3dffacdccc2ecf60a9a
Parents: fd24b7c 69edeaa
Author: Benjamin Lerer 
Authored: Thu Apr 14 12:32:56 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Apr 14 12:33:05 2016 +0200

--

--

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

2016-03-19 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7f1339cc9f9f2e46406596cbe57bf8826afb57ba
Parents: 8d101fd 42cd66a
Author: Benjamin Lerer 
Authored: Thu Mar 17 14:30:51 2016 +0100
Committer: Benjamin Lerer 
Committed: Thu Mar 17 14:30:51 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f1339cc/CHANGES.txt
--
diff --cc CHANGES.txt
index c3d218a,fa4a726..defc25a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.2.6
 +3.0.5
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) 
(CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns 
(CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
   * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
   * Fix bloom filter sizing with LCS (CASSANDRA-11344)
   * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)

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

2016-03-19 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: a64ad4e0f9ee937199ed25d4f5398921a90a7796
Parents: 9995521 6d383be
Author: Benjamin Lerer 
Authored: Thu Mar 17 10:10:39 2016 +0100
Committer: Benjamin Lerer 
Committed: Thu Mar 17 10:10:39 2016 +0100

--
 CHANGES.txt  | 1 +
 doc/cql3/CQL.textile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a64ad4e0/CHANGES.txt
--
diff --cc CHANGES.txt
index b264609,fdb5807..c3d218a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,9 +1,16 @@@
 -2.2.6
 +3.0.5
 + * Add backpressure to compressed commit log (CASSANDRA-10971)
 + * SSTableExport supports secondary index tables (CASSANDRA-11330)
 + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
 + * Establish and implement canonical bulk reading workload(s) 
(CASSANDRA-10331)
 + * Fix paging for IN queries on tables without clustering columns 
(CASSANDRA-11208)
 + * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
 + * Fix filtering on non-primary key columns for queries without index 
(CASSANDRA-6377)
 + * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
 +Merged from 2.2:
+  * Clarify that now() function is calculated on the coordinator node in CQL 
documentation (CASSANDRA-10900)
   * Fix bloom filter sizing with LCS (CASSANDRA-11344)
   * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
 - * Fix intra-node serialization issue for multicolumn-restrictions 
(CASSANDRA-11196)
 - * Non-obsoleting compaction operations over compressed files can impose rate 
limit on normal reads (CASSANDRA-11301)
   * Add missing newline at end of bin/cqlsh (CASSANDRA-11325)
   * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
   * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)

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

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

2016-02-23 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: e9abaabfe83f74b1ef7c0273bdd7738402fb0ebc
Parents: 037d24e 5009594
Author: Tyler Hobbs 
Authored: Tue Feb 23 11:29:04 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Feb 23 11:29:04 2016 -0600

--
 CHANGES.txt   |  1 +
 .../transport/messages/ErrorMessage.java  |  6 --
 .../cassandra/transport/ProtocolErrorTest.java| 18 ++
 3 files changed, 23 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9abaabf/CHANGES.txt
--
diff --cc CHANGES.txt
index a675016,01e7b3d..cd2a930
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,5 +1,22 @@@
 -2.2.6
 +3.0.4
 + * Introduce backpressure for hints (CASSANDRA-10972)
 + * Fix ClusteringPrefix not being able to read tombstone range boundaries 
(CASSANDRA-11158)
 + * Prevent logging in sandboxed state (CASSANDRA-11033)
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 +Merged from 2.2:
+  * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
   * Replacing an aggregate with a new version doesn't reset INITCOND 
(CASSANDRA-10840)
   * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
   * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9abaabf/test/unit/org/apache/cassandra/transport/ProtocolErrorTest.java
--

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

2016-02-18 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: c64d3a53b2c79cdc9ad544e7b96c2ef712129382
Parents: 15ac9e8 c116207
Author: Tyler Hobbs 
Authored: Thu Feb 18 11:09:52 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 18 11:09:52 2016 -0600

--
 CHANGES.txt  |  1 +
 .../apache/cassandra/db/marshal/UserType.java|  2 +-
 .../cql3/validation/entities/JsonTest.java   | 19 +++
 3 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/CHANGES.txt
--
diff --cc CHANGES.txt
index f68eea5,c85fc45..a79a411
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,9 +1,21 @@@
 -2.2.6
 +3.0.4
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 +Merged from 2.2:
+  * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
   * Better error message for cleanup (CASSANDRA-10991)
   * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 - * Use cloned TokenMetadata in size estimates to avoid race against 
membership check
 -   (CASSANDRA-10736)
   * Always persist upsampled index summaries (CASSANDRA-10512)
   * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
   * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c64d3a53/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
--

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

2016-02-15 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7bdffec93dedf416d198c05ab8466b6a6633196d
Parents: efbcd15 f3b5ff8
Author: Benjamin Lerer 
Authored: Mon Feb 15 10:05:34 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Feb 15 10:05:42 2016 +0100

--

--

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

2016-02-11 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d4e6f08d48317796bfda8691f85c038fcd264769
Parents: 604c9df d5c83f4
Author: Tyler Hobbs 
Authored: Thu Feb 11 17:54:22 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 17:54:22 2016 -0600

--
 CHANGES.txt |   1 +
 .../io/sstable/format/SSTableReader.java|  13 ++-
 .../cassandra/io/sstable/SSTableReaderTest.java | 113 ++-
 3 files changed, 93 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4e6f08d/CHANGES.txt
--
diff --cc CHANGES.txt
index 7a0357f,fa25980..5156b0c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.2.6
 +3.0.4
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 +Merged from 2.2:
+  * Always persist upsampled index summaries (CASSANDRA-10512)
   * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
   * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
   * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4e6f08d/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 1618516,e81e4e9..691bf45
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@@ -1175,13 -1154,7 +1175,7 @@@ public abstract class SSTableReader ext
  else if (samplingLevel < indexSummary.getSamplingLevel())
  {
  // we can use the existing index summary to make a smaller one
 -newSummary = IndexSummaryBuilder.downsample(indexSummary, 
samplingLevel, minIndexInterval, partitioner);
 +newSummary = IndexSummaryBuilder.downsample(indexSummary, 
samplingLevel, minIndexInterval, getPartitioner());
- 
- try(SegmentedFile.Builder ibuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false);
- SegmentedFile.Builder dbuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression))
- {
- saveSummary(ibuilder, dbuilder, newSummary);
- }
  }
  else
  {
@@@ -1189,6 -1162,18 +1183,13 @@@
  "no adjustments to min/max_index_interval");
  }
  
+ //Always save the resampled index
+ try(SegmentedFile.Builder ibuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false);
+ SegmentedFile.Builder dbuilder = 
SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression))
+ {
 -for (long boundry : dfile.copyReadableBounds())
 -dbuilder.addPotentialBoundary(boundry);
 -for (long boundry : ifile.copyReadableBounds())
 -ibuilder.addPotentialBoundary(boundry);
 -
+ saveSummary(ibuilder, dbuilder, newSummary);
+ }
+ 
  long newSize = bytesOnDisk();
  StorageMetrics.load.inc(newSize - oldSize);
  parent.metric.liveDiskSpaceUsed.inc(newSize - oldSize);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4e6f08d/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index c7f3c36,000..640b68b
mode 100644,00..100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++

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

2016-02-11 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt
pylib/cqlshlib/test/test_cqlsh_completion.py


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

Branch: refs/heads/cassandra-3.0
Commit: 604c9df8832e119476642eaea23240c7ae2f82e6
Parents: 9b5af91 af6bd1b
Author: Tyler Hobbs 
Authored: Thu Feb 11 15:31:02 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 15:31:02 2016 -0600

--
 CHANGES.txt  |   1 +
 pylib/cqlshlib/cql3handling.py   |   3 +-
 pylib/cqlshlib/cqlhandling.py|   2 +-
 pylib/cqlshlib/test/test_cqlsh_completion.py | 145 +++---
 pylib/cqlshlib/test/test_keyspace_init.cql   |  35 ++
 5 files changed, 165 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/604c9df8/CHANGES.txt
--
diff --cc CHANGES.txt
index 9be4f38,1a4717d..7a0357f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.2.6
 +3.0.4
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 +Merged from 2.2:
+  * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
   * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
   * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/604c9df8/pylib/cqlshlib/test/test_cqlsh_completion.py
--
diff --cc pylib/cqlshlib/test/test_cqlsh_completion.py
index 88bdc22,19bd092..0f0cc4d
--- a/pylib/cqlshlib/test/test_cqlsh_completion.py
+++ b/pylib/cqlshlib/test/test_cqlsh_completion.py
@@@ -406,7 -406,7 +406,7 @@@ class TestCqlshCompletion(CqlshCompleti
   'utf8_with_special_chars',
   'system_traces.', 'songs',
   'system_auth.', 'system_distributed.',
-  'system_schema.','system_traces.',
 - 'system_traces.',
++ 'system_schema.', 'system_traces.',
   '"' + self.cqlsh.keyspace + '".'],
  other_choices_ok=True)
  self.trycompletions('DELETE FROM twenty_rows_composite_table ',
@@@ -656,10 -655,10 +656,10 @@@
  self.trycompletions(prefix + " new_table (col_a int PRIMARY KEY) WITH 
compaction = "
  + "{'class': 'DateTieredCompactionStrategy', '",
  choices=['base_time_seconds', 
'max_sstable_age_days',
- 'timestamp_resolution', 'min_threshold', 
'class', 'max_threshold',
- 'tombstone_compaction_interval', 
'tombstone_threshold',
- 'enabled', 
'unchecked_tombstone_compaction',
- 'max_window_size_seconds', 
'only_purge_repaired_tombstones'])
+  'timestamp_resolution', 'min_threshold', 
'class', 'max_threshold',
+  'tombstone_compaction_interval', 
'tombstone_threshold',
+  'enabled', 
'unchecked_tombstone_compaction',
 - 'max_window_size_seconds'])
++ 'max_window_size_seconds', 
'only_purge_repaired_tombstones'])
  
  def test_complete_in_create_columnfamily(self):
  self.trycompletions('CREATE C', choices=['COLUMNFAMILY', 'CUSTOM'])

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

2016-02-11 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 9b5af911c9bfdedaeb6562e0e13e9f44e6dbd4e0
Parents: b2f38ef 6b1bd17
Author: Tyler Hobbs 
Authored: Thu Feb 11 10:29:46 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 11 10:29:46 2016 -0600

--
 CHANGES.txt |  3 +-
 src/java/org/apache/cassandra/cql3/Json.java| 10 ++-
 .../cassandra/cql3/selection/Selection.java |  2 +-
 .../apache/cassandra/db/marshal/AsciiType.java  |  2 +-
 .../apache/cassandra/db/marshal/MapType.java|  2 +-
 .../apache/cassandra/db/marshal/UTF8Type.java   |  2 +-
 .../apache/cassandra/db/marshal/UserType.java   |  2 +-
 .../cql3/validation/entities/JsonTest.java  | 70 +---
 8 files changed, 77 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/CHANGES.txt
--
diff --cc CHANGES.txt
index e723aba,3aca720..9be4f38
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.2.6
 +3.0.4
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state 
(CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference 
(CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown 
(CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
- Merged from 2.2.6:
++Merged from 2.2:
+  * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
   * Fix SELECT on tuple relations for mixed ASC/DESC clustering order 
(CASSANDRA-7281)
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/cql3/Json.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/cql3/selection/Selection.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/AsciiType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/MapType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5af911/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
--

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

2016-02-05 Thread jasobrown

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0663ebbd797cc6bd3d9e55537c19e28ea9851d13
Parents: 7a435c3 e4fb1de
Author: Jason Brown 
Authored: Fri Feb 5 14:03:42 2016 -0800
Committer: Jason Brown 
Committed: Fri Feb 5 14:03:42 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0663ebbd/CHANGES.txt
--
diff --cc CHANGES.txt
index d773c9d,0d98779..48321f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,44 -1,6 +1,45 @@@
 -2.2.6
 +3.0.4
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 
(CASSANDRA-11001)
- 
++Merged from 2.2.6
+  * Gossiper#isEnabled is not thread safe (CASSANDRA-6)
 - * Fix paging on DISTINCT queries repeats result when first row in partition 
changes (CASSANDRA-10010)
 +
 +3.0.3
 + * Remove double initialization of newly added tables (CASSANDRA-11027)
 + * Filter keys searcher results by target range (CASSANDRA-11104)
 + * Fix deserialization of legacy read commands (CASSANDRA-11087)
 + * Fix incorrect computation of deletion time in sstable metadata 
(CASSANDRA-11102)
 + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
 + * Mutations do not block for completion under view lock contention 
(CASSANDRA-10779)
 + * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
 + * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
 +   (CASSANDRA-11003)
 + * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
 + * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
 + * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
 + * Added support for IBM zSystems architecture (CASSANDRA-11054)
 + * Update CQL documentation (CASSANDRA-10899)
 + * Check the column name, not cell name, for dropped columns when reading
 +   legacy sstables (CASSANDRA-11018)
 + * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
 + * Remove checksum files after replaying hints (CASSANDRA-10947)
 + * Support passing base table metadata to custom 2i validation 
(CASSANDRA-10924)
 + * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
  2.2.5
   * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
   * Apply change to compaction throughput in real time (CASSANDRA-10025)

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

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

2016-02-04 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7a435c376cad0a031a7a58b754bb648988cb565e
Parents: f340362 1168ddf
Author: Tyler Hobbs 
Authored: Thu Feb 4 12:35:36 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Feb 4 12:35:36 2016 -0600

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


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

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

2016-01-27 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 22d6f649ffae901f2893dc973c324e8fbb8eea69
Parents: 3e37b4a fa2fa60
Author: Benjamin Lerer 
Authored: Wed Jan 27 17:29:33 2016 +0100
Committer: Benjamin Lerer 
Committed: Wed Jan 27 17:29:51 2016 +0100

--

--

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

2016-01-22 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 2f8e5f34642790f2e75573a4fc4e4e43d49b52e4
Parents: 0b05203 b4d67c9
Author: Tyler Hobbs 
Authored: Fri Jan 22 12:01:23 2016 -0600
Committer: Tyler Hobbs 
Committed: Fri Jan 22 12:01:23 2016 -0600

--

--

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

2016-01-12 Thread tylerhobbs

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 2569fbd1429681f80aaf47b8668e9bc15cf0445d
Parents: a942b2c de946ae
Author: Tyler Hobbs 
Authored: Tue Jan 12 11:52:24 2016 -0600
Committer: Tyler Hobbs 
Committed: Tue Jan 12 11:52:24 2016 -0600

--
 CHANGES.txt  | 2 ++
 bin/cqlsh.py | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2569fbd1/CHANGES.txt
--
diff --cc CHANGES.txt
index b916fa6,f895139..3ec5346
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,22 @@@
 -2.2.5
 +3.0.3
 + * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
 + * Fix UnsupportedOperationException when reading old sstable with range
 +   tombstone (CASSANDRA-10743)
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * (cqlsh) Also apply --connect-timeout to control connection
+timeout (CASSANDRA-10959)
   * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
   * Enable GC logging by default (CASSANDRA-10140)
   * Optimize pending range computation (CASSANDRA-9258)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2569fbd1/bin/cqlsh.py
--

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

2016-01-07 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 24630b4a1fcfe8fc7fdb228a3f87f153905b519f
Parents: b477c0f 52d8197
Author: T Jake Luciani 
Authored: Thu Jan 7 12:28:00 2016 -0500
Committer: T Jake Luciani 
Committed: Thu Jan 7 12:28:00 2016 -0500

--
 CHANGES.txt | 1 +
 .../apache/cassandra/metrics/EstimatedHistogramReservoir.java   | 5 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/24630b4a/CHANGES.txt
--
diff --cc CHANGES.txt
index 1533619,a26f9e0..7f6b761
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -2.2.5
 +3.0.3
 + * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
 + * Fix potential assertion error during compaction (CASSANDRA-10944)
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
   * Enable GC logging by default (CASSANDRA-10140)
   * Optimize pending range computation (CASSANDRA-9258)
   * Skip commit log and saved cache directories in SSTable version startup 
check (CASSANDRA-10902)

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

2016-01-05 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 025384c065d1cc7c715c048224b9b9bf02ac93ad
Parents: f5416e3 f845283
Author: Marcus Eriksson 
Authored: Tue Jan 5 10:34:45 2016 +0100
Committer: Marcus Eriksson 
Committed: Tue Jan 5 10:34:45 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/025384c0/CHANGES.txt
--
diff --cc CHANGES.txt
index de5c3ed,bb5909c..bcc4c91
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,7 +1,17 @@@
 -2.2.5
 +3.0.3
 + * Fix counting of received sstables in streaming (CASSANDRA-10949)
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-10837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * drop/alter user should be case sensitive (CASSANDRA-10817)
   * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
   * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/025384c0/src/java/org/apache/cassandra/cql3/Cql.g
--

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

2015-12-29 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 36608cefa3470da7aa70a4c3de32d4ed3c3eed3e
Parents: fe62557 f9ac657
Author: Robert Stupp 
Authored: Tue Dec 29 15:34:06 2015 +0100
Committer: Robert Stupp 
Committed: Tue Dec 29 15:34:06 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36608cef/CHANGES.txt
--
diff --cc CHANGES.txt
index b1a556a,23d6bae..837a592
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 -2.2.5
 +3.0.3
 + * Implement hints compression (CASSANDRA-9428)
 + * Fix potential assertion error when reading static columns (CASSANDRA-10903)
 + * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
 + * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
 + * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * Support counter-columns for native aggregates (sum,avg,max,min) 
(CASSANDRA-9977)
   * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)

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

2015-12-24 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0858bfbd7b1e2c1ff43baf1ec96a5fadf115e88d
Parents: c20566f 8287ebc
Author: Robert Stupp 
Authored: Thu Dec 24 14:05:40 2015 +0100
Committer: Robert Stupp 
Committed: Thu Dec 24 14:05:40 2015 +0100

--

--

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

2015-12-21 Thread dbrosius

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/serializers/TimestampSerializer.java


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

Branch: refs/heads/cassandra-3.0
Commit: 8e35f84e93e96be6c8d893a7d396c9ef6d4919fd
Parents: adc9a24 ebbd516
Author: Dave Brosius 
Authored: Mon Dec 21 19:26:12 2015 -0500
Committer: Dave Brosius 
Committed: Mon Dec 21 19:26:12 2015 -0500

--
 .../org/apache/cassandra/db/marshal/DateType.java|  2 +-
 .../apache/cassandra/db/marshal/TimestampType.java   |  2 +-
 .../cassandra/serializers/TimestampSerializer.java   | 15 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/db/marshal/DateType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/db/marshal/TimestampType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e35f84e/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
--
diff --cc src/java/org/apache/cassandra/serializers/TimestampSerializer.java
index 01a85e0,78ee7e7..ad56cd5
--- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
@@@ -97,19 -96,14 +97,27 @@@ public class TimestampSerializer implem
  }
  };
  
 +private static final String UTC_FORMAT = dateStringPatterns[40];
 +private static final ThreadLocal FORMATTER_UTC = new 
ThreadLocal()
 +{
 +protected SimpleDateFormat initialValue()
 +{
 +SimpleDateFormat sdf = new SimpleDateFormat(UTC_FORMAT);
 +sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
 +return sdf;
 +}
 +};
++
+ private static final ThreadLocal FORMATTER_TO_JSON = 
new ThreadLocal()
+ {
+ protected SimpleDateFormat initialValue()
+ {
+ return new SimpleDateFormat(dateStringPatterns[15]);
+ }
+ };
 +
- public static final SimpleDateFormat TO_JSON_FORMAT = new 
SimpleDateFormat(dateStringPatterns[15]);
 +
+ 
  public static final TimestampSerializer instance = new 
TimestampSerializer();
  
  public Date deserialize(ByteBuffer bytes)

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

2015-12-21 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 11165f4733a5f2831f040aa08e881d60f7480922
Parents: 0e63000 7afbaf71
Author: Sylvain Lebresne 
Authored: Mon Dec 21 09:29:30 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 09:29:30 2015 +0100

--
 NEWS.txt | 70 +--
 1 file changed, 35 insertions(+), 35 deletions(-)
--


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

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

2015-12-21 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: adc9a241e396e91ce7d6843aca27eedf6f87944d
Parents: 67fd42f 8565ca8
Author: Sylvain Lebresne 
Authored: Mon Dec 21 16:32:52 2015 +0100
Committer: Sylvain Lebresne 
Committed: Mon Dec 21 16:32:52 2015 +0100

--
 doc/native_protocol_v4.spec | 311 +++
 1 file changed, 155 insertions(+), 156 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/adc9a241/doc/native_protocol_v4.spec
--
diff --cc doc/native_protocol_v4.spec
index 7f54970,51cb875..7fcf1d8
--- a/doc/native_protocol_v4.spec
+++ b/doc/native_protocol_v4.spec
@@@ -1004,15 -997,15 +997,15 @@@ Table of Content
  to performance to pick a value too low. A value below 100 is probably too
  low for most use cases.
- Clients should not rely on the actual size of the result set returned to
- decide if there is more result to fetch or not. Instead, they should 
always
- check the Has_more_pages flag (unless they did not enabled paging for the 
query
+ decide if there are more results to fetch or not. Instead, they should 
always
+ check the Has_more_pages flag (unless they did not enable paging for the 
query
  obviously). Clients should also not assert that no result will have more 
than
-  results. While the current implementation always 
respect
- the exact value of , we reserve ourselves the right to 
return
+  results. While the current implementation always 
respects
+ the exact value of , we reserve the right to return
  slightly smaller or bigger pages in the future for performance reasons.
- The  is specific to a protocol version and drivers should 
not
 -send a  returned by a node using protocol v3 to query a node
 -using protocol v4 for instance.
 +send a  returned by a node using the protocol v3 to query a 
node
 +using the protocol v4 for instance.
  
  
  9. Error codes

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

2015-12-18 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 2800bf1082e773daf0af29516b61c711acda626b
Parents: fa18880 bcd68b5
Author: Aleksey Yeschenko 
Authored: Fri Dec 18 23:30:16 2015 +
Committer: Aleksey Yeschenko 
Committed: Fri Dec 18 23:30:16 2015 +

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 21 +++--
 2 files changed, 8 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2800bf10/CHANGES.txt
--
diff --cc CHANGES.txt
index 199e374,88ef42e..b4419fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -2.2.5
 +3.0.3
 + * Add back support for 3rd party auth providers to bulk loader 
(CASSANDRA-10873)
 + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
 + * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes 
(CASSANDRA-1837)
 + * Fix sstableloader not working with upper case keyspace name 
(CASSANDRA-10806)
 +Merged from 2.2:
+  * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
   * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
   * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2800bf10/bin/cqlsh.py
--

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

2015-12-16 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 363e7bd716b1c0b798f740b88bcb336c41f33470
Parents: 98178f5 b03ce9f
Author: Benjamin Lerer 
Authored: Wed Dec 16 15:19:20 2015 +0100
Committer: Benjamin Lerer 
Committed: Wed Dec 16 15:19:20 2015 +0100

--
 CHANGES.txt |  1 +
 .../apache/cassandra/stress/StressProfile.java  |  8 
 .../stress/generate/values/LocalDates.java  | 43 +++
 .../stress/generate/values/SmallInts.java   | 38 +
 .../cassandra/stress/generate/values/Times.java | 37 
 .../stress/generate/values/TinyInts.java| 45 
 .../operations/userdefined/SchemaStatement.java | 16 +--
 .../cassandra/stress/util/JavaDriverClient.java |  1 +
 8 files changed, 185 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/CHANGES.txt
--
diff --cc CHANGES.txt
index dd1896c,1480960..10504c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -2.2.5
 +3.0.3
 +Merged from 2.2:
+  * Add new types to Stress (CASSANDRA-9556)
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
   * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
   * Better handling of SSL connection errors inter-node (CASSANDRA-10816)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/tools/stress/src/org/apache/cassandra/stress/StressProfile.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
--
diff --cc 
tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
index d0779ed,30d0d4a..7d5f38c
--- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
@@@ -114,7 -95,7 +114,8 @@@ public class JavaDriverClien
  .addContactPoint(host)
  .withPort(port)
  
.withPoolingOptions(poolingOpts)
 +.withoutJMXReporting()
+ 
.withProtocolVersion(ProtocolVersion.NEWEST_SUPPORTED)
  .withoutMetrics(); // The 
driver uses metrics 3 with conflict with our version
  if (whitelist != null)
  clusterBuilder.withLoadBalancingPolicy(whitelist);

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

2015-12-11 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d55a51e9523d3695fa43bfbe7da3b6ab0a110caf
Parents: 65885e7 94c361d
Author: Sylvain Lebresne 
Authored: Fri Dec 11 17:58:48 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Dec 11 17:58:48 2015 +0100

--
 CHANGES.txt |  7 +++
 conf/cassandra.yaml |  8 
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 +
 .../locator/ReconnectableSnitchHelper.java  |  2 +-
 .../apache/cassandra/net/MessagingService.java  | 20 
 .../cassandra/service/StorageService.java   |  8 
 .../org/apache/cassandra/utils/FBUtilities.java | 16 
 .../apache/cassandra/service/RemoveTest.java|  2 +-
 9 files changed, 59 insertions(+), 10 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/config/Config.java
--

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

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

2015-12-10 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 9ee3a0870e500d03db484cce8fc0012e425904c5
Parents: 587fd9f c8493c4
Author: Sylvain Lebresne 
Authored: Thu Dec 10 17:33:25 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Dec 10 17:33:25 2015 +0100

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 6 ++
 .../org/apache/cassandra/net/OutboundTcpConnection.java | 9 +
 3 files changed, 16 insertions(+)
--


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

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

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

2015-12-01 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 1cbd82782e14f097af600f2334ee4031fc7e2706
Parents: 4378b58 8738087
Author: Robert Stupp 
Authored: Tue Dec 1 10:40:07 2015 +0100
Committer: Robert Stupp 
Committed: Tue Dec 1 10:40:07 2015 +0100

--
 bin/cqlsh.py | 11 ---
 pylib/cqlshlib/helptopics.py | 25 -
 2 files changed, 32 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cbd8278/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 6b87d9f,027a45e..7435f00
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -71,8 -71,8 +71,9 @@@ except ImportError
  CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
  
  CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
 -CASSANDRA_CQL_HTML_FALLBACK = 
'https://cassandra.apache.org/doc/cql3/CQL-2.2.html'
++CASSANDRA_CQL_HTML_FALLBACK = 
'https://cassandra.apache.org/doc/cql3/CQL-3.0.html'
  
 +# default location of local CQL.html
  if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):
  # default location of local CQL.html
  CASSANDRA_CQL_HTML = 'file://' + CASSANDRA_PATH + '/doc/cql3/CQL.html'

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cbd8278/pylib/cqlshlib/helptopics.py
--
diff --cc pylib/cqlshlib/helptopics.py
index 347b17d,279063b..46cd156
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@@ -14,9 -14,9 +14,8 @@@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
- from .cql3handling import simple_cql_types
  
  class CQL3HelpTopics(object):
 -
  def get_help_topics(self):
  return [t[5:] for t in dir(self) if t.startswith('help_')]
  
@@@ -130,13 -145,6 +144,15 @@@
  def help_drop_trigger(self):
  return 'dropTriggerStmt'
  
 +def help_create_materialized_view(self):
 +return 'createMVStmt'
++
 +def help_alter_materialized_view(self):
 +return 'alterMVStmt'
++
 +def help_drop_materialized_view(self):
 +return 'dropMVStmt'
 +
  def help_keywords(self):
  return 'appendixA'
  
@@@ -149,15 -160,9 +168,18 @@@
  def help_list_users(self):
  return 'listUsersStmt'
  
 +def help_create_role(self):
 +return 'createRoleStmt'
++
 +def help_drop_role(self):
 +return 'dropRoleStmt'
++
 +def help_list_roles(self):
 +return 'listRolesStmt'
 +
  def help_permissions(self):
  return 'permissions'
+ 
  def help_list_permissions(self):
  return 'listPermissionsStmt'

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

2015-11-27 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 9a2fd8ccf3a98831a6b30b13987d70753ee8523a
Parents: 56965fd 0ee8895
Author: Robert Stupp 
Authored: Fri Nov 27 15:26:02 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 15:26:02 2015 +0100

--
 CHANGES.txt  |1 +
 bin/cqlsh.py |   62 ++-
 build.xml|7 +-
 conf/cqlshrc.sample  |   17 +
 debian/rules |3 +-
 pylib/cqlshlib/helptopics.py | 1078 -
 6 files changed, 188 insertions(+), 980 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a2fd8cc/CHANGES.txt
--
diff --cc CHANGES.txt
index 592cff8,af1a186..0bb05d9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -2.2.4
 +3.0.1
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
+  * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
   * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)
   * CQL.textile syntax incorrectly includes optional keyspace for aggregate 
SFUNC and FINALFUNC (CASSANDRA-10747)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a2fd8cc/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index d05a84b,e7dc121..6b87d9f
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -71,6 -72,31 +72,32 @@@ CQL_LIB_PREFIX = 'cassandra-driver-inte
  
  CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
  
++# default location of local CQL.html
+ if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):
+ # default location of local CQL.html
+ CASSANDRA_CQL_HTML = 'file://' + CASSANDRA_PATH + '/doc/cql3/CQL.html'
+ elif os.path.exists('/usr/share/doc/cassandra/CQL.html'):
+ # fallback to package file
+ CASSANDRA_CQL_HTML = 'file:///usr/share/doc/cassandra/CQL.html'
+ else:
+ # fallback to online version
 -CASSANDRA_CQL_HTML = 'https://cassandra.apache.org/doc/cql3/CQL-2.2.html'
++CASSANDRA_CQL_HTML = 'https://cassandra.apache.org/doc/cql3/CQL-3.0.html'
+ 
+ # On Linux, the Python webbrowser module uses the 'xdg-open' executable
+ # to open a file/URL. But that only works, if the current session has been
+ # opened from _within_ a desktop environment. I.e. 'xdg-open' will fail,
+ # if the session's been opened via ssh to a remote box.
+ #
+ # Use 'python' to get some information about the detected browsers.
+ # >>> import webbrowser
+ # >>> webbrowser._tryorder
+ # >>> webbrowser._browser
+ #
+ if webbrowser._tryorder[0] == 'xdg-open' and os.environ.get('XDG_DATA_DIRS', 
'') == '':
+ # only on Linux (some OS with xdg-open)
+ webbrowser._tryorder.remove('xdg-open')
+ webbrowser._tryorder.append('xdg-open')
+ 
  # use bundled libs for python-cql and thrift, if available. if there
  # is a ../lib dir, use bundled libs there preferentially.
  ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a2fd8cc/pylib/cqlshlib/helptopics.py
--
diff --cc pylib/cqlshlib/helptopics.py
index b5cf09a,c2eebe3..347b17d
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@@ -16,1026 -16,140 +16,152 @@@
  
  from .cql3handling import simple_cql_types
  
- 
- class CQLHelpTopics(object):
--
+ class CQL3HelpTopics(object):
 -
  def get_help_topics(self):
  return [t[5:] for t in dir(self) if t.startswith('help_')]
  
- def print_help_topic(self, topic):
-

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

2015-11-27 Thread blerer

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: c35af2a7a16b4df2032c5134abc535d73e561d0b
Parents: b166f5f e7116f2
Author: Benjamin Lerer 
Authored: Fri Nov 27 13:16:29 2015 +0100
Committer: Benjamin Lerer 
Committed: Fri Nov 27 13:16:29 2015 +0100

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/sstable/format/big/BigTableWriter.java   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/CHANGES.txt
--
diff --cc CHANGES.txt
index 472ed45,7281bd3..97c0eae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -2.2.4
 +3.0.1
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
+  * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
   * Reject index queries while the index is building (CASSANDRA-8505)
   * CQL.textile syntax incorrectly includes optional keyspace for aggregate 
SFUNC and FINALFUNC (CASSANDRA-10747)
   * Fix JSON update with prepared statements (CASSANDRA-10631)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--

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

2015-11-27 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 489d6474cc9bcdf412f6a23d707a81fd60a36e53
Parents: 7e6c1d5 53e777a
Author: Robert Stupp 
Authored: Fri Nov 27 09:21:25 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 09:21:25 2015 +0100

--
 CHANGES.txt  | 1 +
 doc/cql3/CQL.textile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/489d6474/CHANGES.txt
--
diff --cc CHANGES.txt
index e1a959a,361bbf6..729264c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -2.2.4
 +3.0.1
 + * Fix SELECT statement with IN restrictions on partition key,
 +   ORDER BY and LIMIT (CASSANDRA-10729)
 + * Improve stress performance over 1k threads (CASSANDRA-7217)
 + * Wait for migration responses to complete before bootstrapping 
(CASSANDRA-10731)
 + * Unable to create a function with argument of type Inet (CASSANDRA-10741)
 + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
 + * Correctly preserve deletion info on updated rows when notifying indexers
 +   of single-row deletions (CASSANDRA-10694)
 + * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
 + * Keep the file open in trySkipCache (CASSANDRA-10669)
 + * Updated trigger example (CASSANDRA-10257)
 +Merged from 2.2:
+  * CQL.textile syntax incorrectly includes optional keyspace for aggregate 
SFUNC and FINALFUNC (CASSANDRA-10747)
   * Fix JSON update with prepared statements (CASSANDRA-10631)
   * Don't do anticompaction after subrange repair (CASSANDRA-10422)
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/489d6474/doc/cql3/CQL.textile
--

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

2015-11-27 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: c7724e6b356ed0f3cee1236db52ec2ee425f2495
Parents: 7b430ee f8fc031
Author: Robert Stupp 
Authored: Fri Nov 27 11:41:21 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 11:41:21 2015 +0100

--
 .../cassandra/hadoop/cql3/CqlRecordWriter.java  | 160 +++
 1 file changed, 92 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7724e6b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
--
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index 23beba3,84102a5..96815ef
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@@ -108,14 -109,14 +108,14 @@@ class CqlRecordWriter extends RecordWri
  CqlRecordWriter(Configuration conf)
  {
  this.conf = conf;
 -this.queueSize = conf.getInt(ColumnFamilyOutputFormat.QUEUE_SIZE, 32 
* FBUtilities.getAvailableProcessors());
 -batchThreshold = 
conf.getLong(ColumnFamilyOutputFormat.BATCH_THRESHOLD, 32);
 +this.queueSize = conf.getInt(CqlOutputFormat.QUEUE_SIZE, 32 * 
FBUtilities.getAvailableProcessors());
 +batchThreshold = conf.getLong(CqlOutputFormat.BATCH_THRESHOLD, 32);
  this.clients = new HashMap<>();
+ String keyspace = ConfigHelper.getOutputKeyspace(conf);
  
- try (Cluster cluster = 
CqlConfigHelper.getOutputCluster(ConfigHelper.getOutputInitialAddress(conf), 
conf))
+ try (Cluster cluster = 
CqlConfigHelper.getOutputCluster(ConfigHelper.getOutputInitialAddress(conf), 
conf);
+  Session client = cluster.connect(keyspace))
  {
- String keyspace = ConfigHelper.getOutputKeyspace(conf);
- Session client = cluster.connect(keyspace);
  ringCache = new NativeRingCache(conf);
  if (client != null)
  {
@@@ -279,45 -295,67 +294,68 @@@
  public void run()
  {
  Session session = null;
- outer:
- while (run || !queue.isEmpty())
++
+ try
  {
- List bindVariables;
- try
+ outer:
+ while (run || !queue.isEmpty())
  {
- bindVariables = queue.take();
- }
- catch (InterruptedException e)
- {
- // re-check loop condition after interrupt
- continue;
- }
+ List bindVariables;
+ try
+ {
+ bindVariables = queue.take();
+ }
+ catch (InterruptedException e)
+ {
+ // re-check loop condition after interrupt
+ continue;
+ }
  
- ListIterator iter = endpoints.listIterator();
- while (true)
- {
- // send the mutation to the last-used endpoint.  first 
time through, this will NPE harmlessly.
- if (session != null)
+ ListIterator iter = endpoints.listIterator();
+ while (true)
  {
- try
+ // send the mutation to the last-used endpoint.  
first time through, this will NPE harmlessly.
+ if (session != null)
  {
- int i = 0;
- PreparedStatement statement = 
preparedStatement(session);
- while (bindVariables != null)
+ try
  {
- BoundStatement boundStatement = new 
BoundStatement(statement);
- for (int columnPosition = 0; columnPosition < 
bindVariables.size(); columnPosition++)
+ int i = 0;
+ PreparedStatement statement = 
preparedStatement(session);
+ while (bindVariables != null)
  {
- 
boundStatement.setBytesUnsafe(columnPosition, 
bindVariables.get(columnPosition));
+

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

2015-11-20 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0c04a6bc5b0bce5f9c3f2e49964e163e2500841a
Parents: d1ad796 3851670
Author: Sylvain Lebresne 
Authored: Fri Nov 20 13:15:38 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 13:15:38 2015 +0100

--
 build.xml | 34 --
 1 file changed, 28 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c04a6bc/build.xml
--
diff --cc build.xml
index dd3bafa,81ab58f..c40adfd
--- a/build.xml
+++ b/build.xml
@@@ -1131,11 -1177,11 +1136,11 @@@
  
  
  
 -
  
 +

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

2015-11-20 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 6ac831f3273aa55e012bb1cb9953ea25e55e81a2
Parents: fee9791 49d9e51
Author: Robert Stupp 
Authored: Fri Nov 20 17:24:42 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 20 17:24:42 2015 +0100

--
 build.xml   | 180 +-
 ide/idea-iml-file.xml   |  68 
 ide/idea/inspectionProfiles/Project_Default.xml |  38 +-
 ide/idea/misc.xml   |   4 +
 ide/idea/vcs.xml|   6 +
 ide/idea/workspace.xml  | 359 +++
 6 files changed, 447 insertions(+), 208 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ac831f3/ide/idea-iml-file.xml
--
diff --cc ide/idea-iml-file.xml
index 000,63d0e1d..e6c4aee
mode 00,100644..100644
--- a/ide/idea-iml-file.xml
+++ b/ide/idea-iml-file.xml
@@@ -1,0 -1,69 +1,68 @@@
+ 
+ 
+ 
+ 
 -
++
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
 -
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ac831f3/ide/idea/inspectionProfiles/Project_Default.xml
--
diff --cc ide/idea/inspectionProfiles/Project_Default.xml
index aa640e8,a609ae3..2edbb70
--- a/ide/idea/inspectionProfiles/Project_Default.xml
+++ b/ide/idea/inspectionProfiles/Project_Default.xml
@@@ -53,9 -56,6 +56,7 @@@
  
  
  
 +
- 
-

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

2015-11-19 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 46da70e1fc363a1a343831504de601aa8d56223f
Parents: 74070ee 4e48324
Author: Robert Stupp 
Authored: Thu Nov 19 10:42:11 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:42:11 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

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

2015-11-12 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0

Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java


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

Branch: refs/heads/cassandra-3.0
Commit: 464f8f076878dd95ae1f77f96edca8e1cd3c5699
Parents: 9f056a9 b05fe4f
Author: blerer 
Authored: Thu Nov 12 21:07:08 2015 +0100
Committer: blerer 
Committed: Thu Nov 12 21:07:08 2015 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/db/marshal/SimpleDateType.java   |  2 +-
 .../cql3/validation/operations/AlterTest.java  | 17 +
 3 files changed, 19 insertions(+), 1 deletion(-)
--


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

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

2015-11-10 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d00fcbc43980528990e2de4423d0fd8d8d5e8b95
Parents: fb463c7 9fc957c
Author: Aleksey Yeschenko 
Authored: Tue Nov 10 16:32:44 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 10 16:32:44 2015 +

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00fcbc4/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
--
diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 1b11391,36da92d..6856175
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@@ -98,248 -78,4 +98,248 @@@ public class CqlInputFormat extends org
  return new

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

2015-11-09 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: f2af290c53d88df5d9c07fbfacc7e34bf886a1b4
Parents: 96f407b b5b1252
Author: Robert Stupp 
Authored: Mon Nov 9 12:44:41 2015 +0100
Committer: Robert Stupp 
Committed: Mon Nov 9 12:45:39 2015 +0100

--
 .../cassandra/cql3/functions/JavaBasedUDFunction.java  | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2af290c/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
--
diff --cc src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
index 0fb8123,000..0c1ee64
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
@@@ -1,628 -1,0 +1,639 @@@
 +/*
 + * 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.functions;
 +
 +import java.io.ByteArrayOutputStream;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.lang.invoke.MethodHandle;
 +import java.lang.invoke.MethodHandles;
 +import java.lang.invoke.MethodType;
 +import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
 +import java.net.*;
 +import java.nio.ByteBuffer;
 +import java.security.*;
 +import java.security.cert.Certificate;
 +import java.util.*;
 +import java.util.concurrent.ConcurrentHashMap;
 +import java.util.concurrent.ExecutorService;
 +import java.util.concurrent.ThreadLocalRandom;
 +import java.util.concurrent.atomic.AtomicInteger;
 +
 +import com.google.common.io.ByteStreams;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.datastax.driver.core.DataType;
 +import org.apache.cassandra.concurrent.NamedThreadFactory;
 +import org.apache.cassandra.cql3.ColumnIdentifier;
 +import org.apache.cassandra.db.marshal.AbstractType;
 +import org.apache.cassandra.exceptions.InvalidRequestException;
 +import org.apache.cassandra.utils.FBUtilities;
 +import org.eclipse.jdt.core.compiler.IProblem;
 +import org.eclipse.jdt.internal.compiler.*;
 +import org.eclipse.jdt.internal.compiler.Compiler;
 +import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
 +import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
 +import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 +import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
 +import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
 +import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 +import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
 +
 +final class JavaBasedUDFunction extends UDFunction
 +{
 +private static final String BASE_PACKAGE = 
"org.apache.cassandra.cql3.udf.gen";
 +
 +static final Logger logger = 
LoggerFactory.getLogger(JavaBasedUDFunction.class);
 +
 +private static final AtomicInteger classSequence = new AtomicInteger();
 +
 +// use a JVM standard ExecutorService as DebuggableThreadPoolExecutor 
references internal
 +// classes, which triggers AccessControlException from the UDF sandbox
 +private static final UDFExecutorService executor =
 +new UDFExecutorService(new NamedThreadFactory("UserDefinedFunctions",
 +  Thread.MIN_PRIORITY,
 +  udfClassLoader,
 +  new 
SecurityThreadGroup("UserDefinedFunctions", null, 
UDFunction::initializeThread)),
 +   "userfunction");
 +
 +private static final

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

2015-11-04 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 242b9738f21e835c3f0cb734c96947c4e4ed0710
Parents: 340df43 0ff13d2
Author: Robert Stupp 
Authored: Wed Nov 4 23:29:44 2015 +0100
Committer: Robert Stupp 
Committed: Wed Nov 4 23:29:44 2015 +0100

--
 CHANGES.txt |  2 +-
 bin/cassandra   | 49 
 conf/cassandra-env.sh   | 49 
 .../apache/cassandra/service/StartupChecks.java | 19 +++-
 4 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/CHANGES.txt
--
diff --cc CHANGES.txt
index 1914fa1,fedede2..5fdeae5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,10 +1,29 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 +3.0
 + * Use CQL type names in schema metadata tables (CASSANDRA-10365)
 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
 + * Fix bug when adding a column to thrift with the same name than a primary 
key (CASSANDRA-10608)
 + * Add client address argument to IAuthenticator::newSaslNegotiator 
(CASSANDRA-8068)
 + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
 + * Don't use 'names query' read path for counters (CASSANDRA-10572)
 + * Fix backward compatibility for counters (CASSANDRA-10470)
-  * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
++ * Remove memory_allocator paramter from cassandra.yaml 
(CASSANDRA-10581,10628)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)
   * Fix logback-tools.xml incorrectly configured for outputing to System.err

http://git-wip-us.apache.org/repos/asf/cassandra/blob/242b9738/conf/cassandra-env.sh
--
diff --cc conf/cassandra-env.sh
index 2f0ae34,e82198b..ef164e8
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -156,98 -160,15 +156,49 @@@ if [ "x$MALLOC_ARENA_MAX" = "x" ] ; the
  export MALLOC_ARENA_MAX=4
  fi
  
- # Cassandra uses an installed jemalloc via LD_PRELOAD / DYLD_INSERT_LIBRARIES 
by default to improve off-heap
- # memory allocation performance. The following code searches for an installed 
libjemalloc.dylib/.so/.1.so using
- # Linux and OS-X specific approaches.
- # To specify your own libjemalloc in a different path, configure the fully 
qualified path in CASSANDRA_LIBJEMALLOC.
- # To disable jemalloc at all set CASSANDRA_LIBJEMALLOC=-
- #
- #CASSANDRA_LIBJEMALLOC=
- #
- find_library()
- {
- pattern=$1
- path=$(echo ${2} | tr ":" " ")
- 
- find $path -regex "$pattern" -print 2>/dev/null | head -n 1
- }
- case "`uname -s`" in
- Linux)
- if [ -z $CASSANDRA_LIBJEMALLOC ] ; then
- which ldconfig > /dev/null 2>&1
- if [ $? = 0 ] ; then
- # e.g. for CentOS
- dirs="/lib64 /lib /usr/lib64 /usr/lib `ldconfig -v

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

2015-11-04 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b761b8659b330e7a5bec925420e1f71025b8ab46
Parents: 1d340be a306a1b
Author: Aleksey Yeschenko 
Authored: Wed Nov 4 14:39:37 2015 +
Committer: Aleksey Yeschenko 
Committed: Wed Nov 4 14:39:37 2015 +

--
 pylib/cqlshlib/formatting.py | 1 +
 1 file changed, 1 insertion(+)
--

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

2015-10-30 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 10ef01d1cad75296b039e1ac6e2ab6498f2d8fc8
Parents: 33f1edc acf67d5
Author: Sylvain Lebresne 
Authored: Fri Oct 30 10:02:15 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Oct 30 10:02:15 2015 +0100

--
 bin/cqlsh.py|  69 +--
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 0 -> 233564 bytes
 2 files changed, 31 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10ef01d1/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index e092d44,17bddd3..725f6e9
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1181,24 -1158,9 +1180,24 @@@ class Shell(cmd.Cmd)
  except Exception, err:
  self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
  
- return result
+ return success
  
 -def parse_for_table_meta(self, query_string):
 +def parse_for_select_meta(self, query_string):
 +try:
 +parsed = cqlruleset.cql_parse(query_string)[1]
 +except IndexError:
 +return None
 +ks = self.cql_unprotect_name(parsed.get_binding('ksname', None))
 +name = self.cql_unprotect_name(parsed.get_binding('cfname', None))
 +try:
 +return self.get_table_meta(ks, name)
 +except ColumnFamilyNotFound:
 +try:
 +return self.get_view_meta(ks, name)
 +except MaterializedViewNotFound:
 +raise ObjectNotFound("%r not found in keyspace %r" % (name, 
ks))
 +
 +def parse_for_update_meta(self, query_string):
  try:
  parsed = cqlruleset.cql_parse(query_string)[1]
  except IndexError:
@@@ -1229,15 -1191,15 +1228,15 @@@
  return False, None
  
  if statement.query_string[:6].lower() == 'select':
- self.print_result(rows, 
self.parse_for_select_meta(statement.query_string))
 -self.print_result(result, 
self.parse_for_table_meta(statement.query_string))
++self.print_result(result, 
self.parse_for_select_meta(statement.query_string))
  elif statement.query_string.lower().startswith("list users") or 
statement.query_string.lower().startswith("list roles"):
- self.print_result(rows, self.get_table_meta('system_auth', 
'roles'))
+ self.print_result(result, self.get_table_meta('system_auth', 
'roles'))
  elif statement.query_string.lower().startswith("list"):
- self.print_result(rows, self.get_table_meta('system_auth', 
'role_permissions'))
- elif rows:
+ self.print_result(result, self.get_table_meta('system_auth', 
'role_permissions'))
+ elif result:
  # CAS INSERT/UPDATE
  self.writeresult("")
- self.print_static_result(rows, 
self.parse_for_update_meta(statement.query_string))
 -self.print_static_result(list(result), 
self.parse_for_table_meta(statement.query_string))
++self.print_static_result(list(result), 
self.parse_for_update_meta(statement.query_string))
  self.flush_output()
  return True, future

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

2015-10-30 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: f27cc7ef3cd8448b6e29b3c8e6b5ae08050e6e2f
Parents: df7c658 0fbf715
Author: Sylvain Lebresne 
Authored: Fri Oct 30 14:52:53 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Oct 30 14:52:53 2015 +0100

--
 bin/cqlsh.py|  69 ++-
 lib/cassandra-driver-internal-only-2.7.2.zip| Bin 0 -> 229600 bytes
 ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 233564 -> 0 bytes
 3 files changed, 38 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f27cc7ef/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 725f6e9,09da020..e092d44
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1180,24 -1159,9 +1181,24 @@@ class Shell(cmd.Cmd)
  except Exception, err:
  self.printerr("Unable to fetch query trace: %s" % 
(str(err),))
  
- return success
+ return result
  
 -def parse_for_table_meta(self, query_string):
 +def parse_for_select_meta(self, query_string):
 +try:
 +parsed = cqlruleset.cql_parse(query_string)[1]
 +except IndexError:
 +return None
 +ks = self.cql_unprotect_name(parsed.get_binding('ksname', None))
 +name = self.cql_unprotect_name(parsed.get_binding('cfname', None))
 +try:
 +return self.get_table_meta(ks, name)
 +except ColumnFamilyNotFound:
 +try:
 +return self.get_view_meta(ks, name)
 +except MaterializedViewNotFound:
 +raise ObjectNotFound("%r not found in keyspace %r" % (name, 
ks))
 +
 +def parse_for_update_meta(self, query_string):
  try:
  parsed = cqlruleset.cql_parse(query_string)[1]
  except IndexError:
@@@ -1228,15 -1192,15 +1229,15 @@@
  return False, None
  
  if statement.query_string[:6].lower() == 'select':
- self.print_result(result, 
self.parse_for_select_meta(statement.query_string))
 -self.print_result(rows, 
self.parse_for_table_meta(statement.query_string))
++self.print_result(rows, 
self.parse_for_select_meta(statement.query_string))
  elif statement.query_string.lower().startswith("list users") or 
statement.query_string.lower().startswith("list roles"):
- self.print_result(result, self.get_table_meta('system_auth', 
'roles'))
+ self.print_result(rows, self.get_table_meta('system_auth', 
'roles'))
  elif statement.query_string.lower().startswith("list"):
- self.print_result(result, self.get_table_meta('system_auth', 
'role_permissions'))
- elif result:
+ self.print_result(rows, self.get_table_meta('system_auth', 
'role_permissions'))
+ elif rows:
  # CAS INSERT/UPDATE
  self.writeresult("")
- self.print_static_result(list(result), 
self.parse_for_update_meta(statement.query_string))
 -self.print_static_result(rows, 
self.parse_for_table_meta(statement.query_string))
++self.print_static_result(rows, 
self.parse_for_update_meta(statement.query_string))
  self.flush_output()
  return True, future

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

2015-10-29 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: a8014bb7ec401d2517e0333c93dd6abb68479c4a
Parents: 4b47d71 b154622
Author: Sylvain Lebresne 
Authored: Thu Oct 29 10:39:05 2015 +0100
Committer: Sylvain Lebresne 
Committed: Thu Oct 29 10:39:05 2015 +0100

--
 .../org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

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

2015-10-28 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 4b47d711ec5dd8e9b31679c2810f57503077985a
Parents: 8210075 83fcc92
Author: Robert Stupp 
Authored: Wed Oct 28 20:13:49 2015 +0100
Committer: Robert Stupp 
Committed: Wed Oct 28 20:13:49 2015 +0100

--
 CHANGES.txt |  1 +
 NEWS.txt|  4 
 conf/cassandra-env.sh   | 23 +---
 conf/cassandra.yaml | 13 ---
 .../org/apache/cassandra/config/Config.java |  3 ---
 5 files changed, 15 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b47d711/CHANGES.txt
--
diff --cc CHANGES.txt
index c945bd2,cc4a8bd..3f2f493
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,10 +1,22 @@@
 -2.2.4
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 +3.0
++ * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)
 + * Execute the metadata reload task of all registered indexes on CFS::reload 
(CASSANDRA-10604)
 + * Fix thrift cas operations with defined columns (CASSANDRA-10576)
 + * Fix PartitionUpdate.operationCount()for updates with static column 
operations (CASSANDRA-10606)
 + * Fix thrift get() queries with defined columns (CASSANDRA-10586)
 + * Fix marking of indexes as built and removed (CASSANDRA-10601)
 + * Skip initialization of non-registered 2i instances, remove 
Index::getIndexName (CASSANDRA-10595)
 + * Fix batches on multiple tables (CASSANDRA-10554)
 + * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
 + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
 + * Remove token generator (CASSANDRA-5261)
 + * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)
 + * Fix LogTransaction checking only a single directory for files 
(CASSANDRA-10421)
 + * Fix handling of range tombstones when reading old format sstables 
(CASSANDRA-10360)
 + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
 +Merged from 2.2:
   * Expose phi values from failure detector via JMX and tweak debug
 and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
   * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
   * Do STCS in DTCS windows (CASSANDRA-10276)

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

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

2015-10-19 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 6977521ada5b07670085523c63a3b27455be9368
Parents: 10c65d4 289b7b7
Author: blerer 
Authored: Mon Oct 19 14:10:54 2015 +0200
Committer: blerer 
Committed: Mon Oct 19 14:11:05 2015 +0200

--

--

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

2015-10-19 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 7159a754a5fcaa1b78a53089267ea7506e32e81d
Parents: cf0c61b 3cd7500
Author: Aleksey Yeschenko 
Authored: Mon Oct 19 15:57:04 2015 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Oct 19 15:57:04 2015 +0100

--
 CHANGES.txt |  3 +
 .../apache/cassandra/gms/FailureDetector.java   | 82 +++-
 .../cassandra/gms/FailureDetectorMBean.java |  5 ++
 .../org/apache/cassandra/tools/NodeProbe.java   | 14 +++-
 .../org/apache/cassandra/tools/NodeTool.java|  3 +-
 .../tools/nodetool/FailureDetectorInfo.java | 46 +++
 6 files changed, 133 insertions(+), 20 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7159a754/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index d07a54c,62795b5..b4821f5
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -527,18 -521,18 +527,18 @@@ public class NodeProbe implements AutoC
  
  /**
   * Take a snapshot of all column family from different keyspaces.
-  * 
+  *
   * @param snapshotName
   *the name of the snapshot.
 - * @param columnFamilyList
 + * @param tableList
   *list of columnfamily from different keyspace in the form of 
ks1.cf1 ks2.cf2
   */
 -public void takeMultipleColumnFamilySnapshot(String snapshotName, 
String... columnFamilyList)
 +public void takeMultipleTableSnapshot(String snapshotName, String... 
tableList)
  throws IOException
  {
 -if

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

2015-10-15 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: b42a0cfe87d175b9d5a053bcb91a9fc70a0c241e
Parents: 5f5e960 bee48eb
Author: Sylvain Lebresne 
Authored: Thu Oct 15 09:53:48 2015 +0200
Committer: Sylvain Lebresne 
Committed: Thu Oct 15 09:53:48 2015 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/db/marshal/CompositeType.java | 20 
 2 files changed, 13 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b42a0cfe/CHANGES.txt
--
diff --cc CHANGES.txt
index 66e34b6,9a0baaa..fa74539
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,5 +1,23 @@@
 -2.2.4
 +3.0-rc2
 + * Revert CASSANDRA-7486, make CMS default GC, move GC config to
 +   conf/jvm.options (CASSANDRA-10403)
 + * Fix TeeingAppender causing some logs to be truncated/empty 
(CASSANDRA-10447)
 + * Allow EACH_QUORUM for reads (CASSANDRA-9602)
 + * Fix potential ClassCastException while upgrading (CASSANDRA-10468)
 + * Fix NPE in MVs on update (CASSANDRA-10503)
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
+  * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
 + * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 + * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
 + * Preserve case of quoted Role & User names (CASSANDRA-10394)
 + * cqlsh pg-style-strings broken (CASSANDRA-10484)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
  Merged from 2.1:
   * (cqlsh) Distinguish negative and positive infinity in output 
(CASSANDRA-10523)
   * (cqlsh) allow custom time_format for COPY TO (CASSANDRA-8970)

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

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

2015-10-13 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 27304dafe7f61582319be2f735f1ede8272c69cf
Parents: fce444f 35cf8a3
Author: blerer 
Authored: Tue Oct 13 09:56:07 2015 +0200
Committer: blerer 
Committed: Tue Oct 13 09:56:20 2015 +0200

--
 doc/cql3/CQL.textile | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27304daf/doc/cql3/CQL.textile
--

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

2015-10-12 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0

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


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

Branch: refs/heads/cassandra-3.0
Commit: 6f3d1e225da27924a2d4333086b11ed805a84ee1
Parents: b324759 83b9740
Author: Sylvain Lebresne 
Authored: Mon Oct 12 14:50:01 2015 +0200
Committer: Sylvain Lebresne 
Committed: Mon Oct 12 14:50:01 2015 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  | 30 +-
 .../cassandra/tools/SSTableExpiredBlockers.java |  4 +-
 .../cassandra/tools/SSTableLevelResetter.java   |  2 +
 .../cassandra/tools/SSTableMetadataViewer.java  |  2 +
 .../cassandra/tools/SSTableOfflineRelevel.java  |  3 +
 .../tools/SSTableRepairedAtSetter.java  |  2 +
 .../cassandra/tools/StandaloneScrubber.java |  2 +
 .../cassandra/tools/StandaloneSplitter.java |  2 +
 .../cassandra/tools/StandaloneUpgrader.java |  2 +
 .../cassandra/tools/StandaloneVerifier.java |  2 +
 src/java/org/apache/cassandra/tools/Util.java   | 58 
 12 files changed, 96 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f3d1e22/CHANGES.txt
--
diff --cc CHANGES.txt
index f40c12c,efae4ab..f72929f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,26 +1,47 @@@
 -2.2.3
 +3.0
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
+  * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)
 - * Make Hadoop CF splits more polite to custom orderered partitioners 
(CASSANDRA-10400)
 + * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
  Merged from 2.1:
 - * Fix mmap file segment seeking to EOF (CASSANDRA-10478)
   * Allow LOCAL_JMX to be easily overridden (CASSANDRA-10275)
   * Mark nodes as dead even if they've already left (CASSANDRA-10205)
 - * Update internal python driver used by cqlsh (CASSANDRA-10161)
  
 -2.2.2
 - * cqlsh prompt includes name of keyspace after failed `use` statement 
(CASSANDRA-10369)
 +
 +3.0.0-rc1
 + * Fix mixed version read request compatibility for compact static tables
 +   (CASSANDRA-10373)
 + * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
 + * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
 +   columns (CASSANDRA-9664)
 + * Move crc_check_chance out of compression options (CASSANDRA-9839)
 + * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
 + * Transfer hints to a different node on decommission (CASSANDRA-10198)
 + * Check partition keys for CAS operations during stmt validation 
(CASSANDRA-10338)
 + * Add custom query expressions to SELECT (CASSANDRA-10217)
 + * Fix minor bugs in MV handling (CASSANDRA-10362)
 + * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
 + * Improve MV schema representation (CASSANDRA-9921)
 + * Add flag to enable/disable coordinator batchlog for MV writes 
(CASSANDRA-10230)
 + * Update cqlsh COPY for new internal driver serialization interface 
(CASSANDRA-10318)
 + * Give index implementations more control over rebuild operations 
(CASSANDRA-10312)
 + * Update index file format (CASSANDRA-10314)
 + * Add "shadowable" row tombstones to deal with mv timestamp issues 
(CASSANDRA-10261)
 + * CFS.loadNewSSTables() broken for pre-3.0 sstables
 + * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
 + * Small optimizations of sstable index serialization (CASSANDRA-10232)
 + * Support for both encrypted and unencrypted native transport connections 
(CASSANDRA-9590)
 +Merged from 2.2:
   * Configurable page size in cqlsh (CASSANDRA-9855)
   * Defer default role manager setup until all nodes are on 2.2+ 
(CASSANDRA-9761)
 - * Cancel transaction for sstables we wont redistribute index summary
 -   for

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

2015-10-12 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: fce444f6835d43cd4ad38d2a2003473956908c7d
Parents: 319157d 20c0acc
Author: blerer 
Authored: Mon Oct 12 21:39:57 2015 +0200
Committer: blerer 
Committed: Mon Oct 12 21:40:55 2015 +0200

--
 CHANGES.txt| 1 +
 NEWS.txt   | 6 +++---
 .../cassandra/cql3/validation/operations/AggregationTest.java  | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fce444f6/CHANGES.txt
--
diff --cc CHANGES.txt
index f72929f,0714076..0d80a8d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
 -2.2.4
 +3.0
 + * Only include modified cell data in indexing deltas (CASSANDRA-10438)
 + * Do not load keyspace when creating sstable writer (CASSANDRA-10443)
 + * If node is not yet gossiping write all MV updates to batchlog only 
(CASSANDRA-10413)
 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293)
 + * Provide additional metrics for materialized views (CASSANDRA-10323)
 + * Flush system schema tables after local schema changes (CASSANDRA-10429)
 +Merged from 2.2:
+  * Fix the regression when using LIMIT with aggregates (CASSANDRA-10487)
 -2.2.3
   * Avoid NoClassDefFoundError during DataDescriptor initialization on windows 
(CASSANDRA-10412)
   * Preserve case of quoted Role & User names (CASSANDRA-10394)
   * cqlsh pg-style-strings broken (CASSANDRA-10484)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fce444f6/NEWS.txt
--
diff --cc NEWS.txt
index 1f32001,5808cdf..61fb9ba
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -44,82 -18,8 +44,79 @@@ New feature
  
  Upgrading
  -
 -- Nothing specific to this release, but please see 2.2 if you are 
upgrading
 -  from a previous version.
 +   - Upgrade to 3.0 is supported from Cassandra 2.1 versions greater or equal 
to 2.1.9,
 + or Cassandra 2.2 versions greater or equal to 2.2.1. Upgrade from 
Cassandra 2.0 and
 + older versions is not supported.
 +   - The 'memtable_allocation_type: offheap_objects' option has been removed. 
It should
 + be re-introduced in a future release and you can follow CASSANDRA-9472 
to know more.
-- The LIMIT clause applies now only to the number of rows returned to the 
user,
-  not to the number of row queried. By consequence, queries using 
aggregates will not
-  be impacted by the LIMIT clause anymore.
 +   - The native protocol versions 1 and 2 are not supported anymore.
 +   - Max mutation size is now configurable via max_mutation_size_in_kb 
setting in
 + cassandra.yaml; the default is half the size 
commitlog_segment_size_in_mb * 1024.
 +   - 3.0 requires Java 8u40 or later.
 +   - The default JVM GC has been changed to G1GC.
 +   - The default JVM flag -XX:+PerfDisableSharedMem will cause the following 
tools JVM
 + to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party 
tools like Jolokia.
 + If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 +   - New transaction log files have been introduced to replace the 
compactions_in_progress
 + system table, temporary file markers (tmp and tmplink) and sstable 
ancerstors.
 + Therefore, compaction metadata no longer contains ancestors. Transaction 
log files
 + list sstable descriptors involved in compactions and other operations 
such as flushing
 + and streaming. Use the sstableutil tool to list any sstable files 
currently involved
 + in operations not yet completed, which previously would have been marked 
as temporary.
 + A transaction log file contains one sstable per line, with the prefix 
"add:" or "remove:".
 + They also contain a special line "commit", only inserted at the end when 
the transaction
 + is committed. On startup we use these files to cleanup any partial 
transactions that were
 + in progress when the process exited. If the commit line is found, we 
keep new sstables
 + (those with the "add" prefix) and delete the old sstables (those with 
the "remove" prefix),
 + vice-versa if the commit line is missing. Should you lose or delete 
these log files,
 + both old and new sstable files will be kept as live files, which will 
result in duplicated
 + sstables. These files

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

2015-10-09 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 5a808ad9ee9d74fd7ee0013760a4b17a4291f0fb
Parents: e1eed52 87fa9be
Author: Robert Stupp 
Authored: Fri Oct 9 09:59:51 2015 +0200
Committer: Robert Stupp 
Committed: Fri Oct 9 09:59:51 2015 +0200

--
 CHANGES.txt |  1 +
 pylib/cqlshlib/cql3handling.py  |  3 ++-
 pylib/cqlshlib/test/test_cql_parsing.py | 35 
 3 files changed, 38 insertions(+), 1 deletion(-)
--


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

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

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

2015-10-02 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: a3f1eedae52f9454ee464c82b434e12bed0e860c
Parents: 5ffae4f 1c073e7
Author: Aleksey Yeschenko 
Authored: Fri Oct 2 13:21:42 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Fri Oct 2 13:21:42 2015 -0700

--

--

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

2015-10-01 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 425bfaf20b8ec8efb111c6a22882de9201efd1b1
Parents: 5c2912d f3cd3ed
Author: Aleksey Yeschenko 
Authored: Thu Oct 1 21:21:54 2015 -0700
Committer: Aleksey Yeschenko 
Committed: Thu Oct 1 21:21:54 2015 -0700

--
 pylib/cqlshlib/test/basecase.py  |   2 +-
 pylib/cqlshlib/test/cassconnect.py   |   3 +-
 pylib/cqlshlib/test/run_cqlsh.py |   2 +-
 pylib/cqlshlib/test/test_cql_parsing.py  | 254 +++---
 pylib/cqlshlib/test/test_cqlsh_completion.py |  18 +-
 pylib/cqlshlib/test/test_cqlsh_output.py |  13 +-
 pylib/cqlshlib/test/test_keyspace_init.cql   |   2 +-
 7 files changed, 149 insertions(+), 145 deletions(-)
--

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

2015-09-29 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: c38235d7cf3dc9cf325e1db762ef589346c9f459
Parents: 5d918b8 4595ec0
Author: Sylvain Lebresne 
Authored: Tue Sep 29 11:54:00 2015 +0200
Committer: Sylvain Lebresne 
Committed: Tue Sep 29 11:54:00 2015 +0200

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 37 ++---
 2 files changed, 35 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38235d7/bin/cqlsh.py
--

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

2015-09-29 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 66c185d1a6d5471687c4bfa05b6d2720a9e05927
Parents: c38235d 13b4bb4
Author: Robert Stupp 
Authored: Tue Sep 29 13:23:09 2015 +0200
Committer: Robert Stupp 
Committed: Tue Sep 29 13:23:46 2015 +0200

--
 CHANGES.txt  | 5 +
 bin/cqlsh.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66c185d1/bin/cqlsh.py
--

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

2015-09-11 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/db/marshal/ReversedType.java


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

Branch: refs/heads/cassandra-3.0
Commit: d332c7e6e1f648f4c4f50a9f5eba6607171c39e6
Parents: 0a07977 c12abfb
Author: blerer 
Authored: Fri Sep 11 11:22:37 2015 +0200
Committer: blerer 
Committed: Fri Sep 11 11:22:37 2015 +0200

--
 .../apache/cassandra/cql3/selection/Selector.java|  4 
 .../apache/cassandra/db/marshal/AbstractType.java|  5 +
 .../apache/cassandra/db/marshal/ReversedType.java|  6 ++
 .../cassandra/cql3/validation/entities/UFTest.java   | 15 +++
 .../cql3/validation/operations/AggregationTest.java  | 12 
 5 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/src/java/org/apache/cassandra/cql3/selection/Selector.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/src/java/org/apache/cassandra/db/marshal/ReversedType.java
--
diff --cc src/java/org/apache/cassandra/db/marshal/ReversedType.java
index 2e01d9b,2aea3cd..2f4fdb7
--- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java
+++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java
@@@ -136,12 -129,12 +136,18 @@@ public class ReversedType extends Ab
  }
  
  @Override
 +protected int valueLengthIfFixed()
 +{
 +return baseType.valueLengthIfFixed();
 +}
 +
 +@Override
+ public boolean isReversed()
+ {
+ return true;
+ }
+ 
+ @Override
  public String toString()
  {
  return getClass().getName() + "(" + baseType + ")";

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java
--

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

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

2015-09-10 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: d996c36c3fff4a965b208b1646f14a475d417d94
Parents: 55fb5cd 813eb23
Author: Marcus Eriksson 
Authored: Thu Sep 10 08:37:57 2015 +0200
Committer: Marcus Eriksson 
Committed: Thu Sep 10 08:37:57 2015 +0200

--
 CHANGES.txt  | 2 ++
 .../org/apache/cassandra/io/sstable/IndexSummaryManager.java | 4 
 2 files changed, 6 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d996c36c/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
--

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

2015-09-08 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java


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

Branch: refs/heads/cassandra-3.0
Commit: 62b6d8ce08969a5d4a7e1ff73c661a5b7d1cfbff
Parents: 34bbb44 7b083a4
Author: Joshua McKenzie 
Authored: Tue Sep 8 12:21:30 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 8 12:21:30 2015 -0400

--
 .../cassandra/io/sstable/SnapshotDeletingTask.java  | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)
--

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

2015-09-03 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: e9c0e1787e44903109ed4520d055e983ca20c16e
Parents: 66b0e1d e1fc0e0
Author: Joshua McKenzie 
Authored: Thu Sep 3 12:42:04 2015 -0400
Committer: Joshua McKenzie 
Committed: Thu Sep 3 12:42:04 2015 -0400

--
 CHANGES.txt| 1 +
 bin/cassandra.bat  | 2 +-
 conf/cassandra-env.ps1 | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/CHANGES.txt
--
diff --cc CHANGES.txt
index 751b75d,fcb9ed7..c1f6992
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -2.2.2
 +3.0.0-beta2
 + * Improve batchlog write patch (CASSANDRA-9673)
 + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
 + * Require AbstractType.isByteOrderComparable declaration in constructor 
(CASSANDRA-9901)
 + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
 + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
 + * Choose better poolingOptions for protocol v4 in cassandra-stress 
(CASSANDRA-10182)
 + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
 + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
 + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
 + * Fix double flushing of secondary index tables (CASSANDRA-10180)
 + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
 + * Only use batchlog when paired materialized view replica is remote 
(CASSANDRA-10061)
 + * Reuse TemporalRow when updating multiple MaterializedViews 
(CASSANDRA-10060)
 + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
 + * Fix sstablerepairedset (CASSANDRA-10132)
 +Merged from 2.2:
+  * Fix failure to start with space in directory path on Windows 
(CASSANDRA-10239)
   * Fix repair hang when snapshot failed (CASSANDRA-10057)
   * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 (CASSANDRA-10199)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/conf/cassandra-env.ps1
--

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

2015-09-01 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
conf/cassandra-env.ps1


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

Branch: refs/heads/cassandra-3.0
Commit: 45eba1adbb9f2ec84c05b540bd20d044d046cbc6
Parents: b586868 3effec5
Author: Joshua McKenzie 
Authored: Tue Sep 1 16:29:39 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 1 16:29:39 2015 -0400

--
 conf/cassandra-env.ps1 | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/45eba1ad/conf/cassandra-env.ps1
--
diff --cc conf/cassandra-env.ps1
index 67767e7,fc0f6fd..f6bc6a7
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -347,8 -372,9 +347,6 @@@ Function SetCassandraEnvironmen
  # store in env to check if it's avail in verification
  $env:JMX_PORT=$JMX_PORT
  
- $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.defaultInitOverride=true"
 -# some JVMs will fill up their heap when accessed via JMX, see 
CASSANDRA-6541
 -$env:JVM_OPTS="$env:JVM_OPTS -XX:+CMSClassUnloadingEnabled"
--
  # enable thread priorities, primarily so we can give periodic tasks
  # a lower priority to avoid interfering with client workload
  $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseThreadPriorities"

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

2015-08-28 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b4104e1e1f239da04e0a6082792aa516b70141b9
Parents: 8360f4b 01a11fd
Author: T Jake Luciani j...@apache.org
Authored: Fri Aug 28 09:44:25 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Fri Aug 28 09:44:25 2015 -0400

--

--

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

2015-08-28 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: c73ec67c0555e299e62ccc8a732cd097faa910a7
Parents: 196b7ab c5158e5
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 28 11:03:51 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 28 11:03:51 2015 -0400

--
 .../apache/cassandra/db/commitlog/CommitLog.java| 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


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

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

2015-08-27 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: f3e04b0c845bdbae8ff19c68adce9149a20759b7
Parents: 9cc4890 e1086bc
Author: T Jake Luciani j...@apache.org
Authored: Thu Aug 27 11:27:34 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Thu Aug 27 11:27:34 2015 -0400

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


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

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

2015-08-26 Thread blerer

Merge branch cassandra-2.2 into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: bb77e12f00e92acf569f4fae16db66b321de4be3
Parents: c1740a2 bc25ca1
Author: blerer benjamin.le...@datastax.com
Authored: Wed Aug 26 15:52:03 2015 +0200
Committer: blerer benjamin.le...@datastax.com
Committed: Wed Aug 26 15:55:34 2015 +0200

--
 NEWS.txt | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb77e12f/NEWS.txt
--
diff --cc NEWS.txt
index dc51517,2d6d927..729536b
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -35,69 -19,12 +35,75 @@@ New feature
  
  Upgrading
  -
 -- Nothing specific to this release, but please see 2.2 if you are 
upgrading
 -  from a previous version.
 +   - Max mutation size is now configurable via max_mutation_size_in_kb 
setting in
 + cassandra.yaml; the default is half the size 
commitlog_segment_size_in_mb * 1024.
 +   - 3.0 requires Java 8u40 or later.
 +   - The default JVM GC has been changed to G1GC.
 +   - The default JVM flag -XX:+PerfDisableSharedMem will cause the following 
tools JVM
 + to stop working: jps, jstack, jinfo, jmc, jcmd as well as 3rd party 
tools like Jolokia.
 + If you wish to use these tools you can comment this flag out in 
cassandra-env.{sh,ps1}
 +   - New transaction log files have been introduced to replace the 
compactions_in_progress
 + system table, temporary file markers (tmp and tmplink) and sstable 
ancerstors.
 + Therefore, compaction metadata no longer contains ancestors. Transaction 
log files
 + list sstable descriptors involved in compactions and other operations 
such as flushing
 + and streaming. Use the sstableutil tool to list any sstable files 
currently involved
 + in operations not yet completed, which previously would have been marked 
as temporary.
 + A transaction log file contains one sstable per line, with the prefix 
add: or remove:.
 + They also contain a special line commit, only inserted at the end when 
the transaction
 + is committed. On startup we use these files to cleanup any partial 
transactions that were
 + in progress when the process exited. If the commit line is found, we 
keep new sstables
 + (those with the add prefix) and delete the old sstables (those with 
the remove prefix),
 + vice-versa if the commit line is missing. Should you lose or delete 
these log files,
 + both old and new sstable files will be kept as live files, which will 
result in duplicated
 + sstables. These files are protected by incremental checksums so you 
should not manually
 + edit them. When restoring a full backup or moving sstable files, you 
should clean-up
 + any left over transactions and their temporary files first. You can use 
this command:
 +  === sstableutil -c ks table
 + See CASSANDRA-7066 for full details.
 +   - New write stages have been added for batchlog and materialized view 
mutations
 + you can set their size in cassandra.yaml
 +   - User defined functions are now executed in a sandbox.
 + To use UDFs and UDAs, you have to enable them in cassandra.yaml.
 +   - New SSTable version 'la' with improved bloom-filter false-positive 
handling
 + compared to previous version 'ka' used in 2.2 and 2.1. Running 
sstableupgrade
 + is not necessary but recommended.
 +   - Before upgrading to 3.0, make sure that your cluster is in complete 
agreement
 + (schema versions outputted by `nodetool describecluster` are all the 
same).
 +   - Schema metadata is now stored in the new `system_schema` keyspace, and
 + legacy `system.schema_*` tables are now gone; see CASSANDRA-6717 for 
details.
 +   - Pig's CassandraStorage has been removed. Use CqlNativeStorage instead.
 +   - Hadoop BulkOutputFormat and BulkRecordWriter have been removed; use
 + CqlBulkOutputFormat and CqlBulkRecordWriter instead.
 +   - Hadoop ColumnFamilyInputFormat and ColumnFamilyOutputFormat have been 
removed;
 + use CqlInputFormat and CqlOutputFormat instead.
 +   - Hadoop ColumnFamilyRecordReader and ColumnFamilyRecordWriter have been 
removed;
 + use CqlRecordReader and CqlRecordWriter instead.
 +   - hinted_handoff_enabled in cassandra.yaml no longer supports a list of 
data centers.
 + To specify a list of excluded data centers when hinted_handoff_enabled 
is set to true,
 + use hinted_handoff_disabled_datacenters, see CASSANDRA-9035 for details.
 +   - The `sstable_compression` and `chunk_length_kb`

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

2015-08-26 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: e3baf28b61d41e34e9b75d4b7adb186fb5f5d38b
Parents: 88b05ef 27bc7a5
Author: Robert Stupp sn...@snazy.de
Authored: Thu Aug 27 00:56:48 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Thu Aug 27 00:56:48 2015 +0200

--
 CHANGES.txt |  1 +
 .../io/util/UnbufferedDataOutputStreamPlus.java |  9 +++-
 .../io/util/BufferedDataOutputStreamTest.java   | 45 +++-
 3 files changed, 53 insertions(+), 2 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3baf28b/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java
index 469bccb,ffe9cb9..b875a6a
--- a/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedDataOutputStreamTest.java
@@@ -466,133 -448,42 +471,171 @@@ public class BufferedDataOutputStreamTe
  return count;
  }
  
+ @Test
+ public void testWriteUTF() throws Exception
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+

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

2015-08-25 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: d1ff53171da6348178d029a0fab392849f4d81ce
Parents: f490cce 3238906
Author: T Jake Luciani j...@apache.org
Authored: Tue Aug 25 13:25:38 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Tue Aug 25 13:25:38 2015 -0400

--

--

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

2015-08-25 Thread marcuse

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
src/java/org/apache/cassandra/service/ActiveRepairService.java

test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
test/unit/org/apache/cassandra/repair/LocalSyncTaskTest.java


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

Branch: refs/heads/cassandra-3.0
Commit: f490ccec62b2b86b9dbf0fff352aedbc7f65
Parents: 8afc76a 842f150
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 25 19:05:23 2015 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 25 19:05:34 2015 +0200

--
 .../repair/RepairMessageVerbHandler.java|  5 +-
 .../apache/cassandra/repair/RepairRunnable.java |  2 +-
 .../repair/messages/PrepareMessage.java | 10 +++-
 .../cassandra/repair/messages/RepairOption.java |  4 ++
 .../cassandra/service/ActiveRepairService.java  | 49 +---
 .../LeveledCompactionStrategyTest.java  |  2 +-
 .../cassandra/repair/LocalSyncTaskTest.java |  2 +-
 7 files changed, 51 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f490ccec/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
--
diff --cc src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index 942d902,796f135..ffba9d6
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@@ -73,7 -82,7 +73,8 @@@ public class RepairMessageVerbHandler i
  columnFamilyStores,
  prepareMessage.ranges,
  prepareMessage.isIncremental,
- prepareMessage.timestamp);
 -isGlobal);
++prepareMessage.timestamp,
++prepareMessage.isGlobal);
  MessagingService.instance().sendReply(new 
MessageOut(MessagingService.Verb.INTERNAL_RESPONSE), id, message.from);
  break;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f490ccec/src/java/org/apache/cassandra/repair/RepairRunnable.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f490ccec/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
--
diff --cc src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
index 0cd73db,a57c27e..8909f1b
--- a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
@@@ -40,16 -40,14 +40,18 @@@ public class PrepareMessage extends Rep
  
  public final UUID parentRepairSession;
  public final boolean isIncremental;
 +public final long timestamp;
++public final boolean isGlobal;
  
- public PrepareMessage(UUID parentRepairSession, ListUUID cfIds, 
CollectionRangeToken ranges, boolean isIncremental, long timestamp)
 -public PrepareMessage(UUID parentRepairSession, ListUUID cfIds, 
CollectionRangeToken ranges, boolean isIncremental, boolean isGlobal)
++public PrepareMessage(UUID parentRepairSession, ListUUID cfIds, 
CollectionRangeToken ranges, boolean isIncremental, long timestamp, boolean 
isGlobal)
  {
 -super(isGlobal ? Type.PREPARE_GLOBAL_MESSAGE : Type.PREPARE_MESSAGE, 
null);
 +super(Type.PREPARE_MESSAGE, null);
  this.parentRepairSession = parentRepairSession;
  this.cfIds = cfIds;
  this.ranges = ranges;
  this.isIncremental = isIncremental;
 +this.timestamp = timestamp;
++this.isGlobal = isGlobal;
  }
  
  public static class PrepareMessageSerializer implements 
MessageSerializerPrepareMessage
@@@ -67,10 -65,9 +69,11 @@@
  Range.tokenSerializer.serialize(r, out, version);
  }
  out.writeBoolean(message.isIncremental);
 +out.writeLong(message.timestamp);
++out.writeBoolean(message.isGlobal);
  }
  
 -public PrepareMessage deserialize(DataInput in, int version) throws 
IOException
 +public PrepareMessage deserialize(DataInputPlus in, int version) 
throws IOException
  {
  int cfIdCount = in.readInt();

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

2015-08-24 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: a3d9e6c479e62c1641173d9c6a2af2212b1a961d
Parents: 7ad1da5 2d477a4
Author: Joshua McKenzie jmcken...@apache.org
Authored: Mon Aug 24 12:44:34 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Mon Aug 24 12:44:34 2015 -0400

--
 bin/cassandra.ps1  | 88 -
 conf/cassandra-env.ps1 | 34 +-
 2 files changed, 30 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d9e6c4/conf/cassandra-env.ps1
--

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

2015-08-24 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 9514aba8654a5f05155fea22072a980c201d8b52
Parents: e6a9afb 06a053d
Author: Joshua McKenzie jmcken...@apache.org
Authored: Mon Aug 24 17:11:02 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Mon Aug 24 17:11:02 2015 -0400

--
 .../utils/NanoTimeToCurrentTimeMillis.java  |  2 +-
 .../utils/NanoTimeToCurrentTimeMillisTest.java  | 16 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)
--

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

2015-08-21 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 4cf97f4241e134bd820b4add4132e2e7b6243941
Parents: 1c27abf cd46ca1
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Aug 21 16:44:10 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Aug 21 16:44:10 2015 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4cf97f42/src/java/org/apache/cassandra/service/StartupChecks.java
--
diff --cc src/java/org/apache/cassandra/service/StartupChecks.java
index 1c07b52,4934dea..eca0c7e
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@@ -179,30 -179,33 +179,30 @@@ public class StartupCheck
  }
  };
  
 -public static final StartupCheck checkDataDirs = new StartupCheck()
 +public static final StartupCheck checkDataDirs = () -
  {
 -public void execute() throws StartupException
 +// check all directories(data, commitlog, saved cache) for existence 
and permission
 +IterableString dirs = 
Iterables.concat(Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()),
 + 
Arrays.asList(DatabaseDescriptor.getCommitLogLocation(),
 +   
DatabaseDescriptor.getSavedCachesLocation(),
 +   
DatabaseDescriptor.getHintsDirectory().getAbsolutePath()));
 +for (String dataDir : dirs)
  {
 -// check all directories(data, commitlog, saved cache) for 
existence and permission
 -IterableString dirs = 
Iterables.concat(Arrays.asList(DatabaseDescriptor.getAllDataFileLocations()),
 - 
Arrays.asList(DatabaseDescriptor.getCommitLogLocation(),
 -   
DatabaseDescriptor.getSavedCachesLocation()));
 -for (String dataDir : dirs)
 -{
 -logger.debug(Checking directory {}, dataDir);
 -File dir = new File(dataDir);
 -
 -// check that directories exist.
 -if (!dir.exists())
 -{
 -logger.warn(Directory {} doesn't exist, dataDir);
 -// if they don't, failing their creation, stop cassandra.
 -if (!dir.mkdirs())
 -throw new StartupException(3, Has no permission to 
create directory + dataDir);
 -}
 -
 -// if directories exist verify their permissions
 -if (!Directories.verifyFullPermissions(dir, dataDir))
 -throw new StartupException(3, Insufficient permissions 
on directory  + dataDir);
 +logger.debug(Checking directory {}, dataDir);
 +File dir = new File(dataDir);
  
 +// check that directories exist.
 +if (!dir.exists())
 +{
- logger.error(Directory {} doesn't exist, dataDir);
++logger.warn(Directory {} doesn't exist, dataDir);
 +// if they don't, failing their creation, stop cassandra.
 +if (!dir.mkdirs())
 +throw new StartupException(3, Has no permission to 
create directory + dataDir);
  }
 +
 +// if directories exist verify their permissions
 +if (!Directories.verifyFullPermissions(dir, dataDir))
 +throw new StartupException(3, Insufficient permissions on 
directory  + dataDir);
  }
  };

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

2015-08-21 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0ad1e0aaf665c5afb1a85d2d8b6dce73aaee772e
Parents: 4cf97f4 ab62876
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 21 10:52:35 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 21 10:52:35 2015 -0400

--
 .../db/compaction/LeveledCompactionStrategyTest.java| 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad1e0aa/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--

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

2015-08-21 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 69013c95b6a0f8e6100a61fc8c03385a8037db3a
Parents: f60322a dd19a7f
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 21 14:52:50 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 21 14:52:50 2015 -0400

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

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

2015-08-20 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 0d866456a144ea6b3f86f3677f0e8d90c7b1d2d5
Parents: df52cd6 7a85c8b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Aug 20 21:30:15 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Aug 20 21:30:15 2015 +0300

--

--

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

2015-08-19 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:

test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java


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

Branch: refs/heads/cassandra-3.0
Commit: 811ee6ca2e167d1676501b64b4c1506ff281bf20
Parents: db78236 de2e0a6
Author: Joshua McKenzie jmcken...@apache.org
Authored: Wed Aug 19 10:25:57 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Wed Aug 19 10:25:57 2015 -0400

--
 .../LeveledCompactionStrategyTest.java  | 21 
 1 file changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/811ee6ca/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 46c7068,ccfc6ab..bb15e88
--- 
a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -26,6 -26,9 +26,7 @@@ import java.util.List
  import java.util.Random;
  import java.util.UUID;
  
 -import org.apache.cassandra.io.sstable.format.SSTableReader;
+ import junit.framework.Assert;
  import org.junit.After;
  import org.junit.Before;
  import org.junit.BeforeClass;
@@@ -116,12 -131,19 +122,19 @@@ public class LeveledCompactionStrategyT
  }
  
  waitForLeveling(cfs);
 -WrappingCompactionStrategy strategy = (WrappingCompactionStrategy) 
cfs.getCompactionStrategy();
 +CompactionStrategyManager strategy =  
cfs.getCompactionStrategyManager();
  // Checking we're not completely bad at math
- assert strategy.getSSTableCountPerLevel()[1]  0;
- assert strategy.getSSTableCountPerLevel()[2]  0;
+ int l1Count = strategy.getSSTableCountPerLevel()[1];
+ int l2Count = strategy.getSSTableCountPerLevel()[2];
+ if (l1Count == 0 || l2Count == 0)
+ {
+ logger.error(L1 or L2 has 0 sstables. Expected  0 on both.);
+ logger.error(L1:  + l1Count);
+ logger.error(L2:  + l2Count);
+ Assert.fail();
+ }
  
 -CollectionCollectionSSTableReader groupedSSTables = 
cfs.getCompactionStrategy().groupSSTablesForAntiCompaction(cfs.getSSTables());
 +CollectionCollectionSSTableReader groupedSSTables = 
cfs.getCompactionStrategyManager().groupSSTablesForAntiCompaction(cfs.getLiveSSTables());
  for (CollectionSSTableReader sstableGroup : groupedSSTables)
  {
  int groupLevel = -1;

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

2015-08-18 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 310378d56785fda211166b9d7a78daea0586ca9b
Parents: 2923011 6d9fa37
Author: Robert Stupp sn...@snazy.de
Authored: Tue Aug 18 14:39:41 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Tue Aug 18 14:39:41 2015 +0200

--
 .../cassandra/cql3/validation/operations/AggregationTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/310378d5/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
--

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

2015-08-16 Thread slebresne

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: fb28cb7b6843adab276f509dc9bdc96713381261
Parents: da8d48a 0f287c4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sun Aug 16 12:16:55 2015 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sun Aug 16 12:16:55 2015 +0200

--
 .../org/apache/cassandra/cql3/statements/CreateTableStatement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

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

2015-08-14 Thread jake

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 7b026964b86ce07447e7904ab0286d40a203f0c6
Parents: 8b7caa1 23826f7
Author: T Jake Luciani j...@apache.org
Authored: Fri Aug 14 10:26:31 2015 -0400
Committer: T Jake Luciani j...@apache.org
Committed: Fri Aug 14 10:26:31 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b026964/CHANGES.txt
--
diff --cc CHANGES.txt
index fae0cfc,6a9dc1e..e7cc12e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -2.2.1
 +3.0.0-beta1
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 +Merged from 2.2:
+  * Fix histogram overflow exception (CASSANDRA-9973)
   * Route gossip messages over dedicated socket (CASSANDRA-9237)
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)

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

2015-08-14 Thread snazy

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 6445dd62bb3b5318da24a005cb3bc1f15be86b34
Parents: f8f6fd2 1ba949a
Author: Robert Stupp sn...@snazy.de
Authored: Fri Aug 14 17:24:31 2015 +0200
Committer: Robert Stupp sn...@snazy.de
Committed: Fri Aug 14 17:24:31 2015 +0200

--
 build.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6445dd62/build.xml
--
diff --cc build.xml
index bc433ae,26c3524..06638f6
--- a/build.xml
+++ b/build.xml
@@@ -558,8 -540,9 +558,8 @@@
  dependency groupId=org.mindrot artifactId=jbcrypt/
  dependency groupId=io.dropwizard.metrics 
artifactId=metrics-core/
  dependency groupId=com.addthis.metrics 
artifactId=reporter-config3/
- dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server version=0.3.5/
- dependency groupId=com.clearspring.analytics artifactId=stream 
version=2.5.2 /
+ dependency groupId=com.thinkaurelius.thrift 
artifactId=thrift-server/
+ dependency groupId=com.clearspring.analytics artifactId=stream/
 -dependency groupId=net.sf.supercsv artifactId=super-csv/
  
  dependency groupId=ch.qos.logback artifactId=logback-core/
  dependency groupId=ch.qos.logback artifactId=logback-classic/
@@@ -580,14 -563,12 +580,14 @@@
  
  !-- don't need jamm unless running a server in which case it needs 
to be a -javagent to be used anyway --
  dependency groupId=com.github.jbellis artifactId=jamm/
 -  dependency groupId=com.github.tjake artifactId=crc32ex/
 +
  dependency groupId=io.netty artifactId=netty-all/

-   dependency groupId=joda-time artifactId=joda-time 
version=2.4 /
+   dependency groupId=joda-time artifactId=joda-time/
  
- dependency groupId=org.fusesource artifactId=sigar 
version=1.6.4/
+ dependency groupId=org.fusesource artifactId=sigar/
 +  
 +dependency groupId=org.eclipse.jdt.core.compiler artifactId=ecj 
/
/artifact:pom
artifact:pom id=thrift-pom
  artifactId=cassandra-thrift

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

2015-08-14 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: b294058b67cd33c4834b06c76613fbf1483348de
Parents: 99e0c90 58bee04
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 14 15:23:27 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 14 15:23:27 2015 -0400

--
 bin/nodetool.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

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

2015-08-14 Thread aleksey

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 99e0c907eabc26f876f984daf33fdc2d3ab66a24
Parents: 507ed14 3aa7308
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Aug 14 21:27:08 2015 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Aug 14 21:27:08 2015 +0300

--
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 +-
 .../cassandra/db/SizeEstimatesRecorder.java |  3 ++-
 .../org/apache/cassandra/db/lifecycle/View.java | 20 
 .../apache/cassandra/dht/AbstractBounds.java| 25 
 src/java/org/apache/cassandra/dht/Bounds.java   |  2 +-
 .../apache/cassandra/dht/ExcludingBounds.java   |  2 +-
 .../cassandra/dht/IncludingExcludingBounds.java |  2 +-
 .../cassandra/streaming/StreamSession.java  | 16 +
 .../apache/cassandra/db/lifecycle/ViewTest.java |  8 ---
 9 files changed, 63 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99e0c907/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 797e2c7,8bda6b2..8d72ecf
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1179,7 -1394,7 +1179,7 @@@ public class ColumnFamilyStore implemen
  SetSSTableReader results = null;
  for (SSTableReader sstable : sstables)
  {
- SetSSTableReader overlaps = 
ImmutableSet.copyOf(view.sstablesInBounds(sstableSet, 
AbstractBounds.bounds(sstable.first, true, sstable.last, true)));
 -SetSSTableReader overlaps = 
ImmutableSet.copyOf(tree.search(Interval.RowPosition, 
SSTableReadercreate(sstable.first, sstable.last)));
++SetSSTableReader overlaps = 
ImmutableSet.copyOf(view.sstablesInBounds(sstableSet, sstable.first, 
sstable.last));
  results = results == null ? overlaps : Sets.union(results, 
overlaps).immutableCopy();
  }
  results = Sets.difference(results, ImmutableSet.copyOf(sstables));

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99e0c907/src/java/org/apache/cassandra/db/lifecycle/View.java
--
diff --cc src/java/org/apache/cassandra/db/lifecycle/View.java
index 75590fa,73ba131..7ee0fdf
--- a/src/java/org/apache/cassandra/db/lifecycle/View.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/View.java
@@@ -176,41 -126,19 +176,53 @@@ public class Vie
  return String.format(View(pending_count=%d, sstables=%s, 
compacting=%s), liveMemtables.size() + flushingMemtables.size() - 1, sstables, 
compacting);
  }
  
- public IterableSSTableReader sstablesInBounds(SSTableSet sstableSet, 
AbstractBoundsPartitionPosition rowBounds)
+ /**
 -  * Returns the sstables that have any partition between {@code left} and 
{@code right}, when both bounds are taken inclusively.
 -  * The interval formed by {@code left} and {@code right} shouldn't wrap.
 -  */
 -public ListSSTableReader sstablesInBounds(RowPosition left, RowPosition 
right)
++ * Returns the sstables that have any partition between {@code left} and 
{@code right}, when both bounds are taken inclusively.
++ * The interval formed by {@code left} and {@code right} shouldn't wrap.
++ */
++public IterableSSTableReader sstablesInBounds(SSTableSet sstableSet, 
PartitionPosition left, PartitionPosition right)
  {
+ assert !AbstractBounds.strictlyWrapsAround(left, right);
+ 
  if (intervalTree.isEmpty())
  return Collections.emptyList();
- PartitionPosition stopInTree = rowBounds.right.isMinimum() ? 
intervalTree.max() : rowBounds.right;
- return select(sstableSet, 
intervalTree.search(Interval.create(rowBounds.left, stopInTree)));
+ 
 -RowPosition stopInTree = right.isMinimum() ? intervalTree.max() : 
right;
 -return intervalTree.search(Interval.RowPosition, 
SSTableReadercreate(left, stopInTree));
++PartitionPosition stopInTree = right.isMinimum() ? intervalTree.max() 
: right;
++return select(sstableSet, intervalTree.search(Interval.create(left, 
stopInTree)));
 +}
 +
 +public static FunctionView,

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

2015-08-14 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 12884276699681e2950529418e45e51f73282d1b
Parents: 381cf56 10be826
Author: Joshua McKenzie jmcken...@apache.org
Authored: Fri Aug 14 11:50:40 2015 -0400
Committer: Joshua McKenzie jmcken...@apache.org
Committed: Fri Aug 14 11:50:40 2015 -0400

--
 bin/cassandra.ps1  | 1 -
 conf/cassandra-env.ps1 | 1 -
 2 files changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12884276/conf/cassandra-env.ps1
--

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

2015-08-13 Thread jasobrown

Merge branch 'cassandra-2.2' into cassandra-3.0

Conflicts:
CHANGES.txt


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

Branch: refs/heads/cassandra-3.0
Commit: 6e2cf57202120e9d6fcb112aaf8d5f836ce1e500
Parents: 0ff2a5b 9a6ee93
Author: Jason Brown jasedbr...@gmail.com
Authored: Thu Aug 13 05:41:46 2015 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Aug 13 05:41:46 2015 -0700

--
 CHANGES.txt |  1 +
 .../cassandra/metrics/ConnectionMetrics.java| 30 
 .../org/apache/cassandra/net/MessageOut.java|  2 +-
 .../apache/cassandra/net/MessagingService.java  | 24 
 .../cassandra/net/MessagingServiceMBean.java| 15 ++
 .../net/OutboundTcpConnectionPool.java  | 14 +++--
 .../cassandra/tools/nodetool/NetStats.java  |  8 ++
 7 files changed, 90 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2cf572/CHANGES.txt
--
diff --cc CHANGES.txt
index d7e84bf,3b548e5..2a9b89b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,12 +1,23 @@@
 -2.2.1
 +3.0.0-beta1
+  * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
 - * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
   * Write hints for paxos commits (CASSANDRA-7342)
   * (cqlsh) Fix timestamps before 1970 on Windows, always
 use UTC for timestamp display (CASSANDRA-1)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2cf572/src/java/org/apache/cassandra/net/MessageOut.java
--

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

1 2 >

1 - 100 of 109 matches

Mail list logo