Move mapper internal to planner

Declares it's usage to be internal to the planner package, hopefull discouraging it's usage outside, and hopefully clarifying it's purpose. Is a straight cut-paste, no logic has changed in this commit.
sourcenetwork · Oct 25, 2022 · 2ffd5f3 · 2ffd5f3
1 parent 60e769d
commit 2ffd5f3
Show file tree

Hide file tree

Showing 28 changed files with 19 additions and 19 deletions.
diff --git a/planner/arbitrary_join.go b/planner/arbitrary_join.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 
 	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // A data-source that may yield child items, parent items, or both depending on configuration

diff --git a/planner/average.go b/planner/average.go
@@ -16,7 +16,7 @@ import (
 	"github.com/sourcenetwork/defradb/client/request"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 type averageNode struct {

diff --git a/planner/commit.go b/planner/commit.go
@@ -21,7 +21,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/db/fetcher"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 type dagScanNode struct {

diff --git a/planner/count.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 type countNode struct {

diff --git a/planner/create.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // createNode is used to construct and execute

diff --git a/planner/datasource.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // sourceInfo stores info about the data source

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

diff --git a/planner/group.go b/planner/group.go
@@ -16,7 +16,7 @@ import (
 	"github.com/sourcenetwork/defradb/client/request"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // A node responsible for the grouping of documents by a given selection of fields.

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

diff --git a/mapper/aggregate.go → planner/mapper/aggregate.go b/mapper/aggregate.go → planner/mapper/aggregate.go
diff --git a/mapper/commitSelect.go → planner/mapper/commitSelect.go b/mapper/commitSelect.go → planner/mapper/commitSelect.go
diff --git a/mapper/descriptions.go → planner/mapper/descriptions.go b/mapper/descriptions.go → planner/mapper/descriptions.go
diff --git a/mapper/field.go → planner/mapper/field.go b/mapper/field.go → planner/mapper/field.go
diff --git a/mapper/mapper.go → planner/mapper/mapper.go b/mapper/mapper.go → planner/mapper/mapper.go
diff --git a/mapper/mutation.go → planner/mapper/mutation.go b/mapper/mutation.go → planner/mapper/mutation.go
diff --git a/mapper/requestable.go → planner/mapper/requestable.go b/mapper/requestable.go → planner/mapper/requestable.go
diff --git a/mapper/select.go → planner/mapper/select.go b/mapper/select.go → planner/mapper/select.go
diff --git a/mapper/targetable.go → planner/mapper/targetable.go b/mapper/targetable.go → planner/mapper/targetable.go
diff --git a/planner/order.go b/planner/order.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // simplified planNode interface.

diff --git a/planner/planner.go b/planner/planner.go
@@ -20,7 +20,7 @@ import (
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/logging"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 var (

diff --git a/planner/scan.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // scans an index for records

diff --git a/planner/select.go b/planner/select.go
@@ -19,7 +19,7 @@ import (
 	"github.com/sourcenetwork/defradb/db/base"
 	"github.com/sourcenetwork/defradb/db/fetcher"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 /*

diff --git a/planner/sum.go b/planner/sum.go
@@ -18,7 +18,7 @@ import (
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/core/enumerable"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 type sumNode struct {

diff --git a/planner/top.go b/planner/top.go
@@ -14,7 +14,7 @@ import (
 	"github.com/sourcenetwork/defradb/client/request"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 const topLevelNodeKind string = "topLevelNode"

diff --git a/planner/type_join.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 	"github.com/sourcenetwork/defradb/query/graphql/schema"
 )
 

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

diff --git a/planner/values.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 // valuesNode contains a collection

diff --git a/planner/versionedscan.go b/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/mapper"
+	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
 var (