You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2009/03/20 18:27:04 UTC
svn commit: r756666 - in
/incubator/cassandra/trunk/src/org/apache/cassandra/io:
AIORandomAccessFile.java SequenceFile.java
Author: alakshman
Date: Fri Mar 20 17:27:03 2009
New Revision: 756666
URL: http://svn.apache.org/viewvc?rev=756666&view=rev
Log:
Removed references to JDK7 specific classes.
Removed:
incubator/cassandra/trunk/src/org/apache/cassandra/io/AIORandomAccessFile.java
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java?rev=756666&r1=756665&r2=756666&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java Fri Mar 20 17:27:03 2009
@@ -24,8 +24,6 @@
import java.nio.CharBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
-import java.nio.file.OpenOption;
-import java.nio.file.StandardOpenOption;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -35,7 +33,6 @@
import java.util.SortedMap;
import java.util.StringTokenizer;
import java.util.TreeMap;
-
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.continuations.Suspendable;
import org.apache.cassandra.db.RowMutation;
@@ -272,32 +269,6 @@
ChecksumManager.close(filename_);
}
}
-
- public static class AIOWriter extends Writer
- {
- private int size_;
- private boolean bContinuations_ = false;
- private long position_ = 0L;
-
- AIOWriter(String filename, int size) throws IOException
- {
- this(filename, size, false);
- }
-
- AIOWriter(String filename, int size, boolean bContinuations) throws IOException
- {
- super(filename);
- size_ = size;
- bContinuations_ = bContinuations;
- init(filename);
- }
-
- @Override
- protected void init(String filename) throws IOException
- {
- file_ = new AIORandomAccessFile(filename, size_, bContinuations_);
- }
- }
public static class ConcurrentWriter extends AbstractWriter
{
@@ -1460,30 +1431,6 @@
}
}
- public static class AIOReader extends Reader
- {
- private int size_;
- private boolean bContinuations_;
-
- AIOReader(String filename, int size) throws IOException
- {
- this(filename, size, false);
- }
-
- AIOReader(String filename, int size, boolean bContinuations) throws IOException
- {
- super(filename);
- size_ = size;
- bContinuations_ = bContinuations;
- init(filename);
- }
-
- protected void init(String filename) throws IOException
- {
- file_ = new AIORandomAccessFile(filename, size_, bContinuations_);
- }
- }
-
private static Logger logger_ = Logger.getLogger( SequenceFile.class ) ;
public static final short utfPrefix_ = 2;
public static final String marker_ = "Bloom-Filter";
@@ -1502,11 +1449,6 @@
{
return new ChecksumWriter(filename, size);
}
-
- public static IFileWriter aioWriter(String filename, int size) throws IOException
- {
- return new AIOWriter(filename, size);
- }
public static IFileWriter concurrentWriter(String filename) throws IOException
{
@@ -1532,16 +1474,6 @@
{
return new ChecksumReader(filename, size);
}
-
- public static IFileReader aioReader(String filename, int size) throws IOException
- {
- return new AIOReader(filename, size);
- }
-
- public static IFileReader aioReader(String filename, int size, boolean bContinuations) throws IOException
- {
- return new AIOReader(filename, size, bContinuations);
- }
public static boolean readBoolean(ByteBuffer buffer)
{