Renamed o.n.i.gbptree -> o.n.i.internal.gbptree

neo4j · Jan 12, 2017 · 3bb1777 · 3bb1777
1 parent f3b1a99
commit 3bb1777
Show file tree

Hide file tree

Showing 55 changed files with 218 additions and 130 deletions.
diff --git a/...o4j/index/gbptree/ConsistencyChecker.java → .../internal/gbptree/ConsistencyChecker.java b/...o4j/index/gbptree/ConsistencyChecker.java → .../internal/gbptree/ConsistencyChecker.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,8 +31,8 @@
 import static java.lang.Math.toIntExact;
 import static java.lang.String.format;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * <ul>

diff --git a/...o4j/index/gbptree/FreeListIdProvider.java → .../internal/gbptree/FreeListIdProvider.java b/...o4j/index/gbptree/FreeListIdProvider.java → .../internal/gbptree/FreeListIdProvider.java
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.function.LongConsumer;
 
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.PagedFile;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
-import static org.neo4j.index.gbptree.PageCursorUtil.goTo;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.goTo;
 
 class FreeListIdProvider implements IdProvider
 {

diff --git a/...org/neo4j/index/gbptree/FreelistNode.java → .../index/internal/gbptree/FreelistNode.java b/...org/neo4j/index/gbptree/FreelistNode.java → .../index/internal/gbptree/FreelistNode.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.get6BLong;
-import static org.neo4j.index.gbptree.PageCursorUtil.getUnsignedInt;
-import static org.neo4j.index.gbptree.PageCursorUtil.put6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.get6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.getUnsignedInt;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.put6BLong;
 
 /**
  * Manages the physical format of a free-list node, i.e. how bytes about free-list pages

diff --git a/...java/org/neo4j/index/gbptree/GBPTree.java → ...neo4j/index/internal/gbptree/GBPTree.java b/...java/org/neo4j/index/gbptree/GBPTree.java → ...neo4j/index/internal/gbptree/GBPTree.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -42,10 +42,11 @@
 import org.neo4j.io.pagecache.PagedFile;
 
 import static java.lang.String.format;
-import static org.neo4j.index.gbptree.Generation.generation;
-import static org.neo4j.index.gbptree.Generation.stableGeneration;
-import static org.neo4j.index.gbptree.Generation.unstableGeneration;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+
+import static org.neo4j.index.internal.gbptree.Generation.generation;
+import static org.neo4j.index.internal.gbptree.Generation.stableGeneration;
+import static org.neo4j.index.internal.gbptree.Generation.unstableGeneration;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * A generation-aware B+tree (GB+Tree) implementation directly atop a {@link PageCache} with no caching in between.

diff --git a/...g/neo4j/index/gbptree/GenSafePointer.java → ...ndex/internal/gbptree/GenSafePointer.java b/...g/neo4j/index/gbptree/GenSafePointer.java → ...ndex/internal/gbptree/GenSafePointer.java
@@ -17,13 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.get6BLong;
-import static org.neo4j.index.gbptree.PageCursorUtil.getUnsignedInt;
-import static org.neo4j.index.gbptree.PageCursorUtil.put6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.get6BLong;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.getUnsignedInt;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.put6BLong;
 
 /**
  * Provides static methods for getting and manipulating GSP (gen-safe pointer) data.

diff --git a/...o4j/index/gbptree/GenSafePointerPair.java → .../internal/gbptree/GenSafePointerPair.java b/...o4j/index/gbptree/GenSafePointerPair.java → .../internal/gbptree/GenSafePointerPair.java
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.lang.String.format;
 
-import static org.neo4j.index.gbptree.GenSafePointer.MIN_GENERATION;
-import static org.neo4j.index.gbptree.GenSafePointer.checksumOf;
-import static org.neo4j.index.gbptree.GenSafePointer.readChecksum;
-import static org.neo4j.index.gbptree.GenSafePointer.readGeneration;
-import static org.neo4j.index.gbptree.GenSafePointer.readPointer;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.MIN_GENERATION;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.checksumOf;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readChecksum;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readGeneration;
+import static org.neo4j.index.internal.gbptree.GenSafePointer.readPointer;
 
 /**
  * Two {@link GenSafePointer} forming the basis for a B+tree becoming generate-aware.

diff --git a/...a/org/neo4j/index/gbptree/Generation.java → ...4j/index/internal/gbptree/Generation.java b/...a/org/neo4j/index/gbptree/Generation.java → ...4j/index/internal/gbptree/Generation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Logic for composing and decomposing stable/unstable generation number (unsigned int) to/from a single {@code long}.

diff --git a/...ain/java/org/neo4j/index/gbptree/Hit.java → ...org/neo4j/index/internal/gbptree/Hit.java b/...ain/java/org/neo4j/index/gbptree/Hit.java → ...org/neo4j/index/internal/gbptree/Hit.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Represents a hit during an {@link Index#seek(Object, Object)}. There's no guarantee about whether or

diff --git a/...a/org/neo4j/index/gbptree/IdProvider.java → ...4j/index/internal/gbptree/IdProvider.java b/...a/org/neo4j/index/gbptree/IdProvider.java → ...4j/index/internal/gbptree/IdProvider.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 

diff --git a/...java/org/neo4j/index/gbptree/IdSpace.java → ...neo4j/index/internal/gbptree/IdSpace.java b/...java/org/neo4j/index/gbptree/IdSpace.java → ...neo4j/index/internal/gbptree/IdSpace.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Defines special page ids for {@link GBPTree}.

diff --git a/...eo4j/index/gbptree/InternalTreeLogic.java → ...x/internal/gbptree/InternalTreeLogic.java b/...eo4j/index/gbptree/InternalTreeLogic.java → ...x/internal/gbptree/InternalTreeLogic.java
@@ -17,17 +17,17 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Comparator;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.KeySearch.isHit;
-import static org.neo4j.index.gbptree.KeySearch.positionOf;
-import static org.neo4j.index.gbptree.PageCursorUtil.goTo;
+import static org.neo4j.index.internal.gbptree.KeySearch.isHit;
+import static org.neo4j.index.internal.gbptree.KeySearch.positionOf;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.goTo;
 
 /**
  * Implementation of GB+ tree insert/remove algorithms.

diff --git a/...va/org/neo4j/index/gbptree/KeySearch.java → ...o4j/index/internal/gbptree/KeySearch.java b/...va/org/neo4j/index/gbptree/KeySearch.java → ...o4j/index/internal/gbptree/KeySearch.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Comparator;
 

diff --git a/.../java/org/neo4j/index/gbptree/Layout.java → .../neo4j/index/internal/gbptree/Layout.java b/.../java/org/neo4j/index/gbptree/Layout.java → .../neo4j/index/internal/gbptree/Layout.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Comparator;
 

diff --git a/...ex/gbptree/MetadataMismatchException.java → ...al/gbptree/MetadataMismatchException.java b/...ex/gbptree/MetadataMismatchException.java → ...al/gbptree/MetadataMismatchException.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Thrown to signal mismatches between meta data about tree and user-provided configuration.

diff --git a/...g/neo4j/index/gbptree/PageCursorUtil.java → ...ndex/internal/gbptree/PageCursorUtil.java b/...g/neo4j/index/gbptree/PageCursorUtil.java → ...ndex/internal/gbptree/PageCursorUtil.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 

diff --git a/.../neo4j/index/gbptree/PointerChecking.java → ...dex/internal/gbptree/PointerChecking.java b/.../neo4j/index/gbptree/PointerChecking.java → ...dex/internal/gbptree/PointerChecking.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 

diff --git a/...neo4j/index/gbptree/RightmostInChain.java → ...ex/internal/gbptree/RightmostInChain.java b/...neo4j/index/gbptree/RightmostInChain.java → ...ex/internal/gbptree/RightmostInChain.java
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.TreeNode.NO_NODE_FLAG;
+import static org.neo4j.index.internal.gbptree.TreeNode.NO_NODE_FLAG;
 
 /**
  * Used to verify a chain of siblings starting with leftmost node.

diff --git a/...in/java/org/neo4j/index/gbptree/Root.java → ...rg/neo4j/index/internal/gbptree/Root.java b/...in/java/org/neo4j/index/gbptree/Root.java → ...rg/neo4j/index/internal/gbptree/Root.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 

diff --git a/...a/org/neo4j/index/gbptree/SeekCursor.java → ...4j/index/internal/gbptree/SeekCursor.java b/...a/org/neo4j/index/gbptree/SeekCursor.java → ...4j/index/internal/gbptree/SeekCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.function.LongSupplier;
@@ -27,7 +27,8 @@
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.lang.Integer.max;
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * {@link RawCursor} over tree leaves, making keys/values accessible to user. Given a starting leaf

diff --git a/...j/index/gbptree/StructurePropagation.java → ...nternal/gbptree/StructurePropagation.java b/...j/index/gbptree/StructurePropagation.java → ...nternal/gbptree/StructurePropagation.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Means of communicating information about splits, caused by insertion, from lower levels of the tree up to parent

diff --git a/...x/gbptree/TreeInconsistencyException.java → ...l/gbptree/TreeInconsistencyException.java b/...x/gbptree/TreeInconsistencyException.java → ...l/gbptree/TreeInconsistencyException.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Thrown to signal inconsistencies in the tree, either between tree nodes or inside a tree node.

diff --git a/...ava/org/neo4j/index/gbptree/TreeNode.java → ...eo4j/index/internal/gbptree/TreeNode.java b/...ava/org/neo4j/index/gbptree/TreeNode.java → ...eo4j/index/internal/gbptree/TreeNode.java
@@ -17,16 +17,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.function.Consumer;
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
-import static org.neo4j.index.gbptree.GenSafePointerPair.read;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.NO_LOGICAL_POS;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.read;
 
 /**
  * Methods to manipulate single tree node such as set and get header fields,

diff --git a/.../org/neo4j/index/gbptree/TreePrinter.java → ...j/index/internal/gbptree/TreePrinter.java b/.../org/neo4j/index/gbptree/TreePrinter.java → ...j/index/internal/gbptree/TreePrinter.java
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.IOException;
 import java.io.PrintStream;
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.ConsistencyChecker.assertOnTreeNode;
-import static org.neo4j.index.gbptree.GenSafePointerPair.pointer;
+import static org.neo4j.index.internal.gbptree.ConsistencyChecker.assertOnTreeNode;
+import static org.neo4j.index.internal.gbptree.GenSafePointerPair.pointer;
 
 /**
  * Utility class for printing a {@link GBPTree}, either whole or sub-tree.

diff --git a/...va/org/neo4j/index/gbptree/TreeState.java → ...o4j/index/internal/gbptree/TreeState.java b/...va/org/neo4j/index/gbptree/TreeState.java → ...o4j/index/internal/gbptree/TreeState.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.util.Objects;
 

diff --git a/...rg/neo4j/index/gbptree/TreeStatePair.java → ...index/internal/gbptree/TreeStatePair.java b/...rg/neo4j/index/gbptree/TreeStatePair.java → ...index/internal/gbptree/TreeStatePair.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -26,7 +26,7 @@
 
 import org.neo4j.io.pagecache.PageCursor;
 
-import static org.neo4j.index.gbptree.PageCursorUtil.checkOutOfBounds;
+import static org.neo4j.index.internal.gbptree.PageCursorUtil.checkOutOfBounds;
 
 /**
  * Pair of {@link TreeState}, ability to make decision about which of the two to read and write respectively,

diff --git a/.../org/neo4j/index/gbptree/ValueMerger.java → ...j/index/internal/gbptree/ValueMerger.java b/.../org/neo4j/index/gbptree/ValueMerger.java → ...j/index/internal/gbptree/ValueMerger.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Decides what to do when inserting key which already exists in index. Different implementations of

diff --git a/...org/neo4j/index/gbptree/ValueMergers.java → .../index/internal/gbptree/ValueMergers.java b/...org/neo4j/index/gbptree/ValueMergers.java → .../index/internal/gbptree/ValueMergers.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 /**
  * Common {@link ValueMerger} implementations.

diff --git a/.../java/org/neo4j/index/gbptree/Writer.java → .../neo4j/index/internal/gbptree/Writer.java b/.../java/org/neo4j/index/gbptree/Writer.java → .../neo4j/index/internal/gbptree/Writer.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/...org/neo4j/index/gbptree/package-info.java → .../index/internal/gbptree/package-info.java b/...org/neo4j/index/gbptree/package-info.java → .../index/internal/gbptree/package-info.java
@@ -27,4 +27,4 @@
  * <p>
  * See https://en.wikipedia.org/wiki/B%2B_tree
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
diff --git a/...4j/index/gbptree/ByteArrayPageCursor.java → ...internal/gbptree/ByteArrayPageCursor.java b/...4j/index/gbptree/ByteArrayPageCursor.java → ...internal/gbptree/ByteArrayPageCursor.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.gbptree;
+package org.neo4j.index.internal.gbptree;
 
 import java.io.File;
 import java.io.IOException;