db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r372263 - in /db/derby/code/trunk/java/engine/org/apache/derby: database/ iapi/store/access/ iapi/store/raw/ impl/db/ impl/store/access/ impl/store/raw/
Date Wed, 25 Jan 2006 16:41:39 GMT
Author: mikem
Date: Wed Jan 25 08:41:33 2006
New Revision: 372263

URL: http://svn.apache.org/viewcvs?rev=372263&view=rev
Log:
Fix for DERBY-665, committed on behalf of Suresh Thalamati.

Comments from submitter:
 This patch removes the unused backup functions with File as parameter, 


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java?rev=372263&r1=372262&r2=372263&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/database/Database.java Wed Jan 25 08:41:33
2006
@@ -85,18 +85,6 @@
     public void backup(String backupDir, boolean wait) 
         throws SQLException;
 
-	/**
-	 * Backup the database to a backup directory.  See online documentation
-	 * for more detail about how to use this feature.
-	 *
-	 * @param backupDir the directory where the database backup should
-	 *   go.  This directory will be created if not it does not exist.
-	 *
-	 * @exception SQLException Thrown on error
-	 */
-	public void backup(File backupDir) throws SQLException;
-
-
 
     /**
      * Backup the database to a backup directory and enable the log archive
@@ -127,31 +115,6 @@
     boolean wait) 
         throws SQLException;
 
-
-	/**
-	 * 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 
-     *                                      database backup should go.  This 
-     *                                      directory will be created if it does
-     *                                      not exist.
-     *
-	 * @param deleteOnlineArchivedLogFiles  If true deletes online archived log
-     *                                      files that exist before this backup;
-     *                                      otherwise they will not be deleted. 
-     *
-	 *                                      Deletion will occur only after 
-     *                                      backup is complete.
-     *
-	 * @exception SQLException Thrown on error
-	 */
-	public void backupAndEnableLogArchiveMode(
-    File    backupDir, 
-    boolean deleteOnlineArchivedLogFiles) 
-		throws SQLException;
-	
 
 	/**
 	 * Disables the log archival process, i.e No old log files

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java?rev=372263&r1=372262&r2=372263&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
Wed Jan 25 08:41:33 2006
@@ -243,15 +243,6 @@
     public void backup(String backupDir, boolean wait) 
         throws StandardException;
 
-	/**
-	  * Backup the database to backupDir.  
-	  * <P>Please see cloudscape on line documentation on backup and restore.
-	  *
-	  * @param backupDir the directory where the backup should be stored.
-	  *
-	  * @exception StandardException Thrown on error
-	  */
-	public void backup(File backupDir) throws StandardException;
 	
 	/**
      * Backup the database to a backup directory and enable the log archive
@@ -280,28 +271,6 @@
     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.
-     *
-	 * @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
-     *                                      files that exist before this backup,
-     *                                      delete will occur only after backup
-     *                                      is complete.
-     *
-	 * @exception StandardException Thrown on error
-	 */
-	public void backupAndEnableLogArchiveMode(
-    File    backupDir, 
-    boolean deleteOnlineArchivedLogFiles) 
-		throws StandardException;
-
 	/**
 	 * disables the log archival process, i.e No old log files
 	 * will be kept around for a roll-forward recovery.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java?rev=372263&r1=372262&r2=372263&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 Wed
Jan 25 08:41:33 2006
@@ -657,17 +657,6 @@
     String backupDir, 
     boolean wait) throws StandardException;
 
-	/**
-	  * Backup the database to backupDir.  
-	  * <P>Please see cloudscape on line documentation on backup and restore.
-	  *
-	  * @param backupDir the directory where the backup should be stored.
-	  *
-	  * @exception StandardException Thrown on error
-	  */
-	public void backup(File backupDir) throws StandardException;
-
-
 		
 	/**
 	 * Backup the database to a backup directory and enable the log archive
@@ -695,27 +684,6 @@
     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.
-	 * @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
-     *                                      files that exist before this backup,
-     *                                      delete will occur only after backup
-     *                                      is complete.
-     *
-	 * @exception StandardException Thrown on error
-	 */
-	public void backupAndEnableLogArchiveMode(
-    File    backupDir, 
-    boolean deleteOnlineArchivedLogFiles) 
-		throws StandardException;
-	
 	/**
 	 * disables the log archival process, i.e No old log files
 	 * will be kept around for a roll-forward recovery.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java?rev=372263&r1=372262&r2=372263&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java Wed Jan 25
08:41:33 2006
@@ -338,16 +338,6 @@
 		}
 	}
 
-	public void backup(File backupDir) throws SQLException
-	{
-		try {
-			af.backup(backupDir);
-		} catch (StandardException se) {
-			throw PublicAPI.wrapStandardException(se);
-		}
-	}
-
-
 
     public void backupAndEnableLogArchiveMode(String  backupDir, 
                                               boolean deleteOnlineArchivedLogFiles,
@@ -363,17 +353,6 @@
 		}
 	}
 
-	public void backupAndEnableLogArchiveMode(File backupDir, 
-											  boolean
-											  deleteOnlineArchivedLogFiles)
-		throws SQLException
-	{
-		try {
-			af.backupAndEnableLogArchiveMode(backupDir, deleteOnlineArchivedLogFiles);
-		} catch (StandardException se) {
-			throw PublicAPI.wrapStandardException(se);
-		}
-	}
 	
 	public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 		throws SQLException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java?rev=372263&r1=372262&r2=372263&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
Wed Jan 25 08:41:33 2006
@@ -934,11 +934,6 @@
 		rawstore.backup(backupDir, wait);
 	}
 
-	public void backup(File backupDir) throws StandardException
-	{
-		rawstore.backup(backupDir);
-	}
-
 
     public void backupAndEnableLogArchiveMode(
     String  backupDir, 
@@ -950,15 +945,6 @@
                                                deleteOnlineArchivedLogFiles, 
                                                wait);
 	}
-
-	public void backupAndEnableLogArchiveMode(
-    File    backupDir, 
-    boolean deleteOnlineArchivedLogFiles) 
-		throws StandardException
-	{
-		rawstore.backupAndEnableLogArchiveMode(
-            backupDir, deleteOnlineArchivedLogFiles);
-	}	
 
 	public void disableLogArchiveMode(boolean deleteOnlineArchivedLogFiles)
 		throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=372263&r1=372262&r2=372263&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java Wed Jan
25 08:41:33 2006
@@ -538,11 +538,6 @@
 	}
 
 
-	public void backup(File backupDir) throws StandardException
-	{
-		backup(backupDir);
-	}
-
 	/*
 	 * Backup the database.
 	 * Online backup copies all the database files (log, seg0  ...Etc) to the
@@ -857,22 +852,6 @@
                 logFactory.disableLogArchiveMode();
             throw StandardException.plainWrapException(error);
         }
-	}
-
-
-	public void backupAndEnableLogArchiveMode(File backupDir,boolean
-											  deleteOnlineArchivedLogFiles) 
-		throws StandardException
-	{
-		logFactory.enableLogArchiveMode();
-		backup(backupDir);
-		//After successful backup delete the archived log files
-		//that are not necessary to do a roll-forward recovery
-		//from this backup if requested.
-		if(deleteOnlineArchivedLogFiles)
-		{
-			logFactory.deleteOnlineArchivedLogFiles();
-		}
 	}
 
 



Mime
View raw message