Store keys in a system keyspace

Added the idea of complex operations (multi-row operations)
Added system keyspaces
StructuredSetOperation stores each of the keys
Scan can now be filtered by keyspace (inefficiently!)

Author: justinsb

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/KeyValueStateMachine.java

@@ -165,9 +165,9 @@ public Value get(long storeId, Keyspace keyspace, ByteString key) {
         return keyValueStore.get(keyspace.mapToKey(key).asReadOnlyByteBuffer());
     }
 
-    public BtreeQuery scan(long storeId) {
+    public BtreeQuery scan(long storeId, Keyspace keyspace) {
         KeyValueStore keyValueStore = getKeyValueStore(storeId);
-        return keyValueStore.buildQuery();
+        return keyValueStore.buildQuery(keyspace);
     }
 
 }

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/KeyValueStore.java

@@ -9,6 +9,7 @@
 
 import com.cloudata.btree.Btree;
 import com.cloudata.btree.BtreeQuery;
+import com.cloudata.btree.Keyspace;
 import com.cloudata.btree.MmapPageStore;
 import com.cloudata.btree.PageStore;
 import com.cloudata.btree.ReadOnlyTransaction;
@@ -44,8 +45,8 @@ public Value get(final ByteBuffer key) {
         }
     }
 
-    public BtreeQuery buildQuery() {
-        return new BtreeQuery(btree);
+    public BtreeQuery buildQuery(Keyspace keyspace) {
+        return new BtreeQuery(btree, keyspace);
     }
 
 }

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/operation/KeyOperation.java

@@ -1,9 +1,9 @@
 package com.cloudata.keyvalue.operation;
 
-import com.cloudata.btree.BtreeOperation;
+import com.cloudata.btree.operation.RowOperation;
 import com.cloudata.keyvalue.KeyValueProto.KvEntry;
 
-public interface KeyOperation<V> extends BtreeOperation<V> {
+public interface KeyOperation<V> extends RowOperation<V> {
 
     public abstract KvEntry.Builder serialize();
 }

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/redis/RedisEndpoint.java

@@ -2,13 +2,15 @@
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.util.concurrent.DefaultEventExecutorGroup;
+import io.netty.util.concurrent.Future;
 
 import java.net.SocketAddress;
 
@@ -65,8 +67,11 @@ protected void initChannel(SocketChannel ch) throws Exception {
     }
 
     public void stop() throws InterruptedException {
-        group.shutdownGracefully();
+        Future<?> f1 = group.shutdownGracefully();
 
-        serverChannel.close().sync();
+        ChannelFuture f2 = serverChannel.close();
+
+        f1.sync();
+        f2.sync();
     }
 }

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/redis/commands/SelectCommand.java

@@ -24,7 +24,7 @@ public RedisResponse execute(RedisServer server, RedisSession session, RedisRequ
             return new ErrorRedisReponse("invalid DB index");
         }
 
-        session.setKeyspace(Keyspace.build(Ints.checkedCast(keyspaceId)));
+        session.setKeyspace(Keyspace.user(Ints.checkedCast(keyspaceId)));
         return StatusRedisResponse.OK;
     }
 }

cloudata-keyvalue/src/main/java/com/cloudata/keyvalue/web/KeyValueEndpoint.java

@@ -26,10 +26,10 @@
 import com.cloudata.btree.BtreeQuery;
 import com.cloudata.btree.Keyspace;
 import com.cloudata.keyvalue.KeyValueProto.KvAction;
+import com.cloudata.keyvalue.KeyValueStateMachine;
 import com.cloudata.keyvalue.operation.DeleteOperation;
 import com.cloudata.keyvalue.operation.IncrementOperation;
 import com.cloudata.keyvalue.operation.SetOperation;
-import com.cloudata.keyvalue.KeyValueStateMachine;
 import com.cloudata.values.Value;
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.ByteStreams;
@@ -63,7 +63,7 @@ public Response get(@PathParam("key") String key) throws IOException {
     @GET
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
     public Response query() throws IOException {
-        BtreeQuery query = stateMachine.scan(storeId);
+        BtreeQuery query = stateMachine.scan(storeId, getKeyspace());
 
         query.setFormat(MediaType.APPLICATION_OCTET_STREAM_TYPE);
         return Response.ok(query).build();

cloudata-server-shared/src/main/java/com/cloudata/btree/BranchPage.java

@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.cloudata.btree.operation.RowOperation;
 import com.cloudata.util.Hex;
 
 public class BranchPage extends Page {
@@ -45,7 +46,8 @@ private int findPos(ByteBuffer find) {
 
                     ByteBuffer midKey = getKey(mid);
                     int comparison = ByteBuffers.compare(midKey, find);
-                    log.info("comparison: @{} {} vs {}: {}", mid, Hex.forDebug(midKey), Hex.forDebug(find), comparison);
+                    // log.info("comparison: @{} {} vs {}: {}", mid, Hex.forDebug(midKey), Hex.forDebug(find),
+                    // comparison);
 
                     if (comparison < 0) {
                         min = mid + 1;
@@ -316,7 +318,7 @@ private int findPos(ByteBuffer find) {
 
                 ByteBuffer midKey = getKey(mid);
                 int comparison = ByteBuffers.compare(midKey, find);
-                log.info("comparison: @{} {} vs {}: {}", mid, Hex.forDebug(midKey), Hex.forDebug(find), comparison);
+                // log.info("comparison: @{} {} vs {}: {}", mid, Hex.forDebug(midKey), Hex.forDebug(find), comparison);
 
                 if (comparison < 0) {
                     min = mid + 1;
@@ -411,7 +413,7 @@ Mutable getMutable() {
     }
 
     @Override
-    public <V> void doAction(Transaction txn, ByteBuffer key, BtreeOperation<V> operation) {
+    public <V> void doAction(Transaction txn, ByteBuffer key, RowOperation<V> operation) {
         int pos = findPos(key);
         if (pos < 0) {
             pos = 0;

cloudata-server-shared/src/main/java/com/cloudata/btree/BtreeOperation.java

@@ -9,9 +9,11 @@ public class BtreeQuery {
     private final Btree btree;
     private final ByteBuffer start;
     private MediaType format;
+    private final Keyspace keyspace;
 
-    public BtreeQuery(Btree btree) {
+    public BtreeQuery(Btree btree, Keyspace keyspace) {
         this.btree = btree;
+        this.keyspace = keyspace;
         this.start = null;
     }
 
@@ -41,6 +43,9 @@ public KeyValueResultset(ReadOnlyTransaction txn) {
         }
 
         public void walk(EntryListener entryListener) {
+            if (keyspace != null) {
+                entryListener = new KeyspaceFilter(keyspace, entryListener);
+            }
             txn.walk(btree, start, entryListener);
         }
 

cloudata-server-shared/src/main/java/com/cloudata/btree/BtreeQuery.java

@@ -6,5 +6,10 @@
 
 public interface EntryListener {
 
+    /*
+     * Called for each entry.
+     * 
+     * Return false to terminate the walk.
+     */
     public boolean found(ByteBuffer key, Value value);
 }