db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r486240 - in /db/derby/code/trunk/java/engine/org/apache/derby: catalog/ iapi/services/io/ iapi/sql/dictionary/ impl/sql/catalog/
Date Tue, 12 Dec 2006 17:09:20 GMT
Author: djd
Date: Tue Dec 12 09:09:19 2006
New Revision: 486240

URL: http://svn.apache.org/viewvc?view=rev&rev=486240
Log:
DERBY-2138 (partial) Cleanup DependableFinder and associated classes by removing an unused
method
and adding comments to related classes.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java?view=diff&rev=486240&r1=486239&r2=486240
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java Tue Dec
12 09:09:19 2006
@@ -51,20 +51,9 @@
 	public	Dependable	getDependable(UUID dependableObjectID) throws SQLException;
 
 	/**
-	  *	Get the in-memory object associated with the passed-in object ID.
-	  *
-	  *	@param	dependableObjectID the UUID of the Dependable as a String.
-	  * Used to locate that Dependable
-	  *
-	  *	@return	the associated Dependable
-	  * @exception SQLException		thrown on error
-	  */
-	public	Dependable	getDependable(String dependableObjectID) throws SQLException;
-
-	/**
 	  * The name of the class of Dependables as a "SQL Object" which this
 	  * Finder can find.
-	  * This is a value like "Table", "View", or "Publication".
+	  * This is a value like "Table" or "View".
 	  *	Every DependableFinder can find some class of Dependables. 
 	  *
 	  *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java?view=diff&rev=486240&r1=486239&r2=486240
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
Tue Dec 12 09:09:19 2006
@@ -23,10 +23,38 @@
 
 import org.apache.derby.iapi.services.loader.InstanceGetter;
 
+/**
+ * Class that loads Formattables (typically from disk)through
+ * one level of indirection.
+ * A concrete implementation of this class is registered as the
+ * class to handle a number of format identifiers in RegisteredFormatIds.
+ * When the in-memory representation of RegisteredFormatIds is set up
+ * an instance of the concrete class will be created for each format
+ * identifier the class is registered for, and each instances will
+ * have its setFormatId() called once with the appropriate format identifier.
+ * 
+ * <BR>
+ * When a Formattable object is read from disk and its registered class
+ * is an instance of FormatableInstanceGetter the getNewInstance() method
+ * will be called to create the object.
+ * The implementation can use the fmtId field to determine the
+ * class of the instance to be returned.
+ * <BR>
+ * Instances of FormatableInstanceGetter are system wide, that is there is
+ * a single set of RegisteredFormatIds per system.
+ * 
+ * @see RegisteredFormatIds
+ */
 public abstract class FormatableInstanceGetter implements InstanceGetter {
 
+    /**
+     * Format identifier of the object 
+     */
 	protected int fmtId;
 
+    /**
+     * Set the format identifier that this instance will be loading from disk.
+    */
 	public final void setFormatId(int fmtId) {
 		this.fmtId = fmtId;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java?view=diff&rev=486240&r1=486239&r2=486240
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
Tue Dec 12 09:09:19 2006
@@ -21,27 +21,20 @@
 
 package org.apache.derby.iapi.sql.dictionary;
 
-import org.apache.derby.catalog.UUID;
-
-import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.sql.StatementType;
 import org.apache.derby.catalog.DependableFinder;
-import org.apache.derby.catalog.Dependable;
-import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.sql.depend.DependencyManager;
+import org.apache.derby.catalog.UUID;
 import org.apache.derby.iapi.sql.depend.Dependent;
-import org.apache.derby.iapi.sql.depend.Dependency;
 import org.apache.derby.iapi.sql.depend.Provider;
 
 /**
- * This interface is used to get information from a DependencyDescriptor.
- *
- * @version 0.1
- * @author Jerry Brenner
+ * DependencyDescriptor represents a persistent dependency between
+ * SQL objects, such as a TRIGGER being dependent on a TABLE.
+ * 
+ * A DependencyDescriptor is stored in SYSDEPENDS as four
+ * separate columms corresponding to the getters of this class. 
+ * 
+ * 
  */
-
 public class DependencyDescriptor extends TupleDescriptor 
 	implements UniqueTupleDescriptor
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java?view=diff&rev=486240&r1=486239&r2=486240
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
Tue Dec 12 09:09:19 2006
@@ -24,6 +24,14 @@
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
 
+/**
+ * FormatableInstanceGetter to load stored instances
+ * of DependableFinder. Class is registered in RegisteredFormatIds
+ * 
+ * @see org.apache.derby.catalog.DependableFinder
+ * @see org.apache.derby.iapi.services.io.RegisteredFormatIds
+ *
+ */
 public class CoreDDFinderClassInfo extends FormatableInstanceGetter {
 
 	public Object getNewInstance() 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java?view=diff&rev=486240&r1=486239&r2=486240
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
Tue Dec 12 09:09:19 2006
@@ -145,26 +145,6 @@
 	//
 	////////////////////////////////////////////////////////////////////////
 
-
-	/**
-	 * Gets the in-memory object associated with the passed-in object ID.
-	 *
-	 * @param	dependableObjectID the UUID of the Dependable as a String.
-	 * 			Used to locate that Dependable
-	 *
-	 * @return	the associated Dependable
-	 *
-	 * @exception java.sql.SQLException		thrown on error
-	 */
-	public	final Dependable	getDependable(String dependableObjectID) throws java.sql.SQLException
-	{
-		/*
-		** Call the specific implementation of getDependable
-		** to do the work
-		*/
-		return getDependable(recreateUUID(dependableObjectID));
-	}
-
 	/**
 	  *	Gets the AliasDescriptor associated with the passed-in object ID.
 	  *



Mime
View raw message