PR FIXUP - Fix mapper commit prop name

sourcenetwork · May 8, 2023 · 47ae50e · 47ae50e
1 parent 9410098
commit 47ae50e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/planner/commit.go b/planner/commit.go
@@ -71,16 +71,16 @@ func (n *dagScanNode) Init() error {
 		if n.commitSelect.DocKey.HasValue() {
 			key := core.DataStoreKey{}.WithDocKey(n.commitSelect.DocKey.Value())
 
-			if n.commitSelect.FieldIDName.HasValue() {
-				field := n.commitSelect.FieldIDName.Value()
+			if n.commitSelect.FieldID.HasValue() {
+				field := n.commitSelect.FieldID.Value()
 				key = key.WithFieldId(field)
 			}
 
 			n.spans = core.NewSpans(core.NewSpan(key, key.PrefixEnd()))
 		}
 	}
 
-	return n.fetcher.Start(n.planner.ctx, n.planner.txn, n.spans, n.commitSelect.FieldIDName)
+	return n.fetcher.Start(n.planner.ctx, n.planner.txn, n.spans, n.commitSelect.FieldID)
 }
 
 func (n *dagScanNode) Start() error {
@@ -105,8 +105,8 @@ func (n *dagScanNode) Spans(spans core.Spans) {
 	copy(headSetSpans.Value, spans.Value)
 
 	var fieldId string
-	if n.commitSelect.FieldIDName.HasValue() {
-		fieldId = n.commitSelect.FieldIDName.Value()
+	if n.commitSelect.FieldID.HasValue() {
+		fieldId = n.commitSelect.FieldID.Value()
 	} else {
 		fieldId = core.COMPOSITE_NAMESPACE
 	}
@@ -130,8 +130,8 @@ func (n *dagScanNode) simpleExplain() (map[string]any, error) {
 	simpleExplainMap := map[string]any{}
 
 	// Add the field attribute to the explanation if it exists.
-	if n.commitSelect.FieldIDName.HasValue() {
-		simpleExplainMap[request.FieldIDName] = n.commitSelect.FieldIDName.Value()
+	if n.commitSelect.FieldID.HasValue() {
+		simpleExplainMap[request.FieldIDName] = n.commitSelect.FieldID.Value()
 	} else {
 		simpleExplainMap[request.FieldIDName] = nil
 	}

diff --git a/planner/mapper/commitSelect.go b/planner/mapper/commitSelect.go
@@ -23,7 +23,7 @@ type CommitSelect struct {
 	DocKey immutable.Option[string]
 
 	// The field for which commits have been requested.
-	FieldIDName immutable.Option[string]
+	FieldID immutable.Option[string]
 
 	// The maximum depth to yield results for.
 	Depth immutable.Option[uint64]
@@ -41,9 +41,9 @@ func (s *CommitSelect) CloneTo(index int) Requestable {
 
 func (s *CommitSelect) cloneTo(index int) *CommitSelect {
 	return &CommitSelect{
-		Select:      *s.Select.cloneTo(index),
-		DocKey:      s.DocKey,
-		FieldIDName: s.FieldIDName,
-		Cid:         s.Cid,
+		Select:  *s.Select.cloneTo(index),
+		DocKey:  s.DocKey,
+		FieldID: s.FieldID,
+		Cid:     s.Cid,
 	}
 }
diff --git a/planner/mapper/mapper.go b/planner/mapper/mapper.go
@@ -831,11 +831,11 @@ func ToCommitSelect(
 		return nil, err
 	}
 	return &CommitSelect{
-		Select:      *underlyingSelect,
-		DocKey:      selectRequest.DocKey,
-		FieldIDName: selectRequest.FieldID,
-		Depth:       selectRequest.Depth,
-		Cid:         selectRequest.Cid,
+		Select:  *underlyingSelect,
+		DocKey:  selectRequest.DocKey,
+		FieldID: selectRequest.FieldID,
+		Depth:   selectRequest.Depth,
+		Cid:     selectRequest.Cid,
 	}, nil
 }