From c015b038f4be90ba2a75339b0f68de89b853113a Mon Sep 17 00:00:00 2001 From: jsteemann Date: Tue, 25 May 2021 14:29:48 +0200 Subject: [PATCH 1/3] resolve merge conflicts --- revision.go | 4 ++-- test/revisions_test.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/revision.go b/revision.go index 163fdb1e..683a884a 100644 --- a/revision.go +++ b/revision.go @@ -45,8 +45,8 @@ type RevisionRanges struct { // RevisionTreeNode is a leaf in Merkle tree with hashed Revisions and with count of documents in the leaf type RevisionTreeNode struct { - Hash string `json:"hash"` - Count int64 `json:"count,int"` + Hash uint64 `json:"hash"` + Count uint64 `json:"count,int"` } // RevisionTree is a list of Revisions in a Merkle tree diff --git a/test/revisions_test.go b/test/revisions_test.go index 5f66a916..51e321b0 100644 --- a/test/revisions_test.go +++ b/test/revisions_test.go @@ -39,7 +39,7 @@ func TestRevisionTree(t *testing.T) { t.Skipf("Not a single") } c := createClientFromEnv(t, true) - skipBelowVersion(c, "3.7", t) + skipBelowVersion(c, "3.8", t) db := ensureDatabase(nil, c, "revision_tree", nil, t) col := ensureCollection(nil, db, "revision_tree", nil, t) @@ -86,7 +86,9 @@ func TestRevisionTree(t *testing.T) { noOfLeaves := noOfLeavesOnLevel for i := 1; i <= tree.MaxDepth; i++ { noOfLeavesOnLevel *= branchFactor - noOfLeaves += noOfLeavesOnLevel + if i == tree.MaxDepth { + noOfLeaves = noOfLeavesOnLevel + } } require.Equalf(t, noOfLeaves, len(tree.Nodes), "Number of leaves in the revision tree is not correct") From 4462213910bb63d7bd18c9e9312a19385bda6f9f Mon Sep 17 00:00:00 2001 From: jsteemann Date: Tue, 25 May 2021 14:55:18 +0200 Subject: [PATCH 2/3] add extra attributes to revision struct --- revision.go | 13 ++++++++----- test/revisions_test.go | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/revision.go b/revision.go index 683a884a..05e53d3c 100644 --- a/revision.go +++ b/revision.go @@ -51,11 +51,14 @@ type RevisionTreeNode struct { // RevisionTree is a list of Revisions in a Merkle tree type RevisionTree struct { - Version int `json:"version"` - MaxDepth int `json:"maxDepth"` - RangeMin RevisionUInt64 `json:"rangeMin,string" velocypack:"rangeMin"` - RangeMax RevisionUInt64 `json:"rangeMax,string" velocypack:"rangeMax"` - Nodes []RevisionTreeNode `json:"nodes"` + Version int `json:"version"` + MaxDepth int `json:"maxDepth"` + RangeMin RevisionUInt64 `json:"rangeMin,string" velocypack:"rangeMin"` + RangeMax RevisionUInt64 `json:"rangeMax,string" velocypack:"rangeMax"` + InitialRangeMin RevisionUInt64 `json:"initialRangeMin,string" velocypack:"initialRangeMin"` + Count uint64 `json:"count,int"` + Hash uint64 `json:"hash"` + Nodes []RevisionTreeNode `json:"nodes"` } var ( diff --git a/test/revisions_test.go b/test/revisions_test.go index 51e321b0..b8294835 100644 --- a/test/revisions_test.go +++ b/test/revisions_test.go @@ -79,6 +79,7 @@ func TestRevisionTree(t *testing.T) { require.NotEmpty(t, tree.Version) require.NotEmpty(t, tree.RangeMin) require.NotEmpty(t, tree.RangeMax) + require.NotEmpty(t, tree.InitialRangeMin) require.NotEmpty(t, tree.Nodes) branchFactor := 8 @@ -90,6 +91,7 @@ func TestRevisionTree(t *testing.T) { noOfLeaves = noOfLeavesOnLevel } } + require.Equalf(t, noOfDocuments, int(tree.Count), "Count value of tree is not correct") require.Equalf(t, noOfLeaves, len(tree.Nodes), "Number of leaves in the revision tree is not correct") getRanges := func() driver.Revisions { From c3c4a7f00ff51b3b2b67c2329cafa7182d86fe29 Mon Sep 17 00:00:00 2001 From: Adam Janikowski <12255597+ajanikow@users.noreply.github.com> Date: Wed, 26 May 2021 13:49:21 +0200 Subject: [PATCH 3/3] Change image of 3.8.0 to latest --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30a06ca4..b12f5b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,12 +32,12 @@ env: - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb:3.6 - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb:latest ALWAYS=1 - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb:3.7 - - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:3.8.0-beta.1 + - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:3.8.0-nightly - TEST_SUITE=run-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:latest - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb:3.6 - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb:latest ALWAYS=1 - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb:3.7 - - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:3.8.0-beta.1 + - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:3.8.0-nightly - TEST_SUITE=run-v2-tests-single GOIMAGE=gcr.io/gcr-for-testing/golang:1.13.4-stretch STARTER=gcr.io/gcr-for-testing/arangodb/arangodb-starter:latest ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.4 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb-preview:latest script: