db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r425116 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/
Date Mon, 24 Jul 2006 16:50:10 GMT
Author: djd
Date: Mon Jul 24 09:50:09 2006
New Revision: 425116

URL: http://svn.apache.org/viewvc?rev=425116&view=rev
Log:
DERBY-1581 (partial) Clean-up some descriptor objects as a step to ensuring their identity
is immutable
once created and/or fully populated. Remove some unused methods.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -55,15 +55,15 @@
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider
 {
-	private UUID		aliasID;
-	private String		aliasName;
-	private UUID		schemaID;
-	private String		javaClassName;
-	private char		aliasType;
-	private char		nameSpace;
-	private boolean		systemAlias;
-	private AliasInfo	aliasInfo;
-	private String		specificName;
+	private final UUID		aliasID;
+	private final String		aliasName;
+	private final UUID		schemaID;
+	private final String		javaClassName;
+	private final char		aliasType;
+	private final char		nameSpace;
+	private final boolean		systemAlias;
+	private final AliasInfo	aliasInfo;
+	private final String		specificName;
 
 	/**
 	 * Constructor for a AliasDescriptor

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -55,20 +55,20 @@
  * @author Jeff Lichtman
  */
 
-public class ColumnDescriptor extends TupleDescriptor
+public final class ColumnDescriptor extends TupleDescriptor
 {
 
 	// implementation
-	DefaultInfo			columnDefaultInfo;
-	TableDescriptor		table;
-	String			columnName;
-	int			columnPosition;
-	DataTypeDescriptor	columnType;
-	DataValueDescriptor	columnDefault;
-	UUID				uuid;
-	UUID				defaultUUID;
-	long				autoincStart;
-	long				autoincInc;
+	private DefaultInfo			columnDefaultInfo;
+	private TableDescriptor		table;
+	private String			columnName;
+	private int			columnPosition;
+	private DataTypeDescriptor	columnType;
+	private DataValueDescriptor	columnDefault;
+	private UUID				uuid;
+	private UUID				defaultUUID;
+	private long				autoincStart;
+	private long				autoincInc;
 	//Following variable is used to see if the user is adding an autoincrement 
 	//column, or if user is altering the existing autoincrement column to change 
 	//the increment value or to change the start value. If none of the above,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -63,14 +63,14 @@
 	public static final int SYSCONSTRAINTS_STATE_FIELD = 6;
 
 	TableDescriptor		table;
-	String				constraintName;
-	boolean				deferrable;
-	boolean				initiallyDeferred;
+	final String				constraintName;
+	private final boolean				deferrable;
+	private final boolean				initiallyDeferred;
 	boolean				isEnabled;
-	int[]				referencedColumns;
-	UUID					constraintId;
-	SchemaDescriptor	schemaDesc;
-	ColumnDescriptorList	colDL;
+	private final int[]				referencedColumns;
+	final UUID					constraintId;
+	private final SchemaDescriptor	schemaDesc;
+	private ColumnDescriptorList	colDL;
 
 	/**
 	 * Constructor for a ConstraintDescriptor
@@ -118,16 +118,6 @@
 	public UUID	getTableId()
 	{
 		return table.getUUID();
-	}
-
-	/**
-	 * Sets the UUID of the constraint.
-	 *
-	 * @param constraintId	The constraint Id.
-	 */
-	public void	setConstraintId(UUID constraintId)
-	{
-		this.constraintId = constraintId;
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -48,18 +48,9 @@
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider, Dependent
 {
-	/** public interface to this class 
-		<ol>
-		<li>public void setDefaultUUID(UUID defaultUUID);
-		<li>public UUID	getTableUUID();
-		</ol>
-	*/
-   
-	// implementation
-
-	int			columnNumber;
-	UUID		defaultUUID;
-	UUID		tableUUID;
+	private final int			columnNumber;
+	private final UUID		defaultUUID;
+	private final UUID		tableUUID;
 
 	/**
 	 * Constructor for a DefaultDescriptor
@@ -87,16 +78,6 @@
 	public UUID	getUUID()
 	{
 		return defaultUUID;
-	}
-
-	/**
-	 * Set the UUID of the default.
-	 *
-	 * @param defaultUUID The new UUID for the default.
-	 */
-	public void setDefaultUUID(UUID defaultUUID)
-	{
-		this.defaultUUID = defaultUUID;
 	}
 
 	/**

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?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- 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
Mon Jul 24 09:50:09 2006
@@ -53,10 +53,10 @@
 	*/
 
 	// implementation
-	private UUID					dependentID;
-	private DependableFinder		dependentBloodhound;
-	private UUID					providerID;
-	private DependableFinder		providerBloodhound;
+	private final UUID					dependentID;
+	private final DependableFinder		dependentBloodhound;
+	private final UUID					providerID;
+	private final DependableFinder		providerBloodhound;
 
 	/**
 	 * Constructor for a DependencyDescriptor

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -34,7 +34,7 @@
 /**
  * A Descriptor for a file that has been stored in the database.
  */
-public class  FileInfoDescriptor extends TupleDescriptor 
+public final class  FileInfoDescriptor extends TupleDescriptor 
 	implements Provider, UniqueSQLObjectDescriptor
 {
 	/** A type tho indicate the file is a jar file **/
@@ -45,10 +45,10 @@
 		<li>public long	getGenerationId();
 		</ol>
 	*/
-	UUID id;
-	SchemaDescriptor sd;
-	String sqlName;
-	long generationId;
+	private final UUID id;
+	private final SchemaDescriptor sd;
+	private final String sqlName;
+	private final long generationId;
 	
 	/**
 	 * Constructor for a FileInfoDescriptor.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/PermissionsDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -34,10 +34,10 @@
 	implements Cloneable, Provider
 {
 	protected UUID oid;
-	protected String grantee;
-	protected String grantor;
+	private final String grantee;
+	private String grantor;
 
-	public PermissionsDescriptor( DataDictionary dd,
+	PermissionsDescriptor( DataDictionary dd,
 								  String grantee,
 								  String grantor)
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java?rev=425116&r1=425115&r2=425116&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
Mon Jul 24 09:50:09 2006
@@ -526,17 +526,6 @@
 	}
 
 	/**
-	 * Set the text of the USING clause. Used by
-	 * ALTER statement.
-	 *
-	 * @param usingText	the new value for the USING text
-	 */
-	public final synchronized void setUsingText(String usingText)
-	{
-		this.usingText = usingText;
-	}
-
-	/**
 	 * Sets the UUID of the SPS.
 	 *
 	 * @param uuid	The UUID of the SPS to be set in the descriptor



Mime
View raw message