added logging

Author: normen662

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

@@ -21,8 +21,11 @@
 package com.apple.foundationdb.async.hnsw;
 
 import com.apple.foundationdb.ReadTransaction;
+import com.apple.foundationdb.Transaction;
 import com.apple.foundationdb.subspace.Subspace;
 import com.apple.foundationdb.tuple.Tuple;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -32,6 +35,9 @@
  * Implementations and attributes common to all concrete implementations of {@link StorageAdapter}.
  */
 abstract class AbstractStorageAdapter<N extends NodeReference> implements StorageAdapter<N> {
+    @Nonnull
+    private static final Logger logger = LoggerFactory.getLogger(AbstractStorageAdapter.class);
+
     @Nonnull
     private final HNSW.Config config;
     @Nonnull
@@ -122,4 +128,16 @@ protected abstract CompletableFuture<Node<N>> fetchNodeInternal(@Nonnull ReadTra
     private Node<N> checkNode(@Nullable final Node<N> node) {
         return node;
     }
+
+    public void writeNode(@Nonnull Transaction transaction, @Nonnull Node<N> node, int layer,
+                          @Nonnull NeighborsChangeSet<N> changeSet) {
+        writeNodeInternal(transaction, node, layer, changeSet);
+        if (logger.isDebugEnabled()) {
+            logger.debug("written node with key={} at layer={}", node.getPrimaryKey(), layer);
+        }
+    }
+
+    protected abstract void writeNodeInternal(@Nonnull Transaction transaction, @Nonnull Node<N> node, int layer,
+                                              @Nonnull NeighborsChangeSet<N> changeSet);
+
 }

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

@@ -53,8 +53,8 @@ public NodeKind getNodeKind() {
     private final Vector<Half> vector;
 
     public CompactNode(@Nonnull final Tuple primaryKey, @Nonnull final Vector<Half> vector,
-                       @Nonnull final List<NodeReference> nodeReferences) {
-        super(primaryKey, nodeReferences);
+                       @Nonnull final List<NodeReference> neighbors) {
+        super(primaryKey, neighbors);
         this.vector = vector;
     }
 
@@ -91,4 +91,11 @@ public InliningNode asInliningNode() {
     public static NodeFactory<NodeReference> factory() {
         return FACTORY;
     }
+
+    @Override
+    public String toString() {
+        return "C[primaryKey=" + getPrimaryKey() +
+                ";vector=" + vector +
+                ";neighbors=" + getNeighbors() + "]";
+    }
 }

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

@@ -27,6 +27,8 @@
 import com.christianheina.langx.half4j.Half;
 import com.google.common.base.Verify;
 import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -36,6 +38,9 @@
  * TODO.
  */
 class CompactStorageAdapter extends AbstractStorageAdapter<NodeReference> implements StorageAdapter<NodeReference> {
+    @Nonnull
+    private static final Logger logger = LoggerFactory.getLogger(CompactStorageAdapter.class);
+
     public CompactStorageAdapter(@Nonnull final HNSW.Config config, @Nonnull final NodeFactory<NodeReference> nodeFactory,
                                  @Nonnull final Subspace subspace,
                                  @Nonnull final OnWriteListener onWriteListener,
@@ -98,8 +103,8 @@ private Node<NodeReference> compactNodeFromTuples(@Nonnull final Tuple primaryKe
         final Vector<Half> vector = StorageAdapter.vectorFromTuple(vectorTuple);
         final List<NodeReference> nodeReferences = Lists.newArrayListWithExpectedSize(neighborsTuple.size());
 
-        for (final Object neighborObject : neighborsTuple) {
-            final Tuple neighborTuple = (Tuple)neighborObject;
+        for (int i = 0; i < neighborsTuple.size(); i ++) {
+            final Tuple neighborTuple = neighborsTuple.getNestedTuple(i);
             nodeReferences.add(new NodeReference(neighborTuple));
         }
 
@@ -108,11 +113,11 @@ private Node<NodeReference> compactNodeFromTuples(@Nonnull final Tuple primaryKe
 
 
     @Override
-    public void writeNode(@Nonnull final Transaction transaction, @Nonnull final Node<NodeReference> node,
-                          final int layer, @Nonnull final NeighborsChangeSet<NodeReference> neighborsChangeSet) {
+    public void writeNodeInternal(@Nonnull final Transaction transaction, @Nonnull final Node<NodeReference> node,
+                                  final int layer, @Nonnull final NeighborsChangeSet<NodeReference> neighborsChangeSet) {
         final byte[] key = getDataSubspace().pack(Tuple.from(layer, node.getPrimaryKey()));
 
-        final List<Object> nodeItems = Lists.newArrayListWithExpectedSize(4);
+        final List<Object> nodeItems = Lists.newArrayListWithExpectedSize(3);
         nodeItems.add(NodeKind.COMPACT.getSerialized());
         final CompactNode compactNode = node.asCompactNode();
         nodeItems.add(StorageAdapter.tupleFromVector(compactNode.getVector()));
@@ -123,6 +128,11 @@ public void writeNode(@Nonnull final Transaction transaction, @Nonnull final Nod
         for (final NodeReference neighborReference : neighbors) {
             neighborItems.add(neighborReference.getPrimaryKey());
         }
+        if (logger.isDebugEnabled()) {
+            logger.debug("written neighbors of primaryKey={}, oldSize={}, newSize={}", node.getPrimaryKey(),
+                    node.getNeighbors().size(), neighborItems.size());
+        }
+
         nodeItems.add(Tuple.fromList(neighborItems));
         final Tuple nodeTuple = Tuple.fromList(nodeItems);
 

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

@@ -24,6 +24,8 @@
 import com.apple.foundationdb.tuple.Tuple;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -34,6 +36,9 @@
  * TODO.
  */
 class DeleteNeighborsChangeSet<N extends NodeReference> implements NeighborsChangeSet<N> {
+    @Nonnull
+    private static final Logger logger = LoggerFactory.getLogger(DeleteNeighborsChangeSet.class);
+
     @Nonnull
     private final NeighborsChangeSet<N> parent;
 
@@ -66,6 +71,10 @@ public void writeDelta(@Nonnull final InliningStorageAdapter storageAdapter, @No
         for (final Tuple deletedNeighborPrimaryKey : deletedNeighborsPrimaryKeys) {
             if (tuplePredicate.test(deletedNeighborPrimaryKey)) {
                 storageAdapter.deleteNeighbor(transaction, layer, node.asInliningNode(), deletedNeighborPrimaryKey);
+                if (logger.isDebugEnabled()) {
+                    logger.debug("deleted neighbor of primaryKey={} targeting primaryKey={}", node.getPrimaryKey(),
+                            deletedNeighborPrimaryKey);
+                }
             }
         }
     }