db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r647502 - in /db/derby/code/branches/10.4/java/engine/org/apache/derby: iapi/sql/dictionary/ impl/sql/execute/ impl/store/access/sort/
Date Sat, 12 Apr 2008 22:03:13 GMT
Author: myrnavl
Date: Sat Apr 12 15:03:10 2008
New Revision: 647502

URL: http://svn.apache.org/viewvc?rev=647502&view=rev
Log:
Javadoc fixes (no jira)
Merged to 10.4 with svn -merge 636113:636114 from trunk. No conflicts. 

Modified:
    db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsExternalSortFactory.java

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java?rev=647502&r1=647501&r2=647502&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
Sat Apr 12 15:03:10 2008
@@ -270,7 +270,7 @@
 	}
 
 	/**
-     * @see IndexDescriptor#isisUniqueWithDuplicateNulls
+     * @see IndexDescriptor#isUniqueWithDuplicateNulls
      */
 	public boolean isUniqueWithDuplicateNulls()
 	{

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java?rev=647502&r1=647501&r2=647502&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
Sat Apr 12 15:03:10 2008
@@ -115,7 +115,7 @@
      * @param forCreateTable                Being executed within a CREATE TABLE
      *                                      statement
      * @param unique		                True means it will be a unique index
-     * @param isUniqueWithDuplicateNulls    True means index check and disallow
+     * @param uniqueWithDuplicateNulls      True means index check and disallow
      *                                      any duplicate key if key has no 
      *                                      column with a null value.  If any 
      *                                      column in the key has a null value,
@@ -153,17 +153,18 @@
             Properties		properties)
 	{
 		super(tableId, indexName, tableName, schemaName);
-        this.forCreateTable = forCreateTable;
-		this.unique = unique;
-		this.uniqueWithDuplicateNulls = uniqueWithDuplicateNulls;
-		this.indexType = indexType;
-		this.columnNames = columnNames;
-		this.isAscending = isAscending;
-		this.isConstraint = isConstraint;
-		this.conglomerateUUID = conglomerateUUID;
-		this.properties = properties;
-		this.conglomId = -1L;
-		this.droppedConglomNum = -1L;
+
+        this.forCreateTable             = forCreateTable;
+		this.unique                     = unique;
+		this.uniqueWithDuplicateNulls   = uniqueWithDuplicateNulls;
+		this.indexType                  = indexType;
+		this.columnNames                = columnNames;
+		this.isAscending                = isAscending;
+		this.isConstraint               = isConstraint;
+		this.conglomerateUUID           = conglomerateUUID;
+		this.properties                 = properties;
+		this.conglomId                  = -1L;
+		this.droppedConglomNum          = -1L;
 	}
 
 	/**

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java?rev=647502&r1=647501&r2=647502&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/execute/UniqueWithDuplicateNullsIndexSortObserver.java
Sat Apr 12 15:03:10 2008
@@ -47,15 +47,17 @@
      * 		if language is reusing row wrappers.
      * @param isConstraint is this part of a constraint
      * @param indexOrConstraintName name of index of constraint
-     * @param distinct	If true, toss out duplicates.
-     * 		Otherwise, retain them.
      * @param execRow	ExecRow to use as source of clone for store.
      * @param reuseWrappers	Whether or not we can reuse the wrappers
      * @param tableName name of the table
      */
-    public UniqueWithDuplicateNullsIndexSortObserver(boolean doClone, boolean isConstraint,
-            String indexOrConstraintName, ExecRow execRow,
-            boolean reuseWrappers, String tableName) {
+    public UniqueWithDuplicateNullsIndexSortObserver(
+    boolean doClone, 
+    boolean isConstraint,
+    String  indexOrConstraintName, 
+    ExecRow execRow,
+    boolean reuseWrappers, 
+    String  tableName) {
         super(doClone, false, execRow, reuseWrappers);
         this.isConstraint = isConstraint;
         this.indexOrConstraintName = indexOrConstraintName;
@@ -67,7 +69,7 @@
      * exception if the duplicates has no null part in the key. 
      * @param in new key
      * @param dup the new key is duplicate of this key
-     * @returns DVD [] if there is at least one null in
+     * @return DVD [] if there is at least one null in
      * the key else thorws StandardException
      * @throws StandardException is the duplicate key has all non null parts
      */

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java?rev=647502&r1=647501&r2=647502&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
Sat Apr 12 15:03:10 2008
@@ -124,7 +124,7 @@
 	 * Returns merge sort implementation. Extending classes can overide this 
 	 * method to customize sorting.
      *
-	 * @returns MergeSort implementation
+	 * @return MergeSort implementation
 	 */
 	protected MergeSort getMergeSort() 
     {

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsExternalSortFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsExternalSortFactory.java?rev=647502&r1=647501&r2=647502&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsExternalSortFactory.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/store/access/sort/UniqueWithDuplicateNullsExternalSortFactory.java
Sat Apr 12 15:03:10 2008
@@ -20,28 +20,38 @@
  */
 
 package org.apache.derby.impl.store.access.sort;
+
+// for javadoc
+import org.apache.derby.iapi.store.access.conglomerate.MethodFactory;
+
 /**
  * Method factory to support sorting of Almost unique index. This class 
  * overrides getMergeSort of ExternalSortFactory to return UniqueWithDuplicateNullsMergeSort.
  */
-public class UniqueWithDuplicateNullsExternalSortFactory extends ExternalSortFactory {
-    private static final String IMPLEMENTATIONID = "sort almost unique external";
+public class UniqueWithDuplicateNullsExternalSortFactory 
+    extends ExternalSortFactory 
+{
+    private static final String IMPLEMENTATIONID = 
+        "sort almost unique external";
     
-    protected MergeSort getMergeSort() {
+    protected MergeSort getMergeSort() 
+    {
         return new UniqueWithDuplicateNullsMergeSort ();
     }
 
     /**
      * @see MethodFactory#primaryImplementationType
      */
-    public String primaryImplementationType() {
+    public String primaryImplementationType() 
+    {
         return IMPLEMENTATIONID;
     }
 
     /**
      * @see MethodFactory#supportsImplementation
      */
-    public boolean supportsImplementation(String implementationId) {
-        return IMPLEMENTATIONID.equals (implementationId);
+    public boolean supportsImplementation(String implementationId) 
+    {
+        return IMPLEMENTATIONID.equals(implementationId);
     }
 }



Mime
View raw message