db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r425814 - in /db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary: ConglomerateDescriptor.java DefaultDescriptor.java SchemaDescriptor.java ViewDescriptor.java
Date Wed, 26 Jul 2006 19:41:59 GMT
Author: djd
Date: Wed Jul 26 12:41:58 2006
New Revision: 425814

URL: http://svn.apache.org/viewvc?rev=425814&view=rev
Log:
Minor cleanup in some data dictionary descriptors moving towards the identity being immmutable

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.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/SchemaDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java?rev=425814&r1=425813&r2=425814&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
Wed Jul 26 12:41:58 2006
@@ -47,19 +47,19 @@
  * @author Jeff Lichtman
  */
 
-public class ConglomerateDescriptor extends TupleDescriptor
+public final class ConglomerateDescriptor extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider
 {
 	// Implementation
-	long	conglomerateNumber;
-	String	name;
-	String[]	columnNames;
-	boolean	indexable;
-	boolean	forConstraint;
-	IndexRowGenerator	indexRowGenerator;
-	UUID	uuid;
-	UUID	tableID;
-	UUID	schemaID;
+	private long	conglomerateNumber;
+	private String	name;
+	private String[]	columnNames;
+	private final boolean	indexable;
+	private final boolean	forConstraint;
+	private final IndexRowGenerator	indexRowGenerator;
+	private final UUID	uuid;
+	private final UUID	tableID;
+	private final UUID	schemaID;
 
 	/**
 	 * Constructor for a conglomerate descriptor.

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=425814&r1=425813&r2=425814&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
Wed Jul 26 12:41:58 2006
@@ -44,7 +44,7 @@
  * @author Jerry
  */
 
-public class DefaultDescriptor 
+public final class DefaultDescriptor 
 	extends TupleDescriptor
 	implements UniqueTupleDescriptor, Provider, Dependent
 {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java?rev=425814&r1=425813&r2=425814&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
Wed Jul 26 12:41:58 2006
@@ -34,7 +34,7 @@
  * @author Jeff Lichtman
  */
 
-public class SchemaDescriptor extends TupleDescriptor 
+public final class SchemaDescriptor extends TupleDescriptor 
 	implements UniqueTupleDescriptor, Provider
 {
 	
@@ -155,8 +155,8 @@
 	private UUID			oid;
 	private final String			aid;
 
-    private boolean isSystem;
-    private boolean isSYSIBM;
+    private final boolean isSystem;
+    private final boolean isSYSIBM;
 
 	/**
 	 * Constructor for a SchemaDescriptor.
@@ -181,8 +181,7 @@
 		this.aid = aid;
 		this.oid = oid;
         this.isSystem = isSystem;
-		if (isSystem)
-			isSYSIBM = IBM_SYSTEM_SCHEMA_NAME.equals(name);
+		isSYSIBM = isSystem && IBM_SYSTEM_SCHEMA_NAME.equals(name);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java?rev=425814&r1=425813&r2=425814&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
Wed Jul 26 12:41:58 2006
@@ -55,14 +55,14 @@
  * @author Jeff Lichtman
  */
 
-public class ViewDescriptor extends TupleDescriptor
+public final class ViewDescriptor extends TupleDescriptor
 	implements UniqueTupleDescriptor, Dependent, Provider
 {
-	private int			checkOption;
+	private final int			checkOption;
 	private String		viewName;
-	private String		viewText;
+	private final String		viewText;
 	private UUID		uuid;
-	private UUID		compSchemaId;
+	private final UUID		compSchemaId;
 
 	public static final	int NO_CHECK_OPTION = 0;
 



Mime
View raw message