[chore] fix ExecutionNode info for In & SecretJoin & Replicate (#513)

Author: FollyCoolly

pkg/interpreter/graph/graph_builder.go

@@ -530,9 +530,6 @@ func (plan *GraphBuilder) AddJoinNode(name string, left []*Tensor, right []*Tens
 }
 
 func (plan *GraphBuilder) AddSecretJoinNode(name string, leftKeys, rightKeys, leftPayloads, rightPayloads []*Tensor, partyCodes []string) ([]*Tensor, []*Tensor, error) {
-	partyAttr := &Attribute{}
-	partyAttr.SetStrings(partyCodes)
-
 	inputs := make(map[string][]*Tensor)
 	inputs["LeftKey"] = leftKeys
 	inputs["RightKey"] = rightKeys
@@ -551,7 +548,7 @@ func (plan *GraphBuilder) AddSecretJoinNode(name string, leftKeys, rightKeys, le
 	outputs["LeftOutput"] = leftOutput
 	outputs["RightOutput"] = rightOutput
 	if _, err := plan.AddExecutionNode(name, operator.OpNameSecretJoin, inputs, outputs,
-		map[string]*Attribute{operator.InputPartyCodesAttr: partyAttr}, partyCodes); err != nil {
+		map[string]*Attribute{}, partyCodes); err != nil {
 		return nil, nil, err
 	}
 	return leftOutput, rightOutput, nil

pkg/interpreter/translator/translator.go

@@ -1124,8 +1124,10 @@ func (t *translator) addBasicInNode(left *graph.Tensor, right *graph.Tensor, out
 		localInAttr.SetInt64(operator.LocalIn)
 		attrs[operator.InTypeAttr] = localInAttr
 	}
+	parties := []string{left.OwnerPartyCode, right.OwnerPartyCode}
+	parties = sliceutil.SliceDeDup(parties)
 	if _, err := t.ep.AddExecutionNode(nodeName, operator.OpNameIn, map[string][]*graph.Tensor{graph.Left: {left}, graph.Right: {right}},
-		map[string][]*graph.Tensor{graph.Out: {output}}, attrs, []string{left.OwnerPartyCode, right.OwnerPartyCode}); err != nil {
+		map[string][]*graph.Tensor{graph.Out: {output}}, attrs, parties); err != nil {
 		return nil, err
 	}
 	return output, nil
@@ -1763,7 +1765,7 @@ func (t *translator) buildCrossJoin(left logicalNode, right logicalNode) (map[in
 	attr := &graph.Attribute{}
 	attr.SetStrings([]string{leftPartyCode, rightPartyCode})
 	_, err := t.ep.AddReplicateNode(operator.OpNameReplicate, left.ResultTable(), right.ResultTable(),
-		leftOutput, rightOutput, map[string]*graph.Attribute{operator.InputPartyCodesAttr: attr}, []string{leftPartyCode, rightPartyCode})
+		leftOutput, rightOutput, map[string]*graph.Attribute{operator.InputPartyCodesAttr: attr}, sliceutil.SliceDeDup([]string{leftPartyCode, rightPartyCode}))
 	if err != nil {
 		return nil, fmt.Errorf("buildCrossJoin: %v", err)
 	}

pkg/interpreter/translator/translator_ccl_input_for_test.go

@@ -88,7 +88,7 @@ var translateWithCCLTestCases = []sPair{
 10 [label="GreaterEqual:{in:[Left:{t_11,},Right:{t_13,},],out:[Out:{t_14,},],attr:[],party:[alice,]}"]
 11 [label="apply_filter:{in:[Filter:{t_14,},In:{t_10,t_9,t_11,},],out:[Out:{t_15,t_16,t_17,},],attr:[],party:[alice,]}"]
 12 [label="runsql:{in:[],out:[Out:{t_18,},],attr:[sql:select ta.plain_int_0 from alice.tbl_0 as ta;,table_refs:[alice.tbl_0],],party:[alice,]}"]
-13 [label="psi_in:{in:[Left:{t_16,},Right:{t_18,},],out:[Out:{t_19,},],attr:[in_type:2,input_party_codes:[alice alice],psi_algorithm:0,reveal_to:[alice],],party:[alice,alice,]}"]
+13 [label="psi_in:{in:[Left:{t_16,},Right:{t_18,},],out:[Out:{t_19,},],attr:[in_type:2,input_party_codes:[alice alice],psi_algorithm:0,reveal_to:[alice],],party:[alice,]}"]
 14 [label="apply_filter:{in:[Filter:{t_19,},In:{t_15,},],out:[Out:{t_20,},],attr:[],party:[alice,]}"]
 15 [label="publish:{in:[In:{t_20,},],out:[Out:{t_21,},],attr:[],party:[alice,]}"]
 0 -> 2 [label = "t_0:{join_int_0:PRIVATE:INT64}"]
@@ -134,7 +134,7 @@ var translateWithCCLTestCases = []sPair{
 10 [label="GreaterEqual:{in:[Left:{t_11,},Right:{t_13,},],out:[Out:{t_14,},],attr:[],party:[alice,]}"]
 11 [label="apply_filter:{in:[Filter:{t_14,},In:{t_10,t_9,t_11,},],out:[Out:{t_15,t_16,t_17,},],attr:[],party:[alice,]}"]
 12 [label="runsql:{in:[],out:[Out:{t_18,},],attr:[sql:select min(ta.plain_int_0) as expr_362 from alice.tbl_0 as ta;,table_refs:[alice.tbl_0],],party:[alice,]}"]
-13 [label="Replicate:{in:[Left:{t_16,t_15,t_17,},Right:{t_18,},],out:[LeftOut:{t_19,t_20,t_21,},RightOut:{t_22,},],attr:[input_party_codes:[alice alice],],party:[alice,alice,]}"]
+13 [label="Replicate:{in:[Left:{t_16,t_15,t_17,},Right:{t_18,},],out:[LeftOut:{t_19,t_20,t_21,},RightOut:{t_22,},],attr:[input_party_codes:[alice alice],],party:[alice,]}"]
 14 [label="Greater:{in:[Left:{t_19,},Right:{t_22,},],out:[Out:{t_23,},],attr:[],party:[alice,]}"]
 15 [label="apply_filter:{in:[Filter:{t_23,},In:{t_20,},],out:[Out:{t_24,},],attr:[],party:[alice,]}"]
 16 [label="publish:{in:[In:{t_24,},],out:[Out:{t_25,},],attr:[],party:[alice,]}"]
@@ -289,7 +289,7 @@ var translateWithCCLTestCases = []sPair{
 6 [label="make_constant:{in:[],out:[Out:{t_9,},],attr:[scalar:1,],party:[alice,bob,carol,]}"]
 7 [label="broadcast:{in:[In:{t_9,},ShapeRefTensor:{t_8,},],out:[Out:{t_10,},],attr:[],party:[alice,]}"]
 8 [label="Add:{in:[Left:{t_8,},Right:{t_10,},],out:[Out:{t_11,},],attr:[],party:[alice,]}"]
-9 [label="psi_in:{in:[Left:{t_0,},Right:{t_11,},],out:[Out:{t_12,},],attr:[in_type:2,input_party_codes:[alice alice],psi_algorithm:0,reveal_to:[alice],],party:[alice,alice,]}"]
+9 [label="psi_in:{in:[Left:{t_0,},Right:{t_11,},],out:[Out:{t_12,},],attr:[in_type:2,input_party_codes:[alice alice],psi_algorithm:0,reveal_to:[alice],],party:[alice,]}"]
 10 [label="apply_filter:{in:[Filter:{t_12,},In:{t_0,},],out:[Out:{t_13,},],attr:[],party:[alice,]}"]
 11 [label="publish:{in:[In:{t_13,},],out:[Out:{t_14,},],attr:[],party:[alice,]}"]
 0 -> 10 [label = "t_0:{plain_int_0:PRIVATE:INT64}"]
@@ -321,7 +321,7 @@ var translateWithCCLTestCases = []sPair{
 8 [label="make_constant:{in:[],out:[Out:{t_11,},],attr:[scalar:1,],party:[alice,bob,carol,]}"]
 9 [label="broadcast:{in:[In:{t_11,},ShapeRefTensor:{t_10,},],out:[Out:{t_12,},],attr:[],party:[alice,]}"]
 10 [label="Add:{in:[Left:{t_10,},Right:{t_12,},],out:[Out:{t_13,},],attr:[],party:[alice,]}"]
-11 [label="Replicate:{in:[Left:{t_0,},Right:{t_13,},],out:[LeftOut:{t_14,},RightOut:{t_15,},],attr:[input_party_codes:[alice alice],],party:[alice,alice,]}"]
+11 [label="Replicate:{in:[Left:{t_0,},Right:{t_13,},],out:[LeftOut:{t_14,},RightOut:{t_15,},],attr:[input_party_codes:[alice alice],],party:[alice,]}"]
 12 [label="Greater:{in:[Left:{t_14,},Right:{t_15,},],out:[Out:{t_16,},],attr:[],party:[alice,]}"]
 13 [label="apply_filter:{in:[Filter:{t_16,},In:{t_14,},],out:[Out:{t_17,},],attr:[],party:[alice,]}"]
 14 [label="publish:{in:[In:{t_17,},],out:[Out:{t_18,},],attr:[],party:[alice,]}"]
@@ -502,7 +502,7 @@ var translateWithCCLTestCases = []sPair{
 8 [label="concat:{in:[In:{t_9,t_10,},],out:[Out:{t_11,},],attr:[axis:0,],party:[alice,bob,carol,]}"]
 9 [label="make_share:{in:[In:{t_1,},],out:[Out:{t_12,},],attr:[],party:[alice,bob,carol,]}"]
 10 [label="make_share:{in:[In:{t_0,},],out:[Out:{t_13,},],attr:[],party:[alice,bob,carol,]}"]
-11 [label="secret_join:{in:[Left:{t_13,t_12,},LeftKey:{t_12,},Right:{t_11,},RightKey:{t_8,},],out:[LeftOutput:{t_14,t_15,},RightOutput:{t_16,},],attr:[input_party_codes:[alice bob carol],],party:[alice,bob,carol,]}"]
+11 [label="secret_join:{in:[Left:{t_13,t_12,},LeftKey:{t_12,},Right:{t_11,},RightKey:{t_8,},],out:[LeftOutput:{t_14,t_15,},RightOutput:{t_16,},],attr:[],party:[alice,bob,carol,]}"]
 12 [label="make_private:{in:[In:{t_15,},],out:[Out:{t_17,},],attr:[reveal_to:alice,],party:[alice,bob,carol,]}"]
 13 [label="make_private:{in:[In:{t_14,},],out:[Out:{t_19,},],attr:[reveal_to:alice,],party:[alice,bob,carol,]}"]
 14 [label="make_private:{in:[In:{t_16,},],out:[Out:{t_21,},],attr:[reveal_to:alice,],party:[alice,bob,carol,]}"]