[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[jmckenzie]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 6d1254ac238604f5fe6c5660eb72d40959626651
Parents: bdae452 af9b9cd
Author: Josh McKenzie 
Authored: Fri Apr 1 11:54:51 2016 -0400
Committer: Josh McKenzie 
Committed: Fri Apr 1 11:54:51 2016 -0400

--
 CHANGES.txt |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 134 ++--
 .../org/apache/cassandra/db/Directories.java|  16 +-
 src/java/org/apache/cassandra/db/Memtable.java  |  29 +++-
 .../db/commitlog/CommitLogSegmentManager.java   |   4 +-
 .../cassandra/io/util/DiskAwareRunnable.java|  56 ---
 .../apache/cassandra/cql3/OutOfSpaceTest.java   | 157 +++
 7 files changed, 276 insertions(+), 121 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1254ac/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a6645b5,6e01b34..b47cf85
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1128,17 -1149,10 +1160,15 @@@ public class ColumnFamilyStore implemen
  }
  }
  }
- memtable.cfs.replaceFlushed(memtable, sstables);
- reclaim(memtable);
+ }
+ memtable.cfs.replaceFlushed(memtable, sstables);
+ reclaim(memtable);
 -logger.debug("Flushed to {} ({} sstables, {} bytes), biggest {} 
bytes, smallest {} bytes", sstables, sstables.size(), totalBytesOnDisk, 
maxBytesOnDisk, minBytesOnDisk);
 +logger.debug("Flushed to {} ({} sstables, {}), biggest {}, 
smallest {}",
 + sstables,
 + sstables.size(),
 + FBUtilities.prettyPrintMemory(totalBytesOnDisk),
 + FBUtilities.prettyPrintMemory(maxBytesOnDisk),
 + FBUtilities.prettyPrintMemory(minBytesOnDisk));
- }
- // signal the post-flush we've done our work
- postFlush.latch.countDown();
  }
  
  private void reclaim(final Memtable memtable)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1254ac/src/java/org/apache/cassandra/db/Memtable.java
--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: d00bda88b1c83a296a026f5ce14482bbe9a31b4c
Parents: 7f6d70d 7fbdce8
Author: Yuki Morishita 
Authored: Wed Mar 30 16:51:59 2016 -0500
Committer: Yuki Morishita 
Committed: Wed Mar 30 16:51:59 2016 -0500

--

--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[aleksey]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 9fd6322dc3539dd0327f886734211a17aa89b9ad
Parents: 761dfc2 bed6aae
Author: Aleksey Yeschenko 
Authored: Tue Mar 29 17:57:48 2016 +0100
Committer: Aleksey Yeschenko 
Committed: Tue Mar 29 17:57:48 2016 +0100

--

--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[marcuse]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: f04224707d29544228e791f0b532a9969da2820b
Parents: a0a9494 0a25085
Author: Marcus Eriksson 
Authored: Tue Mar 29 11:10:28 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Mar 29 11:10:28 2016 +0200

--
 CHANGES.txt |  2 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 20 -
 .../db/compaction/CompactionManager.java| 44 +---
 .../cassandra/service/StorageService.java   | 30 ++---
 .../cassandra/service/StorageServiceMBean.java  |  8 
 .../org/apache/cassandra/tools/NodeProbe.java   | 38 ++---
 .../cassandra/tools/nodetool/Cleanup.java   |  9 +++-
 .../tools/nodetool/RelocateSSTables.java|  8 +++-
 .../apache/cassandra/tools/nodetool/Scrub.java  | 13 --
 .../tools/nodetool/UpgradeSSTable.java  | 10 -
 .../org/apache/cassandra/db/CleanupTest.java|  6 +--
 .../unit/org/apache/cassandra/db/ScrubTest.java | 16 +++
 12 files changed, 141 insertions(+), 63 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0422470/src/java/org/apache/cassandra/tools/NodeProbe.java
--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[jmckenzie]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 8602918722c96f3ffa6b970597d4ff6927b24707
Parents: 5beedbc c7ef7c9
Author: Josh McKenzie 
Authored: Mon Mar 28 13:56:13 2016 -0400
Committer: Josh McKenzie 
Committed: Mon Mar 28 13:56:13 2016 -0400

--
 pylib/cqlshlib/copyutil.py | 98 +
 1 file changed, 69 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86029187/pylib/cqlshlib/copyutil.py
--
diff --cc pylib/cqlshlib/copyutil.py
index 1da5d14,0cae396..f03a1a3
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -1496,10 -1529,10 +1536,10 @@@ class ExportProcess(ChildProcess)
  def result_callback(rows):
  if future.has_more_pages:
  future.start_fetching_next_page()
 -self.write_rows_to_csv(token_range, rows)
 +self.write_rows_to_csv(token_range, rows, cql_types)
  else:
 -self.write_rows_to_csv(token_range, rows)
 +self.write_rows_to_csv(token_range, rows, cql_types)
- self.outmsg.send((None, None))
+ self.send((None, None))
  session.complete_request()
  
  def err_callback(err):
@@@ -1517,10 -1550,10 +1557,10 @@@
  writer = csv.writer(output, **self.options.dialect)
  
  for row in rows:
 -writer.writerow(map(self.format_value, row))
 +writer.writerow(map(self.format_value, row, cql_types))
  
  data = (output.getvalue(), len(rows))
- self.outmsg.send((token_range, data))
+ self.send((token_range, data))
  output.close()
  
  except Exception, e:

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: a1940a1571007c73ab0855a568f073d4d523ee37
Parents: 207d08f 76241eb
Author: Yuki Morishita 
Authored: Tue Mar 22 16:10:20 2016 -0500
Committer: Yuki Morishita 
Committed: Tue Mar 22 16:10:20 2016 -0500

--

--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[slebresne]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 3508cd1af337c1f082f1b3ce112ee4e44b8cb55d
Parents: 7a9b8ca d526ad7
Author: Sylvain Lebresne 
Authored: Thu Mar 17 10:22:10 2016 +0100
Committer: Sylvain Lebresne 
Committed: Thu Mar 17 10:22:10 2016 +0100

--
 doc/cql3/CQL.textile | 26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)
--


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

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[marcuse]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: df58c1f4d1cac989bc6af3390db0126d4e463365
Parents: 3d4aa59 fc6b2b3
Author: Marcus Eriksson 
Authored: Wed Mar 16 10:49:48 2016 +0100
Committer: Marcus Eriksson 
Committed: Wed Mar 16 10:49:48 2016 +0100

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


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

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 9d527ed257ece570b1cd29e1ce77a74d10cfd605
Parents: bdd9e3b 10d61d4
Author: Yuki Morishita 
Authored: Thu Mar 10 13:03:21 2016 -0600
Committer: Yuki Morishita 
Committed: Thu Mar 10 13:03:21 2016 -0600

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml |  7 +++
 .../net/IncomingStreamingConnection.java|  5 +
 .../cassandra/streaming/ConnectionHandler.java  | 21 +---
 .../cassandra/streaming/StreamSession.java  |  2 ++
 5 files changed, 25 insertions(+), 11 deletions(-)
--


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

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[slebresne]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: be20457c0d2583ea9e81a3000e9709aa6151d09c
Parents: 97fe1aa 17d1b1b
Author: Sylvain Lebresne 
Authored: Tue Mar 8 17:22:23 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Mar 8 17:22:23 2016 +0100

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


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

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[slebresne]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 97fe1aab4b19b8cd7761093cb2681f9b89765c86
Parents: b78117c 719f584
Author: Sylvain Lebresne 
Authored: Tue Mar 8 10:42:13 2016 +0100
Committer: Sylvain Lebresne 
Committed: Tue Mar 8 10:42:13 2016 +0100

--
 src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 
 1 file changed, 4 insertions(+)
--

[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

[yukim]

Merge branch 'cassandra-3.5' into trunk


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

Branch: refs/heads/trunk
Commit: 3ae4f80e4e7bb853b438bca014429d4962caad12
Parents: e017f94 eef2b18
Author: Yuki Morishita 
Authored: Mon Mar 7 12:48:26 2016 -0600
Committer: Yuki Morishita 
Committed: Mon Mar 7 12:48:26 2016 -0600

--

--