Conflict resolver not being passed to Fetch/Store-ValueCommand [JIRA: CLIENTS-565]

[tegioz]

Conflict resolver is not being passed from the builder to the command, so it's never being called.

riak-go-client/kv_commands.go

Line 240 in 437fcfc

return &FetchValueCommand{protobuf: builder.protobuf}, nil

Should be:

return &FetchValueCommand{protobuf: builder.protobuf, resolver: builder.resolver}, nil

riak-go-client/kv_commands.go

Line 510 in 437fcfc

return &StoreValueCommand{value: builder.value, protobuf: builder.protobuf}, nil

Should be:

return &StoreValueCommand{value: builder.value, protobuf: builder.protobuf, resolver: builder.resolver}, nil

I was wondering also if it would be possible to make the call to the resolver only when there are at least 2 values, as it seems that often -when there are no siblings- the call might not be necessary.

riak-go-client/kv_commands.go

Lines 76 to 78 in 437fcfc

	if cmd.resolver != nil {
	response.Values = cmd.resolver.Resolve(response.Values)
	}

riak-go-client/kv_commands.go

Lines 311 to 313 in 437fcfc

	if cmd.resolver != nil {
	response.Values = cmd.resolver.Resolve(response.Values)
	}

[lukebakken]

Hi Sergio,

Thanks for finding that, I'll get it resolved soon.

I checked the Node.js client and Java client, and the resolver, if present, is always called, no matter the result count. I'll leave the behavior the same in the Go client to remain consistent.

[tegioz]

Hi Luke,

I understand, that makes sense, thanks.