natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move generic classes w/ no cassandra dependencies into cassandra.io.util. patch by jbellis 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894447 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-12-29 17:14:20 +00:00
parent bcfd76081d
commit dc6e4fe55f
41 changed files with 45 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -25,7 +25,7 @@ import org.apache.cassandra.db.marshal.UTF8Type;
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;

2
src/java/org/apache/cassandra/db/Column.java
View File

@ -27,7 +27,7 @@ import org.apache.log4j.Logger;
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;
/**

1
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -36,6 +36,7 @@ import org.apache.log4j.Logger;
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;

3
src/java/org/apache/cassandra/db/ColumnIndexer.java
View File

@ -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.List;
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;

6
src/java/org/apache/cassandra/db/CommitLog.java
View File

@ -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;

2
src/java/org/apache/cassandra/db/CompactionManager.java
View File

@ -34,7 +34,7 @@ import org.apache.cassandra.io.*;
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;

2
src/java/org/apache/cassandra/db/Memtable.java
View File

@ -26,7 +26,7 @@ import org.apache.commons.lang.ArrayUtils;
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;

2
src/java/org/apache/cassandra/db/RangeCommand.java
View File

@ -25,7 +25,7 @@ import java.io.DataInputStream;
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;

2
src/java/org/apache/cassandra/db/RangeReply.java
View File

@ -25,7 +25,7 @@ import java.io.IOException;
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;

2
src/java/org/apache/cassandra/db/RangeSliceCommand.java
View File

@ -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;

7
src/java/org/apache/cassandra/db/RangeSliceReply.java
View File

@ -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

2
src/java/org/apache/cassandra/db/ReadVerbHandler.java
View File

@ -24,7 +24,7 @@ import java.io.IOException;
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;

2
src/java/org/apache/cassandra/db/RecoveryManager.java
View File

@ -22,7 +22,7 @@ import java.util.*;
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;

2
src/java/org/apache/cassandra/db/RowMutation.java
View File

@ -34,7 +34,7 @@ import java.nio.ByteBuffer;
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.*;

2
src/java/org/apache/cassandra/db/SuperColumn.java
View File

@ -27,7 +27,7 @@ import java.security.MessageDigest;
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;

4
src/java/org/apache/cassandra/db/Table.java
View File

@ -25,12 +25,12 @@ import java.util.concurrent.locks.Lock;
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.*;

1
src/java/org/apache/cassandra/db/filter/SSTableNamesIterator.java
View File

@ -29,6 +29,7 @@ import org.apache.cassandra.db.DecoratedKey;
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;

1
src/java/org/apache/cassandra/db/filter/SSTableSliceIterator.java
View File

@ -29,6 +29,7 @@ import org.apache.cassandra.db.IColumn;
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;

1
src/java/org/apache/cassandra/io/CompactionIterator.java
View File

@ -36,6 +36,7 @@ import org.apache.cassandra.utils.FBUtilities;
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<IteratingRow, CompactionIterator.CompactedRow> implements Closeable
{

1
src/java/org/apache/cassandra/io/IteratingRow.java
View File

@ -28,6 +28,7 @@ import org.apache.cassandra.db.DecoratedKey;
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<IColumn> implements Comparable<IteratingRow>

2
src/java/org/apache/cassandra/io/SSTable.java
View File

@ -31,7 +31,7 @@ import org.apache.commons.lang.StringUtils;
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;
/**

1
src/java/org/apache/cassandra/io/SSTableReader.java
View File

@ -35,6 +35,7 @@ import org.apache.cassandra.service.StorageService;
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;

3
src/java/org/apache/cassandra/io/SSTableScanner.java
View File

@ -25,8 +25,9 @@ import java.util.Iterator;
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<IteratingRow>, Closeable

2
src/java/org/apache/cassandra/io/SSTableWriter.java
View File

@ -32,6 +32,8 @@ import org.apache.cassandra.service.StorageService;
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

2
src/java/org/apache/cassandra/io/BufferedRandomAccessFile.java → src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java
View File

@ -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;

2
src/java/org/apache/cassandra/io/DataOutputBuffer.java → src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
View File

@ -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;

2
src/java/org/apache/cassandra/utils/FileUtils.java → src/java/org/apache/cassandra/io/util/FileUtils.java
View File

@ -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;

2
src/java/org/apache/cassandra/net/io/FastSerializer.java
View File

@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
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

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -37,11 +37,11 @@ import org.apache.cassandra.gms.*;
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;

2
src/java/org/apache/cassandra/service/StreamManager.java
View File

@ -29,8 +29,8 @@ import java.net.InetAddress;
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;

2
src/java/org/apache/cassandra/tools/SSTableImport.java
View File

@ -27,7 +27,7 @@ import org.apache.cassandra.db.DecoratedKey;
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.*;

4
src/java/org/apache/cassandra/tools/ThreadListBuilder.java
View File

@ -26,7 +26,7 @@ import java.io.RandomAccessFile;
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 @@ public class ThreadListBuilder
File directory = new File(args[0]);
File[] files = directory.listFiles();
List<DataOutputBuffer> buffers = new ArrayList<DataOutputBuffer>();
List<DataOutputBuffer> buffers = new ArrayList<DataOutputBuffer>();
BloomFilter bf = new BloomFilter(count_, 8);
int keyCount = 0;

2
test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
View File

@ -26,7 +26,7 @@ import java.util.TreeMap;
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;

3
test/unit/org/apache/cassandra/db/ReadMessageTest.java
View File

@ -27,12 +27,9 @@ import java.util.ArrayList;
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
{

2
test/unit/org/apache/cassandra/db/TableTest.java
View File

@ -37,7 +37,7 @@ import org.apache.cassandra.db.filter.QueryPath;
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

2
test/unit/org/apache/cassandra/gms/GossipDigestTest.java
View File

@ -27,7 +27,7 @@ import java.io.ByteArrayInputStream;
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;

4
test/unit/org/apache/cassandra/io/SSTableTest.java
View File

@ -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;

2
test/unit/org/apache/cassandra/io/SSTableUtils.java
View File

@ -30,8 +30,8 @@ import org.apache.cassandra.config.DatabaseDescriptor;
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

2
test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java
View File

@ -30,7 +30,7 @@ import org.apache.cassandra.dht.IPartitioner;
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;

1
test/unit/org/apache/cassandra/tools/SSTableExportTest.java
View File

@ -28,7 +28,6 @@ import org.apache.cassandra.db.ColumnFamily;
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;

2
test/unit/org/apache/cassandra/utils/FilterTest.java
View File

@ -27,7 +27,7 @@ import java.util.Set;
import org.junit.Test;
import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.io.util.DataOutputBuffer;
public class FilterTest
{