db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r165023 - in /incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store: access/sort/ raw/xact/
Date Wed, 27 Apr 2005 18:19:50 GMT
Author: mikem
Date: Wed Apr 27 11:19:49 2005
New Revision: 165023

URL: http://svn.apache.org/viewcvs?rev=165023&view=rev
Log:
cleaning up some store javadoc issues.


Modified:
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
    incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
Wed Apr 27 11:19:49 2005
@@ -288,8 +288,6 @@
      *
 	 * @return The identifier to be used to open the conglomerate later.
      *
-     * @param param1 param1 does this.
-     * @param param2 param2 does this.
      *
 	 * @exception  StandardException  Standard exception policy.
      **/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
Wed Apr 27 11:19:49 2005
@@ -333,7 +333,7 @@
      * For some conglomerates this may be a no-op.
      * <p>
      *
-     * @param conlgom   Conglomerate object of the conglomerate being changed.
+     * @param conglom   Conglomerate object of the conglomerate being changed.
      * @param page      Page in the conglomerate being changed.
      *
 	 * @exception  StandardException  Standard exception policy.

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
Wed Apr 27 11:19:49 2005
@@ -104,7 +104,7 @@
     coding this differently saves in sort scans, as did the
     heap recoding.
 
-    @param template The template row into which the value
+    @param row The template row into which the value
 	of the next position in the scan is to be stored.
 
     @return True if there is a next position in the scan,

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
Wed Apr 27 11:19:49 2005
@@ -117,7 +117,6 @@
 
 		BeginXact has no optional data to write out
 
-		@param out Where and how to write to optional data.
 		@see ObjectOutput
 	*/
 	public ByteArray getPreparedLog()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
Wed Apr 27 11:19:49 2005
@@ -96,7 +96,6 @@
 		@param xact			the Transaction
 		@param instant		the log instant of this operation
 		@param in			optional data
-		@param dataLengt	optional data length
 
 	*/
 	public void doMe(Transaction xact, LogInstant instant, LimitObjectInput in)
@@ -119,7 +118,6 @@
 
 		EndXact has no optional data to write out
 
-		@param out Where and how to write to optional data.
 		@see ObjectOutput
 	*/
 	public ByteArray getPreparedLog()

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
Wed Apr 27 11:19:49 2005
@@ -236,8 +236,8 @@
      * will be called when the container is closed.
      * <p>
      *
-     * @param t             The transaction to associate the lock with.
-     * @param container     Container to unlock.
+     * @param t                 The transaction to associate the lock with.
+     * @param container_handle  Container to unlock.
      **/
 	public void unlockContainer(
     Transaction     t, 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
Wed Apr 27 11:19:49 2005
@@ -229,7 +229,7 @@
      *
      * @param t                        transaction to associate the lock with.
      * @param record                   The record to be locked.
-     * @param lockForInsertPreviouskey Lock is for a previous key of a insert.
+     * @param lockForInsertPreviousKey Lock is for a previous key of a insert.
      * @param waitForLock              Should lock request wait until granted?
      *
      * @return true if the lock was granted, false if waitForLock was false 
@@ -240,13 +240,13 @@
 	public boolean zeroDurationLockRecordForWrite(
     Transaction     t, 
     RecordHandle    record,
-    boolean         lockForPreviousKey,
+    boolean         lockForInsertPreviousKey,
     boolean         waitForLock)
 		throws StandardException
 	{
         return(lf.zeroDurationlockObject(
                 t.getCompatibilitySpace(), record, 
-                (lockForPreviousKey ? RowLock.RIP : getWriteLockType()),
+                (lockForInsertPreviousKey ? RowLock.RIP : getWriteLockType()),
                 waitForLock ? C_LockFactory.TIMED_WAIT : C_LockFactory.NO_WAIT));
 	}
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
Wed Apr 27 11:19:49 2005
@@ -300,7 +300,6 @@
      *
 	 * @return The ContextManager of the transaction being searched for.
      *
-     * @param global_id The global transaction we are searching for.
      **/
 	public Hashtable getTableForXA()
 	{
@@ -506,7 +505,7 @@
 	}
 
 	/**
-		Return the largest update transactionId I have seen so far
+		Return the largest update transactionId I have seen so far.
 
 		<P>MT - unsafe, caller is recovery, which is single threaded.
 	*/
@@ -517,7 +516,7 @@
 
 
 	/**
-		Is there an active internal transaction in the transaction table
+		Is there an active internal transaction in the transaction table.
 
 		<P>MT - unsafe, caller is recovery, which is single threaded.
 	*/

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
Wed Apr 27 11:19:49 2005
@@ -373,8 +373,6 @@
 
 	/** 
 		Add this to the xactFactory list of update transaction.
-		@param rollbackFirst true if this transaction should be rolled back
-				first during recovery
 	*/
 	public void addUpdateTransaction(int transactionStatus)
 	{
@@ -1607,8 +1605,7 @@
      *
 	 * @return The identifier to be used to open the conglomerate later.
      *
-     * @param old_ent The original entry we are assuming the identity of.
-     * @param new_ent The new permanent entry in the transaction table.
+     * @param ent The original entry we are assuming the identity of.
      *
      **/
 	protected void assumeGlobalXactIdentity(

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java?rev=165023&r1=165022&r2=165023&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
Wed Apr 27 11:19:49 2005
@@ -34,11 +34,16 @@
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.error.ExceptionSeverity;
+
 /**
-	Store the transaction opened within a context manager (ie. typically
-	a single user) for a single RawStoreFactory.
+The context associated with the transaction.
+
+This object stores the context associated with the raw store transaction
+on the stack.  It stores info about the transaction opened within a 
+context manager (ie. typically a single user) for a single RawStoreFactory.
+
+**/
 
-*/
 public class XactContext extends ContextImpl {
 
 	private		RawTransaction	xact;



Mime
View raw message