Move MVCCKey encoding into C++.

client/client_test.go

@@ -738,7 +738,7 @@ func setupClientBenchData(useSSL bool, numVersions, numKeys int, b *testing.B) (
 	}
 
 	if r, ok := s.Ctx.Engines[0].(*engine.RocksDB); ok {
-		r.CompactRange(nil, nil)
+		r.CompactRange(engine.NilKey, engine.NilKey)
 	}
 
 	return s, db

keys/constants.go

@@ -117,11 +117,6 @@ var (
 	// (storage/engine/rocksdb/db.cc).
 	localTransactionSuffix = roachpb.RKey("txn-")
 
-	// SystemPrefix indicates the beginning of the key range for
-	// global, system data which are replicated across the cluster.
-	SystemPrefix = roachpb.Key("\x04")
-	SystemMax    = roachpb.Key("\x05")
-
 	// Meta1Prefix is the first level of key addressing. It is selected such that
 	// all range addressing records sort before any system tables which they
 	// might describe. The value is a RangeDescriptor struct.
@@ -141,6 +136,11 @@ var (
 	// MetaMax is the end of the range of addressing keys.
 	MetaMax = roachpb.Key("\x04")
 
+	// SystemPrefix indicates the beginning of the key range for
+	// global, system data which are replicated across the cluster.
+	SystemPrefix = roachpb.Key("\x04")
+	SystemMax    = roachpb.Key("\x05")
+
 	// DescIDGenerator is the global descriptor ID generator sequence used for
 	// table and namespace IDs.
 	DescIDGenerator = roachpb.Key(MakeKey(SystemPrefix, roachpb.RKey("desc-idgen")))

kv/txn_coord_sender_test.go

@@ -299,7 +299,7 @@ func verifyCleanup(key roachpb.Key, coord *TxnCoordSender, eng engine.Engine, t
 			return fmt.Errorf("expected empty transactions map; got %d", l)
 		}
 		meta := &engine.MVCCMetadata{}
-		ok, _, _, err := eng.GetProto(engine.MVCCEncodeKey(key), meta)
+		ok, _, _, err := eng.GetProto(engine.MakeMVCCMetadataKey(key), meta)
 		if err != nil {
 			return fmt.Errorf("error getting MVCC metadata: %s", err)
 		}

roachpb/internal.proto

@@ -119,6 +119,8 @@ message RaftSnapshotData {
   message KeyValue {
     optional bytes key = 1;
     optional bytes value = 2;
+    optional int64 wall_time = 3 [(gogoproto.nullable) = false];
+    optional int32 logical = 4 [(gogoproto.nullable) = false];
   }
   // The latest RangeDescriptor
   optional RangeDescriptor range_descriptor = 1 [(gogoproto.nullable) = false];