Return only new ID to Key (#102)

thibaultrobert · web-flow · commit a4a60203b602 · 2020-02-26T17:32:37.000+01:00
* Return only new ID to Key

* Rename after review
diff --git a/EXAMPLES.md b/EXAMPLES.md
@@ -1499,8 +1499,6 @@ peer chaincode invoke -n mycc -c '{"Args":["updateComputePlan","{\"computePlanID
 ```json
 {
  "IDToKey": {
-  "firstTraintupleID": "432fcffdf68892f5e4adeeed8bb618beaeaecf709f840671eca724a3e3109369",
-  "secondTraintupleID": "d23f8cf290b902417ae698d68e2c6835483521d54fcbece31208517759b7c299",
   "thirdTraintupleID": "c163663889566a4c51fad3765107774891f8ed456dcc859a9a1a7fcd17b11386"
  },
  "aggregatetupleKeys": null,
@@ -1598,11 +1596,7 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlan","{\"key\":\"7dd808
 ##### Command output:
 ```json
 {
- "IDToKey": {
-  "firstTraintupleID": "432fcffdf68892f5e4adeeed8bb618beaeaecf709f840671eca724a3e3109369",
-  "secondTraintupleID": "d23f8cf290b902417ae698d68e2c6835483521d54fcbece31208517759b7c299",
-  "thirdTraintupleID": "c163663889566a4c51fad3765107774891f8ed456dcc859a9a1a7fcd17b11386"
- },
+ "IDToKey": {},
  "aggregatetupleKeys": null,
  "compositeTraintupleKeys": null,
  "computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
@@ -1629,11 +1623,7 @@ peer chaincode invoke -n mycc -c '{"Args":["queryComputePlans"]}' -C myc
 ```json
 [
  {
-  "IDToKey": {
-   "firstTraintupleID": "432fcffdf68892f5e4adeeed8bb618beaeaecf709f840671eca724a3e3109369",
-   "secondTraintupleID": "d23f8cf290b902417ae698d68e2c6835483521d54fcbece31208517759b7c299",
-   "thirdTraintupleID": "c163663889566a4c51fad3765107774891f8ed456dcc859a9a1a7fcd17b11386"
-  },
+  "IDToKey": {},
   "aggregatetupleKeys": null,
   "compositeTraintupleKeys": null,
   "computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
@@ -1669,11 +1659,7 @@ peer chaincode invoke -n mycc -c '{"Args":["cancelComputePlan","{\"key\":\"7dd80
 ##### Command output:
 ```json
 {
- "IDToKey": {
-  "firstTraintupleID": "432fcffdf68892f5e4adeeed8bb618beaeaecf709f840671eca724a3e3109369",
-  "secondTraintupleID": "d23f8cf290b902417ae698d68e2c6835483521d54fcbece31208517759b7c299",
-  "thirdTraintupleID": "c163663889566a4c51fad3765107774891f8ed456dcc859a9a1a7fcd17b11386"
- },
+ "IDToKey": {},
  "aggregatetupleKeys": null,
  "compositeTraintupleKeys": null,
  "computePlanID": "7dd808239c1e062399449bd11b634d9bd1fd0a2b795ad345b62f95b4933bfa17",
diff --git a/chaincode/compute_plan.go b/chaincode/compute_plan.go
@@ -138,7 +138,7 @@ func createComputePlanInternal(db *LedgerDB, inp inputComputePlan, tag string) (
 		len(inp.CompositeTraintuples) +
 		len(inp.Testtuples)
 	if count == 0 {
-		resp.Fill(ID, computePlan)
+		resp.Fill(ID, computePlan, []string{})
 		return resp, nil
 	}
 	return updateComputePlanInternal(db, ID, inp)
@@ -154,6 +154,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp
 	for ID, trainTask := range computePlan.IDToTrainTask {
 		IDToTrainTask[ID] = trainTask
 	}
+	NewIDs := []string{}
 	DAG, err := createComputeDAG(inp, computePlan.IDToTrainTask)
 	if err != nil {
 		return resp, errors.BadRequest(err)
@@ -211,6 +212,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp
 			}
 		}
 		IDToTrainTask[task.ID] = TrainTask{Depth: task.Depth, Key: tupleKey}
+		NewIDs = append(NewIDs, task.ID)
 	}
 
 	for index, computeTesttuple := range inp.Testtuples {
@@ -236,7 +238,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp
 	if err != nil {
 		return resp, err
 	}
-	resp.Fill(computePlanID, computePlan)
+	resp.Fill(computePlanID, computePlan, NewIDs)
 	return resp, err
 }
 
@@ -275,7 +277,7 @@ func getOutComputePlan(db *LedgerDB, key string) (resp outputComputePlan, err er
 		return resp, err
 	}
 
-	resp.Fill(key, computePlan)
+	resp.Fill(key, computePlan, []string{})
 	return resp, err
 }
 
@@ -297,7 +299,7 @@ func cancelComputePlan(db *LedgerDB, args []string) (resp outputComputePlan, err
 	}
 
 	db.AddComputePlanEvent(inp.Key, computeplan.State.Status)
-	resp.Fill(inp.Key, computeplan)
+	resp.Fill(inp.Key, computeplan, []string{})
 	return resp, nil
 }
 
diff --git a/chaincode/compute_plan_test.go b/chaincode/compute_plan_test.go
@@ -681,7 +681,7 @@ func TestUpdateComputePlan(t *testing.T) {
 	assert.Len(
 		t,
 		out.IDToKey,
-		3,
-		"IDToKey should match the 3 train like tuples keys to their respective ID")
+		1,
+		"IDToKey should match the newly created tuple keys to its ID")
 	assert.Equal(t, 4, out.TupleCount)
 }
diff --git a/chaincode/output.go b/chaincode/output.go
@@ -311,7 +311,7 @@ type outputComputePlan struct {
 	IDToKey                 map[string]string `json:"IDToKey"`
 }
 
-func (out *outputComputePlan) Fill(key string, in ComputePlan) {
+func (out *outputComputePlan) Fill(key string, in ComputePlan, newIDs []string) {
 	out.ComputePlanID = key
 	nb := getLimitedNbSliceElements(in.TraintupleKeys)
 	out.TraintupleKeys = in.TraintupleKeys[:nb]
@@ -325,8 +325,8 @@ func (out *outputComputePlan) Fill(key string, in ComputePlan) {
 	out.TupleCount = in.State.TupleCount
 	out.DoneCount = in.State.DoneCount
 	IDToKey := map[string]string{}
-	for ID, trainTask := range in.IDToTrainTask {
-		IDToKey[ID] = trainTask.Key
+	for _, ID := range newIDs {
+		IDToKey[ID] = in.IDToTrainTask[ID].Key
 	}
 	out.IDToKey = IDToKey
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func createComputePlanInternal(db *LedgerDB, inp inputComputePlan, tag string) (`
`138`	`138`	`len(inp.CompositeTraintuples) +`
`139`	`139`	`len(inp.Testtuples)`
`140`	`140`	`if count == 0 {`
`141`		`- resp.Fill(ID, computePlan)`
	`141`	`+ resp.Fill(ID, computePlan, []string{})`
`142`	`142`	`return resp, nil`
`143`	`143`	`}`
`144`	`144`	`return updateComputePlanInternal(db, ID, inp)`
`@@ -154,6 +154,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp`
`154`	`154`	`for ID, trainTask := range computePlan.IDToTrainTask {`
`155`	`155`	`IDToTrainTask[ID] = trainTask`
`156`	`156`	`}`
	`157`	`+ NewIDs := []string{}`
`157`	`158`	`DAG, err := createComputeDAG(inp, computePlan.IDToTrainTask)`
`158`	`159`	`if err != nil {`
`159`	`160`	`return resp, errors.BadRequest(err)`
`@@ -211,6 +212,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp`
`211`	`212`	`}`
`212`	`213`	`}`
`213`	`214`	`IDToTrainTask[task.ID] = TrainTask{Depth: task.Depth, Key: tupleKey}`
	`215`	`+ NewIDs = append(NewIDs, task.ID)`
`214`	`216`	`}`
`215`	`217`
`216`	`218`	`for index, computeTesttuple := range inp.Testtuples {`
`@@ -236,7 +238,7 @@ func updateComputePlanInternal(db *LedgerDB, computePlanID string, inp inputComp`
`236`	`238`	`if err != nil {`
`237`	`239`	`return resp, err`
`238`	`240`	`}`
`239`		`- resp.Fill(computePlanID, computePlan)`
	`241`	`+ resp.Fill(computePlanID, computePlan, NewIDs)`
`240`	`242`	`return resp, err`
`241`	`243`	`}`
`242`	`244`
`@@ -275,7 +277,7 @@ func getOutComputePlan(db *LedgerDB, key string) (resp outputComputePlan, err er`
`275`	`277`	`return resp, err`
`276`	`278`	`}`
`277`	`279`
`278`		`- resp.Fill(key, computePlan)`
	`280`	`+ resp.Fill(key, computePlan, []string{})`
`279`	`281`	`return resp, err`
`280`	`282`	`}`
`281`	`283`
`@@ -297,7 +299,7 @@ func cancelComputePlan(db *LedgerDB, args []string) (resp outputComputePlan, err`
`297`	`299`	`}`
`298`	`300`
`299`	`301`	`db.AddComputePlanEvent(inp.Key, computeplan.State.Status)`
`300`		`- resp.Fill(inp.Key, computeplan)`
	`302`	`+ resp.Fill(inp.Key, computeplan, []string{})`
`301`	`303`	`return resp, nil`
`302`	`304`	`}`
`303`	`305`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ type outputComputePlan struct {`
`311`	`311`	IDToKey map[string]string `json:"IDToKey"`
`312`	`312`	`}`
`313`	`313`
`314`		`-func (out *outputComputePlan) Fill(key string, in ComputePlan) {`
	`314`	`+func (out *outputComputePlan) Fill(key string, in ComputePlan, newIDs []string) {`
`315`	`315`	`out.ComputePlanID = key`
`316`	`316`	`nb := getLimitedNbSliceElements(in.TraintupleKeys)`
`317`	`317`	`out.TraintupleKeys = in.TraintupleKeys[:nb]`
`@@ -325,8 +325,8 @@ func (out *outputComputePlan) Fill(key string, in ComputePlan) {`
`325`	`325`	`out.TupleCount = in.State.TupleCount`
`326`	`326`	`out.DoneCount = in.State.DoneCount`
`327`	`327`	`IDToKey := map[string]string{}`
`328`		`- for ID, trainTask := range in.IDToTrainTask {`
`329`		`- IDToKey[ID] = trainTask.Key`
	`328`	`+ for _, ID := range newIDs {`
	`329`	`+ IDToKey[ID] = in.IDToTrainTask[ID].Key`
`330`	`330`	`}`
`331`	`331`	`out.IDToKey = IDToKey`
`332`	`332`	`}`