[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-09-27 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5692c59d14dbc81e0a2ee6d9d0fbd7505d503ab5
Parents: 7bef418 8aa6f29
Author: Tyler Hobbs 
Authored: Tue Sep 27 11:53:45 2016 -0500
Committer: Tyler Hobbs 
Committed: Tue Sep 27 11:53:45 2016 -0500

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-23 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk

* cassandra-3.0:
  Avoid clock skew corrupting other nodes through paxos


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

Branch: refs/heads/trunk
Commit: 484e1c47f63c5ae326b4b5dc5ed74c1a3cb7ff21
Parents: f147ca9 969f797
Author: Sylvain Lebresne 
Authored: Thu Jun 23 09:58:05 2016 +0200
Committer: Sylvain Lebresne 
Committed: Thu Jun 23 09:58:05 2016 +0200

--
 CHANGES.txt |  2 +
 .../apache/cassandra/service/ClientState.java   | 56 +---
 .../apache/cassandra/service/StorageProxy.java  |  6 ++-
 .../org/apache/cassandra/utils/UUIDGen.java | 32 +++
 4 files changed, 88 insertions(+), 8 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/src/java/org/apache/cassandra/service/ClientState.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/484e1c47/src/java/org/apache/cassandra/utils/UUIDGen.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-17 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0ff8ab0c2bf3983eec63e07daf96d32decf916cd
Parents: 057c329 70115ff
Author: Josh McKenzie 
Authored: Fri Jun 17 12:41:03 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Jun 17 12:41:03 2016 -0400

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/utils/CLibrary.java| 28 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-15 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 4210a25a909c629c19db5d91de671c2a0f9fa28b
Parents: 4ed0060 70ee4ed
Author: Robert Stupp 
Authored: Wed Jun 15 11:47:37 2016 +0200
Committer: Robert Stupp 
Committed: Wed Jun 15 11:47:37 2016 +0200

--
 CHANGES.txt   |  2 +-
 .../apache/cassandra/repair/RepairRunnable.java   |  7 ++-
 .../cassandra/service/ActiveRepairService.java|  7 +--
 .../service/ActiveRepairServiceTest.java  | 18 ++
 4 files changed, 22 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4210a25a/CHANGES.txt
--
diff --cc CHANGES.txt
index dbcfa34,3eb420d..c9fa673
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,11 -8,8 +21,10 @@@ Merged from 2.1
   * 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
 +3.7
 + * Support multiple folders for user defined compaction tasks 
(CASSANDRA-11765)
 + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
 +Merged from 3.0:
   * 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)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4210a25a/src/java/org/apache/cassandra/service/ActiveRepairService.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-13 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 719e7d6624c2755295dd89670cff1aebf3c73795
Parents: db8df91 73a8341
Author: Marcus Eriksson 
Authored: Mon Jun 13 15:16:33 2016 +0200
Committer: Marcus Eriksson 
Committed: Mon Jun 13 15:16:33 2016 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  4 ++
 .../org/apache/cassandra/db/lifecycle/View.java | 11 +++
 .../cassandra/streaming/StreamSession.java  | 18 +++--
 .../io/sstable/SSTableRewriterTest.java | 75 +---
 5 files changed, 88 insertions(+), 21 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/src/java/org/apache/cassandra/db/lifecycle/View.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/src/java/org/apache/cassandra/streaming/StreamSession.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-06-10 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: db8df91530512cc192b95252ccad89f0edee8540
Parents: f0613bf 3d211e9
Author: Stefania Alborghetti 
Authored: Fri Jun 10 15:56:47 2016 -0500
Committer: Stefania Alborghetti 
Committed: Fri Jun 10 15:56:47 2016 -0500

--
 CHANGES.txt|  3 +++
 pylib/cqlshlib/copyutil.py | 38 +++---
 2 files changed, 38 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db8df915/CHANGES.txt
--
diff --cc CHANGES.txt
index d699f93,47aef7e..a944bd1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,11 -2,11 +14,14 @@@ Merged from 3.0
   * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
  Merged from 2.2:
   * StorageService shutdown hook should use a volatile variable 
(CASSANDRA-11984)
+ Merged from 2.1:
+  * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid 
corrupting SSL connections (CASSANDRA-11749)
+ 
  
 -3.0.7
 +3.7
 + * Support multiple folders for user defined compaction tasks 
(CASSANDRA-11765)
 + * Fix race in CompactionStrategyManager's pause/resume (CASSANDRA-11922)
 +Merged from 3.0:
   * 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)

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-05-18 Thread jbellis 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0f483d8ff34a14a2030d6481669988d33d4de2c0
Parents: 050516c 958183f
Author: Jonathan Ellis 
Authored: Wed May 18 12:31:02 2016 -0500
Committer: Jonathan Ellis 
Committed: Wed May 18 12:31:02 2016 -0500

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-28 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 16e3507534377cfda39ef8bd61e949dfc28e57ca
Parents: 2cc26eb 32112d8
Author: Stefania Alborghetti 
Authored: Fri Apr 29 08:18:13 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 29 08:18:13 2016 +0800

--
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-26 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e6505a606f98707d3aab436e0713f5dab004a5ab
Parents: 0b81f72 f2afd04
Author: Stefania Alborghetti 
Authored: Wed Apr 27 09:09:34 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 09:10:17 2016 +0800

--
 CHANGES.txt  |  1 +
 pylib/cqlshlib/copyutil.py   | 39 +--
 pylib/cqlshlib/formatting.py | 22 +-
 3 files changed, 51 insertions(+), 11 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6505a60/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index 36c951c,b17bdfe..46c7eb6
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -306,9 -306,8 +306,10 @@@ class CopyTask(object)
  copy_options['pagetimeout'] = int(opts.pop('pagetimeout', max(10, 10 
* (copy_options['pagesize'] / 1000
  copy_options['maxattempts'] = int(opts.pop('maxattempts', 5))
  copy_options['dtformats'] = DateTimeFormat(opts.pop('datetimeformat', 
shell.display_timestamp_format),
--   shell.display_date_format, 
shell.display_nanotime_format)
 -copy_options['float_precision'] = shell.display_float_precision
++   shell.display_date_format, 
shell.display_nanotime_format,
++   milliseconds_only=True)
 +copy_options['floatprecision'] = int(opts.pop('floatprecision', '5'))
 +copy_options['doubleprecision'] = int(opts.pop('doubleprecision', 
'12'))
  copy_options['chunksize'] = int(opts.pop('chunksize', 5000))
  copy_options['ingestrate'] = int(opts.pop('ingestrate', 10))
  copy_options['maxbatchsize'] = int(opts.pop('maxbatchsize', 20))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6505a60/pylib/cqlshlib/formatting.py
--
diff --cc pylib/cqlshlib/formatting.py
index aa50204,dcd08da..5364c18
--- a/pylib/cqlshlib/formatting.py
+++ b/pylib/cqlshlib/formatting.py
@@@ -101,101 -99,20 +101,102 @@@ def color_text(bval, colormap, displayw
  
  DEFAULT_NANOTIME_FORMAT = '%H:%M:%S.%N'
  DEFAULT_DATE_FORMAT = '%Y-%m-%d'
 -DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S%z'
  
 -if platform.system() == 'Windows':
 -DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
 +DEFAULT_TIMESTAMP_FORMAT = os.environ.get('CQLSH_DEFAULT_TIMESTAMP_FORMAT', 
'')
 +if not DEFAULT_TIMESTAMP_FORMAT:
 +DEFAULT_TIMESTAMP_FORMAT = '%Y-%m-%d %H:%M:%S.%f%z'
  
  
 -class DateTimeFormat():
 +class DateTimeFormat:
  
  def __init__(self, timestamp_format=DEFAULT_TIMESTAMP_FORMAT, 
date_format=DEFAULT_DATE_FORMAT,
-- nanotime_format=DEFAULT_NANOTIME_FORMAT, timezone=None):
++ nanotime_format=DEFAULT_NANOTIME_FORMAT, timezone=None, 
milliseconds_only=False):
  self.timestamp_format = timestamp_format
  self.date_format = date_format
  self.nanotime_format = nanotime_format
  self.timezone = timezone
++self.milliseconds_only = milliseconds_only  # the microseconds part, 
.NN, wil be rounded to .NNN
 +
 +
 +class CqlType(object):
 +"""
 +A class for converting a string into a cql type name that can match a 
formatter
 +and a list of its sub-types, if any.
 +"""
 +pattern = re.compile('^([^<]*)<(.*)>$')  # *<*>
 +
 +def __init__(self, typestring, ksmeta=None):
 +self.type_name, self.sub_types, self.formatter = 
self.parse(typestring, ksmeta)
 +
 +def __str__(self):
 +return "%s%s" % (self.type_name, self.sub_types or '')
 +
 +__repr__ = __str__
 +
 +def get_n_sub_types(self, num):
 +"""
 +Return the sub-types if the requested number matches the length of 
the sub-types (tuples)
 +or the first sub-type times the number requested if the length of the 
sub-types is one (list, set),
 +otherwise raise an exception
 +"""
 +if len(self.sub_types) == num:
 +return self.sub_types
 +elif len(self.sub_types) == 1:
 +return [self.sub_types[0]] * num
 +else:
 +raise

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-26 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 0b81f72ed09b542174f4fefef0c5023b87ddef30
Parents: ac902a5 fae7bf9
Author: Stefania Alborghetti 
Authored: Wed Apr 27 08:45:55 2016 +0800
Committer: Stefania Alborghetti 
Committed: Wed Apr 27 08:45:55 2016 +0800

--
 CHANGES.txt|  1 +
 pylib/setup.py | 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-26 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 16ea55b0ef962795891c21d0dd0bdb0b6d816c9b
Parents: 73ad99d bf7d433
Author: Marcus Eriksson 
Authored: Tue Apr 26 08:30:58 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 26 09:32:12 2016 +0200

--
 CHANGES.txt |  2 +
 .../compaction/LeveledCompactionStrategy.java   | 15 -
 .../db/compaction/LeveledManifest.java  | 15 -
 .../LongLeveledCompactionStrategyTest.java  | 64 
 4 files changed, 92 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16ea55b0/CHANGES.txt
--
diff --cc CHANGES.txt
index 0c96c44,7d6760b..cd9220b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -80,13 -23,10 +80,15 @@@ Merged from 2.1
   * cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
(CASSANDRA-11633)
   * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
+  * Validate levels when building LeveledScanner to avoid overlaps with 
orphaned sstables (CASSANDRA-9935)
+ 
  
 -3.0.5
 +3.5
 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens 
(CASSANDRA-11525)
 + * Correctly fix potential assertion error during compaction (CASSANDRA-11353)
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable 
files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns 
(CASSANDRA-11397)
 +Merged from 3.0:
   * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
   * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
   * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/16ea55b0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/16ea55b0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/16ea55b0/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--
diff --cc 
test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index fe1871b,79497aa..24a9cea
--- 
a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ 
b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -134,4 -141,61 +141,61 @@@ public class LongLeveledCompactionStrat
  }
  }
  }
+ 
+ @Test
+ public void testLeveledScanner() throws Exception
+ {
+ testParallelLeveledCompaction();
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore store = 
keyspace.getColumnFamilyStore(CF_STANDARDLVL);
+ store.disableAutoCompaction();
 -
 -LeveledCompactionStrategy lcs = 
(LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
++CompactionStrategyManager mgr = store.getCompactionStrategyManager();
++LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) 
mgr.getStrategies().get(1).get(0);
+ 
+ ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB 
value
+ 
+ // Adds 10 partitions
+ for (int r = 0; r < 10; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ UpdateBuilder builder = UpdateBuilder.create(store.metadata, key);
+ for (int c = 0; c < 10; c++)
+ builder.newRow("column" + c).add("val", value);
+ 
+ Mutation rm = new Mutation(builder.build());
+ rm.apply();
+ }
+ 
+ //Flush sstable
+ store.forceBlockingFlush();
+ 
+ Iterable allSSTables = 
store.getSSTables(SSTableSet.LIVE);
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to 
simulate a bug: " + sstable.getFilename());
+ 
sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-25 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 73ad99d9df84436261ba8ebf5cd749abcc3bbed0
Parents: db7d07c 251449f
Author: Yuki Morishita 
Authored: Mon Apr 25 20:08:51 2016 -0500
Committer: Yuki Morishita 
Committed: Mon Apr 25 20:08:51 2016 -0500

--
 CHANGES.txt  | 1 +
 bin/debug-cql| 8 
 bin/nodetool | 9 +
 bin/sstableloader| 9 +
 bin/sstablescrub | 9 +
 bin/sstableupgrade   | 9 +
 bin/sstableutil  | 9 +
 bin/sstableverify| 9 +
 tools/bin/cassandra-stress   | 9 +
 tools/bin/cassandra-stressd  | 9 +
 tools/bin/sstabledump| 9 +
 tools/bin/sstableexpiredblockers | 9 +
 tools/bin/sstablelevelreset  | 9 +
 tools/bin/sstablemetadata| 9 +
 tools/bin/sstableofflinerelevel  | 9 +
 tools/bin/sstablerepairedset | 9 +
 tools/bin/sstablesplit   | 9 +
 17 files changed, 80 insertions(+), 64 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-25 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: db7d07cfa42702bc2d02e779b3a8aaeaab6b6006
Parents: f07a406 c9285d0
Author: Robert Stupp 
Authored: Mon Apr 25 10:22:47 2016 +0200
Committer: Robert Stupp 
Committed: Mon Apr 25 10:22:47 2016 +0200

--
 CHANGES.txt|  1 +
 pylib/cqlshlib/copyutil.py | 17 +
 2 files changed, 10 insertions(+), 8 deletions(-)
--


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

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-21 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: a18402ca089b3a94dd7d1b22c9b97bd85657e0cc
Parents: de1a96c f050133
Author: Stefania Alborghetti 
Authored: Fri Apr 22 09:44:37 2016 +0800
Committer: Stefania Alborghetti 
Committed: Fri Apr 22 09:44:37 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a18402ca/CHANGES.txt
--
diff --cc CHANGES.txt
index 0704c57,fbccb6c..0c86ff7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -75,14 -19,10 +75,15 @@@ Merged from 2.2
   * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
  Merged from 2.1:
+  * clqsh: COPY FROM throws TypeError with Cython extensions enabled 
(CASSANDRA-11574)
   * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
  
 -3.0.5
 +3.5
 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens 
(CASSANDRA-11525)
 + * Correctly fix potential assertion error during compaction (CASSANDRA-11353)
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable 
files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns 
(CASSANDRA-11397)
 +Merged from 3.0:
   * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
   * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
   * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-20 Thread stefania 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5062bb6eb05ae9fe376b7738c5170ff92e48636f
Parents: 2b08690 bb68078
Author: Stefania Alborghetti 
Authored: Thu Apr 21 10:18:26 2016 +0800
Committer: Stefania Alborghetti 
Committed: Thu Apr 21 10:18:26 2016 +0800

--
 CHANGES.txt| 3 ++-
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5062bb6e/CHANGES.txt
--
diff --cc CHANGES.txt
index f6ec738,eb2405c..9f67555
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -70,14 -16,10 +70,15 @@@ Merged from 2.2
   * CqlConfigHelper no longer requires both a keystore and truststore to work 
(CASSANDRA-11532)
   * Make deprecated repair methods backward-compatible with previous 
notification service (CASSANDRA-11430)
   * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
- 
+ Merged from 2.1:
+  * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)
  
 -3.0.5
 +3.5
 + * StaticTokenTreeBuilder should respect posibility of duplicate tokens 
(CASSANDRA-11525)
 + * Correctly fix potential assertion error during compaction (CASSANDRA-11353)
 + * Avoid index segment stitching in RAM which lead to OOM on big SSTable 
files (CASSANDRA-11383)
 + * Fix clustering and row filters for LIKE queries on clustering columns 
(CASSANDRA-11397)
 +Merged from 3.0:
   * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
   * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
   * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-04-11 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: cb1a63474d37d9bf0525d4c5be7c30ddd2ec6965
Parents: c2acf47 5dbeef3
Author: Aleksey Yeschenko 
Authored: Mon Apr 11 19:18:21 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Mon Apr 11 19:18:42 2016 +0100

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml | 62 +++-
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 ++
 .../cql3/statements/BatchStatement.java | 39 
 5 files changed, 51 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb1a6347/CHANGES.txt
--
diff --cc CHANGES.txt
index f399fd9,76c9d99..69ad7da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -167,9 -89,9 +167,10 @@@ Merged from 2.2
   * (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)
 + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
   * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Checking if an unlogged batch is local is inefficient (CASSANDRA-11529)
   * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448).
   * Don't do defragmentation if reading from repaired sstables 
(CASSANDRA-10342)
   * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb1a6347/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index 58bd1b6,f81c1e5..f9be453
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -649,18 -630,18 +649,6 @@@ snapshot_before_compaction: fals
  # lose data on truncation or drop.
  auto_snapshot: true
  
--# When executing a scan, within or across a partition, we need to keep the
--# tombstones seen in memory so we can return them to the coordinator, which
--# will use them to make sure other replicas also know about the deleted rows.
--# With workloads that generate a lot of tombstones, this can cause performance
--# problems and even exaust the server heap.
--# 
(http://www.datastax.com/dev/blog/cassandra-anti-patterns-queues-and-queue-like-datasets)
--# Adjust the thresholds here if you understand the dangers and want to
--# scan more tombstones anyway.  These thresholds may also be adjusted at 
runtime
--# using the StorageService mbean.
--tombstone_warn_threshold: 1000
--tombstone_failure_threshold: 10
--
  # Granularity of the collation index of rows within a partition.
  # Increase if your rows are large, or if you have a very large
  # number of rows per partition.  The competing goals are these:
@@@ -672,14 -653,17 +660,6 @@@
  #  you can cache more hot rows
  column_index_size_in_kb: 64
  
--
--# Log WARN on any batch size exceeding this value. 5kb per batch by default.
--# Caution should be taken on increasing the size of this threshold as it can 
lead to node instability.
--batch_size_warn_threshold_in_kb: 5
--
--# Fail any batch exceeding this value. 50kb (10x warn threshold) by default.
--batch_size_fail_threshold_in_kb: 50
 -
 -# Log WARN on any batches not of type LOGGED than span across more partitions 
than this limit
 -unlogged_batch_across_partitions_warn_threshold: 10
--
  # Number of simultaneous compactions to allow, NOT including
  # validation "compactions" for anti-entropy repair.  Simultaneous
  # compactions can help preserve read performance in a mixed read/write
@@@ -704,9 -688,9 +684,6 @@@
  # of compaction, including validation compaction.
  compaction_throughput_mb_per_sec: 16
  
--# Log a warning when compacting partitions larger than this value
--compaction_large_partition_warning_threshold_mb: 100
--
  # When compacting, the replacement sstable(s) can be opened before they
  # are completely written, and used in place of the prior sstables for
  # any range that has been written. This helps to smoothly transfer reads 
@@@ -942,11 -921,11 +919,6 @@@ inter_dc_tcp_nodelay: fals
  tracetype_query_ttl: 86400
  tracetype_repair_ttl: 604800
  
--# GC Pauses greater than gc_warn_threshold_in_ms will be logged at WARN level
--# Adjust the threshold based on your application throughput requirement
--# By default, Cassandra logs GC Pauses greater than 200 ms at INFO level

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-23 Thread jasobrown 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: ac8c8b213c6a02de1b547cd537bf9058e851bfdc
Parents: babf30d c4bd6d2
Author: Jason Brown 
Authored: Tue Feb 23 14:38:18 2016 -0800
Committer: Jason Brown 
Committed: Tue Feb 23 14:39:53 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac8c8b21/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ad7e1f,9ca2f80..361eedc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -61,8 -33,8 +61,9 @@@ Merged from 2.2
   * (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)
 + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
  Merged from 2.1:
+  * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-17 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 7871c36e36522b3c9b62d689b94b52b416f886e5
Parents: 9f322ac 39e966d
Author: Yuki Morishita 
Authored: Wed Feb 17 10:27:01 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 17 10:27:01 2016 -0600

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


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7871c36e/bin/cassandra
--
diff --cc bin/cassandra
index 98de893,c968c35..d8daa5e
--- a/bin/cassandra
+++ b/bin/cassandra
@@@ -231,13 -231,9 +231,13 @@@ while true; d
  exit 0
  ;;
  -v)
- "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion
+ "$JAVA" -cp "$CLASSPATH" 
"-Dlogback.configurationFile=logback-tools.xml" 
org.apache.cassandra.tools.GetVersion
  exit 0
  ;;
 +-R)
 +allow_root="yes"
 +shift
 +;;
  -D)
  properties="$properties -D$2"
  shift 2

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-17 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 9f322ac600d8cbd8d06427a0b11cea59991ba5ee
Parents: 097ce38 ee81b46
Author: Yuki Morishita 
Authored: Wed Feb 17 09:53:28 2016 -0600
Committer: Yuki Morishita 
Committed: Wed Feb 17 09:53:28 2016 -0600

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-11 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 559280bf1b3e8a3e2a04380119963fc5d52bbe7e
Parents: 11de522 11bfd19
Author: Marcus Eriksson 
Authored: Thu Feb 11 09:03:24 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 09:03:24 2016 +0100

--
 .../db/compaction/CompactionsCQLTest.java   | 53 +---
 1 file changed, 25 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/559280bf/test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-10 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 11de522b5c2d98baa7d73ecace9935097ae8ee10
Parents: 5c2a4ef fdd2cd0
Author: Marcus Eriksson 
Authored: Thu Feb 11 08:50:42 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 08:50:42 2016 +0100

--
 .../LeveledCompactionStrategyTest.java  | 31 
 1 file changed, 25 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/11de522b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 1676896,77d2d12..6ed57ba
--- 
a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -198,13 -196,29 +198,32 @@@ public class LeveledCompactionStrategyT
   */
  private void waitForLeveling(ColumnFamilyStore cfs) throws 
InterruptedException
  {
- CompactionStrategyManager strategy = 
cfs.getCompactionStrategyManager();
- // L0 is the lowest priority, so when that's done, we know everything 
is done
- while (strategy.getSSTableCountPerLevel()[0] > 1)
+ CompactionStrategyManager strategyManager = 
cfs.getCompactionStrategyManager();
+ while (true)
+ {
+ // since we run several compaction strategies we wait until L0 in 
all strategies is empty and
+ // atleast one L1+ is non-empty. In these tests we always run a 
single data directory with only unrepaired data
+ // so it should be good enough
+ boolean allL0Empty = true;
+ boolean anyL1NonEmpty = false;
 -for (AbstractCompactionStrategy strategy : 
strategyManager.getStrategies())
++for (List strategies : 
strategyManager.getStrategies())
+ {
 -if (!(strategy instanceof LeveledCompactionStrategy))
 -return;
 -// note that we check > 1 here, if there is too little data 
in L0, we don't compact it up to L1
 -if (((LeveledCompactionStrategy)strategy).getLevelSize(0) > 1)
 -allL0Empty = false;
 -for (int i = 1; i < 5; i++)
 -if (((LeveledCompactionStrategy)strategy).getLevelSize(i) 
> 0)
 -anyL1NonEmpty = true;
++for (AbstractCompactionStrategy strategy : strategies)
++{
++if (!(strategy instanceof LeveledCompactionStrategy))
++return;
++// note that we check > 1 here, if there is too little 
data in L0, we don't compact it up to L1
++if (((LeveledCompactionStrategy)strategy).getLevelSize(0) 
> 1)
++allL0Empty = false;
++for (int i = 1; i < 5; i++)
++if 
(((LeveledCompactionStrategy)strategy).getLevelSize(i) > 0)
++anyL1NonEmpty = true;
++}
+ }
+ if (allL0Empty && anyL1NonEmpty)
+ return;
  Thread.sleep(100);
- 
- // in AbstractCompationStrategy.replaceSSTables() first we remove and 
then we add sstables so wait a little bit longer
- Thread.sleep(10);
+ }
  }
  
  @Test

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-10 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5c2a4ef280256d0d982d6322672893a8e2846988
Parents: 7863bd3 d436407
Author: Marcus Eriksson 
Authored: Thu Feb 11 08:29:22 2016 +0100
Committer: Marcus Eriksson 
Committed: Thu Feb 11 08:29:22 2016 +0100

--
 CHANGES.txt |  1 +
 .../cassandra/db/compaction/CompactionManager.java  | 12 +++-
 .../org/apache/cassandra/db/compaction/Scrubber.java| 12 
 .../org/apache/cassandra/tools/StandaloneScrubber.java  |  2 +-
 test/unit/org/apache/cassandra/db/ScrubTest.java| 12 ++--
 5 files changed, 15 insertions(+), 24 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/src/java/org/apache/cassandra/db/compaction/Scrubber.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c2a4ef2/test/unit/org/apache/cassandra/db/ScrubTest.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-08 Thread marcuse 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: d3f0c32f0224cc0f606ac1e1e24f41688af72e4f
Parents: 93f77c7 d4fc9d0
Author: Marcus Eriksson 
Authored: Mon Feb 8 09:04:17 2016 +0100
Committer: Marcus Eriksson 
Committed: Mon Feb 8 09:04:17 2016 +0100

--
 CHANGES.txt   |  3 +++
 .../db/compaction/DateTieredCompactionStrategy.java   | 10 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3f0c32f/CHANGES.txt
--
diff --cc CHANGES.txt
index a4f0421,0fb8f34..179da46
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,12 -2,11 +18,15 @@@ Merged from 3.0
   * 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)
+ Merged from 2.1:
+  * Avoid major compaction mixing repaired and unrepaired sstables in DTCS 
(CASSANDRA-3)
+ 
  
 -3.0.3
 +3.3
 + * Avoid infinite loop if owned range is smaller than number of
 +   data dirs (CASSANDRA-11034)
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
   * 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)

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2016-02-08 Thread aleksey 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c227b928a9cfd49450fda6bc349e75f9b783c083
Parents: 1d7f312 0d30540
Author: Aleksey Yeschenko 
Authored: Mon Feb 8 15:53:48 2016 +
Committer: Aleksey Yeschenko 
Committed: Mon Feb 8 15:53:48 2016 +

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-31 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b4e2a80a6f810042ab3f9c2453e4f665b8c91502
Parents: e8d3c9e fe043b6
Author: Yuki Morishita 
Authored: Thu Dec 31 12:51:57 2015 -0600
Committer: Yuki Morishita 
Committed: Thu Dec 31 12:51:57 2015 -0600

--
 CHANGES.txt | 1 +
 .../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4e2a80a/CHANGES.txt
--
diff --cc CHANGES.txt
index 5cd1b4c,03b9ecb..4a1f137
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -38,7 -14,12 +38,8 @@@ 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)
 - * 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:
+  * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
   * cqlsh fails to decode utf-8 characters for text typed columns 
(CASSANDRA-10875)
   * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-23 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: ce6ad5bf835aab747a1dfc6165e7033a3ea04e6e
Parents: 3c8d87f 382d9a9
Author: Joshua McKenzie 
Authored: Wed Dec 23 13:21:27 2015 -0500
Committer: Joshua McKenzie 
Committed: Wed Dec 23 13:21:27 2015 -0500

--
 pylib/cqlshlib/copyutil.py | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3120b8b656392505d2352e235c9e647684b69cf9
Parents: e1cb9b4 a2088b1
Author: Yuki Morishita 
Authored: Tue Dec 22 14:29:56 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Dec 22 14:29:56 2015 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3120b8b6/CHANGES.txt
--
diff --cc CHANGES.txt
index 84e1cb8,be39f29..3b7f389
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,7 -9,12 +32,8 @@@ 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)
 - * 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:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-22 Thread slebresne 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 7950d80330ba0a786e62c27d5051e66ee4e41464
Parents: c4428c7 450fca9
Author: Sylvain Lebresne 
Authored: Tue Dec 22 11:55:46 2015 +0100
Committer: Sylvain Lebresne 
Committed: Tue Dec 22 11:55:46 2015 +0100

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-12-10 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1299ec31904ea30513c28a48b92b35659b7267df
Parents: 425dc5f a7a0388
Author: Joshua McKenzie 
Authored: Thu Dec 10 12:41:46 2015 -0500
Committer: Joshua McKenzie 
Committed: Thu Dec 10 12:41:46 2015 -0500

--
 CHANGES.txt |  2 ++
 .../apache/cassandra/hadoop/ConfigHelper.java   | 26 +++-
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 17 -
 .../apache/cassandra/net/MessagingService.java  |  6 +
 .../cassandra/net/OutboundTcpConnection.java|  9 +++
 5 files changed, 53 insertions(+), 7 deletions(-)
--


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

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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-03 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: f505e8bdfe1edc13a3dbdb60ccf5d8bc9b710cd3
Parents: 468a4c5 87f5e2e
Author: Yuki Morishita 
Authored: Tue Nov 3 10:03:40 2015 -0600
Committer: Yuki Morishita 
Committed: Tue Nov 3 10:03:40 2015 -0600

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/streaming/StreamReader.java| 12 
 .../streaming/compress/CompressedStreamReader.java  | 11 ---
 3 files changed, 17 insertions(+), 7 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-11-02 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fbdeef836ae8f88bb0e0a7081c512629caf61c1d
Parents: 9c9e392 79f230f
Author: Benedict Elliott Smith 
Authored: Mon Nov 2 18:59:35 2015 +
Committer: Benedict Elliott Smith 
Committed: Mon Nov 2 18:59:35 2015 +

--
 .../cassandra/utils/btree/NodeBuilder.java  |  11 +-
 .../cassandra/utils/btree/TreeBuilder.java  |   2 +-
 .../cassandra/utils/memory/MemoryUtil.java  |   2 +-
 .../org/apache/cassandra/db/NativeCellTest.java | 280 +++
 4 files changed, 288 insertions(+), 7 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-29 Thread samt 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: ef1b4c0f5a8e0677efd3ec25fa735782ce1b1480
Parents: 9df2139 3d98693
Author: Sam Tunnicliffe 
Authored: Thu Oct 29 10:55:03 2015 +
Committer: Sam Tunnicliffe 
Committed: Thu Oct 29 10:55:03 2015 +

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-26 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 73c48260d74e5114ea9d2b79726b308181c2b465
Parents: 6f848db a4f32c5
Author: Yuki Morishita 
Authored: Mon Oct 26 12:52:22 2015 -0500
Committer: Yuki Morishita 
Committed: Mon Oct 26 12:52:22 2015 -0500

--
 .../db/compaction/CompactionManager.java| 32 
 .../cassandra/service/StorageService.java   |  3 ++
 2 files changed, 35 insertions(+)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-23 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 87f16ca9ac52d8042563ce5198b776f355236617
Parents: 71d9dba 1d28a4a
Author: Joshua McKenzie 
Authored: Fri Oct 23 13:59:23 2015 -0400
Committer: Joshua McKenzie 
Committed: Fri Oct 23 13:59:23 2015 -0400

--
 pylib/cqlshlib/test/run_cqlsh.py |  2 +-
 pylib/cqlshlib/test/test_cqlsh_output.py | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-21 Thread samt 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c62837f1c949d9babd02d98ed489900a9eaaf034
Parents: 2af041b 73d9a80
Author: Sam Tunnicliffe 
Authored: Wed Oct 21 09:34:20 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Wed Oct 21 09:34:20 2015 +0100

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-13 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3bcdc4b22a350b43d2294e9cdf4c2e1245196af2
Parents: 824db3b 6e20325
Author: Benedict Elliott Smith 
Authored: Tue Oct 13 09:34:05 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Tue Oct 13 09:34:05 2015 +0100

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-10 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 739de136dbe895c0645d8541c925b6a5b7cda091
Parents: e8d8941 fc92c96
Author: Benedict Elliott Smith 
Authored: Sat Oct 10 09:23:15 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Sat Oct 10 09:23:15 2015 +0100

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-10-08 Thread samt 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b8a1547065641a83e27c221cb5e75628b5c5a93f
Parents: 3971452 6b25c58
Author: Sam Tunnicliffe 
Authored: Thu Oct 8 10:06:32 2015 +0100
Committer: Sam Tunnicliffe 
Committed: Thu Oct 8 10:06:32 2015 +0100

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-29 Thread jmckenzie 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8765e6a869f8e902a85690e1477930a640ab7f6d
Parents: 50f8ac0 cf0b737
Author: Joshua McKenzie 
Authored: Tue Sep 29 12:14:46 2015 -0400
Committer: Joshua McKenzie 
Committed: Tue Sep 29 12:14:46 2015 -0400

--
 .../org/apache/cassandra/utils/JVMStabilityInspector.java   | 4 
 .../apache/cassandra/utils/JVMStabilityInspectorTest.java   | 9 +
 2 files changed, 13 insertions(+)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-29 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: ed65ff99c1b5972f9c707262aee1335f6bcd4ca7
Parents: 8765e6a 8bb7077
Author: Yuki Morishita 
Authored: Tue Sep 29 12:02:07 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Sep 29 12:02:07 2015 -0500

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-18 Thread brandonwilliams 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 787b4fcbc532324b50f6650706ce27dcd568f4c9
Parents: aefb2a6 fb61603
Author: Brandon Williams 
Authored: Fri Sep 18 09:16:43 2015 -0500
Committer: Brandon Williams 
Committed: Fri Sep 18 09:16:43 2015 -0500

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-16 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 2f82a69ea270aa1afa886af795e69c006ac6daec
Parents: e2eb867 f542a20
Author: Yuki Morishita 
Authored: Wed Sep 16 08:47:19 2015 -0500
Committer: Yuki Morishita 
Committed: Wed Sep 16 08:47:19 2015 -0500

--
 CHANGES.txt   |  1 +
 .../org/apache/cassandra/utils/FBUtilities.java   | 15 ++-
 .../apache/cassandra/utils/FBUtilitiesTest.java   | 18 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-16 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 10b11835ac01d769a70c408a92eacca00d06ce47
Parents: f5cf571 9218d74
Author: Robert Stupp 
Authored: Wed Sep 16 22:00:57 2015 +0200
Committer: Robert Stupp 
Committed: Wed Sep 16 22:00:57 2015 +0200

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cache/AutoSavingCache.java | 195 +++
 .../org/apache/cassandra/cache/CacheKey.java|  14 +-
 .../apache/cassandra/cache/CounterCacheKey.java |  26 +--
 .../org/apache/cassandra/cache/KeyCacheKey.java |  19 +-
 .../org/apache/cassandra/cache/OHCProvider.java |  39 +++-
 .../org/apache/cassandra/cache/RowCacheKey.java |  34 ++--
 .../org/apache/cassandra/config/CFMetaData.java |  10 +
 .../cassandra/config/DatabaseDescriptor.java|  19 +-
 .../org/apache/cassandra/config/Schema.java |  58 +-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  81 +++-
 src/java/org/apache/cassandra/db/Keyspace.java  |   6 -
 .../org/apache/cassandra/db/RowIndexEntry.java  |   2 +-
 .../db/SinglePartitionReadCommand.java  |   3 +-
 .../io/sstable/format/SSTableReader.java|  10 +-
 .../io/sstable/format/big/BigTableReader.java   |   2 +-
 .../apache/cassandra/service/CacheService.java  |  54 +++--
 .../cassandra/service/CassandraDaemon.java  |  39 +++-
 .../cassandra/service/StorageService.java   |  29 +--
 .../org/apache/cassandra/utils/FBUtilities.java |  16 ++
 .../cassandra/cache/AutoSavingCacheTest.java|   5 +-
 .../cassandra/cache/CacheProviderTest.java  |  24 ++-
 .../apache/cassandra/cql3/KeyCacheCqlTest.java  | 101 ++
 .../apache/cassandra/db/CounterCacheTest.java   |  68 ++-
 .../org/apache/cassandra/db/KeyCacheTest.java   |   2 +-
 .../org/apache/cassandra/db/RowCacheTest.java   |  41 +++-
 26 files changed, 611 insertions(+), 287 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b11835/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-15 Thread brandonwilliams 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 131e097a7e6c334ba31911510dee6c073c9f769b
Parents: d22703b a54589e
Author: Brandon Williams 
Authored: Tue Sep 15 16:11:14 2015 -0500
Committer: Brandon Williams 
Committed: Tue Sep 15 16:11:14 2015 -0500

--
 src/java/org/apache/cassandra/gms/FailureDetector.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-13 Thread snazy 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: e234b314a550df301545feda01647a77453f6b64
Parents: 1e66e97 29c6f1d
Author: Robert Stupp 
Authored: Sun Sep 13 11:37:26 2015 +0200
Committer: Robert Stupp 
Committed: Sun Sep 13 11:37:26 2015 +0200

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/cql3handling.py | 2 +-
 pylib/cqlshlib/cqlhandling.py  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-04 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 356dd5b31f73628ade6ea28efe33c55d1d1d3379
Parents: eaf0e35 ce63ccc
Author: Benedict Elliott Smith 
Authored: Fri Sep 4 12:43:37 2015 +0100
Committer: Benedict Elliott Smith 
Committed: Fri Sep 4 12:43:37 2015 +0100

--
 build.xml   |   8 +-
 lib/licenses/ohc-0.3.4.txt  | 201 
 lib/licenses/ohc-0.4.2.txt  | 201 
 lib/ohc-core-0.4.2.jar  | Bin 0 -> 126802 bytes
 lib/ohc-core-0.4.jar| Bin 127890 -> 0 bytes
 lib/ohc-core-j8-0.4.2.jar   | Bin 0 -> 4994 bytes
 lib/ohc-core-j8-0.4.jar | Bin 4989 -> 0 bytes
 .../apache/cassandra/cache/AutoSavingCache.java |   2 +-
 .../org/apache/cassandra/cache/OHCProvider.java |   3 +-
 .../org/apache/cassandra/db/SystemKeyspace.java |   2 +-
 .../db/commitlog/CommitLogReplayer.java |  19 +-
 .../cassandra/db/filter/ColumnFilter.java   |   2 +-
 .../cassandra/hints/ChecksummedDataInput.java   | 128 +++--
 .../org/apache/cassandra/hints/HintsReader.java |  67 ++-
 .../compress/CompressedRandomAccessReader.java  | 147 +++---
 .../io/compress/CompressedThrottledReader.java  |  48 --
 .../io/compress/CompressionMetadata.java|   2 +-
 .../cassandra/io/sstable/KeyIterator.java   |   1 -
 .../io/sstable/format/SSTableReader.java| 100 ++--
 .../cassandra/io/sstable/format/Version.java|   2 +
 .../io/sstable/format/big/BigFormat.java|   9 +
 .../io/sstable/format/big/BigTableReader.java   | 108 ++---
 .../io/sstable/format/big/BigTableWriter.java   |   2 -
 .../cassandra/io/util/AbstractDataInput.java| 343 -
 .../io/util/BufferedSegmentedFile.java  |  24 -
 .../cassandra/io/util/ByteBufferDataInput.java  | 171 ---
 .../apache/cassandra/io/util/ChannelProxy.java  |   4 +-
 .../io/util/ChecksummedRandomAccessReader.java  |  62 ++-
 .../io/util/CompressedSegmentedFile.java| 100 ++--
 .../cassandra/io/util/DataInputBuffer.java  |  24 +-
 .../io/util/DataIntegrityMetadata.java  |  11 +-
 .../apache/cassandra/io/util/FileDataInput.java |  25 +-
 .../io/util/FileSegmentInputStream.java |  96 
 .../cassandra/io/util/ICompressedFile.java  |   9 +-
 .../cassandra/io/util/MemoryInputStream.java|  54 ++-
 .../cassandra/io/util/MmappedRegions.java   | 344 +
 .../cassandra/io/util/MmappedSegmentedFile.java | 214 +++-
 .../cassandra/io/util/NIODataInputStream.java   | 352 +-
 .../cassandra/io/util/RandomAccessReader.java   | 417 ++--
 .../io/util/RebufferingInputStream.java | 286 +++
 .../apache/cassandra/io/util/SegmentedFile.java | 115 ++---
 .../cassandra/io/util/ThrottledReader.java  |  48 --
 .../compress/CompressedStreamWriter.java|  10 +-
 .../apache/cassandra/utils/ByteBufferUtil.java  |   3 -
 .../org/apache/cassandra/utils/Throwables.java  |  45 +-
 .../apache/cassandra/utils/vint/VIntCoding.java |   2 +-
 .../cassandra/db/commitlog/CommitLogTest.java   |   8 +-
 .../db/commitlog/CommitLogTestReplayer.java |   3 +-
 .../hints/ChecksummedDataInputTest.java | 227 +++--
 .../io/ChecksummedRandomAccessReaderTest.java   | 127 -
 .../cassandra/io/RandomAccessReaderTest.java| 269 ---
 .../CompressedRandomAccessReaderTest.java   | 245 +-
 .../CompressedSequentialWriterTest.java |   2 +-
 .../cassandra/io/sstable/SSTableReaderTest.java |   3 +-
 .../io/util/BufferedDataOutputStreamTest.java   |  12 +-
 .../io/util/BufferedRandomAccessFileTest.java   |  91 +---
 .../util/ChecksummedRandomAccessReaderTest.java | 127 +
 .../io/util/FileSegmentInputStreamTest.java | 131 +
 .../apache/cassandra/io/util/MemoryTest.java|  37 ++
 .../cassandra/io/util/MmappedRegionsTest.java   | 375 ++
 .../io/util/NIODataInputStreamTest.java |  16 +-
 .../io/util/RandomAccessReaderTest.java | 483 +++
 62 files changed, 3340 insertions(+), 2627 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/356dd5b3/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/356dd5b3/src/java/org/apache/cassandra/utils/ByteBufferUtil.java

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-09-01 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 97b57cbdf790274934bcedfe435a5daad78839fc
Parents: 0d2603c ae669b0
Author: Yuki Morishita 
Authored: Tue Sep 1 16:58:27 2015 -0500
Committer: Yuki Morishita 
Committed: Tue Sep 1 16:58:27 2015 -0500

--
 CHANGES.txt   |  1 +
 .../cassandra/streaming/messages/StreamMessage.java   | 14 ++
 2 files changed, 11 insertions(+), 4 deletions(-)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-31 Thread brandonwilliams 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c5632c40077dcdf34e5c33e1687a1eff3bd9c898
Parents: 5d0c6ef f3c5fab
Author: Brandon Williams 
Authored: Mon Aug 31 16:43:19 2015 -0500
Committer: Brandon Williams 
Committed: Mon Aug 31 16:43:19 2015 -0500

--
 CHANGES.txt |  8 +
 .../org/apache/cassandra/tools/NodeProbe.java   |  2 ++
 .../org/apache/cassandra/tools/NodeTool.java|  1 +
 .../tools/nodetool/GetTraceProbability.java | 33 
 4 files changed, 44 insertions(+)
--


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-31 Thread brandonwilliams 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 8302ef7a856e8bb18986d226596b23daf3020ed0
Parents: c5632c4 627e939
Author: Brandon Williams 
Authored: Mon Aug 31 17:10:58 2015 -0500
Committer: Brandon Williams 
Committed: Mon Aug 31 17:10:58 2015 -0500

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-24 Thread jbellis 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 32c841598e0b4fd22c0c1558d1e0186e46b4c969
Parents: 9a7dfb1 27a97a5
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 24 20:00:39 2015 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 24 20:00:39 2015 -0500

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-24 Thread jbellis 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 5d110214649f3967e7c1e0ef41e98ca54c2a6541
Parents: 32c8415 ee9807e
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Aug 24 20:10:19 2015 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Aug 24 20:10:19 2015 -0500

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


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

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-23 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: b1fb6b939ac892432ace5e7f5c7597bd573b669c
Parents: 7aa49ac 342e33f
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Aug 23 11:31:03 2015 +0100
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Aug 23 11:31:03 2015 +0100

--
 .../apache/cassandra/stress/StressProfile.java  |  3 +-
 .../stress/generate/values/BigDecimals.java | 39 
 2 files changed, 41 insertions(+), 1 deletion(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-09 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 98cc1ee0994060ca136bc0db968fa4fdf3d772bd
Parents: 6292aaa e2ad7d5
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sun Aug 9 09:41:44 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sun Aug 9 09:41:44 2015 +0200

--
 .../cassandra/service/CassandraDaemon.java  |   8 +
 .../cassandra/utils/JVMStabilityInspector.java  |   9 +-
 .../org/apache/cassandra/db/CommitLogTest.java  | 161 ++-
 .../apache/cassandra/utils/KillerForTests.java  |  11 +-
 4 files changed, 184 insertions(+), 5 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-08 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 6292aaa729ffb7f6367b149fb84edce3613c7872
Parents: 05de664 7ea2ce1
Author: Benedict Elliott Smith bened...@apache.org
Authored: Sat Aug 8 12:36:36 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Sat Aug 8 12:36:36 2015 +0200

--
 .../apache/cassandra/db/commitlog/AbstractCommitLogService.java   | 3 ++-
 .../org/apache/cassandra/db/commitlog/BatchCommitLogService.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-06 Thread benedict 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fe8fbc8f1d2a91d21ef5643577e375334bd20f62
Parents: 9cd4f82 bf47408
Author: Benedict Elliott Smith bened...@apache.org
Authored: Thu Aug 6 14:51:39 2015 +0200
Committer: Benedict Elliott Smith bened...@apache.org
Committed: Thu Aug 6 14:51:39 2015 +0200

--
 test/unit/org/apache/cassandra/Util.java| 24 ++--
 .../cassandra/concurrent/WaitQueueTest.java |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

2015-08-05 Thread yukim 
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: c1aff4fa61e09396de56cfa365c56dbe256393ee
Parents: 760dbd9 c3ed25b
Author: Yuki Morishita yu...@apache.org
Authored: Wed Aug 5 16:10:42 2015 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Aug 5 16:10:42 2015 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/tools/NodeProbe.java   | 16 ++
 .../apache/cassandra/tools/nodetool/Info.java   | 23 ++--
 3 files changed, 19 insertions(+), 21 deletions(-)
--