[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/fc37e618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc37e618 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc37e618 Branch: refs/heads/trunk Commit: fc37e618bb87971e5df82be1104ba7bec83e Parents: 3efcdc5 03df4c7 Author: Yuki Morishita Authored: Fri Apr 1 12:45:48 2016 -0500 Committer: Yuki Morishita Committed: Fri Apr 1 12:45:48 2016 -0500 -- CHANGES.txt | 1 + .../db/lifecycle/LogAwareFileLister.java| 23 --- .../apache/cassandra/io/sstable/Descriptor.java | 20 +-- .../db/lifecycle/LogTransactionTest.java| 63 +++- .../cassandra/io/sstable/DescriptorTest.java| 40 + 5 files changed, 90 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc37e618/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc37e618/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java -- diff --cc test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java index 59958bb,45b5844..9defa8d --- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java @@@ -514,12 -515,12 +515,12 @@@ public class LogTransactionTest extend // test listing Assert.assertEquals(sstables[0].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder1)); + getTemporaryFiles(dataFolder1)); Assert.assertEquals(sstables[2].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder2)); + getTemporaryFiles(dataFolder2)); // normally called at startup -LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2)); + assertTrue(LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2))); // new tables should be only table left assertFiles(dataFolder1.getPath(), new HashSet<>(sstables[1].getAllFilePaths())); @@@ -565,12 -566,12 +566,12 @@@ // test listing Assert.assertEquals(sstables[1].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder1)); + getTemporaryFiles(dataFolder1)); Assert.assertEquals(sstables[3].getAllFilePaths().stream().map(File::new).collect(Collectors.toSet()), - LogAwareFileLister.getTemporaryFiles(dataFolder2)); + getTemporaryFiles(dataFolder2)); // normally called at startup -LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2)); + assertTrue(LogTransaction.removeUnfinishedLeftovers(Arrays.asList(dataFolder1, dataFolder2))); // old tables should be only table left assertFiles(dataFolder1.getPath(), new HashSet<>(sstables[0].getAllFilePaths()));
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/7e5c6b59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e5c6b59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e5c6b59 Branch: refs/heads/trunk Commit: 7e5c6b597aae9571b3e6fb47dfe3b6467fecdc19 Parents: 3c147f8 b80a31d Author: T Jake Luciani Authored: Thu Mar 31 10:18:19 2016 -0400 Committer: T Jake Luciani Committed: Thu Mar 31 10:18:19 2016 -0400 -- CHANGES.txt | 1 + .../stress/settings/SettingsTransport.java| 18 +- 2 files changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e5c6b59/CHANGES.txt --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/fafbf27f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fafbf27f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fafbf27f Branch: refs/heads/trunk Commit: fafbf27fd629bf9474e406ec636dea4e6d9c76fc Parents: d00bda8 cd69d9d Author: Marcus Eriksson Authored: Thu Mar 31 09:46:02 2016 +0200 Committer: Marcus Eriksson Committed: Thu Mar 31 09:46:02 2016 +0200 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 17 ++--- .../repair/RepairMessageVerbHandler.java | 18 ++ .../cassandra/service/ActiveRepairService.java| 2 +- 4 files changed, 22 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fafbf27f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fafbf27f/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/b5b2ffa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5b2ffa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5b2ffa8 Branch: refs/heads/trunk Commit: b5b2ffa8d75c462762bea29fb62421371e1ffcb7 Parents: f042247 df18c9b Author: Marcus Eriksson Authored: Tue Mar 29 11:21:50 2016 +0200 Committer: Marcus Eriksson Committed: Tue Mar 29 11:21:50 2016 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/lifecycle/LifecycleTransaction.java | 5 - .../org/apache/cassandra/io/sstable/SSTableWriterTestBase.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5b2ffa8/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5b2ffa8/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/1c0c39de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c0c39de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c0c39de Branch: refs/heads/trunk Commit: 1c0c39de7ac79d6c5805e12e8e2cc31892adb4db Parents: c9c9c42 acc2f89 Author: Robert Stupp Authored: Mon Mar 28 13:26:29 2016 +0200 Committer: Robert Stupp Committed: Mon Mar 28 13:26:29 2016 +0200 -- src/java/org/apache/cassandra/service/paxos/PrepareCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/df1ff74e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df1ff74e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df1ff74e Branch: refs/heads/trunk Commit: df1ff74e205de1151c4acbdf17a686f882e5df06 Parents: a1940a1 4509934 Author: Marcus Eriksson Authored: Wed Mar 23 14:41:11 2016 +0100 Committer: Marcus Eriksson Committed: Wed Mar 23 14:41:11 2016 +0100 -- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/f387d882 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f387d882 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f387d882 Branch: refs/heads/trunk Commit: f387d88249c2e43f651f5e7a14e0f39402c6f445 Parents: 3dcbe90 faa9524 Author: Marcus Eriksson Authored: Wed Mar 16 09:24:03 2016 +0100 Committer: Marcus Eriksson Committed: Wed Mar 16 09:24:03 2016 +0100 -- CHANGES.txt | 1 + .../writers/MaxSSTableSizeWriter.java | 27 +--- 2 files changed, 19 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f387d882/CHANGES.txt --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/b12413d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b12413d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b12413d4 Branch: refs/heads/trunk Commit: b12413d4e260d30f175c19e36a772d003aec0895 Parents: 0ac03a2 950b1a3 Author: Joshua McKenzie Authored: Mon Mar 14 18:02:19 2016 -0400 Committer: Joshua McKenzie Committed: Mon Mar 14 18:02:19 2016 -0400 -- .../apache/cassandra/service/StorageProxy.java | 35 ++-- 1 file changed, 17 insertions(+), 18 deletions(-) --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/0ac03a20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ac03a20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ac03a20 Branch: refs/heads/trunk Commit: 0ac03a20c013e93d978ddf5cdf2e645be18de410 Parents: 8097d39 de44900 Author: Yuki Morishita Authored: Fri Mar 11 16:47:49 2016 -0600 Committer: Yuki Morishita Committed: Fri Mar 11 16:47:49 2016 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac03a20/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ac03a20/bin/cqlsh.py -- diff --cc bin/cqlsh.py index f8cd32d,3cdeb35..3be72b4 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -1328,16 -1373,14 +1328,21 @@@ class Shell(cmd.Cmd) def print_static_result(self, column_names, rows, table_meta): if not column_names and not table_meta: return + column_names = column_names or table_meta.columns.keys() + formatted_names = [self.myformat_colname(name, table_meta) for name in column_names] + if not rows: + # print header only + self.print_formatted_result(formatted_names, None) + return -formatted_values = [map(self.myformat_value, row.values()) for row in rows] + +cql_types = [] +if table_meta: +ks_meta = self.conn.metadata.keyspaces[table_meta.keyspace_name] +cql_types = [CqlType(table_meta.columns[c].cql_type, ks_meta) + if c in table_meta.columns else None for c in column_names] + - formatted_names = [self.myformat_colname(name, table_meta) for name in column_names] +formatted_values = [map(self.myformat_value, row.values(), cql_types) for row in rows] if self.expand_enabled: self.print_formatted_result_vertically(formatted_names, formatted_values)
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/40b9e2cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40b9e2cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40b9e2cc Branch: refs/heads/trunk Commit: 40b9e2cc25a63829110d06ee6f8f02957fbca189 Parents: 32b5f8f 96a6e2e Author: Marcus Eriksson Authored: Thu Mar 10 11:20:34 2016 +0100 Committer: Marcus Eriksson Committed: Thu Mar 10 11:20:34 2016 +0100 -- --
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
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/32b5f8fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32b5f8fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32b5f8fe Branch: refs/heads/trunk Commit: 32b5f8fe4939fc560f783ed39e4d9ac69f086a11 Parents: dc480c7 d2333a9 Author: Yuki Morishita Authored: Wed Mar 9 11:43:44 2016 -0600 Committer: Yuki Morishita Committed: Wed Mar 9 11:43:44 2016 -0600 -- CHANGES.txt | 1 + bin/cqlsh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32b5f8fe/CHANGES.txt --