Fix compilation issue on 32 bit machine

conn/node.go

@@ -27,16 +27,17 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/dgraph-io/badger/v2/y"
-	"github.com/dgraph-io/dgo/v2/protos/api"
-	"github.com/dgraph-io/dgraph/protos/pb"
-	"github.com/dgraph-io/dgraph/raftwal"
-	"github.com/dgraph-io/dgraph/x"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 	"go.etcd.io/etcd/raft"
 	"go.etcd.io/etcd/raft/raftpb"
 	otrace "go.opencensus.io/trace"
+
+	"github.com/dgraph-io/badger/v2/y"
+	"github.com/dgraph-io/dgo/v2/protos/api"
+	"github.com/dgraph-io/dgraph/protos/pb"
+	"github.com/dgraph-io/dgraph/raftwal"
+	"github.com/dgraph-io/dgraph/x"
 )
 
 var (
@@ -48,6 +49,12 @@ var (
 type Node struct {
 	x.SafeMutex
 
+	// Applied is used to keep track of the applied RAFT proposals.
+	// The stages are proposed -> committed (accepted by cluster) ->
+	// applied (to PL) -> synced (to BadgerDB).
+	// This needs to be 64 bit aligned for atomics to work on 32 bit machine.
+	Applied y.WaterMark
+
 	joinLock sync.Mutex
 
 	// Used to keep track of lin read requests.
@@ -70,10 +77,6 @@ type Node struct {
 	Rand        *rand.Rand
 
 	Proposals proposals
-	// applied is used to keep track of the applied RAFT proposals.
-	// The stages are proposed -> committed (accepted by cluster) ->
-	// applied (to PL) -> synced (to BadgerDB).
-	Applied y.WaterMark
 
 	heartbeatsOut int64
 	heartbeatsIn  int64

dgraph/cmd/alpha/run.go

@@ -585,6 +585,7 @@ func run() {
 		AbortOlderThan:      abortDur,
 		StartTime:           startTime,
 		LudicrousMode:       Alpha.Conf.GetBool("ludicrous_mode"),
+		BadgerKeyFile:       worker.Config.BadgerKeyFile,
 	}
 
 	setupCustomTokenizers()

posting/index.go

@@ -35,6 +35,7 @@ import (
 	"github.com/dgraph-io/badger/v2"
 	"github.com/dgraph-io/badger/v2/options"
 	bpb "github.com/dgraph-io/badger/v2/pb"
+	"github.com/dgraph-io/dgraph/ee/enc"
 	"github.com/dgraph-io/dgraph/protos/pb"
 	"github.com/dgraph-io/dgraph/schema"
 	"github.com/dgraph-io/dgraph/tok"
@@ -546,13 +547,12 @@ func (r *rebuilder) Run(ctx context.Context) error {
 
 	dbOpts := badger.DefaultOptions(tmpIndexDir).
 		WithSyncWrites(false).
-		WithNumVersionsToKeep(math.MaxInt64).
+		WithNumVersionsToKeep(math.MaxInt32).
 		WithLogger(&x.ToGlog{}).
 		WithCompression(options.None).
 		WithEventLogging(false).
 		WithLogRotatesToFlush(10).
-		WithMaxCacheSize(50) // TODO(Aman): Disable cache altogether
-
+		WithEncryptionKey(enc.ReadEncryptionKeyFile(x.WorkerConfig.BadgerKeyFile))
 	tmpDB, err := badger.OpenManaged(dbOpts)
 	if err != nil {
 		return errors.Wrap(err, "error opening temp badger for reindexing")

worker/draft.go

@@ -49,6 +49,10 @@ import (
 )
 
 type node struct {
+	// This needs to be 64 bit aligned for atomics to work on 32 bit machine.
+	pendingSize int64
+
+	// embedded struct
 	*conn.Node
 
 	// Fields which are never changed after init.
@@ -66,8 +70,6 @@ type node struct {
 	canCampaign bool
 	elog        trace.EventLog
 
-	pendingSize int64
-
 	ex *executor
 }
 

x/config.go

@@ -78,6 +78,8 @@ type WorkerOptions struct {
 	StartTime time.Time
 	// LudicrousMode is super fast mode with fewer guarantees.
 	LudicrousMode bool
+	// BadgerKeyFile is the file containing the key used for encryption. Enterprise only feature.
+	BadgerKeyFile string
 }
 
 // WorkerConfig stores the global instance of the worker package's options.

x/x.go

@@ -83,10 +83,10 @@ const (
 	Star = "_STAR_ALL"
 
 	// GrpcMaxSize is the maximum possible size for a gRPC message.
-	// Dgraph uses the maximum size for the most flexibility (4GB - equal
+	// Dgraph uses the maximum size for the most flexibility (2GB - equal
 	// to the max grpc frame size). Users will still need to set the max
 	// message sizes allowable on the client size when dialing.
-	GrpcMaxSize = 4 << 30
+	GrpcMaxSize = math.MaxInt32
 
 	// PortZeroGrpc is the default gRPC port for zero.
 	PortZeroGrpc = 5080