You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by mi...@apache.org on 2010/06/29 20:17:11 UTC

svn commit: r959060 [1/3] - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/store/raw/RawStoreFactory.java impl/store/raw/data/StoredPage.java impl/store/raw/data/StoredRecordHeader.java

Author: mikem
Date: Tue Jun 29 18:17:11 2010
New Revision: 959060

URL: http://svn.apache.org/viewvc?rev=959060&view=rev
Log:
DERBY-4577

fixing inconsistent tabs and spaces in files affected by DERBY-4577.
This change is a white space only change.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java?rev=959060&r1=959059&r2=959060&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java Tue Jun 29 18:17:11 2010
@@ -41,117 +41,117 @@ import java.io.Serializable;
 import java.io.File;
 
 /**
-	RawStoreFactory implements a single unit of transactional
-	storage. A RawStoreFactory contains Segments and Segments
-	contain Containers.
-	<P>
-	Segments are identified
-	by integer identifiers that are unique within a RawStoreFactory.
-	<P>
-	Containers are also identified by unique integer identifiers
-	within a RawStoreFactory, but will overlap with segment identifiers.
-	<P><B>LIMITS</B><BR>
-	This is a list of (hopefully) all limits within the raw store. Where a size 
+    RawStoreFactory implements a single unit of transactional
+    storage. A RawStoreFactory contains Segments and Segments
+    contain Containers.
+    <P>
+    Segments are identified
+    by integer identifiers that are unique within a RawStoreFactory.
+    <P>
+    Containers are also identified by unique integer identifiers
+    within a RawStoreFactory, but will overlap with segment identifiers.
+    <P><B>LIMITS</B><BR>
+    This is a list of (hopefully) all limits within the raw store. Where a size 
     has more than one limit all are documented (rather than just the most 
     restrictive) so that the correct limit can be found if the most restictive 
     is every removed.
-	<UL>
-	<LI>Field - 
-		<UL>
-		<LI>Max length 2^31 - 1  (2147483647) - 
-		</UL>
-	<LI>Record - 
-		<UL>
-		<LI>Max number of fields 2^31 - 1  (2147483647) - from use of Object[] 
+    <UL>
+    <LI>Field - 
+        <UL>
+        <LI>Max length 2^31 - 1  (2147483647) - 
+        </UL>
+    <LI>Record - 
+        <UL>
+        <LI>Max number of fields 2^31 - 1  (2147483647) - from use of Object[] 
         array to represent row, which can "only" have int sized number of array
         members.
-		</UL>
-	<LI>Page -
-	<LI>Container -
-	<LI>Segment -
-	<LI>Raw Store -
-	</UL>
-
-	<P>
-	Access and RawStore work together to provide the ACID properties of
-	transactions. On a high level, RawStore deals with anything that directly
-	impacts persistency. On a more detailed level, RawStore provides
-	logging, rollback and recovery, data management on page, page allocation
-	and deallocation, container allocation and deallocation.  
-
-
-	<P>
-	RawStore is organized as 3 branches, transaction, data, and
-	logging.  These branches each have its own "factory", the transaction
-	factory hands out transactions, the data factory hands out containers,
-	and the log factory hands out logger (or log buffers) for transactions to
-	write on.  For a more detailed description on these factories, please see
-	their corresponding javadocs.
+        </UL>
+    <LI>Page -
+    <LI>Container -
+    <LI>Segment -
+    <LI>Raw Store -
+    </UL>
+
+    <P>
+    Access and RawStore work together to provide the ACID properties of
+    transactions. On a high level, RawStore deals with anything that directly
+    impacts persistency. On a more detailed level, RawStore provides
+    logging, rollback and recovery, data management on page, page allocation
+    and deallocation, container allocation and deallocation.  
+
+
+    <P>
+    RawStore is organized as 3 branches, transaction, data, and
+    logging.  These branches each have its own "factory", the transaction
+    factory hands out transactions, the data factory hands out containers,
+    and the log factory hands out logger (or log buffers) for transactions to
+    write on.  For a more detailed description on these factories, please see
+    their corresponding javadocs.
 
 
-	MT - Thread Safe
+    MT - Thread Safe
 
-	@see ContainerHandle */
+    @see ContainerHandle */
 
 
 public interface RawStoreFactory extends Corruptable {
 
-	/** Store engine version numbers indicating the database must be upgraded to 
-	 * or created at the current engine level 
-	 */
+    /** Store engine version numbers indicating the database must be upgraded to 
+     * or created at the current engine level 
+     */
 
-	/** Derby Store Minor Version (1) **/
-	public static final int DERBY_STORE_MINOR_VERSION_1    = 1;
+    /** Derby Store Minor Version (1) **/
+    public static final int DERBY_STORE_MINOR_VERSION_1    = 1;
 
     /** Derby Store Minor Version (2) **/
-	public static final int DERBY_STORE_MINOR_VERSION_2    = 2;
+    public static final int DERBY_STORE_MINOR_VERSION_2    = 2;
 
-	/** Derby Store Minor Version (3) **/
-	public static final int DERBY_STORE_MINOR_VERSION_3    = 3;
+    /** Derby Store Minor Version (3) **/
+    public static final int DERBY_STORE_MINOR_VERSION_3    = 3;
         
-	/** Derby Store Minor Version (4) **/
-	public static final int DERBY_STORE_MINOR_VERSION_4    = 4;
+    /** Derby Store Minor Version (4) **/
+    public static final int DERBY_STORE_MINOR_VERSION_4    = 4;
 
-	/** Derby 10 Store Major version */
-	public static final int DERBY_STORE_MAJOR_VERSION_10   = 10;
+    /** Derby 10 Store Major version */
+    public static final int DERBY_STORE_MAJOR_VERSION_10   = 10;
 
-	/**
-		Default value for PAGE_SIZE_PARAMETER (4096).
-	*/
-	public static final int PAGE_SIZE_DEFAULT = 4096;
+    /**
+        Default value for PAGE_SIZE_PARAMETER (4096).
+    */
+    public static final int PAGE_SIZE_DEFAULT = 4096;
 
-	/**
-		Minimum page size we will accept (1024).
-	*/
-	public static final int PAGE_SIZE_MINIMUM = 1024;
+    /**
+        Minimum page size we will accept (1024).
+    */
+    public static final int PAGE_SIZE_MINIMUM = 1024;
 
 
-	public static final String PAGE_SIZE_STRING = "2048";
+    public static final String PAGE_SIZE_STRING = "2048";
 
 
-	/** Property name for the page cache size to be used in the storage area.
-	Equal to 'derby.storage.pageCacheSize'
-	*/
-	public static final String PAGE_CACHE_SIZE_PARAMETER = 
+    /** Property name for the page cache size to be used in the storage area.
+    Equal to 'derby.storage.pageCacheSize'
+    */
+    public static final String PAGE_CACHE_SIZE_PARAMETER = 
         "derby.storage.pageCacheSize";
 
-	/**
-		Default value for PAGE_CACHE_SIZE_PARAMETER (1000).
-	*/
-	public static final int PAGE_CACHE_SIZE_DEFAULT = 1000;
-
-	/**
-		Minimum page cache size we will accept (40).
-	*/
-	public static final int PAGE_CACHE_SIZE_MINIMUM = 40;
-
-	/**
-		Maximum page cache size we will accept (MAXINT).
-	*/
-	public static final int PAGE_CACHE_SIZE_MAXIMUM = Integer.MAX_VALUE;
+    /**
+        Default value for PAGE_CACHE_SIZE_PARAMETER (1000).
+    */
+    public static final int PAGE_CACHE_SIZE_DEFAULT = 1000;
 
+    /**
+        Minimum page cache size we will accept (40).
+    */
+    public static final int PAGE_CACHE_SIZE_MINIMUM = 40;
 
-	/** Property name for the number of open files to maintain associated with
+    /**
+        Maximum page cache size we will accept (MAXINT).
+    */
+    public static final int PAGE_CACHE_SIZE_MAXIMUM = Integer.MAX_VALUE;
+
+
+    /** Property name for the number of open files to maintain associated with
         the page cache.  Internally this is referred to as the "ContainerCache".
 
         Each object in this cache maps to a java level "open" file on a file
@@ -181,39 +181,39 @@ public interface RawStoreFactory extends
         open files.
 
         Equal to 'derby.storage.fileCacheSize'
-	*/
-	public static final String CONTAINER_CACHE_SIZE_PARAMETER = 
+    */
+    public static final String CONTAINER_CACHE_SIZE_PARAMETER = 
         "derby.storage.fileCacheSize";
 
-	/**
-		Default value for CONTAINER_CACHE_SIZE_PARAMETER (100).
-	*/
-	public static final int CONTAINER_CACHE_SIZE_DEFAULT = 100;
-
-	/**
-		Minimum container cache size accepted (2).
-	*/
-	public static final int CONTAINER_CACHE_SIZE_MINIMUM = 2;
-
-	/**
-		Maximum container cache size we will accept (MAXINT).
-	*/
-	public static final int CONTAINER_CACHE_SIZE_MAXIMUM = Integer.MAX_VALUE;
-
-	/**
-		Maximum number of initial pages when a container is created
-	*/
-	public static final short MAX_CONTAINER_INITIAL_PAGES = 1000;
+    /**
+        Default value for CONTAINER_CACHE_SIZE_PARAMETER (100).
+    */
+    public static final int CONTAINER_CACHE_SIZE_DEFAULT = 100;
 
+    /**
+        Minimum container cache size accepted (2).
+    */
+    public static final int CONTAINER_CACHE_SIZE_MINIMUM = 2;
 
-	/** Property name for the default minimum record size to be used in the 
+    /**
+        Maximum container cache size we will accept (MAXINT).
+    */
+    public static final int CONTAINER_CACHE_SIZE_MAXIMUM = Integer.MAX_VALUE;
+
+    /**
+        Maximum number of initial pages when a container is created
+    */
+    public static final short MAX_CONTAINER_INITIAL_PAGES = 1000;
+
+
+    /** Property name for the default minimum record size to be used in the 
         storage area. Minimum record size is the minimum number of bytes that a 
         record will reserve on disk.
-	*/
-	public static final String MINIMUM_RECORD_SIZE_PARAMETER = 
+    */
+    public static final String MINIMUM_RECORD_SIZE_PARAMETER = 
         "derby.storage.minimumRecordSize";
-	/**
-		Default value for MINIMUM_RECORD_SIZE_PARAMETER	for heap tables that 
+    /**
+        Default value for MINIMUM_RECORD_SIZE_PARAMETER for heap tables that 
         allow overflow.  By setting minimumRecordSize to 12 bytes, we 
         guarantee there is enough space to update the a head row even if there 
         is not enough space on the page.  The 12 bytes of user data along with
@@ -224,126 +224,126 @@ public interface RawStoreFactory extends
         portion of the record.  The record also will contain space for the
         "non-user" portion which includes the offset table and the record
         header.
-	*/
-	public static final int MINIMUM_RECORD_SIZE_DEFAULT = 12;
+    */
+    public static final int MINIMUM_RECORD_SIZE_DEFAULT = 12;
 
 
-	/**
-		Minimum value for MINIMUM_RECORD_SIZE_PARAMETER (1).
-	*/
-	public static final int MINIMUM_RECORD_SIZE_MINIMUM = 1;
-
-	/** Property name for percentage of space to leave free on page for updates.
-	*/
-	public static final String PAGE_RESERVED_SPACE_PARAMETER = 
+    /**
+        Minimum value for MINIMUM_RECORD_SIZE_PARAMETER (1).
+    */
+    public static final int MINIMUM_RECORD_SIZE_MINIMUM = 1;
+
+    /** Property name for percentage of space to leave free on page for updates.
+    */
+    public static final String PAGE_RESERVED_SPACE_PARAMETER = 
         "derby.storage.pageReservedSpace";
 
-	public static final String PAGE_RESERVED_ZERO_SPACE_STRING = "0";
+    public static final String PAGE_RESERVED_ZERO_SPACE_STRING = "0";
 
-	/** Property name for the number of pages we try to pre-allocate in one
-	/** synchronous I/O
-	*/
-	public static final String PRE_ALLOCATE_PAGE = 
+    /** Property name for the number of pages we try to pre-allocate in one
+    /** synchronous I/O
+    */
+    public static final String PRE_ALLOCATE_PAGE = 
         "derby.storage.pagePerAllocate";
 
 
-	/**
-		Property name for container which reuses recordId when a page is
-		reused.  Defaults to false, which means recordId is never reused. 	
-
-		This property should NOT be set by the end user, only Access should set
-		it for special conglomerates which does not count on permanant unique
-		recordIds for all records.
-	*/
-	public static final String PAGE_REUSABLE_RECORD_ID = 
+    /**
+        Property name for container which reuses recordId when a page is
+        reused.  Defaults to false, which means recordId is never reused.   
+
+        This property should NOT be set by the end user, only Access should set
+        it for special conglomerates which does not count on permanant unique
+        recordIds for all records.
+    */
+    public static final String PAGE_REUSABLE_RECORD_ID = 
         "derby.storage.reusableRecordId";
 
-	/**
-		Property name for buffer size to be used in the stream file container.
-		Equal to 'derby.storage.streamFileBufferSize'
-	*/
-	public static final String STREAM_FILE_BUFFER_SIZE_PARAMETER = 
+    /**
+        Property name for buffer size to be used in the stream file container.
+        Equal to 'derby.storage.streamFileBufferSize'
+    */
+    public static final String STREAM_FILE_BUFFER_SIZE_PARAMETER = 
         "derby.storage.streamFileBufferSize";
 
-	/**
-		Default value for STREAM_FILE_BUFFER_SIZE_PARAMETER (16384).
-	*/
-	public static final int STREAM_FILE_BUFFER_SIZE_DEFAULT = 16384;
-
-	/**
-		Minimum stream file buffer size we will accept (1024).
-	*/
-	public static final int STREAM_FILE_BUFFER_SIZE_MINIMUM = 1024;
-
-	/**
-		Maximum stream file buffer size we will accept (MAXINT).
-	*/
-	public static final int STREAM_FILE_BUFFER_SIZE_MAXIMUM = 
+    /**
+        Default value for STREAM_FILE_BUFFER_SIZE_PARAMETER (16384).
+    */
+    public static final int STREAM_FILE_BUFFER_SIZE_DEFAULT = 16384;
+
+    /**
+        Minimum stream file buffer size we will accept (1024).
+    */
+    public static final int STREAM_FILE_BUFFER_SIZE_MINIMUM = 1024;
+
+    /**
+        Maximum stream file buffer size we will accept (MAXINT).
+    */
+    public static final int STREAM_FILE_BUFFER_SIZE_MAXIMUM = 
         Integer.MAX_VALUE;
 
-	/**
+    /**
 
-		Property name for container which attempts to be created with an
-		initial size of this many pages.  Defaults to 1 page.  
+        Property name for container which attempts to be created with an
+        initial size of this many pages.  Defaults to 1 page.  
 
-		<BR>All containers are guarenteed to be created with at least 1 page,
-		if this property is set, it will attempt to allocate
-		CONTAINER_INITIAL_PAGES, but with no guarentee.
-		CONTAIENR_INITIAL_PAGES legally ranges from 1 to
-		MAX_CONTAINER_INITIAL_PAGES.  Values < 1 will
-		be set to 1 and values > MAX_CONTAINER_INITIAL_PAGES will be set to
-		MAX_CONTAINER_INITIAL_PAGES
-
-		This property should only be set in the PROPERTIES list in a CREATE
-		TABLE or CREATE INDEX statement.  The global setting of this property
-		has no effect. 
-	*/
-	public static final String CONTAINER_INITIAL_PAGES = 
+        <BR>All containers are guarenteed to be created with at least 1 page,
+        if this property is set, it will attempt to allocate
+        CONTAINER_INITIAL_PAGES, but with no guarentee.
+        CONTAIENR_INITIAL_PAGES legally ranges from 1 to
+        MAX_CONTAINER_INITIAL_PAGES.  Values < 1 will
+        be set to 1 and values > MAX_CONTAINER_INITIAL_PAGES will be set to
+        MAX_CONTAINER_INITIAL_PAGES
+
+        This property should only be set in the PROPERTIES list in a CREATE
+        TABLE or CREATE INDEX statement.  The global setting of this property
+        has no effect. 
+    */
+    public static final String CONTAINER_INITIAL_PAGES = 
         "derby.storage.initialPages";
 
-	/**
-		encryption alignment requirement.
-	 */
-	public static final int ENCRYPTION_ALIGNMENT = 8;
-
-	/**
-		default encryption block size
-		In old existing databases (ie 5.1.x), the default
-		encryption block size used is 8. Do not change this value unless you 
-		account for downgrade issues
-	 */
-	public static final int DEFAULT_ENCRYPTION_BLOCKSIZE = 8;
-
-	/**
-		encryption block size used during creation of encrypted database
-		This property is not set by the user; it is set by the engine when
-		RawStore boots up during creation of an encrypted database
-	*/
-	public static final String ENCRYPTION_BLOCKSIZE = "derby.encryptionBlockSize";
-
-	/**
-
-		This variable is used to store the encryption scheme to allow
-		for any future changes in encryption schemes of data 
-		This property has been introduced in version 10
-		Value starts at 1
-	 */
-	public static final String DATA_ENCRYPT_ALGORITHM_VERSION="data_encrypt_algorithm_version";
+    /**
+        encryption alignment requirement.
+     */
+    public static final int ENCRYPTION_ALIGNMENT = 8;
+
+    /**
+        default encryption block size
+        In old existing databases (ie 5.1.x), the default
+        encryption block size used is 8. Do not change this value unless you 
+        account for downgrade issues
+     */
+    public static final int DEFAULT_ENCRYPTION_BLOCKSIZE = 8;
+
+    /**
+        encryption block size used during creation of encrypted database
+        This property is not set by the user; it is set by the engine when
+        RawStore boots up during creation of an encrypted database
+    */
+    public static final String ENCRYPTION_BLOCKSIZE = "derby.encryptionBlockSize";
+
+    /**
+
+        This variable is used to store the encryption scheme to allow
+        for any future changes in encryption schemes of data 
+        This property has been introduced in version 10
+        Value starts at 1
+     */
+    public static final String DATA_ENCRYPT_ALGORITHM_VERSION="data_encrypt_algorithm_version";
 
-	/**
+    /**
                 Store the encryption scheme used for logging
-		This will allow for any future changes in encryption schemes of logs
-		This variable has been introduced in version 10 and value starts at 1.
- 	 */
-	public static final String LOG_ENCRYPT_ALGORITHM_VERSION="log_encrypt_algorithm_version";
-
-	/**
-		If dataEncryption is true, store the encrypted key in
-		services.properties file. It is really the encrypted
-		key, but the property key is called the encryptedBootPassword.
+        This will allow for any future changes in encryption schemes of logs
+        This variable has been introduced in version 10 and value starts at 1.
+     */
+    public static final String LOG_ENCRYPT_ALGORITHM_VERSION="log_encrypt_algorithm_version";
+
+    /**
+        If dataEncryption is true, store the encrypted key in
+        services.properties file. It is really the encrypted
+        key, but the property key is called the encryptedBootPassword.
 
-	 */
-	public static final String ENCRYPTED_KEY = 
+     */
+    public static final String ENCRYPTED_KEY = 
         "encryptedBootPassword";
 
 
@@ -353,8 +353,8 @@ public interface RawStoreFactory extends
      * successfully completes or rolled back. It is really the old 
      * encryptedkey, but the property key is called the 
      * OldEncryptedBootPassword.
-	 */
-	public static final String OLD_ENCRYPTED_KEY = 
+     */
+    public static final String OLD_ENCRYPTED_KEY = 
         "OldEncryptedBootPassword";
 
 
@@ -384,161 +384,161 @@ public interface RawStoreFactory extends
     public static final int  DB_ENCRYPTION_IN_CLEANUP  =  3;
 
     
-	/**
+    /**
        A File used to save the old copy of the verify key 
        (Attribute.CRYPTO_EXTERNAL_KEY_VERIFY_FILE) file during 
        re-encryption of the database. 
-	 */
-	String CRYPTO_OLD_EXTERNAL_KEY_VERIFY_FILE = "verifyOldKey.dat";
+     */
+    String CRYPTO_OLD_EXTERNAL_KEY_VERIFY_FILE = "verifyOldKey.dat";
 
 
 
-	/**
-	 *  for debugging, keep all transaction logs intact.
-	 */
-	public static final String KEEP_TRANSACTION_LOG = 
+    /**
+     *  for debugging, keep all transaction logs intact.
+     */
+    public static final String KEEP_TRANSACTION_LOG = 
         "derby.storage.keepTransactionLog";
 
     /**
       * The following is a to enable patch for databases with recovery
       * errors during redo of InitPage. If this property is set and
-	  * the page on the disk is corrupted and is getting exceptions like
-	  * invalid page format ids, we cook up the page during the recovery time.
-	  * We have seen this kind of problem with 1.5.1 databases from
-	  * customer Tridium ( Bug no: 3813).
-	  * This patch needs to be kept unless we find the problem is during
-	  * recovery process. If we discover this problem is actaully happening
-	  * at the recovery then this patch should be backed out.
-	  **/
-	public static final String PATCH_INITPAGE_RECOVER_ERROR = 
+      * the page on the disk is corrupted and is getting exceptions like
+      * invalid page format ids, we cook up the page during the recovery time.
+      * We have seen this kind of problem with 1.5.1 databases from
+      * customer Tridium ( Bug no: 3813).
+      * This patch needs to be kept unless we find the problem is during
+      * recovery process. If we discover this problem is actaully happening
+      * at the recovery then this patch should be backed out.
+      **/
+    public static final String PATCH_INITPAGE_RECOVER_ERROR = 
         "derby.storage.patchInitPageRecoverError";
 
 
-	/** module name */
-	public static final String MODULE = 
+    /** module name */
+    public static final String MODULE = 
         "org.apache.derby.iapi.store.raw.RawStoreFactory";
 
-	/**
-		Is the store read-only.
-	*/
-	public boolean isReadOnly();
-
-	/**
-		Get the LockFactory to use with this store.
-	*/
-	public LockFactory getLockFactory();
+    /**
+        Is the store read-only.
+    */
+    public boolean isReadOnly();
+
+    /**
+        Get the LockFactory to use with this store.
+    */
+    public LockFactory getLockFactory();
 
 
-	/**
-		Create a user transaction, almost all work within the raw store is
+    /**
+        Create a user transaction, almost all work within the raw store is
         performed in the context of a transaction.
-		<P>
-		Starting a transaction always performs the following steps.
-		<OL>
-		<LI>Create an raw store transaction context
-		<LI>Create a new idle transaction and then link it to the context.
-		</UL>
-		Only one user transaction and one nested user transaction can be active
+        <P>
+        Starting a transaction always performs the following steps.
+        <OL>
+        <LI>Create an raw store transaction context
+        <LI>Create a new idle transaction and then link it to the context.
+        </UL>
+        Only one user transaction and one nested user transaction can be active
         in a context at any one time.
-		After a commit the transaction may be re-used.
-		<P>
-		<B>Raw Store Transaction Context Behaviour</B>
-		<BR>
-		The cleanupOnError() method of this context behaves as follows:
-		<UL>
-		<LI>
-		If error is an instance of StandardException that
-		has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+        After a commit the transaction may be re-used.
+        <P>
+        <B>Raw Store Transaction Context Behaviour</B>
+        <BR>
+        The cleanupOnError() method of this context behaves as follows:
+        <UL>
+        <LI>
+        If error is an instance of StandardException that
+        has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
         no action is taken.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
+        <LI>
+        If error is an instance of StandardException that
+        has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
         the context's transaction is aborted, and the transaction returned to
         the idle state.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
+        <LI>
+        If error is an instance of StandardException that
+        has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
         then the context's transaction is aborted, the transaction closed, and
         the context is popped off the stack.
-		<LI>
-		If error is not an instance of StandardException then the context's
-		transaction is aborted, the transaction closed, and the
-		context is popped off the stack.
-		</UL>
+        <LI>
+        If error is not an instance of StandardException then the context's
+        transaction is aborted, the transaction closed, and the
+        context is popped off the stack.
+        </UL>
 
-		@param contextMgr is the context manager to use.  An exception will be
-		thrown if context is not the current context.
+        @param contextMgr is the context manager to use.  An exception will be
+        thrown if context is not the current context.
         @param transName is the name of the transaction. Thsi name will be displayed
         by the transactiontable VTI.
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see Transaction
-		@see org.apache.derby.iapi.services.context.Context
-		@see StandardException
-	*/
+        @see Transaction
+        @see org.apache.derby.iapi.services.context.Context
+        @see StandardException
+    */
 
-	public Transaction startTransaction(
+    public Transaction startTransaction(
     ContextManager contextMgr,
     String transName)
         throws StandardException;
 
-	/**
-		Create a global user transaction, almost all work within the raw store
+    /**
+        Create a global user transaction, almost all work within the raw store
         is performed in the context of a transaction.
-		<P>
+        <P>
         The (format_id, global_id, branch_id) triplet is meant to come exactly
         from a javax.transaction.xa.Xid.  We don't use Xid so that the system
         can be delivered on a non-1.2 vm system and not require the javax 
         classes in the path.  
         <P>
-		Starting a transaction always performs the following steps.
-		<OL>
-		<LI>Create an raw store transaction context
-		<LI>Create a new idle transaction and then link it to the context.
-		</UL>
-		Only one user transaction can be active in a context at any one time.
-		After a commit the transaction may be re-used.
-		<P>
-		<B>Raw Store Transaction Context Behaviour</B>
-		<BR>
-		The cleanupOnError() method of this context behaves as follows:
-		<UL>
-		<LI>
-		If error is an instance of StandardException that
-		has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then 
+        Starting a transaction always performs the following steps.
+        <OL>
+        <LI>Create an raw store transaction context
+        <LI>Create a new idle transaction and then link it to the context.
+        </UL>
+        Only one user transaction can be active in a context at any one time.
+        After a commit the transaction may be re-used.
+        <P>
+        <B>Raw Store Transaction Context Behaviour</B>
+        <BR>
+        The cleanupOnError() method of this context behaves as follows:
+        <UL>
+        <LI>
+        If error is an instance of StandardException that
+        has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then 
         no action is taken.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
+        <LI>
+        If error is an instance of StandardException that
+        has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
         the context's transaction is aborted, and the transaction returned to 
         the idle state.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY 
+        <LI>
+        If error is an instance of StandardException that
+        has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY 
         then the context's transaction is aborted, the transaction closed, and 
         the context is popped off the stack.
-		<LI>
-		If error is not an instance of StandardException then the context's
-		transaction is aborted, the transaction closed, and the
-		context is popped off the stack.
-		</UL>
+        <LI>
+        If error is not an instance of StandardException then the context's
+        transaction is aborted, the transaction closed, and the
+        context is popped off the stack.
+        </UL>
 
-		@param contextMgr is the context manager to use.  An exception will be
-		                  thrown if context is not the current context.
+        @param contextMgr is the context manager to use.  An exception will be
+                          thrown if context is not the current context.
         @param format_id  the format id part of the Xid - ie. Xid.getFormatId().
         @param global_id  the global transaction identifier part of XID - ie.
                           Xid.getGlobalTransactionId().
         @param local_id   The branch qualifier of the Xid - ie. 
                           Xid.getBranchQaulifier()
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see Transaction
-		@see org.apache.derby.iapi.services.context.Context
-		@see StandardException
-	*/
-	public Transaction startGlobalTransaction(
+        @see Transaction
+        @see org.apache.derby.iapi.services.context.Context
+        @see StandardException
+    */
+    public Transaction startGlobalTransaction(
     ContextManager contextMgr,
     int            format_id,
     byte[]         global_id,
@@ -546,201 +546,201 @@ public interface RawStoreFactory extends
         throws StandardException;
 
 
-	/**
-		Find a user transaction in the context manager, which must be the
-		current context manager.  If a user transaction does not already exist,
-		then create one @see #startTransaction
+    /**
+        Find a user transaction in the context manager, which must be the
+        current context manager.  If a user transaction does not already exist,
+        then create one @see #startTransaction
 
-		@param contextMgr the context manager to use.  An exception will be 
+        @param contextMgr the context manager to use.  An exception will be 
                           thrown if context is not the current context.
         @param transName  If a new transaction is started, it will be given 
                           this name.
         The name is displayed in the transactiontable VTI.
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see #startTransaction
-	*/
-	public Transaction findUserTransaction(
+        @see #startTransaction
+    */
+    public Transaction findUserTransaction(
         ContextManager contextMgr,
         String transName) throws StandardException;
 
 
-	/**
-		Create an internal transaction.
-		<P>
-		Starting an internal transaction always performs the following steps.
-		<OL>
-		<LI>Create an raw store internal transaction context
-		<LI>Create a new idle internal transaction and then link it to the 
+    /**
+        Create an internal transaction.
+        <P>
+        Starting an internal transaction always performs the following steps.
+        <OL>
+        <LI>Create an raw store internal transaction context
+        <LI>Create a new idle internal transaction and then link it to the 
             context.
-		</UL>
-		<P>
-		AN internal transaction is identical to a user transaction with the 
+        </UL>
+        <P>
+        AN internal transaction is identical to a user transaction with the 
         exception that
-		<UL>
-		<LI> Logical operations are not supported
-		<LI> Savepoints are not supported
-		<LI> Containers are not closed when commit() is called.
-		<LI> Pages are not unlatched (since containers are not closed) when 
+        <UL>
+        <LI> Logical operations are not supported
+        <LI> Savepoints are not supported
+        <LI> Containers are not closed when commit() is called.
+        <LI> Pages are not unlatched (since containers are not closed) when 
              commit() is called.
-		<LI> During recovery time internal transactions are rolled back before 
+        <LI> During recovery time internal transactions are rolled back before 
              user transactions.
-		</UL>
-		Only one internal transaction can be active in a context at any one time.
-		After a commit the transaction may be re-used.
-		<P>
-		<B>Raw Store Internal Transaction Context Behaviour</B>
-		<BR>
-		The cleanupOnError() method of this context behaves as follows:
-		<UL>
-		<LI>
-		If error is an instance of StandardException that
-		has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
-		the internal transaction is aborted, the internal transaction is closed,        the context is popped off the stack, and an exception of severity 
+        </UL>
+        Only one internal transaction can be active in a context at any one time.
+        After a commit the transaction may be re-used.
+        <P>
+        <B>Raw Store Internal Transaction Context Behaviour</B>
+        <BR>
+        The cleanupOnError() method of this context behaves as follows:
+        <UL>
+        <LI>
+        If error is an instance of StandardException that
+        has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+        the internal transaction is aborted, the internal transaction is closed,        the context is popped off the stack, and an exception of severity 
         Transaction exception is re-thrown.
-		<LI>
-		If error is an instance of StandardException that has a severity 
+        <LI>
+        If error is an instance of StandardException that has a severity 
         greater than or equal to ExceptionSeverity.TRANSACTION_SEVERITY then
         the context's internal transaction is aborted, the internal 
         transaction is closed and the context is popped off the stack.
-		<LI>
-		If error is not an instance of StandardException then the context's
-		internal transaction is aborted, the internal transaction is closed 
+        <LI>
+        If error is not an instance of StandardException then the context's
+        internal transaction is aborted, the internal transaction is closed 
         and the context is popped off the stack.
-		</UL>
+        </UL>
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see Transaction
-		@see org.apache.derby.iapi.services.context.Context
-		@see StandardException
-	*/
-	public Transaction startInternalTransaction(ContextManager contextMgr) throws StandardException;
+        @see Transaction
+        @see org.apache.derby.iapi.services.context.Context
+        @see StandardException
+    */
+    public Transaction startInternalTransaction(ContextManager contextMgr) throws StandardException;
 
-	/**
-		Create a nested user transaction, almost all work within the raw store 
+    /**
+        Create a nested user transaction, almost all work within the raw store 
         is performed in the context of a transaction.
-		<P>
+        <P>
         A nested user transaction is exactly the same as a user transaction,
         except that one can specify a compatibility space to associate with
         the transaction.
-		Starting a transaction always performs the following steps.
-		<OL>
-		<LI>Create an raw store transaction context
-		<LI>Create a new idle transaction and then link it to the context.
-		</UL>
-		Only one user transaction and one nested user transaction can be active
+        Starting a transaction always performs the following steps.
+        <OL>
+        <LI>Create an raw store transaction context
+        <LI>Create a new idle transaction and then link it to the context.
+        </UL>
+        Only one user transaction and one nested user transaction can be active
         in a context at any one time.
-		After a commit the transaction may be re-used.
-		<P>
-		<B>Raw Store Transaction Context Behaviour</B>
-		<BR>
-		The cleanupOnError() method of this context behaves as follows:
-		<UL>
-		<LI>
-		If error is an instance of StandardException that
-		has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+        After a commit the transaction may be re-used.
+        <P>
+        <B>Raw Store Transaction Context Behaviour</B>
+        <BR>
+        The cleanupOnError() method of this context behaves as follows:
+        <UL>
+        <LI>
+        If error is an instance of StandardException that
+        has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
         no action is taken.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
+        <LI>
+        If error is an instance of StandardException that
+        has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
         the context's transaction is aborted, and the transaction returned to
         the idle state.  If a user transaction exists on the context stack
         then that transaction is aborted also.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
+        <LI>
+        If error is an instance of StandardException that
+        has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
         then the context's transaction is aborted, the transaction closed, and
         the context is popped off the stack.
-		<LI>
-		If error is not an instance of StandardException then the context's
-		transaction is aborted, the transaction closed, and the
-		context is popped off the stack.
-		</UL>
-
-		@param compatibilitySpace compatibility space to use for locks.
-		@param contextMgr is the context manager to use.  An exception will be
-		thrown if context is not the current context.
+        <LI>
+        If error is not an instance of StandardException then the context's
+        transaction is aborted, the transaction closed, and the
+        context is popped off the stack.
+        </UL>
+
+        @param compatibilitySpace compatibility space to use for locks.
+        @param contextMgr is the context manager to use.  An exception will be
+        thrown if context is not the current context.
         @param transName is the name of the transaction. This name will be 
         displayed by the transactiontable VTI.
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see Transaction
-		@see org.apache.derby.iapi.services.context.Context
-		@see StandardException
-	*/
+        @see Transaction
+        @see org.apache.derby.iapi.services.context.Context
+        @see StandardException
+    */
 
-	public Transaction startNestedReadOnlyUserTransaction(
+    public Transaction startNestedReadOnlyUserTransaction(
     CompatibilitySpace compatibilitySpace,
     ContextManager contextMgr,
     String         transName)
         throws StandardException;
 
-	/**
-		Create a nested user transaction, almost all work within the raw store 
+    /**
+        Create a nested user transaction, almost all work within the raw store 
         is performed in the context of a transaction.
-		<P>
+        <P>
         A nested user transaction is exactly the same as a user transaction,
         except that one can specify a compatibility space to associate with
         the transaction.
-		Starting a transaction always performs the following steps.
-		<OL>
-		<LI>Create an raw store transaction context
-		<LI>Create a new idle transaction and then link it to the context.
-		</UL>
-		Only one user transaction and one nested user transaction can be active
+        Starting a transaction always performs the following steps.
+        <OL>
+        <LI>Create an raw store transaction context
+        <LI>Create a new idle transaction and then link it to the context.
+        </UL>
+        Only one user transaction and one nested user transaction can be active
         in a context at any one time.
-		After a commit the transaction may be re-used.
-		<P>
-		<B>Raw Store Transaction Context Behaviour</B>
-		<BR>
-		The cleanupOnError() method of this context behaves as follows:
-		<UL>
-		<LI>
-		If error is an instance of StandardException that
-		has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
+        After a commit the transaction may be re-used.
+        <P>
+        <B>Raw Store Transaction Context Behaviour</B>
+        <BR>
+        The cleanupOnError() method of this context behaves as follows:
+        <UL>
+        <LI>
+        If error is an instance of StandardException that
+        has a severity less than ExceptionSeverity.TRANSACTION_SEVERITY then
         no action is taken.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
+        <LI>
+        If error is an instance of StandardException that
+        has a severity equal to ExceptionSeverity.TRANSACTION_SEVERITY then
         the context's transaction is aborted, and the transaction returned to
         the idle state.  If a user transaction exists on the context stack
         then that transaction is aborted also.
-		<LI>
-		If error is an instance of StandardException that
-		has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
+        <LI>
+        If error is an instance of StandardException that
+        has a severity greater than  ExceptionSeverity.TRANSACTION_SEVERITY
         then the context's transaction is aborted, the transaction closed, and
         the context is popped off the stack.
-		<LI>
-		If error is not an instance of StandardException then the context's
-		transaction is aborted, the transaction closed, and the
-		context is popped off the stack.
-		</UL>
+        <LI>
+        If error is not an instance of StandardException then the context's
+        transaction is aborted, the transaction closed, and the
+        context is popped off the stack.
+        </UL>
 
-		@param contextMgr is the context manager to use.  An exception will be
-		thrown if context is not the current context.
+        @param contextMgr is the context manager to use.  An exception will be
+        thrown if context is not the current context.
         @param transName is the name of the transaction. This name will be 
         displayed by the transactiontable VTI.
 
-		@exception StandardException Standard Derby error policy
+        @exception StandardException Standard Derby error policy
 
-		@see Transaction
-		@see org.apache.derby.iapi.services.context.Context
-		@see StandardException
-	*/
+        @see Transaction
+        @see org.apache.derby.iapi.services.context.Context
+        @see StandardException
+    */
 
-	public Transaction startNestedUpdateUserTransaction(
+    public Transaction startNestedUpdateUserTransaction(
     ContextManager contextMgr,
     String         transName)
         throws StandardException;
 
 
-	/**
-	  @see org.apache.derby.iapi.store.access.AccessFactory#getTransactionInfo
-	 */
-	public TransactionInfo[] getTransactionInfo();
+    /**
+      @see org.apache.derby.iapi.store.access.AccessFactory#getTransactionInfo
+     */
+    public TransactionInfo[] getTransactionInfo();
 
     /**
      * Start the replication master role for this database
@@ -779,213 +779,213 @@ public interface RawStoreFactory extends
      */
     public void failover(String dbname) throws StandardException;
 
-	/**
-	  * Freeze the database temporarily so a backup can be taken.
-	  * <P>Please see Derby on line documentation on backup and restore.
-	  *
-	  * @exception StandardException Thrown on error
-	  */
-	public void freeze() throws StandardException;
-
-	/**
-	  * Unfreeze the database after a backup has been taken.
-	  * <P>Please see Derby on line documentation on backup and restore.
-	  *
-	  * @exception StandardException Thrown on error
-	  */
-	public void unfreeze() throws StandardException;
-
-	/**
-	  * Backup the database to backupDir.  
-	  * <P>Please see Derby on line documentation on backup and restore.
-	  *
-	  * @param backupDir the name of the directory where the backup should be
+    /**
+      * Freeze the database temporarily so a backup can be taken.
+      * <P>Please see Derby on line documentation on backup and restore.
+      *
+      * @exception StandardException Thrown on error
+      */
+    public void freeze() throws StandardException;
+
+    /**
+      * Unfreeze the database after a backup has been taken.
+      * <P>Please see Derby on line documentation on backup and restore.
+      *
+      * @exception StandardException Thrown on error
+      */
+    public void unfreeze() throws StandardException;
+
+    /**
+      * Backup the database to backupDir.  
+      * <P>Please see Derby on line documentation on backup and restore.
+      *
+      * @param backupDir the name of the directory where the backup should be
       *                  stored.
       * @param wait      if <tt>true</tt>, waits for  all the backup blocking 
       *                  operations in progress to finish.
       * 
       * @exception StandardException Thrown on error
-	  */
+      */
     public void backup(
     String backupDir, 
     boolean wait) throws StandardException;
 
-		
-	/**
-	 * Backup the database to a backup directory and enable the log archive
-	 * mode that will keep the archived log files required for roll-forward
-	 * from this version backup.
+        
+    /**
+     * Backup the database to a backup directory and enable the log archive
+     * mode that will keep the archived log files required for roll-forward
+     * from this version backup.
      *
-	 * @param backupDir                     the directory name where the 
+     * @param backupDir                     the directory name where the 
      *                                      database backup should go.  This 
      *                                      directory will be created if not it
      *                                      does not exist.
      *
-	 * @param deleteOnlineArchivedLogFiles  If true deletes online archived log
+     * @param deleteOnlineArchivedLogFiles  If true deletes online archived log
      *                                      files that exist before this backup,
      *                                      delete will occur only after backup
      *                                      is complete.
      *
      * @param wait if <tt>true</tt>, waits for  all the backup blocking 
-	 *             operations in progress to finish.
+     *             operations in progress to finish.
      *
      * @exception StandardException Thrown on error
-	 */
+     */
     public void backupAndEnableLogArchiveMode(
     String  backupDir, 
     boolean deleteOnlineArchivedLogFiles,
     boolean wait) 
-		throws StandardException;
-		
-	/**
-	 * disables the log archival process, i.e No old log files
-	 * will be kept around for a roll-forward recovery.
+        throws StandardException;
+        
+    /**
+     * disables the log archival process, i.e No old log files
+     * will be kept around for a roll-forward recovery.
      *
-	 * @param deleteOnlineArchivedLogFiles  If true deletes all online archived
+     * @param deleteOnlineArchivedLogFiles  If true deletes all online archived
      *                                      log files that exist before this 
      *                                      call immediately; Only restore that
      *                                      can be performed after disabling 
      *                                      log archive mode is version 
      *                                      recovery.
      *
-	 * @exception StandardException Thrown on error
-	 */
-	public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
-		throws StandardException;
+     * @exception StandardException Thrown on error
+     */
+    public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
+        throws StandardException;
 
 
-	/**
+    /**
         Checkpoint the database.
 
         The raw store will wait for any current checkpoints to complete.  It
         will start a new checkpoint and not return until that checkpoint 
         completes.
 
-		@exception StandardException Standard Derby error policy
-	*/
-	public void checkpoint() throws StandardException;
-
-
-	/**
-		Idle the raw store as much as possible. 
-		@exception StandardException Standard Derby error policy
-
-	*/
-	public void idle() throws StandardException;
-
-	/**
-	    Get a flushed scan.
-		@param start The instant for the beginning of the scan.
-		@param groupsIWant log record groups the caller wants to scan.
-		@exception StandardException StandardDerby error policy
-		*/
-	ScanHandle openFlushedScan(DatabaseInstant start, int groupsIWant) 
-		 throws StandardException;
-
-	
-	/**
-		If this raw store has a daemon that services its need, return the
-		daemon.  If not, return null
-	*/
-	public DaemonService getDaemon();
-
-
-	/*
-	 * return the transaction factory module 
-	 */
-	public String getTransactionFactoryModule();
-
-	/*
-	 * return the data factory module 
-	 */
-	public String getDataFactoryModule();
-
-	/*
-	 * return the Log factory module 
-	 */
-	public String getLogFactoryModule();
+        @exception StandardException Standard Derby error policy
+    */
+    public void checkpoint() throws StandardException;
+
+
+    /**
+        Idle the raw store as much as possible. 
+        @exception StandardException Standard Derby error policy
+
+    */
+    public void idle() throws StandardException;
+
+    /**
+        Get a flushed scan.
+        @param start The instant for the beginning of the scan.
+        @param groupsIWant log record groups the caller wants to scan.
+        @exception StandardException StandardDerby error policy
+        */
+    ScanHandle openFlushedScan(DatabaseInstant start, int groupsIWant) 
+         throws StandardException;
 
-	/*
-	 * Return the module providing XAresource interface to the transaction 
+    
+    /**
+        If this raw store has a daemon that services its need, return the
+        daemon.  If not, return null
+    */
+    public DaemonService getDaemon();
+
+
+    /*
+     * return the transaction factory module 
+     */
+    public String getTransactionFactoryModule();
+
+    /*
+     * return the data factory module 
+     */
+    public String getDataFactoryModule();
+
+    /*
+     * return the Log factory module 
+     */
+    public String getLogFactoryModule();
+
+    /*
+     * Return the module providing XAresource interface to the transaction 
      * table. 
      *
-	 * @exception StandardException Standard Derby exception policy.
-	 */
-	public /* XAResourceManager */ Object getXAResourceManager()
+     * @exception StandardException Standard Derby exception policy.
+     */
+    public /* XAResourceManager */ Object getXAResourceManager()
         throws StandardException;
 
-	/*
-	 * the database creation phase is finished
-	 * @exception StandardException Standard Derby exception policy.
-	 */
-	public void createFinished() throws StandardException;
-
-	/**
-	 * Get JBMS properties relavent to raw store
-	 *
-	 * @exception StandardException Standard Derby exception policy.
-	 */
-	public void getRawStoreProperties(PersistentSet tc) 
-		 throws StandardException; 
-
-	/**
-	 *  Backup / restore support
-	 */
-
-	/**
-	 * Freeze the database from altering any persistent storage.
-	 *
-	 * @exception StandardException Standard Derby exception policy.
-	 */
-	public void freezePersistentStore() throws StandardException;
-
-	/**
-	 * Unfreeze the database, persistent storage can now be altered.
-	 *
-	 * @exception StandardException Standard Derby exception policy.
-	 */
-	public void unfreezePersistentStore() throws StandardException;
-
-	/**
-		Encrypt cleartext into ciphertext.
-
-		@see org.apache.derby.iapi.services.crypto.CipherProvider#encrypt
-		@exception StandardException Standard Derby Error Policy
-	 */
-	public int encrypt(byte[] cleartext, int offset, int length, 
-					   byte[] ciphertext, int outputOffset,
+    /*
+     * the database creation phase is finished
+     * @exception StandardException Standard Derby exception policy.
+     */
+    public void createFinished() throws StandardException;
+
+    /**
+     * Get JBMS properties relavent to raw store
+     *
+     * @exception StandardException Standard Derby exception policy.
+     */
+    public void getRawStoreProperties(PersistentSet tc) 
+         throws StandardException; 
+
+    /**
+     *  Backup / restore support
+     */
+
+    /**
+     * Freeze the database from altering any persistent storage.
+     *
+     * @exception StandardException Standard Derby exception policy.
+     */
+    public void freezePersistentStore() throws StandardException;
+
+    /**
+     * Unfreeze the database, persistent storage can now be altered.
+     *
+     * @exception StandardException Standard Derby exception policy.
+     */
+    public void unfreezePersistentStore() throws StandardException;
+
+    /**
+        Encrypt cleartext into ciphertext.
+
+        @see org.apache.derby.iapi.services.crypto.CipherProvider#encrypt
+        @exception StandardException Standard Derby Error Policy
+     */
+    public int encrypt(byte[] cleartext, int offset, int length, 
+                       byte[] ciphertext, int outputOffset,
                        boolean newEngine) 
-		 throws StandardException ;
+         throws StandardException ;
+
+    /**
+        Decrypt cleartext from ciphertext.
+
+        @see org.apache.derby.iapi.services.crypto.CipherProvider#decrypt
+        @exception StandardException Standard Derby Error Policy
+     */
+    public int decrypt(byte[] ciphertext, int offset, int length, 
+                       byte[] cleartext, int outputOffset) 
+         throws StandardException ;
 
-	/**
-		Decrypt cleartext from ciphertext.
+    /**
+        Returns the encryption block size used during creation of the encrypted database
+     */
+    public int getEncryptionBlockSize();
 
-		@see org.apache.derby.iapi.services.crypto.CipherProvider#decrypt
-		@exception StandardException Standard Derby Error Policy
-	 */
-	public int decrypt(byte[] ciphertext, int offset, int length, 
-					   byte[] cleartext, int outputOffset) 
-		 throws StandardException ;
-
-	/**
-	 	Returns the encryption block size used during creation of the encrypted database
-	 */
-	public int getEncryptionBlockSize();
-
-	/**
-		Returns a secure random number for this raw store - if database is not
-		encrypted, returns 0.
-	 */
-	public int random();
-
-	/**
-		Change the boot password.  Return the encrypted form of the secret key.
-		The new value must be a String of the form: oldBootPassword, newBootPassword
-
-		@exception StandardException Standard Derby Error Policy
-	 */
-	public Serializable changeBootPassword(Properties properties, Serializable changePassword)
-		 throws StandardException ;
+    /**
+        Returns a secure random number for this raw store - if database is not
+        encrypted, returns 0.
+     */
+    public int random();
+
+    /**
+        Change the boot password.  Return the encrypted form of the secret key.
+        The new value must be a String of the form: oldBootPassword, newBootPassword
+
+        @exception StandardException Standard Derby Error Policy
+     */
+    public Serializable changeBootPassword(Properties properties, Serializable changePassword)
+         throws StandardException ;
 
     /**
      * Return an id which can be used to create a container.
@@ -996,18 +996,18 @@ public interface RawStoreFactory extends
      * it as it is used.
      * <p>
      *
-	 * @return The an id which can be used to create a container.
+     * @return The an id which can be used to create a container.
      *
-	 * @exception  StandardException  Standard exception policy.
+     * @exception  StandardException  Standard exception policy.
      **/
     long getMaxContainerId()
-		throws StandardException;
+        throws StandardException;
 
 
     /**
-		Get the Transaction Factory to use with this store.
-	*/
-	public TransactionFactory getXactFactory();
+        Get the Transaction Factory to use with this store.
+    */
+    public TransactionFactory getXactFactory();
 
     /**
      *  Check to see if a database has been upgraded to the required
@@ -1026,7 +1026,7 @@ public interface RawStoreFactory extends
      *             when <code>feature</code> feature is 
      *             not <code> null </code>. 
      */
-	public boolean checkVersion(
+    public boolean checkVersion(
     int     requiredMajorVersion, 
     int     requiredMinorVersion, 
     String  feature)