sourcenetwork · shahzadlone · May 16, 2022 · May 16, 2022 · May 16, 2022 · May 17, 2022
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -1,7 +1,7 @@
 # Source Network's codecov configuration file.
 
 github_checks:
-    annotations: true
+  annotations: true
 
 codecov:
   require_ci_to_pass: yes
@@ -31,13 +31,11 @@ coverage:
 
     changes: false
 
-
 comment:
   layout: "reach, diff, files"
   behavior: default # update if exists else create new
   require_changes: true
 
 ignore:
-  - "bench"
-  - "db/tests"
+  - "testing"
   - "**/*_test.go"
diff --git a/.github/workflows/lint-then-benchmark.yml b/.github/workflows/lint-then-benchmark.yml
@@ -243,13 +243,21 @@ jobs:
           check_artifacts:  false
           search_artifacts: false
 
-      - name: Run the benchmark comparisons
+      - name: Prepare benchmark reports for comparisons
         if: |
           github.event_name == 'pull_request' &&
           github.base_ref == 'develop'
         run: >
           make deps:bench &&
           cp bench-artifact-${{ steps.last_successful_upload_on_develop.outputs.commit_hash }}.txt develop.txt &&
+          sed -i '/^pkg: /s/^pkg:\ .*\/bench\//pkg:\ /g' develop.txt &&
+          sed -i '/^pkg: /s/^pkg:\ .*\/bench\//pkg:\ /g' current.txt
+
+      - name: Run the benchmark comparisons
+        if: |
+          github.event_name == 'pull_request' &&
+          github.base_ref == 'develop'
+        run: >
           ${GOPATH}/bin/benchstat -html -alpha 1.1 develop.txt current.txt | sed -n "/<body>/,/<\/body>/p" > comparison.html &&
           ./tools/scripts/pretty-benchstat-html.sh comparison.html > pretty-comparison.md
 

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,6 @@ build/defradb*
 cover.out
 coverage-full.txt
 coverage-quick.txt
-bench/*.log
-bench/*.svg
-.vscode
+testing/bench/*.log
+testing/bench/*.svg
+.vscode
diff --git a/Makefile b/Makefile
@@ -77,11 +77,11 @@ test\:clean: clean\:test test
 
 .PHONY: test\:bench
 test\:bench:
-	make -C ./bench/ bench
+	make -C ./testing/bench/ bench
 
 .PHONY: test\:bench-short
 test\:bench-short:
-	make -C ./bench/ bench:short
+	make -C ./testing/bench/ bench:short
 
 # This also takes integration tests into account.
 .PHONY: test\:coverage-full

diff --git a/bench/Makefile → testing/bench/Makefile b/bench/Makefile → testing/bench/Makefile
diff --git a/bench/README.md → testing/bench/README.md b/bench/README.md → testing/bench/README.md
diff --git a/bench/bench_util.go → testing/bench/bench_util.go b/bench/bench_util.go → testing/bench/bench_util.go
@@ -23,10 +23,10 @@ import (
 	"github.com/dgraph-io/badger/v3"
 	ds "github.com/ipfs/go-datastore"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
 	"github.com/sourcenetwork/defradb/client"
-	testutils "github.com/sourcenetwork/defradb/db/tests"
 	"github.com/sourcenetwork/defradb/logging"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
+	testutils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 const (
@@ -36,7 +36,7 @@ const (
 
 var (
 	storage string = "memory"
-	log            = logging.MustNewLogger("defra.bench")
+	log            = logging.MustNewLogger("defra.testing.bench")
 )
 
 func init() {

diff --git a/bench/collection/simple_create_many_test.go → ...nch/collection/simple_create_many_test.go b/bench/collection/simple_create_many_test.go → ...nch/collection/simple_create_many_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 func Benchmark_Collection_UserSimple_CreateMany_Sync_0_10(b *testing.B) {

diff --git a/bench/collection/simple_create_test.go → ...ng/bench/collection/simple_create_test.go b/bench/collection/simple_create_test.go → ...ng/bench/collection/simple_create_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 func Benchmark_Collection_UserSimple_Create_Sync_0_1(b *testing.B) {

diff --git a/bench/collection/simple_read_test.go → testing/bench/collection/simple_read_test.go b/bench/collection/simple_read_test.go → testing/bench/collection/simple_read_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 func Benchmark_Collection_UserSimple_Read_Sync_1_1(b *testing.B) {

diff --git a/bench/collection/utils.go → testing/bench/collection/utils.go b/bench/collection/utils.go → testing/bench/collection/utils.go
@@ -17,9 +17,9 @@ import (
 	"sync"
 	"testing"
 
-	benchutils "github.com/sourcenetwork/defradb/bench"
-	"github.com/sourcenetwork/defradb/bench/fixtures"
 	"github.com/sourcenetwork/defradb/client"
+	benchutils "github.com/sourcenetwork/defradb/testing/bench"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 const (

diff --git a/bench/fixtures/data.go → testing/bench/fixtures/data.go b/bench/fixtures/data.go → testing/bench/fixtures/data.go
diff --git a/bench/fixtures/fixtures.go → testing/bench/fixtures/fixtures.go b/bench/fixtures/fixtures.go → testing/bench/fixtures/fixtures.go
diff --git a/bench/query/planner/simple_test.go → testing/bench/query/planner/simple_test.go b/bench/query/planner/simple_test.go → testing/bench/query/planner/simple_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/planner/utils.go → testing/bench/query/planner/utils.go b/bench/query/planner/utils.go → testing/bench/query/planner/utils.go
@@ -15,10 +15,10 @@ import (
 	"fmt"
 	"testing"
 
-	benchutils "github.com/sourcenetwork/defradb/bench"
-	"github.com/sourcenetwork/defradb/bench/fixtures"
 	"github.com/sourcenetwork/defradb/query/graphql/planner"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
+	benchutils "github.com/sourcenetwork/defradb/testing/bench"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 func runQueryParserBench(

diff --git a/bench/query/simple/simple_test.go → testing/bench/query/simple/simple_test.go b/bench/query/simple/simple_test.go → testing/bench/query/simple/simple_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/simple/utils.go → testing/bench/query/simple/utils.go b/bench/query/simple/utils.go → testing/bench/query/simple/utils.go
@@ -17,9 +17,9 @@ import (
 	"strings"
 	"testing"
 
-	benchutils "github.com/sourcenetwork/defradb/bench"
-	"github.com/sourcenetwork/defradb/bench/fixtures"
 	"github.com/sourcenetwork/defradb/client"
+	benchutils "github.com/sourcenetwork/defradb/testing/bench"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/simple/with_filter_test.go → ...ng/bench/query/simple/with_filter_test.go b/bench/query/simple/with_filter_test.go → ...ng/bench/query/simple/with_filter_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/simple/with_limit_offset_test.go → ...ch/query/simple/with_limit_offset_test.go b/bench/query/simple/with_limit_offset_test.go → ...ch/query/simple/with_limit_offset_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/simple/with_multi_lookup_test.go → ...ch/query/simple/with_multi_lookup_test.go b/bench/query/simple/with_multi_lookup_test.go → ...ch/query/simple/with_multi_lookup_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/...h/query/simple/with_single_lookup_test.go → ...h/query/simple/with_single_lookup_test.go b/...h/query/simple/with_single_lookup_test.go → ...h/query/simple/with_single_lookup_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/query/simple/with_sort_test.go → testing/bench/query/simple/with_sort_test.go b/bench/query/simple/with_sort_test.go → testing/bench/query/simple/with_sort_test.go
@@ -14,7 +14,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/sourcenetwork/defradb/bench/fixtures"
+	"github.com/sourcenetwork/defradb/testing/bench/fixtures"
 )
 
 var (

diff --git a/bench/storage/get_test.go → testing/bench/storage/get_test.go b/bench/storage/get_test.go → testing/bench/storage/get_test.go
diff --git a/bench/storage/put_many_test.go → testing/bench/storage/put_many_test.go b/bench/storage/put_many_test.go → testing/bench/storage/put_many_test.go
diff --git a/bench/storage/put_test.go → testing/bench/storage/put_test.go b/bench/storage/put_test.go → testing/bench/storage/put_test.go
diff --git a/bench/storage/txn_get_test.go → testing/bench/storage/txn_get_test.go b/bench/storage/txn_get_test.go → testing/bench/storage/txn_get_test.go
diff --git a/bench/storage/txn_iterator_test.go → testing/bench/storage/txn_iterator_test.go b/bench/storage/txn_iterator_test.go → testing/bench/storage/txn_iterator_test.go
diff --git a/bench/storage/utils.go → testing/bench/storage/utils.go b/bench/storage/utils.go → testing/bench/storage/utils.go
@@ -19,8 +19,8 @@ import (
 	ds "github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-datastore/query"
 
-	benchutils "github.com/sourcenetwork/defradb/bench"
 	"github.com/sourcenetwork/defradb/client"
+	benchutils "github.com/sourcenetwork/defradb/testing/bench"
 )
 
 func runStorageBenchGet(

diff --git a/db/tests/README.md → testing/db/README.md b/db/tests/README.md → testing/db/README.md
@@ -3,18 +3,18 @@
 - We want to keep the mutation and query tests separate, here is what the folder
 structure looks like currently:
 ```
-    db/tests
+    testing/db
         ├── mutation/
         └── query/
 ```
 
-- Every immediate directory under `db/tests/mutation` and `db/tests/query` should ONLY contain
+- Every immediate directory under `testing/db/mutation` and `testing/db/query` should ONLY contain
     a single schema. For example:
-`db/tests/query/simple` and `db/tests/query/complex` have different schemas.
+`testing/db/query/simple` and `testing/db/query/complex` have different schemas.
 
 - We can group different types of tests using the same schema into further sub-folders.
     For example:
-    - `db/tests/mutation/simple/create`: contains tests that 
+    - `testing/db/mutation/simple/create`: contains tests that 
         use the `simple` schema to test only the create mutation.
-    - `db/tests/mutation/simple/mix`: contains test that use
+    - `testing/db/mutation/simple/mix`: contains test that use
         the `simple` schema to test combination of mutations.
diff --git a/...tation/inline_array/update/simple_test.go → ...tation/inline_array/update/simple_test.go b/...tation/inline_array/update/simple_test.go → ...tation/inline_array/update/simple_test.go
@@ -13,8 +13,8 @@ package update
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	inlineArray "github.com/sourcenetwork/defradb/db/tests/mutation/inline_array"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	inlineArray "github.com/sourcenetwork/defradb/testing/db/mutation/inline_array"
 )
 
 func TestMutationInlineArrayUpdateWithBooleans(t *testing.T) {

diff --git a/db/tests/mutation/inline_array/utils.go → testing/db/mutation/inline_array/utils.go b/db/tests/mutation/inline_array/utils.go → testing/db/mutation/inline_array/utils.go
@@ -13,7 +13,7 @@ package inline_array
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 var userCollectionGQLSchema = (`

diff --git a/...utation/relation/delete/single_id_test.go → ...utation/relation/delete/single_id_test.go b/...utation/relation/delete/single_id_test.go → ...utation/relation/delete/single_id_test.go
@@ -13,8 +13,8 @@ package relation_delete
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	relationTests "github.com/sourcenetwork/defradb/db/tests/mutation/relation"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	relationTests "github.com/sourcenetwork/defradb/testing/db/mutation/relation"
 )
 
 func TestRelationalDeletionOfADocumentUsingSingleKey_Success(t *testing.T) {

diff --git a/db/tests/mutation/relation/utils.go → testing/db/mutation/relation/utils.go b/db/tests/mutation/relation/utils.go → testing/db/mutation/relation/utils.go
@@ -13,7 +13,7 @@ package relation
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 var bookAuthorPublisherGQLSchema = (`

diff --git a/...sts/mutation/simple/create/simple_test.go → .../db/mutation/simple/create/simple_test.go b/...sts/mutation/simple/create/simple_test.go → .../db/mutation/simple/create/simple_test.go
@@ -13,8 +13,8 @@ package create
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestMutationCreateSimple(t *testing.T) {

diff --git a/.../mutation/simple/delete/multi_ids_test.go → .../mutation/simple/delete/multi_ids_test.go b/.../mutation/simple/delete/multi_ids_test.go → .../mutation/simple/delete/multi_ids_test.go
@@ -13,8 +13,8 @@ package delete
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestDeletionOfMultipleDocumentUsingMultipleKeys_Success(t *testing.T) {

diff --git a/.../mutation/simple/delete/single_id_test.go → .../mutation/simple/delete/single_id_test.go b/.../mutation/simple/delete/single_id_test.go → .../mutation/simple/delete/single_id_test.go
@@ -13,8 +13,8 @@ package delete
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestDeletionOfADocumentUsingSingleKey_Success(t *testing.T) {

diff --git a/...utation/simple/delete/with_filter_test.go → ...utation/simple/delete/with_filter_test.go b/...utation/simple/delete/with_filter_test.go → ...utation/simple/delete/with_filter_test.go
@@ -13,8 +13,8 @@ package delete
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestDeletionOfDocumentsWithFilter_Success(t *testing.T) {

diff --git a/...ests/mutation/simple/mix/with_txn_test.go → ...g/db/mutation/simple/mix/with_txn_test.go b/...ests/mutation/simple/mix/with_txn_test.go → ...g/db/mutation/simple/mix/with_txn_test.go
@@ -13,8 +13,8 @@ package mix
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestMutationWithTxnDeletesUserGivenSameTransaction(t *testing.T) {

diff --git a/...utation/simple/update/with_filter_test.go → ...utation/simple/update/with_filter_test.go b/...utation/simple/update/with_filter_test.go → ...utation/simple/update/with_filter_test.go
@@ -13,8 +13,8 @@ package update
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
-	simpleTests "github.com/sourcenetwork/defradb/db/tests/mutation/simple"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
+	simpleTests "github.com/sourcenetwork/defradb/testing/db/mutation/simple"
 )
 
 func TestSimpleMutationUpdateWithBooleanFilter(t *testing.T) {

diff --git a/db/tests/mutation/simple/utils.go → testing/db/mutation/simple/utils.go b/db/tests/mutation/simple/utils.go → testing/db/mutation/simple/utils.go
@@ -13,7 +13,7 @@ package simple
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 var userSchema = (`

diff --git a/db/tests/query/all_commits/simple_test.go → testing/db/query/all_commits/simple_test.go b/db/tests/query/all_commits/simple_test.go → testing/db/query/all_commits/simple_test.go
@@ -13,7 +13,7 @@ package all_commits
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 func TestQueryAllCommitsSingleDAG(t *testing.T) {

diff --git a/db/tests/query/all_commits/utils.go → testing/db/query/all_commits/utils.go b/db/tests/query/all_commits/utils.go → testing/db/query/all_commits/utils.go
@@ -13,7 +13,7 @@ package all_commits
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 var userCollectionGQLSchema = (`

diff --git a/...ests/query/all_commits/with_count_test.go → ...g/db/query/all_commits/with_count_test.go b/...ests/query/all_commits/with_count_test.go → ...g/db/query/all_commits/with_count_test.go
@@ -13,7 +13,7 @@ package all_commits
 import (
 	"testing"
 
-	testUtils "github.com/sourcenetwork/defradb/db/tests"
+	testUtils "github.com/sourcenetwork/defradb/testing/db"
 )
 
 func TestQueryAllCommitsSingleDAGWithLinkCount(t *testing.T) {