Fingerprint and base36 encode Keys in TxnContext

Author: Pawan Rawal

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project will adhere to [Semantic Versioning](http://semver.org/spec/v2.
 * Fix TLS flag parsing for Dgraph server and live loader.
 * Reduce dependencies for Go client.
 * `depth` and `loop` arguments should be inside @recurse().
+* Base36 encode keys that are part of TxnContext and are sent to the client.
 
 ## [0.9.1] - 2017-11-15
 

dgraph/cmd/server/http.go

@@ -19,7 +19,6 @@ package server
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -205,11 +204,6 @@ func mutationHandler(w http.ResponseWriter, r *http.Request) {
 		e.Txn.Keys = e.Txn.Keys[:0]
 	}
 
-	// base64 encode the keys
-	for i, k := range e.Txn.Keys {
-		e.Txn.Keys[i] = base64.StdEncoding.EncodeToString([]byte(k))
-	}
-
 	response := map[string]interface{}{}
 	response["extensions"] = e
 	mp := map[string]interface{}{}
@@ -272,15 +266,6 @@ func commitHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// base64 decode keys
-	for i, k := range encodedKeys {
-		data, err := base64.StdEncoding.DecodeString(k)
-		if err != nil {
-			x.SetStatus(w, x.Error, "While base64 decoding keys header.")
-			return
-		}
-		encodedKeys[i] = string(data)
-	}
 	tc.Keys = encodedKeys
 
 	cts, err := worker.CommitOverNetwork(context.Background(), tc)

dgraph/cmd/server/http_test.go

@@ -153,7 +153,7 @@ func TestTransactionBasic(t *testing.T) {
 	keys, mts, err := mutationWithTs(m1, false, ts)
 	require.NoError(t, err)
 	require.Equal(t, mts, ts)
-	expected := []string{"AAAEbmFtZQAAAAAAAAAAAQ==", "AAAEbmFtZQAAAAAAAAAAAQ==", "AAAEbmFtZQIBYWxpY2U=", "AAAEbmFtZQIBYWxpY2U=", "AAAEbmFtZQIBYm9i", "AAAHYmFsYW5jZQAAAAAAAAAAAQ==", "AAAHYmFsYW5jZQAAAAAAAAAAAg==", "AAALX3ByZWRpY2F0ZV8AAAAAAAAAAAE=", "AAALX3ByZWRpY2F0ZV8AAAAAAAAAAAE=", "AAALX3ByZWRpY2F0ZV8AAAAAAAAAAAE=", "AAALX3ByZWRpY2F0ZV8AAAAAAAAAAAI="}
+	expected := []string{"16zy665614irg", "1ep5ewu298spd", "2oz0ld779a6yh", "2oz0ld779a6yh", "321112eei4n9g", "321112eei4n9g", "3fk4wxiwz6h3r", "3mlibw7eeno0x", "u5ausuvjgdwg", "u5ausuvjgdwg", "u5ausuvjgdwg"}
 	sort.Strings(expected)
 	sort.Strings(keys)
 	require.Equal(t, expected, keys)

posting/mvcc.go

@@ -22,13 +22,15 @@ import (
 	"context"
 	"math"
 	"sort"
+	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/dgraph-io/badger"
 	"github.com/dgraph-io/dgraph/protos"
 	"github.com/dgraph-io/dgraph/x"
+	farm "github.com/dgryski/go-farm"
 )
 
 var (
@@ -221,7 +223,8 @@ func (t *Txn) Fill(ctx *protos.TxnContext) {
 func (t *Txn) fill(ctx *protos.TxnContext) {
 	ctx.StartTs = t.StartTs
 	for _, d := range t.deltas {
-		ctx.Keys = append(ctx.Keys, string(d.key))
+		fp := farm.Fingerprint64(d.key)
+		ctx.Keys = append(ctx.Keys, strconv.FormatUint(fp, 36))
 	}
 }