Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 93094 invoked from network); 29 Dec 2009 17:14:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Dec 2009 17:14:50 -0000 Received: (qmail 38464 invoked by uid 500); 29 Dec 2009 17:14:50 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 38433 invoked by uid 500); 29 Dec 2009 17:14:50 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 38423 invoked by uid 99); 29 Dec 2009 17:14:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 17:14:50 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 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; Tue, 29 Dec 2009 17:14:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9C5F523889D2; Tue, 29 Dec 2009 17:14:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894447 - in /incubator/cassandra/trunk: src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/filter/ src/java/org/apache/cassandra/io/ src/java/org/apache/cassandra/io/util/ src/java/org/... Date: Tue, 29 Dec 2009 17:14:21 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091229171423.9C5F523889D2@eris.apache.org> Author: jbellis Date: Tue Dec 29 17:14:20 2009 New Revision: 894447 URL: http://svn.apache.org/viewvc?rev=894447&view=rev Log: move generic classes w/ no cassandra dependencies into cassandra.io.util. patch by jbellis Added: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java (contents, props changed) - copied, changed from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java (contents, props changed) - copied, changed from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/io/DataOutputBuffer.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java (contents, props changed) - copied, changed from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FileUtils.java Removed: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/DataOutputBuffer.java incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FileUtils.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeCommand.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeReply.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceReply.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IteratingRow.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableScanner.java incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/ThreadListBuilder.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableUtils.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Tue Dec 29 17:14:20 2009 @@ -25,7 +25,7 @@ import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.locator.IEndPointSnitch; import org.apache.cassandra.locator.AbstractReplicationStrategy; -import org.apache.cassandra.utils.FileUtils; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.XMLUtils; import org.apache.log4j.Logger; import org.w3c.dom.Node; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Column.java Tue Dec 29 17:14:20 2009 @@ -27,7 +27,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; /** Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue Dec 29 17:14:20 2009 @@ -36,6 +36,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.*; +import org.apache.cassandra.io.util.FileUtils; import java.util.regex.Matcher; import java.util.regex.Pattern; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnIndexer.java Tue Dec 29 17:14:20 2009 @@ -18,7 +18,6 @@ package org.apache.cassandra.db; -import java.io.DataOutputStream; import java.io.IOException; import java.io.DataOutput; import java.util.ArrayList; @@ -27,7 +26,7 @@ import java.util.Iterator; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.IndexHelper; import org.apache.cassandra.utils.BloomFilter; import org.apache.cassandra.db.marshal.AbstractType; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CommitLog.java Tue Dec 29 17:14:20 2009 @@ -19,10 +19,10 @@ package org.apache.cassandra.db; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.BufferedRandomAccessFile; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.FileUtils; import org.apache.cassandra.concurrent.StageManager; import org.apache.commons.lang.StringUtils; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java Tue Dec 29 17:14:20 2009 @@ -34,7 +34,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.AntiEntropyService; -import org.apache.cassandra.utils.FileUtils; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.FBUtilities; import org.cliffc.high_scale_lib.NonBlockingHashMap; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Tue Dec 29 17:14:20 2009 @@ -26,7 +26,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.SSTableReader; import org.apache.cassandra.io.SSTableWriter; import org.apache.cassandra.service.StorageService; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeCommand.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeCommand.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeCommand.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeCommand.java Tue Dec 29 17:14:20 2009 @@ -25,7 +25,7 @@ import java.util.Arrays; import org.apache.cassandra.io.ICompactSerializer; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeReply.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeReply.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeReply.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeReply.java Tue Dec 29 17:14:20 2009 @@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.Message; import org.apache.cassandra.utils.FBUtilities; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java Tue Dec 29 17:14:20 2009 @@ -37,7 +37,7 @@ package org.apache.cassandra.db; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.ICompactSerializer; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.ColumnParent; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceReply.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceReply.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceReply.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceReply.java Tue Dec 29 17:14:20 2009 @@ -18,19 +18,14 @@ package org.apache.cassandra.db; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.FBUtilities; import org.apache.commons.lang.StringUtils; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; import java.util.*; public class RangeSliceReply Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java Tue Dec 29 17:14:20 2009 @@ -24,7 +24,7 @@ import java.util.List; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import java.net.InetAddress; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.Message; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RecoveryManager.java Tue Dec 29 17:14:20 2009 @@ -22,7 +22,7 @@ import java.io.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.utils.FileUtils; +import org.apache.cassandra.io.util.FileUtils; import org.apache.log4j.Logger; import org.apache.commons.lang.StringUtils; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java Tue Dec 29 17:14:20 2009 @@ -34,7 +34,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.ICompactSerializer; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.*; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java Tue Dec 29 17:14:20 2009 @@ -27,7 +27,7 @@ import org.apache.log4j.Logger; import org.apache.cassandra.io.ICompactSerializer2; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.db.marshal.AbstractType; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Tue Dec 29 17:14:20 2009 @@ -25,12 +25,12 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.Future; -import java.util.concurrent.ExecutionException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Range; import org.apache.cassandra.io.SSTableReader; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.FileUtils; + import java.net.InetAddress; import org.apache.cassandra.utils.*; import org.apache.cassandra.db.filter.*; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java Tue Dec 29 17:14:20 2009 @@ -29,6 +29,7 @@ import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.*; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.BloomFilter; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java Tue Dec 29 17:14:20 2009 @@ -29,6 +29,7 @@ import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.*; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.config.DatabaseDescriptor; import com.google.common.collect.AbstractIterator; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java Tue Dec 29 17:14:20 2009 @@ -36,6 +36,7 @@ import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.io.util.DataOutputBuffer; public class CompactionIterator extends ReducingIterator implements Closeable { Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IteratingRow.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IteratingRow.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IteratingRow.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/IteratingRow.java Tue Dec 29 17:14:20 2009 @@ -28,6 +28,7 @@ import org.apache.cassandra.db.IColumn; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import com.google.common.collect.AbstractIterator; public class IteratingRow extends AbstractIterator implements Comparable Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTable.java Tue Dec 29 17:14:20 2009 @@ -31,7 +31,7 @@ import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.utils.BloomFilter; -import org.apache.cassandra.utils.FileUtils; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.db.DecoratedKey; /** Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableReader.java Tue Dec 29 17:14:20 2009 @@ -35,6 +35,7 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.cliffc.high_scale_lib.NonBlockingHashMap; import com.google.common.base.Predicate; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableScanner.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableScanner.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableScanner.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableScanner.java Tue Dec 29 17:14:20 2009 @@ -25,8 +25,9 @@ import java.util.Arrays; import org.apache.cassandra.db.DecoratedKey; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; + import org.apache.log4j.Logger; -import com.google.common.collect.AbstractIterator; public class SSTableScanner implements Iterator, Closeable Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/SSTableWriter.java Tue Dec 29 17:14:20 2009 @@ -32,6 +32,8 @@ import org.apache.cassandra.utils.BloomFilter; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; +import org.apache.cassandra.io.util.DataOutputBuffer; import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap; public class SSTableWriter extends SSTable Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java (from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java) URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java&r1=894446&r2=894447&rev=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java Tue Dec 29 17:14:20 2009 @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.cassandra.io; +package org.apache.cassandra.io.util; import java.io.File; import java.io.FileNotFoundException; Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java (from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/io/DataOutputBuffer.java) URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/io/DataOutputBuffer.java&r1=894446&r2=894447&rev=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/io/DataOutputBuffer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java Tue Dec 29 17:14:20 2009 @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.cassandra.io; +package org.apache.cassandra.io.util; import java.io.ByteArrayOutputStream; import java.io.DataInput; Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java (from r894446, incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FileUtils.java) URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FileUtils.java&r1=894446&r2=894447&rev=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FileUtils.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java Tue Dec 29 17:14:20 2009 @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.cassandra.utils; +package org.apache.cassandra.io.util; import java.io.*; import java.text.DecimalFormat; Propchange: incubator/cassandra/trunk/src/java/org/apache/cassandra/io/util/FileUtils.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/io/FastSerializer.java Tue Dec 29 17:14:20 2009 @@ -22,7 +22,7 @@ import java.io.DataInputStream; import java.io.IOException; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.Message; public class FastSerializer implements ISerializer Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Tue Dec 29 17:14:20 2009 @@ -37,11 +37,11 @@ import org.apache.cassandra.locator.*; import org.apache.cassandra.net.*; import org.apache.cassandra.service.AntiEntropyService.TreeRequestVerbHandler; -import org.apache.cassandra.utils.FileUtils; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.io.SSTableReader; import org.apache.cassandra.io.Streaming; import org.apache.cassandra.io.StreamRequestVerbHandler; +import org.apache.cassandra.io.util.FileUtils; import org.apache.log4j.Logger; import org.apache.log4j.Level; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StreamManager.java Tue Dec 29 17:14:20 2009 @@ -29,8 +29,8 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.io.StreamContextManager; -import org.apache.cassandra.utils.FileUtils; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.io.util.FileUtils; import org.apache.log4j.Logger; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java Tue Dec 29 17:14:20 2009 @@ -27,7 +27,7 @@ import org.apache.cassandra.db.SuperColumn; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.SSTableWriter; import static org.apache.cassandra.utils.FBUtilities.hexToBytes; import org.apache.commons.cli.*; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/ThreadListBuilder.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/ThreadListBuilder.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/ThreadListBuilder.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/tools/ThreadListBuilder.java Tue Dec 29 17:14:20 2009 @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.BloomFilter; @@ -45,7 +45,7 @@ File directory = new File(args[0]); File[] files = directory.listFiles(); - List buffers = new ArrayList(); + List buffers = new ArrayList(); BloomFilter bf = new BloomFilter(count_, 8); int keyCount = 0; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java Tue Dec 29 17:14:20 2009 @@ -26,7 +26,7 @@ import org.junit.Test; -import org.apache.cassandra.io.DataOutputBuffer; +import DataOutputBuffer; import org.apache.cassandra.db.filter.QueryPath; import static org.apache.cassandra.Util.column; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java Tue Dec 29 17:14:20 2009 @@ -27,12 +27,9 @@ import java.util.Arrays; import org.apache.commons.lang.ArrayUtils; -import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.io.DataOutputBuffer; import org.apache.cassandra.db.filter.QueryPath; -import org.apache.cassandra.db.marshal.AsciiType; public class ReadMessageTest { Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java Tue Dec 29 17:14:20 2009 @@ -37,7 +37,7 @@ import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.io.SSTableReader; -import org.apache.cassandra.io.BufferedRandomAccessFile; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.io.IndexHelper; public class TableTest extends CleanupHelper Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/gms/GossipDigestTest.java Tue Dec 29 17:14:20 2009 @@ -27,7 +27,7 @@ import java.io.DataInputStream; import java.io.IOException; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import java.net.InetAddress; import org.junit.Test; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableTest.java Tue Dec 29 17:14:20 2009 @@ -18,16 +18,14 @@ */ package org.apache.cassandra.io; -import java.io.File; import java.io.IOException; import java.util.*; import org.junit.Test; -import static org.junit.Assert.*; import org.apache.cassandra.CleanupHelper; +import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.dht.OrderPreservingPartitioner; import com.google.common.base.Predicate; import com.google.common.base.Predicates; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableUtils.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableUtils.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableUtils.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/io/SSTableUtils.java Tue Dec 29 17:14:20 2009 @@ -30,8 +30,8 @@ import org.apache.cassandra.db.Column; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.Table; -import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.service.StorageService; +import org.apache.cassandra.io.util.DataOutputBuffer; /** * TODO: These methods imitate Memtable.writeSortedKeys to some degree, but Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java Tue Dec 29 17:14:20 2009 @@ -30,7 +30,7 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.CompactionIterator.CompactedRow; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.locator.TokenMetadata; import static org.apache.cassandra.service.AntiEntropyService.*; import org.apache.cassandra.utils.FBUtilities; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java Tue Dec 29 17:14:20 2009 @@ -28,7 +28,6 @@ import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.io.DataOutputBuffer; import org.apache.cassandra.io.SSTableAccessor; import org.apache.cassandra.io.SSTableReader; import org.apache.cassandra.io.SSTableWriter; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java?rev=894447&r1=894446&r2=894447&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java Tue Dec 29 17:14:20 2009 @@ -27,7 +27,7 @@ import org.junit.Test; -import org.apache.cassandra.io.DataOutputBuffer; +import org.apache.cassandra.io.util.DataOutputBuffer; public class FilterTest {