db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r527842 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/store/access/ impl/store/access/ impl/store/access/btree/index/ impl/store/access/heap/ impl/store/access/sort/
Date Thu, 12 Apr 2007 08:52:11 GMT
Author: kristwaa
Date: Thu Apr 12 01:52:10 2007
New Revision: 527842

URL: http://svn.apache.org/viewvc?view=rev&rev=527842
Log:
DERBY-2359: Reduced visibility of a number of fields.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java Thu Apr
12 01:52:10 2007
@@ -120,7 +120,7 @@
 	public static final FetchDescriptor EMPTY_ROW_FETCH_DESCRIPTOR  = 
         new FetchDescriptor(0);
 
-	public static final FetchDescriptor[] ROWUTIL_FETCH_DESCRIPTOR_CONSTANTS  =
+	private static final FetchDescriptor[] ROWUTIL_FETCH_DESCRIPTOR_CONSTANTS  =
         {EMPTY_ROW_FETCH_DESCRIPTOR,
          new FetchDescriptor(1, 1),
          new FetchDescriptor(2, 2),

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
Thu Apr 12 01:52:10 2007
@@ -34,12 +34,12 @@
 	/**
 	The transaction this context is managing.
 	**/
-	protected RAMTransaction transaction;
+	private RAMTransaction transaction;
 
 	/**
 	   true if any exception causes this transaction to be destroyed
 	**/
-	private boolean abortAll;
+	private final boolean abortAll;
 
 	/*
 	** Context methods (most are implemented by super-class).

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
Thu Apr 12 01:52:10 2007
@@ -137,10 +137,10 @@
  */
 public class B2I extends BTree
 {
-    public    static final String PROPERTY_BASECONGLOMID = "baseConglomerateId";
-    public    static final String PROPERTY_ROWLOCCOLUMN  = "rowLocationColumn";
+    private static final String PROPERTY_BASECONGLOMID = "baseConglomerateId";
+    private static final String PROPERTY_ROWLOCCOLUMN  = "rowLocationColumn";
 
-	public static final int FORMAT_NUMBER = StoredFormatIds.ACCESS_B2I_V3_ID;
+    static final int FORMAT_NUMBER = StoredFormatIds.ACCESS_B2I_V3_ID;
 
 	/*
 	** Fields of B2I.
@@ -152,7 +152,7 @@
 	to refer to that conglomerate.  Used to obtain table/row locks on the
     base table rows which the index rows point at.
 	**/
-	protected long baseConglomerateId;
+	long baseConglomerateId;
 
 	/**
 	The column id (zero-based integer index) of the column which holds the row 
@@ -162,7 +162,7 @@
     point at.
 	Currently, RowLocationColumn must be the last key column.
 	**/
-	protected int rowLocationColumn;
+	int rowLocationColumn;
 
     private static final int BASE_MEMORY_USAGE = ClassSize.estimateBaseFromCatalog( B2I.class);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java Thu
Apr 12 01:52:10 2007
@@ -127,7 +127,7 @@
 	** Fields of Heap.
 	*/
 
-	protected ContainerKey id;
+	private ContainerKey id;
 
     /**
      * The format id's of each of the columns in the heap table.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
Thu Apr 12 01:52:10 2007
@@ -362,7 +362,7 @@
         {
             throw StandardException.newException(
                     SQLState.HEAP_CONTAINER_NOT_FOUND, 
-                    new Long(heap.id.getContainerId()));
+                    new Long(heap.getId().getContainerId()));
         }
 
         this.init(open_conglom);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
Thu Apr 12 01:52:10 2007
@@ -62,18 +62,18 @@
 	Information about memory usage to dynamically tune the
 	in-memory sort buffer size.
 	*/
-	long beginFreeMemory;
-	long beginTotalMemory;
-	long estimatedMemoryUsed;
-	boolean avoidMergeRun;		// try to avoid merge run if possible
-    int runSize;
-    int totalRunSize;
+	private long beginFreeMemory;
+	private long beginTotalMemory;
+	private long estimatedMemoryUsed;
+	private boolean avoidMergeRun;		// try to avoid merge run if possible
+    private int runSize;
+    private int totalRunSize;
 
-    protected String  stat_sortType;
-    protected int     stat_numRowsInput;
-    protected int     stat_numRowsOutput;
-    protected int     stat_numMergeRuns;
-    protected Vector  stat_mergeRunsSize;
+    String  stat_sortType;
+    int     stat_numRowsInput;
+    int     stat_numRowsOutput;
+    int     stat_numMergeRuns;
+    Vector  stat_mergeRunsSize;
 
 
 	/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java?view=diff&rev=527842&r1=527841&r2=527842
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
Thu Apr 12 01:52:10 2007
@@ -67,33 +67,33 @@
 
 	/**
 	**/
-	static final int STATE_CLOSED = 0;
+	private static final int STATE_CLOSED = 0;
 
 	/**
 	**/
-	static final int STATE_INITIALIZED = 1;
+	private static final int STATE_INITIALIZED = 1;
 
 	/**
 	**/
-	static final int STATE_INSERTING = 2;
+	private static final int STATE_INSERTING = 2;
 
 	/**
 	**/
-	static final int STATE_DONE_INSERTING = 3;
+	private static final int STATE_DONE_INSERTING = 3;
 
 	/**
 	**/
-	static final int STATE_SCANNING = 4;
+	private static final int STATE_SCANNING = 4;
 
 	/**
 	**/
-	static final int STATE_DONE_SCANNING = 5;
+	private static final int STATE_DONE_SCANNING = 5;
 
 	/**
 	Maintains the current state of the sort as defined in
 	the preceding values.  Sorts start off and end up closed.
 	**/
-	protected int state = STATE_CLOSED;
+	private int state = STATE_CLOSED;
 
 	/**
 	The template as passed in on create.  Valid when the state
@@ -115,17 +115,17 @@
     column to compare.  To find the column id to compare as the i'th column
     look in columnOrderingMap[i].
 	**/
-	protected int columnOrderingMap[];
+	private int columnOrderingMap[];
 
 	/**
     A lookup table to speed up lookup of Ascending state of a column, 
 	**/
-	protected boolean columnOrderingAscendingMap[];
+	private boolean columnOrderingAscendingMap[];
 
 	/**
 	The sort observer.  May be null.  Used as a callback.
 	**/
-	protected SortObserver sortObserver;
+	SortObserver sortObserver;
 
 	/**
 	Whether the rows are expected to be in order on insert,
@@ -137,37 +137,37 @@
 	The inserter that's being used to insert rows into the sort.
 	This field is only valid when the state is INSERTING.
 	**/
-	protected MergeInserter inserter = null;
+	private MergeInserter inserter = null;
 
 	/**
 	The scan that's being used to return rows from the sort.
 	This field is only valid when the state is SCANNING.
 	**/
-	protected Scan scan = null;
+	private Scan scan = null;
 
 	/**
 	A vector of merge runs, produced by the MergeInserter.
 	Might be null if no merge runs were produced.
 	It is a vector of container ids.
 	**/
-	protected Vector mergeRuns = null;
+	private Vector mergeRuns = null;
 
 	/**
 	An ordered set of the leftover rows that didn't go
 	in the last merge run (might be all the rows if there
 	are no merge runs).
 	**/
-	protected SortBuffer sortBuffer = null;
+	private SortBuffer sortBuffer = null;
 
 	/**
 	The maximum number of entries a sort buffer can hold.
 	**/
-	protected int sortBufferMax;
+	int sortBufferMax;
 
 	/**
 	The minimum number of entries a sort buffer can hold.
 	**/
-	protected int sortBufferMin;
+	int sortBufferMin;
 
 	/**
 	Properties for mergeSort



Mime
View raw message