Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A5FC9CD6 for ; Thu, 16 Feb 2012 10:55:12 +0000 (UTC) Received: (qmail 19848 invoked by uid 500); 16 Feb 2012 10:55:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 19822 invoked by uid 500); 16 Feb 2012 10:55:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 19812 invoked by uid 99); 16 Feb 2012 10:55:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 10:55:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 10:55:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31B27320670; Thu, 16 Feb 2012 10:54:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Use test partitioner in SSTableSimpleWriterTest to avoid mismatch during loading Message-Id: <20120216105447.31B27320670@tyr.zones.apache.org> Date: Thu, 16 Feb 2012 10:54:47 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 271630d58 -> 78142cb79 Use test partitioner in SSTableSimpleWriterTest to avoid mismatch during loading Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78142cb7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78142cb7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78142cb7 Branch: refs/heads/cassandra-1.1 Commit: 78142cb790f921395273233eea5e2016b9148d36 Parents: 271630d Author: Sylvain Lebresne Authored: Thu Feb 16 11:54:36 2012 +0100 Committer: Sylvain Lebresne Committed: Thu Feb 16 11:54:36 2012 +0100 ---------------------------------------------------------------------- .../io/sstable/SSTableSimpleWriterTest.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78142cb7/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java index c9edd53..9416432 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java @@ -28,6 +28,7 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.IntegerType; +import org.apache.cassandra.service.StorageService; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; import static org.apache.cassandra.utils.ByteBufferUtil.toInt; @@ -46,7 +47,7 @@ public class SSTableSimpleWriterTest extends CleanupHelper File dir = Directories.create(tablename, cfname).getDirectoryForNewSSTables(0); assert dir.exists(); - IPartitioner partitioner = new RandomPartitioner(); + IPartitioner partitioner = StorageService.getPartitioner(); SSTableSimpleUnsortedWriter writer = new SSTableSimpleUnsortedWriter(dir, partitioner, tablename, cfname, IntegerType.instance, null, 16); int k = 0;