db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1467197 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/
Date Fri, 12 Apr 2013 08:11:52 GMT
Author: kahatlen
Date: Fri Apr 12 08:11:51 2013
New Revision: 1467197

URL: http://svn.apache.org/r1467197
Log:
DERBY-6163: Reduce visibility of methods in subclasses of PageBasicOperation

Make all abstract classes in the PageBasicOperation class hierarchy
package protected. Make all constructors in the class hieararchy
package protected, except the no-argument constructors as the
Formatable interface requires them to be public.

Also reduce visibility of the RawField class, which is only used by
StoredPage in the same package.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,21 +21,15 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.PhysicalPageOperation;
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 
 import org.apache.derby.iapi.services.io.CompressedNumber;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -50,7 +44,7 @@ public final class AllocPageOperation ex
 	protected int doStatus;		// what the doMe operation should set the status to
 	protected int undoStatus;	// what the undoMe operation should set the status to
 
-	public AllocPageOperation(AllocPage allocPage, long pageNumber, int doStatus, int undoStatus)
+    AllocPageOperation(AllocPage allocPage, long pageNumber, int doStatus, int undoStatus)
 		 throws StandardException
 	{
 		super(allocPage);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,22 +21,16 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.PhysicalPageOperation;
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.store.raw.ContainerHandle;
-import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 
 import org.apache.derby.iapi.services.io.CompressedNumber;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.IOException;
 import org.apache.derby.iapi.services.io.LimitObjectInput;
@@ -50,7 +44,7 @@ public final class ChainAllocPageOperati
 	protected long newAllocPageNum;	// the next alloc page's page number
 	protected long newAllocPageOffset; // the next alloc page's page offset 
 
-	public ChainAllocPageOperation(AllocPage allocPage, long pageNumber, long pageOffset)
+    ChainAllocPageOperation(AllocPage allocPage, long pageNumber, long pageOffset)
 		 throws StandardException
 	{
 		super(allocPage);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,22 +21,15 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.PhysicalPageOperation;
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.store.raw.ContainerHandle;
-import org.apache.derby.iapi.store.raw.data.RawContainerHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 
 import org.apache.derby.iapi.services.io.CompressedNumber;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.IOException;
 import org.apache.derby.iapi.services.io.LimitObjectInput;
@@ -77,7 +70,7 @@ public class CompressSpacePageOperation 
      * Constructors for This class:
      **************************************************************************
      */
-	public CompressSpacePageOperation(
+    CompressSpacePageOperation(
     AllocPage   allocPage, 
     int         highest_page, 
     int         num_truncated)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CompressSpacePageOperation10_2.java
Fri Apr 12 08:11:51 2013
@@ -21,26 +21,20 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.CompressSpacePageOperation;
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.io.CompressedNumber;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.IOException;
 import java.io.ObjectInput;
-import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
  * This class overrides the CompressSpacePageOperation class to write
  * CompressSpaceOperation Log Records that do not support negative values
  * for new_highest_page. No other changes are added to the superclass behavior.
- * This class ensures backword compatibility for Soft upgrades. 
+ * This class ensures backward compatibility for Soft upgrades.
  */
 public final class CompressSpacePageOperation10_2 extends CompressSpacePageOperation {
     
@@ -48,7 +42,7 @@ public final class CompressSpacePageOper
 	* Constructors for This class:
 	**************************************************************************
 	*/
-	public CompressSpacePageOperation10_2(
+    CompressSpacePageOperation10_2(
 		AllocPage   allocPage, 
 		int         highest_page, 
 		int         num_truncated)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
Fri Apr 12 08:11:51 2013
@@ -23,13 +23,9 @@ package org.apache.derby.impl.store.raw.
 
 import org.apache.derby.iapi.reference.SQLState;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
-import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.RecordHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.log.LogInstant;
@@ -42,8 +38,6 @@ import org.apache.derby.iapi.services.io
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
-
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -78,7 +72,7 @@ public class CopyRowsOperation extends P
 
 	transient protected ByteArray preparedLog; 
 
-	public CopyRowsOperation(RawTransaction t, BasePage destPage, BasePage srcPage, 
+    CopyRowsOperation(RawTransaction t, BasePage destPage, BasePage srcPage,
 							 int destSlot, int num_rows,
 							 int srcSlot, int[] recordIds)
 		throws StandardException

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
Fri Apr 12 08:11:51 2013
@@ -82,7 +82,7 @@ public final class DeleteOperation exten
 
 	transient protected ByteArray preparedLog;
 
-	public DeleteOperation(RawTransaction t, BasePage page, int slot, int recordId, 
+    DeleteOperation(RawTransaction t, BasePage page, int slot, int recordId,
 						   boolean delete, LogicalUndo undo)
 		throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
Fri Apr 12 08:11:51 2013
@@ -73,7 +73,7 @@ public final class InitPageOperation ext
 	protected boolean reuse;	// is this page being initialize for reuse, or for first time
 	protected boolean overflowPage; // is this page an overflow page
 
-	public InitPageOperation(BasePage page, int flag, int formatid, 
+    InitPageOperation(BasePage page, int flag, int formatid,
 							 long offset)
 		 throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
Fri Apr 12 08:11:51 2013
@@ -22,19 +22,14 @@
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.impl.store.raw.data.BasePage;
-import org.apache.derby.impl.store.raw.data.ReclaimSpace;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
 
 import org.apache.derby.iapi.store.raw.PageKey;
-import org.apache.derby.iapi.store.raw.Compensation;
 import org.apache.derby.iapi.store.raw.Page;
-import org.apache.derby.iapi.store.raw.RecordHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
@@ -42,15 +37,11 @@ import org.apache.derby.iapi.store.raw.x
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
 import org.apache.derby.iapi.services.io.CompressedNumber;
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -88,7 +79,7 @@ public final class InsertOperation exten
 	transient protected ByteArray preparedLog;
 
 	// yyz: revisit later, whether we need preparedLog, maybe everything will be prepared...
-	public InsertOperation(
+    InsertOperation(
     RawTransaction              t, 
     BasePage                    page, 
     int                         slot, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,20 +21,15 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.Transaction;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -59,7 +54,7 @@ import org.apache.derby.iapi.services.io
 */
 public final class InvalidatePageOperation extends PhysicalPageOperation
 {
-	public InvalidatePageOperation(BasePage page)
+    InvalidatePageOperation(BasePage page)
 	{
 		super(page);
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,9 +21,6 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.RecordId;
-import org.apache.derby.impl.store.raw.data.BasePage;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
@@ -32,7 +29,6 @@ import org.apache.derby.iapi.store.raw.C
 import org.apache.derby.iapi.store.raw.Compensation;
 import org.apache.derby.iapi.store.raw.LogicalUndoable;
 import org.apache.derby.iapi.store.raw.LockingPolicy;
-import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.RecordHandle;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.Undoable;
@@ -43,8 +39,6 @@ import org.apache.derby.iapi.store.raw.l
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
 import org.apache.derby.iapi.services.io.CompressedNumber;
 
 import java.io.ObjectOutput;
@@ -71,7 +65,7 @@ import org.apache.derby.iapi.services.io
 	</PRE>
 
 */
-public abstract class LogicalPageOperation 
+abstract class LogicalPageOperation
     extends PageBasicOperation implements LogicalUndoable
 {
 
@@ -88,7 +82,7 @@ public abstract class LogicalPageOperati
 	// no-arg constructor, required by Formatable 
 	public LogicalPageOperation() { super(); }
 
-	protected LogicalPageOperation(BasePage page, LogicalUndo undo, int recordId)
+    LogicalPageOperation(BasePage page, LogicalUndo undo, int recordId)
 	{
 		super(page);
 		this.undo = undo;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,9 +21,6 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
@@ -39,7 +36,6 @@ import org.apache.derby.iapi.error.Stand
 import org.apache.derby.iapi.services.io.CompressedNumber;
 import org.apache.derby.iapi.util.ByteArray;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -67,20 +63,21 @@ import org.apache.derby.iapi.services.io
 	</PRE>
 
 */
-public class LogicalUndoOperation extends PageBasicOperation implements Compensation {
+public final class LogicalUndoOperation extends PageBasicOperation
+        implements Compensation {
 
 	protected int recordId;				// the record id to call undoOp.undoMe with
 
 	/** The operation to be rolled back */
 	transient private	LogicalPageOperation undoOp = null; 
 
-	protected LogicalUndoOperation(BasePage page)
+    LogicalUndoOperation(BasePage page)
 	{
 		super(page);
 	}
 
 	/** Set up a compensation operation during run time rollback */
-	public LogicalUndoOperation(BasePage page, int recordId, LogicalPageOperation op)
+    LogicalUndoOperation(BasePage page, int recordId, LogicalPageOperation op)
 	{
 		super(page);
 		undoOp = op;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
Fri Apr 12 08:11:51 2013
@@ -23,9 +23,6 @@ package org.apache.derby.impl.store.raw.
 
 import org.apache.derby.iapi.reference.SQLState;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.store.raw.ContainerHandle;
 import org.apache.derby.iapi.store.raw.LockingPolicy;
 import org.apache.derby.iapi.store.raw.Loggable;
 import org.apache.derby.iapi.store.raw.Page;
@@ -41,14 +38,10 @@ import org.apache.derby.iapi.store.raw.R
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
 import org.apache.derby.iapi.services.io.CompressedNumber;
 import org.apache.derby.iapi.util.ByteArray;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 
-import java.io.InputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -79,7 +72,7 @@ import org.apache.derby.iapi.services.io
 	@see Loggable
 */
 
-public abstract class PageBasicOperation implements Loggable, RePreparable 
+abstract class PageBasicOperation implements Loggable, RePreparable
 {
 
 
@@ -93,7 +86,7 @@ public abstract class PageBasicOperation
 	transient protected RawContainerHandle	containerHdl;
 	transient protected boolean	            foundHere;
 
-	protected PageBasicOperation(BasePage page) 
+    PageBasicOperation(BasePage page)
     {
 		if (SanityManager.DEBUG) 
         {
@@ -111,7 +104,7 @@ public abstract class PageBasicOperation
 	}
 
 	// no-arg constructor, required by Formatable
-	public PageBasicOperation() 
+    PageBasicOperation()
     {
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,7 +21,6 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
 
 import org.apache.derby.iapi.store.raw.Compensation;
 
@@ -32,8 +31,6 @@ import org.apache.derby.iapi.store.raw.U
 
 import org.apache.derby.iapi.error.StandardException;
 
-import java.io.InputStream;
-import java.io.ObjectInput;
 import java.io.IOException;
 import org.apache.derby.iapi.services.io.LimitObjectInput;
 
@@ -56,9 +53,10 @@ import org.apache.derby.iapi.services.io
 	</PRE>
 */
 
-public abstract class PhysicalPageOperation extends PageBasicOperation implements Undoable
+abstract class PhysicalPageOperation extends PageBasicOperation
+        implements Undoable
 {
-	protected PhysicalPageOperation(BasePage page)
+    PhysicalPageOperation(BasePage page)
 	{
 		super(page);
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,15 +21,11 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
 import org.apache.derby.iapi.store.raw.Compensation;
 import org.apache.derby.iapi.store.raw.Loggable;
-import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.Transaction;
 import org.apache.derby.iapi.store.raw.Undoable;
 
@@ -38,8 +34,6 @@ import org.apache.derby.iapi.store.raw.l
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.util.ByteArray;
 
-import java.io.OutputStream;
-import java.io.ObjectInput;
 import java.io.IOException;
 import org.apache.derby.iapi.services.io.LimitObjectInput;
 
@@ -53,7 +47,7 @@ import org.apache.derby.iapi.services.io
 	@derby.formatId	LOGOP_PAGE_PHYSICAL_UNDO
 		the formatId is written by FormatIdOutputStream when this object is
 		written out by writeObject
-	@derby.purpose	update a physiacl log operation
+    @derby.purpose  update a physical log operation
 	@derby.upgrade
 	@derby.diskLayout
 		PageBasicOperation	the super class
@@ -62,18 +56,19 @@ import org.apache.derby.iapi.services.io
 	</PRE>
 
 */
-public class PhysicalUndoOperation extends PageBasicOperation implements Compensation {
+public final class PhysicalUndoOperation extends PageBasicOperation
+        implements Compensation {
 
 	/** The operation to be rolled back */
 	transient private	PhysicalPageOperation undoOp; 
 
-	protected PhysicalUndoOperation(BasePage page)
+    PhysicalUndoOperation(BasePage page)
 	{
 		super(page);
 	}
 
 	/** Set up a compensation operation during run time rollback */
-	public PhysicalUndoOperation(BasePage page, PhysicalPageOperation op)
+    PhysicalUndoOperation(BasePage page, PhysicalPageOperation op)
 	{
 		super(page);
 		undoOp = op;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
Fri Apr 12 08:11:51 2013
@@ -23,11 +23,7 @@ package org.apache.derby.impl.store.raw.
 
 import org.apache.derby.iapi.reference.SQLState;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
-import org.apache.derby.iapi.services.io.Storable;
 
 import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.RecordHandle;
@@ -44,8 +40,6 @@ import org.apache.derby.iapi.services.io
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
-
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -86,7 +80,7 @@ public final class PurgeOperation extend
 
 	transient protected ByteArray preparedLog;
 
-	public PurgeOperation(RawTransaction t, BasePage page, int slot, int
+    PurgeOperation(RawTransaction t, BasePage page, int slot, int
 						  num_rows, int[] recordIds, boolean needDataLogged)
 		throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java Fri
Apr 12 08:11:51 2013
@@ -21,15 +21,15 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-public class RawField {
+final class RawField {
 
-	private byte[] data;
+    private final byte[] data;
 
-	public RawField(byte[] data) {
+    RawField(byte[] data) {
 		this.data = data;
 	}
 
-	public byte[] getData() {
+    byte[] getData() {
 		return data;
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
Fri Apr 12 08:11:51 2013
@@ -21,28 +21,17 @@
 
 package org.apache.derby.impl.store.raw.data;
 
-import org.apache.derby.iapi.reference.SQLState;
-
-import org.apache.derby.impl.store.raw.data.BasePage;
-
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.store.raw.Page;
 import org.apache.derby.iapi.store.raw.Transaction;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
-import org.apache.derby.iapi.store.raw.xact.RawTransaction; 
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.error.StandardException;
 
 import org.apache.derby.iapi.services.io.CompressedNumber;
-import org.apache.derby.iapi.util.ByteArray;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
-
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -52,14 +41,14 @@ import org.apache.derby.iapi.services.io
 	Represents shrinking of the reserved space of a particular row on a page.
 	This operation is not undoable.
 */
-public class SetReservedSpaceOperation extends PageBasicOperation {
+public final class SetReservedSpaceOperation extends PageBasicOperation {
 
 	protected int	doMeSlot;	// slot where record is at
 	protected int	recordId;	// recordId
 	protected int	newValue;	// the new reserved space value
 	protected int	oldValue;	// the old reserved space value (for BI_logging)
 
-	public SetReservedSpaceOperation(BasePage page, int slot, 
+    SetReservedSpaceOperation(BasePage page, int slot,
 									 int recordId, int newValue, int oldValue)
 	{
 		super(page);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
Fri Apr 12 08:11:51 2013
@@ -23,11 +23,8 @@ package org.apache.derby.impl.store.raw.
 
 import org.apache.derby.iapi.reference.SQLState;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.store.access.conglomerate.LogicalUndo;
@@ -41,14 +38,11 @@ import org.apache.derby.iapi.store.raw.l
 
 import org.apache.derby.iapi.error.StandardException;
 
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.services.io.CompressedNumber;
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -84,7 +78,7 @@ public final class UpdateFieldOperation 
 
 	transient protected ByteArray preparedLog;
 
-	public UpdateFieldOperation(
+    UpdateFieldOperation(
     RawTransaction      t, 
     BasePage            page, 
     int                 slot, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java?rev=1467197&r1=1467196&r2=1467197&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
Fri Apr 12 08:11:51 2013
@@ -23,11 +23,8 @@ package org.apache.derby.impl.store.raw.
 
 import org.apache.derby.iapi.reference.SQLState;
 
-import org.apache.derby.impl.store.raw.data.BasePage;
-
 import org.apache.derby.iapi.services.sanity.SanityManager;
 
-import org.apache.derby.iapi.services.io.FormatIdUtil;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 
 import org.apache.derby.iapi.error.StandardException;
@@ -39,15 +36,11 @@ import org.apache.derby.iapi.store.raw.T
 import org.apache.derby.iapi.store.raw.log.LogInstant;
 import org.apache.derby.iapi.store.raw.xact.RawTransaction; 
 
-import org.apache.derby.iapi.types.DataValueDescriptor;
-
 import org.apache.derby.iapi.services.io.FormatableBitSet;
 import org.apache.derby.iapi.util.ByteArray;
 import org.apache.derby.iapi.services.io.CompressedNumber;
 import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
-import java.io.OutputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectInput;
 import java.io.IOException;
@@ -82,7 +75,7 @@ public final class UpdateOperation exten
 
 	transient protected ByteArray preparedLog;
 	
-	public UpdateOperation(
+    UpdateOperation(
     RawTransaction              t, 
     BasePage                    page, 
     int                         slot, 



Mime
View raw message