read and insert path both code complete

Author: normen662

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/AbstractChangeSet.java

@@ -31,31 +31,29 @@
 /**
  * Implementations and attributes common to all concrete implementations of {@link StorageAdapter}.
  */
-abstract class AbstractStorageAdapter implements StorageAdapter {
-    public static final byte SUBSPACE_PREFIX_ENTRY_NODE = 0x01;
-    public static final byte SUBSPACE_PREFIX_DATA = 0x02;
-
+abstract class AbstractStorageAdapter<N extends NodeReference> implements StorageAdapter<N> {
     @Nonnull
     private final HNSW.Config config;
     @Nonnull
+    private final NodeFactory<N> nodeFactory;
+    @Nonnull
     private final Subspace subspace;
     @Nonnull
     private final OnWriteListener onWriteListener;
     @Nonnull
     private final OnReadListener onReadListener;
 
-    private final Subspace entryNodeSubspace;
     private final Subspace dataSubspace;
 
-    protected AbstractStorageAdapter(@Nonnull final HNSW.Config config, @Nonnull final Subspace subspace,
+    protected AbstractStorageAdapter(@Nonnull final HNSW.Config config, @Nonnull final NodeFactory<N> nodeFactory,
+                                     @Nonnull final Subspace subspace,
                                      @Nonnull final OnWriteListener onWriteListener,
                                      @Nonnull final OnReadListener onReadListener) {
         this.config = config;
+        this.nodeFactory = nodeFactory;
         this.subspace = subspace;
         this.onWriteListener = onWriteListener;
         this.onReadListener = onReadListener;
-
-        this.entryNodeSubspace = subspace.subspace(Tuple.from(SUBSPACE_PREFIX_ENTRY_NODE));
         this.dataSubspace = subspace.subspace(Tuple.from(SUBSPACE_PREFIX_DATA));
     }
 
@@ -65,22 +63,22 @@ public HNSW.Config getConfig() {
         return config;
     }
 
-    @Override
     @Nonnull
-    public Subspace getSubspace() {
-        return subspace;
+    @Override
+    public NodeFactory<N> getNodeFactory() {
+        return nodeFactory;
     }
 
-    @Nullable
+    @Nonnull
     @Override
-    public Subspace getSecondarySubspace() {
-        return null;
+    public NodeKind getNodeKind() {
+        return getNodeFactory().getNodeKind();
     }
 
     @Override
     @Nonnull
-    public Subspace getEntryNodeSubspace() {
-        return entryNodeSubspace;
+    public Subspace getSubspace() {
+        return subspace;
     }
 
     @Override
@@ -103,28 +101,25 @@ public OnReadListener getOnReadListener() {
 
     @Nonnull
     @Override
-    public <N extends NodeReference> CompletableFuture<Node<N>> fetchNode(@Nonnull final NodeFactory<N> nodeFactory,
-                                                                          @Nonnull final ReadTransaction readTransaction,
-                                                                          int layer, @Nonnull Tuple primaryKey) {
-        return fetchNodeInternal(nodeFactory, readTransaction, layer, primaryKey).thenApply(this::checkNode);
+    public CompletableFuture<Node<N>> fetchNode(@Nonnull final ReadTransaction readTransaction,
+                                                int layer, @Nonnull Tuple primaryKey) {
+        return fetchNodeInternal(readTransaction, layer, primaryKey).thenApply(this::checkNode);
     }
 
     @Nonnull
-    protected abstract <N extends NodeReference> CompletableFuture<Node<N>> fetchNodeInternal(@Nonnull NodeFactory<N> nodeFactory,
-                                                                                              @Nonnull ReadTransaction readTransaction,
-                                                                                              int layer, @Nonnull Tuple primaryKey);
+    protected abstract CompletableFuture<Node<N>> fetchNodeInternal(@Nonnull ReadTransaction readTransaction,
+                                                                    int layer, @Nonnull Tuple primaryKey);
 
     /**
      * Method to perform basic invariant check(s) on a newly-fetched node.
      *
      * @param node the node to check
-     * @param <N> the type param for the node in order for this method to not be lossy on the type of the node that
      * was passed in
      *
      * @return the node that was passed in
      */
     @Nullable
-    private <N extends NodeReference> Node<N> checkNode(@Nullable final Node<N> node) {
+    private Node<N> checkNode(@Nullable final Node<N> node) {
         return node;
     }
 }

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/AbstractStorageAdapter.java

@@ -21,20 +21,23 @@
 package com.apple.foundationdb.async.hnsw;
 
 import com.apple.foundationdb.Transaction;
+import com.apple.foundationdb.tuple.Tuple;
+import com.google.common.collect.ImmutableList;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * TODO.
  */
 class BaseNeighborsChangeSet<N extends NodeReference> implements NeighborsChangeSet<N> {
     @Nonnull
-    private final NodeReferenceAndNode<N> baseNode;
+    private final List<N> neighbors;
 
-    public BaseNeighborsChangeSet(@Nonnull final NodeReferenceAndNode<N> baseNode) {
-        this.baseNode = baseNode;
+    public BaseNeighborsChangeSet(@Nonnull final List<N> neighbors) {
+        this.neighbors = ImmutableList.copyOf(neighbors);
     }
 
     @Nullable
@@ -44,10 +47,13 @@ public BaseNeighborsChangeSet<N> getParent() {
 
     @Nonnull
     public List<N> merge() {
-        return baseNode.getNode().getNeighbors();
+        return neighbors;
     }
 
     @Override
-    public void writeDelta(@Nonnull final Transaction transaction) {
+    public void writeDelta(@Nonnull final InliningStorageAdapter storageAdapter, @Nonnull final Transaction transaction,
+                           final int layer, @Nonnull final Node<N> node,
+                           @Nonnull final Predicate<Tuple> primaryKeyPredicate) {
+        // nothing to be written
     }
 }

fdb-extensions/src/main/java/com/apple/foundationdb/async/hnsw/BaseNeighborsChangeSet.java

@@ -22,7 +22,6 @@
 
 import com.apple.foundationdb.tuple.Tuple;
 import com.christianheina.langx.half4j.Half;
-import com.google.common.collect.Lists;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -88,25 +87,6 @@ public InliningNode asInliningNode() {
         throw new IllegalStateException("this is not an inlining node");
     }
 
-    @Override
-    public NodeFactory<NodeReference> sameCreator() {
-        return CompactNode.factory();
-    }
-
-    @Nonnull
-    @Override
-    public Tuple toTuple() {
-        final List<Object> nodeItems = Lists.newArrayListWithExpectedSize(4);
-        nodeItems.add(NodeKind.COMPACT.getSerialized());
-        nodeItems.add(StorageAdapter.tupleFromVector(getVector()));
-        final List<Tuple> neighborItems = Lists.newArrayListWithExpectedSize(getNeighbors().size());
-        for (final NodeReference nodeReference : getNeighbors()) {
-            neighborItems.add(nodeReference.getPrimaryKey());
-        }
-        nodeItems.add(Tuple.fromList(neighborItems));
-        return Tuple.fromList(nodeItems);
-    }
-
     @Nonnull
     public static NodeFactory<NodeReference> factory() {
         return FACTORY;