From d8f26fc83efffbb93e36cee0f679d569fc84d567 Mon Sep 17 00:00:00 2001
From: Andrew Sisley <a.j.sisley@hotmail.com>
Date: Mon, 2 Oct 2023 14:01:45 -0400
Subject: [PATCH] WIP - Replace planner.getCollectionDesc with
 db.GetCollectionByName

They both do pretty much the same thing, only the db is a public func and returns a collection instead of just its description.
---
 planner/datasource.go | 31 ++-----------------------------
 planner/select.go     |  4 ++--
 planner/sum.go        |  8 ++++----
 planner/type_join.go  | 14 ++++++++------
 4 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/planner/datasource.go b/planner/datasource.go
index afcfbab3ce..7a8b0917fe 100644
--- a/planner/datasource.go
+++ b/planner/datasource.go
@@ -11,11 +11,7 @@
 package planner
 
 import (
-	"encoding/json"
-
 	"github.com/sourcenetwork/defradb/client"
-	"github.com/sourcenetwork/defradb/core"
-	"github.com/sourcenetwork/defradb/errors"
 	"github.com/sourcenetwork/defradb/planner/mapper"
 )
 
@@ -36,7 +32,7 @@ func (p *Planner) getSource(parsed *mapper.Select) (planSource, error) {
 }
 
 func (p *Planner) getCollectionScanPlan(parsed *mapper.Select) (planSource, error) {
-	colDesc, err := p.getCollectionDesc(parsed.CollectionName)
+	col, err := p.db.GetCollectionByName(p.ctx, parsed.CollectionName)
 	if err != nil {
 		return planSource{}, err
 	}
@@ -49,30 +45,7 @@ func (p *Planner) getCollectionScanPlan(parsed *mapper.Select) (planSource, erro
 	return planSource{
 		plan: scan,
 		info: sourceInfo{
-			collectionDescription: colDesc,
+			collectionDescription: col.Description(),
 		},
 	}, nil
 }
-
-func (p *Planner) getCollectionDesc(name string) (client.CollectionDescription, error) {
-	collectionKey := core.NewCollectionKey(name)
-	var desc client.CollectionDescription
-	schemaVersionIdBytes, err := p.txn.Systemstore().Get(p.ctx, collectionKey.ToDS())
-	if err != nil {
-		return desc, errors.Wrap("failed to get collection description", err)
-	}
-
-	schemaVersionId := string(schemaVersionIdBytes)
-	schemaVersionKey := core.NewCollectionSchemaVersionKey(schemaVersionId)
-	buf, err := p.txn.Systemstore().Get(p.ctx, schemaVersionKey.ToDS())
-	if err != nil {
-		return desc, err
-	}
-
-	err = json.Unmarshal(buf, &desc)
-	if err != nil {
-		return desc, err
-	}
-
-	return desc, nil
-}
diff --git a/planner/select.go b/planner/select.go
index 4fb9b143f2..b53288bfb5 100644
--- a/planner/select.go
+++ b/planner/select.go
@@ -424,12 +424,12 @@ func (p *Planner) SelectFromSource(
 	}
 
 	if fromCollection {
-		desc, err := p.getCollectionDesc(selectReq.Name)
+		col, err := p.db.GetCollectionByName(p.ctx, selectReq.Name)
 		if err != nil {
 			return nil, err
 		}
 
-		s.sourceInfo = sourceInfo{desc}
+		s.sourceInfo = sourceInfo{col.Description()}
 	}
 
 	aggregates, err := s.initFields(selectReq)
diff --git a/planner/sum.go b/planner/sum.go
index 0e1690898e..1be82e70f6 100644
--- a/planner/sum.go
+++ b/planner/sum.go
@@ -77,12 +77,12 @@ func (p *Planner) isValueFloat(
 	}
 
 	if !source.ChildTarget.HasValue {
-		parentDescription, err := p.getCollectionDesc(parent.CollectionName)
+		parentCollection, err := p.db.GetCollectionByName(p.ctx, parent.CollectionName)
 		if err != nil {
 			return false, err
 		}
 
-		fieldDescription, fieldDescriptionFound := parentDescription.Schema.GetField(source.Name)
+		fieldDescription, fieldDescriptionFound := parentCollection.Schema().GetField(source.Name)
 		if !fieldDescriptionFound {
 			return false, client.NewErrFieldNotExist(source.Name)
 		}
@@ -125,12 +125,12 @@ func (p *Planner) isValueFloat(
 		return false, nil
 	}
 
-	childCollectionDescription, err := p.getCollectionDesc(child.CollectionName)
+	childCollection, err := p.db.GetCollectionByName(p.ctx, child.CollectionName)
 	if err != nil {
 		return false, err
 	}
 
-	fieldDescription, fieldDescriptionFound := childCollectionDescription.Schema.GetField(source.ChildTarget.Name)
+	fieldDescription, fieldDescriptionFound := childCollection.Schema().GetField(source.ChildTarget.Name)
 	if !fieldDescriptionFound {
 		return false, client.NewErrFieldNotExist(source.ChildTarget.Name)
 	}
diff --git a/planner/type_join.go b/planner/type_join.go
index 2ff4f12f60..12f08e7c24 100644
--- a/planner/type_join.go
+++ b/planner/type_join.go
@@ -254,16 +254,17 @@ func (p *Planner) makeTypeJoinOne(
 	// check if the field we're querying is the primary side of the relation
 	isPrimary := subTypeFieldDesc.RelationType.IsSet(client.Relation_Type_Primary)
 
-	subTypeCollectionDesc, err := p.getCollectionDesc(subType.CollectionName)
+	subTypeCollection, err := p.db.GetCollectionByName(p.ctx, subType.CollectionName)
 	if err != nil {
 		return nil, err
 	}
 
-	subTypeField, subTypeFieldNameFound := subTypeCollectionDesc.GetFieldByRelation(
+	subTypeSchema := subTypeCollection.Schema()
+	subTypeField, subTypeFieldNameFound := subTypeCollection.Description().GetFieldByRelation(
 		subTypeFieldDesc.RelationName,
 		parent.sourceInfo.collectionDescription.Name,
 		subTypeFieldDesc.Name,
-		&subTypeCollectionDesc.Schema,
+		&subTypeSchema,
 	)
 	if !subTypeFieldNameFound {
 		return nil, client.NewErrFieldNotExist(subTypeFieldDesc.RelationName)
@@ -481,16 +482,17 @@ func (p *Planner) makeTypeJoinMany(
 		return nil, client.NewErrFieldNotExist(subType.Name)
 	}
 
-	subTypeCollectionDesc, err := p.getCollectionDesc(subType.CollectionName)
+	subTypeCollection, err := p.db.GetCollectionByName(p.ctx, subType.CollectionName)
 	if err != nil {
 		return nil, err
 	}
 
-	rootField, rootNameFound := subTypeCollectionDesc.GetFieldByRelation(
+	subTypeSchema := subTypeCollection.Schema()
+	rootField, rootNameFound := subTypeCollection.Description().GetFieldByRelation(
 		subTypeFieldDesc.RelationName,
 		parent.sourceInfo.collectionDescription.Name,
 		subTypeFieldDesc.Name,
-		&subTypeCollectionDesc.Schema,
+		&subTypeSchema,
 	)
 
 	if !rootNameFound {