save point -- in the middle of just mess

Author: normen662

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

@@ -173,12 +173,16 @@ public void deleteFromNodeIndexIfNecessary(@Nonnull final Transaction transactio
 
     @Nonnull
     @Override
-    public CompletableFuture<Node> fetchNode(@Nonnull final ReadTransaction transaction, @Nonnull final byte[] nodeId) {
-        return getOnWriteListener().onAsyncReadForWrite(fetchNodeInternal(transaction, nodeId).thenApply(this::checkNode));
+    public <N extends Neighbor> CompletableFuture<NodeWithLayer<N>> fetchNode(@Nonnull final Node.NodeCreator<N> creator,
+                                                                              @Nonnull final ReadTransaction readTransaction,
+                                                                              int layer, @Nonnull Tuple primaryKey) {
+        return fetchNodeInternal(creator, readTransaction, layer, primaryKey).thenApply(this::checkNode);
     }
 
     @Nonnull
-    protected abstract CompletableFuture<Node> fetchNodeInternal(@Nonnull ReadTransaction transaction, @Nonnull byte[] nodeId);
+    protected abstract <N extends Neighbor> CompletableFuture<NodeWithLayer<N>> fetchNodeInternal(@Nonnull Node.NodeCreator<N> creator,
+                                                                                                  @Nonnull ReadTransaction readTransaction,
+                                                                                                  int layer, @Nonnull Tuple primaryKey);
 
     /**
      * Method to perform basic invariant check(s) on a newly-fetched node.
@@ -190,12 +194,7 @@ public CompletableFuture<Node> fetchNode(@Nonnull final ReadTransaction transact
      * @return the node that was passed in
      */
     @Nullable
-    private <N extends Node> N checkNode(@Nullable final N node) {
-        if (node != null && (node.size() < getConfig().getMinM() || node.size() > getConfig().getMaxM())) {
-            if (!node.isRoot()) {
-                throw new IllegalStateException("packing of non-root is out of valid range");
-            }
-        }
+    private <N extends Neighbor> NodeWithLayer<N> checkNode(@Nullable final NodeWithLayer<N> node) {
         return node;
     }
 

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

@@ -75,22 +75,44 @@ public ByNodeStorageAdapter(@Nonnull final HNSW.Config config, @Nonnull final Su
     }
 
     @Override
-    public CompletableFuture<NodeWithLayer<? extends Neighbor>> fetchEntryNode(@Nonnull final ReadTransaction readTransaction) {
+    public CompletableFuture<NodeKeyWithLayer> fetchEntryNodeKey(@Nonnull final ReadTransaction readTransaction) {
         final byte[] key = getEntryNodeSubspace().pack();
 
         return readTransaction.get(key)
                 .thenApply(valueBytes -> {
                     if (valueBytes == null) {
-                        throw new IllegalStateException("cannot fetch entry point");
+                        return null; // not a single node in the index
                     }
 
                     final Tuple entryTuple = Tuple.fromBytes(valueBytes);
                     final int lMax = (int)entryTuple.getLong(0);
-                    final Node<? extends Neighbor> node = nodeFromTuple(entryTuple.getNestedTuple(1));
+                    final Tuple primaryKey = entryTuple.getNestedTuple(1);
+                    final OnReadListener onReadListener = getOnReadListener();
+                    onReadListener.onKeyValueRead(key, valueBytes);
+                    return new NodeKeyWithLayer(lMax, primaryKey);
+                });
+    }
+
+    @Nonnull
+    @Override
+    protected <N extends Neighbor> CompletableFuture<NodeWithLayer<N>> fetchNodeInternal(@Nonnull final Node.NodeCreator<N> creator,
+                                                                                         @Nonnull final ReadTransaction readTransaction,
+                                                                                         final int layer,
+                                                                                         @Nonnull final Tuple primaryKey) {
+        final byte[] key = getDataSubspace().pack(Tuple.from(layer, primaryKey));
+
+        return readTransaction.get(key)
+                .thenApply(valueBytes -> {
+                    if (valueBytes == null) {
+                        throw new IllegalStateException("cannot fetch node");
+                    }
+
+                    final Tuple nodeTuple = Tuple.fromBytes(valueBytes);
+                    final Node<N> node = nodeFromTuple(creator, nodeTuple);
                     final OnReadListener onReadListener = getOnReadListener();
                     onReadListener.onNodeRead(node);
-                    onReadListener.onKeyValueRead(node, key, valueBytes);
-                    return node.withLayer(lMax);
+                    onReadListener.onKeyValueRead(key, valueBytes);
+                    return node.withLayer(layer);
                 });
     }
 
@@ -153,7 +175,8 @@ public CompletableFuture<Node> fetchNodeInternal(@Nonnull final ReadTransaction
     }
 
     @Nonnull
-    private Node<? extends Neighbor> nodeFromTuple(@Nonnull final Tuple tuple) {
+    private <N extends Neighbor> Node<N> nodeFromTuple(@Nonnull final Node.NodeCreator<N> creator,
+                                                       @Nonnull final Tuple tuple) {
         final NodeKind nodeKind = NodeKind.fromSerializedNodeKind((byte)tuple.getLong(0));
         final Tuple primaryKey = tuple.getNestedTuple(1);
         final Tuple vectorTuple = tuple.getNestedTuple(2);
@@ -200,9 +223,8 @@ private Node<? extends Neighbor> nodeFromTuple(@Nonnull final Tuple tuple) {
         Verify.verify((nodeKind == NodeKind.DATA && neighbors != null) ||
                 (nodeKind == NodeKind.INTERMEDIATE && neighborsWithVectors != null));
 
-        return nodeKind == NodeKind.DATA
-               ? new DataNode(primaryKey, vector, neighbors)
-               : new IntermediateNode(primaryKey, vector, neighborsWithVectors);
+        return creator.create(nodeKind, primaryKey, vector,
+                nodeKind == NodeKind.DATA ? neighbors : neighborsWithVectors);
     }
 
     @Nonnull

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

@@ -22,6 +22,7 @@
 
 import com.apple.foundationdb.tuple.Tuple;
 import com.christianheina.langx.half4j.Half;
+import com.google.common.base.Verify;
 import com.google.common.collect.Lists;
 
 import javax.annotation.Nonnull;
@@ -37,6 +38,12 @@ public DataNode(@Nonnull final Tuple primaryKey, @Nonnull final Vector<Half> vec
         super(primaryKey, vector, neighbors);
     }
 
+    @Nonnull
+    @Override
+    public NodeKind getKind() {
+        return NodeKind.DATA;
+    }
+
     @Nonnull
     @Override
     public DataNode asDataNode() {
@@ -55,9 +62,18 @@ public NodeWithLayer<Neighbor> withLayer(final int layer) {
         return new NodeWithLayer<>(layer, this);
     }
 
-    @Nonnull
     @Override
-    public NodeKind getKind() {
-        return NodeKind.DATA;
+    public NodeCreator<Neighbor> sameCreator() {
+        return DataNode::creator;
+    }
+
+    @Nonnull
+    @SuppressWarnings("unchecked")
+    public static Node<Neighbor> creator(@Nonnull final NodeKind nodeKind,
+                                         @Nonnull final Tuple primaryKey,
+                                         @Nonnull final Vector<Half> vector,
+                                         @Nonnull final List<? extends Neighbor> neighbors) {
+        Verify.verify(nodeKind == NodeKind.INTERMEDIATE);
+        return new DataNode(primaryKey, vector, (List<Neighbor>)neighbors);
     }
 }