From da78c4237cca33d0b447d58fde3442e559440238 Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Thu, 8 Dec 2022 23:55:33 -0600 Subject: [PATCH 1/3] initial --- worker/backup_ee.go | 4 ++++ x/x.go | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/worker/backup_ee.go b/worker/backup_ee.go index 648fdcbdf43..da7c1ded271 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -1,3 +1,4 @@ +//go:build !oss // +build !oss /* @@ -214,6 +215,9 @@ func ProcessBackupRequest(ctx context.Context, req *pb.BackupRequest) error { } } + // DgraphVersion hard coded in x.go + // todo: dgraph version probably should not be hard coded in source + // todo: we should use ldflag in init.go (currently not exported) dir := fmt.Sprintf(backupPathFmt, req.UnixTs) m := Manifest{ ReadTs: req.ReadTs, diff --git a/x/x.go b/x/x.go index 6ab848d8aec..a5a3bcc064e 100644 --- a/x/x.go +++ b/x/x.go @@ -140,7 +140,8 @@ const ( "X-CSRF-Token, X-Auth-Token, X-Requested-With" DgraphCostHeader = "Dgraph-TouchedUids" - DgraphVersion = 2103 + // todo: we should use ldflag in init.go (currently not exported) to set this version + DgraphVersion = 2200 ) var ( From 95dd1195c69937003979b8b9b9ec1f809aebf2cb Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Fri, 9 Dec 2022 00:09:04 -0600 Subject: [PATCH 2/3] update --- worker/backup_ee.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/backup_ee.go b/worker/backup_ee.go index da7c1ded271..6f2939f407f 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -217,7 +217,7 @@ func ProcessBackupRequest(ctx context.Context, req *pb.BackupRequest) error { // DgraphVersion hard coded in x.go // todo: dgraph version probably should not be hard coded in source - // todo: we should use ldflag in init.go (currently not exported) + // todo: we should use ldflag in init.go (currently not exported) to set this version dir := fmt.Sprintf(backupPathFmt, req.UnixTs) m := Manifest{ ReadTs: req.ReadTs, From e1b39e6c6394b181af767c8d26d18bb30beb1a2e Mon Sep 17 00:00:00 2001 From: Joshua Goldstein Date: Mon, 12 Dec 2022 14:08:53 -0600 Subject: [PATCH 3/3] cleanup and add todos --- worker/backup_ee.go | 4 +--- x/x.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/worker/backup_ee.go b/worker/backup_ee.go index 6f2939f407f..b6fc37a656d 100644 --- a/worker/backup_ee.go +++ b/worker/backup_ee.go @@ -215,9 +215,7 @@ func ProcessBackupRequest(ctx context.Context, req *pb.BackupRequest) error { } } - // DgraphVersion hard coded in x.go - // todo: dgraph version probably should not be hard coded in source - // todo: we should use ldflag in init.go (currently not exported) to set this version + // TODO: we should use ldflag in init.go to set this version (currently DgraphVersion hard coded in x.go) dir := fmt.Sprintf(backupPathFmt, req.UnixTs) m := Manifest{ ReadTs: req.ReadTs, diff --git a/x/x.go b/x/x.go index a5a3bcc064e..d18465b5831 100644 --- a/x/x.go +++ b/x/x.go @@ -140,7 +140,7 @@ const ( "X-CSRF-Token, X-Auth-Token, X-Requested-With" DgraphCostHeader = "Dgraph-TouchedUids" - // todo: we should use ldflag in init.go (currently not exported) to set this version + // TODO: we should use ldflag in init.go (currently not exported) to set this version DgraphVersion = 2200 )