Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 37508 invoked from network); 12 Apr 2010 14:10:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Apr 2010 14:10:50 -0000 Received: (qmail 46284 invoked by uid 500); 12 Apr 2010 14:10:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 46276 invoked by uid 500); 12 Apr 2010 14:10:50 -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 46268 invoked by uid 99); 12 Apr 2010 14:10:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Apr 2010 14:10:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Apr 2010 14:10:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFA1223888E4; Mon, 12 Apr 2010 14:10:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r933248 - in /cassandra/trunk/src/java/org/apache/cassandra: db/ColumnFamilyStore.java service/AntiEntropyService.java Date: Mon, 12 Apr 2010 14:10:26 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100412141026.AFA1223888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Mon Apr 12 14:10:26 2010 New Revision: 933248 URL: http://svn.apache.org/viewvc?rev=933248&view=rev Log: access static members by class name. patch by Tupshin Harper; reviewed by jbellis for CASSANDRA-966 Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=933248&r1=933247&r2=933248&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Apr 12 14:10:26 2010 @@ -796,7 +796,7 @@ public class ColumnFamilyStore implement iterators.add(iter); } - Comparator comparator = filter.getColumnComparator(getComparator()); + Comparator comparator = QueryFilter.getColumnComparator(getComparator()); Iterator collated = IteratorUtils.collatedIterator(comparator, iterators); if (!collated.hasNext()) return null; Modified: cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=933248&r1=933247&r2=933248&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Mon Apr 12 14:10:26 2010 @@ -554,9 +554,9 @@ public class AntiEntropyService // restore partitioners (in case we were serialized) if (ltree.partitioner() == null) - ltree.partitioner(ss.getPartitioner()); + ltree.partitioner(StorageService.getPartitioner()); if (rtree.partitioner() == null) - rtree.partitioner(ss.getPartitioner()); + rtree.partitioner(StorageService.getPartitioner()); // determine the ranges where responsibility overlaps Set interesting = new HashSet(ss.getRangesForEndPoint(cf.left, local));