refactor: Move planner outside the gql directory (#907)

* Move planner out of the gql dir * Move mapper out of the gql dir
sourcenetwork · Oct 19, 2022 · 574d853 · 574d853
1 parent 778bd36
commit 574d853
Show file tree

Hide file tree

Showing 38 changed files with 24 additions and 24 deletions.
diff --git a/db/collection_update.go b/db/collection_update.go
@@ -22,10 +22,10 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner"
 	"github.com/sourcenetwork/defradb/query/graphql/parser"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
-	"github.com/sourcenetwork/defradb/query/graphql/planner"
 )
 
 var (

diff --git a/db/db.go b/db/db.go
@@ -30,7 +30,7 @@ import (
 	"github.com/sourcenetwork/defradb/events"
 	"github.com/sourcenetwork/defradb/logging"
 	"github.com/sourcenetwork/defradb/merkle/crdt"
-	"github.com/sourcenetwork/defradb/query/graphql/planner"
+	"github.com/sourcenetwork/defradb/planner"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
 )
 

diff --git a/query/graphql/mapper/aggregate.go → mapper/aggregate.go b/query/graphql/mapper/aggregate.go → mapper/aggregate.go
diff --git a/query/graphql/mapper/commitSelect.go → mapper/commitSelect.go b/query/graphql/mapper/commitSelect.go → mapper/commitSelect.go
diff --git a/query/graphql/mapper/descriptions.go → mapper/descriptions.go b/query/graphql/mapper/descriptions.go → mapper/descriptions.go
diff --git a/query/graphql/mapper/field.go → mapper/field.go b/query/graphql/mapper/field.go → mapper/field.go
diff --git a/query/graphql/mapper/mapper.go → mapper/mapper.go b/query/graphql/mapper/mapper.go → mapper/mapper.go
diff --git a/query/graphql/mapper/mutation.go → mapper/mutation.go b/query/graphql/mapper/mutation.go → mapper/mutation.go
diff --git a/query/graphql/mapper/requestable.go → mapper/requestable.go b/query/graphql/mapper/requestable.go → mapper/requestable.go
diff --git a/query/graphql/mapper/select.go → mapper/select.go b/query/graphql/mapper/select.go → mapper/select.go
diff --git a/query/graphql/mapper/targetable.go → mapper/targetable.go b/query/graphql/mapper/targetable.go → mapper/targetable.go
diff --git a/query/graphql/planner/arbitrary_join.go → planner/arbitrary_join.go b/query/graphql/planner/arbitrary_join.go → planner/arbitrary_join.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 
 	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // A data-source that may yield child items, parent items, or both depending on configuration

diff --git a/query/graphql/planner/average.go → planner/average.go b/query/graphql/planner/average.go → planner/average.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/commit.go → planner/commit.go b/query/graphql/planner/commit.go → planner/commit.go
@@ -20,7 +20,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/fetcher"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/count.go → planner/count.go b/query/graphql/planner/count.go → planner/count.go
@@ -20,7 +20,7 @@ import (
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/core/enumerable"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 type countNode struct {

diff --git a/query/graphql/planner/create.go → planner/create.go b/query/graphql/planner/create.go → planner/create.go
@@ -17,7 +17,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // createNode is used to construct and execute

diff --git a/query/graphql/planner/datasource.go → planner/datasource.go b/query/graphql/planner/datasource.go → planner/datasource.go
@@ -16,7 +16,7 @@ import (
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // sourceInfo stores info about the data source

diff --git a/query/graphql/planner/delete.go → planner/delete.go b/query/graphql/planner/delete.go → planner/delete.go
@@ -13,7 +13,7 @@ package planner
 import (
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 type deleteNode struct {

diff --git a/query/graphql/planner/doc.go → planner/doc.go b/query/graphql/planner/doc.go → planner/doc.go
diff --git a/query/graphql/planner/executor.go → planner/executor.go b/query/graphql/planner/executor.go → planner/executor.go
@@ -21,7 +21,7 @@ import (
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	"github.com/sourcenetwork/defradb/query/graphql/parser"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
 )

diff --git a/query/graphql/planner/explain.go → planner/explain.go b/query/graphql/planner/explain.go → planner/explain.go
diff --git a/query/graphql/planner/group.go → planner/group.go b/query/graphql/planner/group.go → planner/group.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/limit.go → planner/limit.go b/query/graphql/planner/limit.go → planner/limit.go
@@ -12,7 +12,7 @@ package planner
 
 import (
 	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // Limit the results, yielding only what the limit/offset permits

diff --git a/query/graphql/planner/multi.go → planner/multi.go b/query/graphql/planner/multi.go → planner/multi.go
diff --git a/query/graphql/planner/operations.go → planner/operations.go b/query/graphql/planner/operations.go → planner/operations.go
diff --git a/query/graphql/planner/order.go → planner/order.go b/query/graphql/planner/order.go → planner/order.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // simplified planNode interface.

diff --git a/query/graphql/planner/pipe.go → planner/pipe.go b/query/graphql/planner/pipe.go → planner/pipe.go
diff --git a/query/graphql/planner/planner.go → planner/planner.go b/query/graphql/planner/planner.go → planner/planner.go
@@ -19,7 +19,7 @@ import (
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	"github.com/sourcenetwork/defradb/query/graphql/parser"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )

diff --git a/query/graphql/planner/scan.go → planner/scan.go b/query/graphql/planner/scan.go → planner/scan.go
@@ -15,7 +15,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/db/fetcher"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // scans an index for records

diff --git a/query/graphql/planner/select.go → planner/select.go b/query/graphql/planner/select.go → planner/select.go
@@ -17,7 +17,7 @@ import (
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/db/fetcher"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/sum.go → planner/sum.go b/query/graphql/planner/sum.go → planner/sum.go
@@ -17,7 +17,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/core/enumerable"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/top.go → planner/top.go b/query/graphql/planner/top.go → planner/top.go
@@ -13,7 +13,7 @@ package planner
 import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	parserTypes "github.com/sourcenetwork/defradb/query/graphql/parser/types"
 )
 

diff --git a/query/graphql/planner/type_join.go → planner/type_join.go b/query/graphql/planner/type_join.go → planner/type_join.go
@@ -18,7 +18,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
 )
 

diff --git a/query/graphql/planner/type_join.md → planner/type_join.md b/query/graphql/planner/type_join.md → planner/type_join.md
diff --git a/query/graphql/planner/update.go → planner/update.go b/query/graphql/planner/update.go → planner/update.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 type updateNode struct {

diff --git a/query/graphql/planner/values.go → planner/values.go b/query/graphql/planner/values.go → planner/values.go
@@ -16,7 +16,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/db/container"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 // valuesNode contains a collection

diff --git a/query/graphql/planner/versionedscan.go → planner/versionedscan.go b/query/graphql/planner/versionedscan.go → planner/versionedscan.go
@@ -17,7 +17,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/fetcher"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/mapper"
+	"github.com/sourcenetwork/defradb/mapper"
 )
 
 var (

diff --git a/tests/bench/query/planner/utils.go b/tests/bench/query/planner/utils.go
@@ -15,7 +15,7 @@ import (
 	"testing"
 
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/query/graphql/planner"
+	"github.com/sourcenetwork/defradb/planner"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
 	benchutils "github.com/sourcenetwork/defradb/tests/bench"
 	"github.com/sourcenetwork/defradb/tests/bench/fixtures"