Repository: cassandra Updated Branches: refs/heads/trunk e39dc56ed -> 82e26b217
Fix test timeout in CQLSSTableWriterTest Time out is caused by NPE when creating SSTable writer. 3.0 does not have ks and cf names in SSTable file name, when writing SSTable, it has to be under ks/cf directory. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82e26b21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82e26b21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82e26b21 Branch: refs/heads/trunk Commit: 82e26b217dab3c327bab882be8cc6b8c0c257139 Parents: e39dc56 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Oct 24 13:47:40 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Oct 24 15:11:46 2014 -0500 ---------------------------------------------------------------------- .../cassandra/io/sstable/CQLSSTableWriterTest.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/82e26b21/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index 5a09586..250545a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@ -70,7 +70,7 @@ public class CQLSSTableWriterTest CQLSSTableWriter writer = CQLSSTableWriter.builder() .inDirectory(dataDir) .forTable(schema) - .withPartitioner(StorageService.instance.getPartitioner()) + .withPartitioner(StorageService.getPartitioner()) .using(insert).build(); writer.addRow(0, "test1", 24); @@ -129,16 +129,21 @@ public class CQLSSTableWriterTest // Check that the write respect the buffer size even if we only insert rows withing the same partition (#7360) // To do that simply, we use a writer with a buffer of 1MB, and write 2 rows in the same partition with a value // > 1MB and validate that this created more than 1 sstable. + String KS = "ks"; + String TABLE = "test"; + File tempdir = Files.createTempDir(); + File dataDir = new File(tempdir.getAbsolutePath() + File.separator + KS + File.separator + TABLE); + assert dataDir.mkdirs(); String schema = "CREATE TABLE ks.test (" + " k int PRIMARY KEY," + " v blob" + ")"; String insert = "INSERT INTO ks.test (k, v) VALUES (?, ?)"; CQLSSTableWriter writer = CQLSSTableWriter.builder() - .inDirectory(tempdir) + .inDirectory(dataDir) .forTable(schema) - .withPartitioner(StorageService.instance.getPartitioner()) + .withPartitioner(StorageService.getPartitioner()) .using(insert) .withBufferSizeInMB(1) .build(); @@ -156,6 +161,6 @@ public class CQLSSTableWriterTest return name.endsWith("-Data.db"); } }; - assert tempdir.list(filterDataFiles).length > 1 : Arrays.toString(tempdir.list(filterDataFiles)); + assert dataDir.list(filterDataFiles).length > 1 : Arrays.toString(dataDir.list(filterDataFiles)); } }
