Index: java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java =================================================================== --- java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java (revision 645869) +++ java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java (working copy) @@ -89,7 +89,7 @@ // of the first allocation page. And it is because we // just opened the stream and the first allocation page // is located at the beginning of the file. - readHeader(dis); + readHeader(getEmbryonicPage(dis)); return true; Index: java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java =================================================================== --- java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java (revision 645869) +++ java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java (working copy) @@ -24,9 +24,7 @@ import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; -import org.apache.derby.impl.store.raw.data.BaseDataFileFactory; import org.apache.derby.iapi.store.raw.ContainerKey; import java.io.EOFException; @@ -35,6 +33,7 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.ClosedChannelException; +import org.apache.derby.io.StorageRandomAccessFile; /** * RAFContainer4 overrides a few methods in RAFContainer in an attempt to use @@ -84,6 +83,27 @@ super(factory); } + private FileChannel getChannel(StorageRandomAccessFile file) { + if (file instanceof RandomAccessFile) { + /** XXX - this cast isn't testing friendly. + * A testing class that implements StorageRandomAccessFile but isn't + * a RandomAccessFile will be "worked around" by this class. An + * example of such a class is + * functionTests/util/corruptio/CorruptRandomAccessFile.java. + * An interface rework may be necessary. + */ + return ((RandomAccessFile) file).getChannel(); + } + return null; + } + + private synchronized FileChannel getChannel() { + if (ourChannel == null) { + ourChannel = getChannel(fileData); + } + return ourChannel; + } + /* * Wrapping methods that retrieve the FileChannel from RAFContainer's * fileData after calling the real methods in RAFContainer. @@ -95,21 +115,11 @@ SanityManager.ASSERT(iosInProgress == 0, "Container opened while IO operations are in progress. " + "This should not happen."); + SanityManager.ASSERT(fileData == null, "fileData isn't null"); + SanityManager.ASSERT(ourChannel == null, "ourChannel isn't null"); } - boolean result = super.openContainer(newIdentity); - if (result == true && super.fileData != null && - super.fileData instanceof java.io.RandomAccessFile) { - /** XXX - this cast isn't testing friendly. - * A testing class that implements StorageRandomAccessFile but isn't - * a RandomAccessFile will be "worked around" by this class. An - * example of such a class is - * functionTests/util/corruptio/CorruptRandomAccessFile.java. - * An interface rework may be necessary. - */ - ourChannel = ((RandomAccessFile)super.fileData).getChannel(); - } - return result; + return super.openContainer(newIdentity); } synchronized void createContainer(ContainerKey newIdentity) @@ -119,14 +129,10 @@ SanityManager.ASSERT(iosInProgress == 0, "Container created while IO operations are in progress. " + "This should not happen."); + SanityManager.ASSERT(fileData == null, "fileData isn't null"); + SanityManager.ASSERT(ourChannel == null, "ourChannel isn't null"); } super.createContainer(newIdentity); - - if (super.fileData != null && - super.fileData instanceof java.io.RandomAccessFile) { - // XXX - see "XXX" comment above. - ourChannel = ((RandomAccessFile) super.fileData).getChannel(); - } } @@ -167,22 +173,8 @@ protected void readPage(long pageNumber, byte[] pageData) throws IOException, StandardException { - FileChannel ioChannel; - synchronized (this) { - ioChannel = ourChannel; - if (SanityManager.DEBUG) { - SanityManager.ASSERT(!getCommittedDropState()); - // If ioChannel == null and fileData supports getChannel() - // we have a problem. See this.openContainer(ContainerKey - // newIdentity). - SanityManager.ASSERT(! ((ioChannel == null) && - super.fileData instanceof java.io.RandomAccessFile), - "RAFContainer4: New style readPage attempted" + - " with uninitialized ioChannel"); + FileChannel ioChannel = getChannel(); - } - } - if(ioChannel != null) { long pageOffset = pageNumber * pageSize; @@ -233,22 +225,7 @@ protected void writePage(long pageNumber, byte[] pageData, boolean syncPage) throws IOException, StandardException { - FileChannel ioChannel; - synchronized(this) { - // committed and dropped, do nothing. - // This file container may only be a stub - if (getCommittedDropState()) - return; - ioChannel = ourChannel; - if (SanityManager.DEBUG) { - // If ioChannel == null and fileData supports getChannel() - // we have a problem - SanityManager.ASSERT(! ((ioChannel == null) && - super.fileData instanceof java.io.RandomAccessFile), - "RAFContainer4: New style writePage attempted " + - "with uninitialized ioChannel"); - } - } + FileChannel ioChannel = getChannel(); if(ioChannel != null) { /////////////////////////////////////////////////// // @@ -360,7 +337,31 @@ } } + void writeAtOffset(StorageRandomAccessFile file, byte[] bytes, long offset) + throws IOException + { + FileChannel ioChannel = getChannel(file); + if (ioChannel != null) { + writeFull(ByteBuffer.wrap(bytes), ioChannel, offset); + } else { + super.writeAtOffset(file, bytes, offset); + } + } + byte[] getEmbryonicPage(StorageRandomAccessFile file, long offset) + throws IOException + { + FileChannel ioChannel = getChannel(file); + if (ioChannel != null) { + ByteBuffer buffer = + ByteBuffer.allocate(AllocPage.MAX_BORROWED_SPACE); + readFull(buffer, ioChannel, offset); + return buffer.array(); + } else { + return super.getEmbryonicPage(file, offset); + } + } + /** * Attempts to fill buf completely from start until it's full. *

Index: java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java =================================================================== --- java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java (revision 645869) +++ java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java (working copy) @@ -26,19 +26,11 @@ import org.apache.derby.iapi.reference.Limits; import org.apache.derby.iapi.reference.SQLState; -import org.apache.derby.impl.store.raw.data.BaseContainer; -import org.apache.derby.impl.store.raw.data.BaseContainerHandle; -import org.apache.derby.impl.store.raw.data.BasePage; -import org.apache.derby.impl.store.raw.data.PageVersion; - import org.apache.derby.iapi.services.cache.Cacheable; import org.apache.derby.iapi.services.cache.CacheManager; import org.apache.derby.iapi.services.context.ContextService; -import org.apache.derby.iapi.services.daemon.DaemonService; -import org.apache.derby.iapi.services.daemon.Serviceable; import org.apache.derby.iapi.services.monitor.Monitor; import org.apache.derby.iapi.services.sanity.SanityManager; -import org.apache.derby.iapi.services.io.FormatIdUtil; import org.apache.derby.iapi.services.io.FormatIdOutputStream; import org.apache.derby.iapi.services.io.StoredFormatIds; import org.apache.derby.iapi.services.io.TypedFormat; @@ -46,11 +38,8 @@ import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.store.raw.ContainerHandle; import org.apache.derby.iapi.store.raw.ContainerKey; -import org.apache.derby.iapi.store.raw.LockingPolicy; -import org.apache.derby.iapi.store.raw.Loggable; import org.apache.derby.iapi.store.raw.Page; import org.apache.derby.iapi.store.raw.PageKey; -import org.apache.derby.iapi.store.raw.PageTimeStamp; import org.apache.derby.iapi.store.raw.RecordHandle; import org.apache.derby.iapi.store.raw.RawStoreFactory; import org.apache.derby.iapi.store.raw.Transaction; @@ -69,11 +58,11 @@ import java.io.IOException; import java.io.DataInput; -import java.io.DataOutput; import java.util.Properties; import java.util.zip.CRC32; +import org.apache.derby.io.StorageRandomAccessFile; /** FileContainer is an abstract base class for containers @@ -692,8 +681,7 @@ } /** - Read the container's header. Assumes the input stream (fileData) - is positioned at the beginning of the file. + Read the container's header. Subclass that implements openContainer is expected to manufacture a DataInput stream which is used here to read the header. @@ -703,7 +691,7 @@ @exception StandardException Derby Standard error policy @exception IOException error in reading the header from file */ - protected void readHeader(DataInput fileData) + protected void readHeader(byte[] epage) throws IOException, StandardException { // Always read the header from the input stread even if the alloc page may @@ -716,7 +704,7 @@ // called. We must not get the alloc page in cache because it may be // stale page and it may still say the container has not been dropped. - byte[] epage = getEmbryonicPage(fileData); + //byte[] epage = getEmbryonicPage(fileData); // read persistent container header into containerInfo AllocPage.ReadContainerInfo(containerInfo, epage); @@ -869,8 +857,7 @@ } /** - Write the container header directly to output stream (fileData). - Assumes the output stream is positioned at the beginning of the file. + Write the container header directly to file. Subclasses that can writes the container header is expected to manufacture a DataOutput stream which is used here. @@ -880,7 +867,8 @@ @exception StandardException Derby Standard error policy @exception IOException error in writing the header to file */ - protected void writeHeader(DataOutput fileData, boolean create, byte[] epage) + protected void writeHeader(StorageRandomAccessFile file, + boolean create, byte[] epage) throws IOException, StandardException { // write out the current containerInfo in the borrowed space to byte @@ -903,7 +891,7 @@ dataFactory.writeInProgress(); try { - fileData.write(epage); + writeAtOffset(file, epage, FIRST_ALLOC_PAGE_OFFSET); } finally { @@ -911,6 +899,14 @@ } } + // to be overridden by RAFContainer4 + void writeAtOffset(StorageRandomAccessFile file, byte[] bytes, long offset) + throws IOException + { + file.seek(offset); + file.write(bytes); + } + /** Get an embryonic page from the dataInput stream. @@ -934,6 +930,14 @@ return epage; } + // to be overridden by RAFContainer4 + byte[] getEmbryonicPage(StorageRandomAccessFile file, long offset) + throws IOException + { + file.seek(offset); + return getEmbryonicPage(file); + } + /** Write containerInfo into a byte array The container Header thus put together can be read by readHeaderFromArray. Index: java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java =================================================================== --- java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (revision 645869) +++ java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (working copy) @@ -679,14 +679,11 @@ } else { - file.seek(FIRST_ALLOC_PAGE_OFFSET); - epage = getEmbryonicPage(file); + epage = getEmbryonicPage(file, FIRST_ALLOC_PAGE_OFFSET); } // need to check for frozen state - - file.seek(FIRST_ALLOC_PAGE_OFFSET); writeHeader(file, create, epage); // leave the end of the file at a page boundry. This @@ -1393,8 +1390,8 @@ try { fileData = file.getRandomAccessFile(canUpdate ? "rw" : "r"); - fileData.seek(FIRST_ALLOC_PAGE_OFFSET); - readHeader(fileData); + readHeader(getEmbryonicPage(fileData, + FIRST_ALLOC_PAGE_OFFSET)); if (SanityManager.DEBUG) { @@ -1435,7 +1432,8 @@ fileData = stub.getRandomAccessFile(canUpdate ? "rw" : "r"); - readHeader(fileData); + readHeader(getEmbryonicPage(fileData, + FIRST_ALLOC_PAGE_OFFSET)); } catch (IOException ioe2) {