Changed Message.Opaque to non-pointer interface{} (issue confluentinc#4)

edenhill · edenhill · commit 023805a8178d · 2016-10-12T14:00:17.000+02:00
diff --git a/kafka/handle.go b/kafka/handle.go
@@ -169,7 +169,7 @@ type cgoif interface{}
 // delivery report cgoif container
 type cgo_dr struct {
 	delivery_chan chan Event
-	opaque        *interface{}
+	opaque        interface{}
 }
 
 // cgo_put adds object cg to the handle's cgo map and returns a
diff --git a/kafka/message.go b/kafka/message.go
@@ -92,7 +92,7 @@ type Message struct {
 	Key            []byte
 	Timestamp      time.Time
 	TimestampType  TimestampType
-	Opaque         *interface{}
+	Opaque         interface{}
 }
 
 // String returns a human readable representation of a Message.
diff --git a/kafka/producer.go b/kafka/producer.go
@@ -61,7 +61,7 @@ func (p *Producer) get_handle() *handle {
 // transmit queue, thus returning immediately.
 // The delivery report will be sent on the provided delivery_chan if specified,
 // or on the Producer object's Events channel if not.
-func (p *Producer) produce(msg *Message, msg_flags int, delivery_chan chan Event, opaque *interface{}) error {
+func (p *Producer) produce(msg *Message, msg_flags int, delivery_chan chan Event, opaque interface{}) error {
 	c_rkt := p.handle.get_rkt(*msg.TopicPartition.Topic)
 
 	var valp *byte = nil
@@ -115,7 +115,7 @@ func (p *Producer) produce(msg *Message, msg_flags int, delivery_chan chan Event
 	return nil
 }
 
-func (p *Producer) Produce(msg *Message, delivery_chan chan Event, opaque *interface{}) error {
+func (p *Producer) Produce(msg *Message, delivery_chan chan Event, opaque interface{}) error {
 	return p.produce(msg, 0, delivery_chan, opaque)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ type cgoif interface{}`
`169`	`169`	`// delivery report cgoif container`
`170`	`170`	`type cgo_dr struct {`
`171`	`171`	`delivery_chan chan Event`
`172`		`- opaque *interface{}`
	`172`	`+ opaque interface{}`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`// cgo_put adds object cg to the handle's cgo map and returns a`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ type Message struct {`
`92`	`92`	`Key []byte`
`93`	`93`	`Timestamp time.Time`
`94`	`94`	`TimestampType TimestampType`
`95`		`- Opaque *interface{}`
	`95`	`+ Opaque interface{}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// String returns a human readable representation of a Message.`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (p Producer) get_handle() handle {`
`61`	`61`	`// transmit queue, thus returning immediately.`
`62`	`62`	`// The delivery report will be sent on the provided delivery_chan if specified,`
`63`	`63`	`// or on the Producer object's Events channel if not.`
`64`		`-func (p Producer) produce(msg Message, msg_flags int, delivery_chan chan Event, opaque *interface{}) error {`
	`64`	`+func (p Producer) produce(msg Message, msg_flags int, delivery_chan chan Event, opaque interface{}) error {`
`65`	`65`	`c_rkt := p.handle.get_rkt(*msg.TopicPartition.Topic)`
`66`	`66`
`67`	`67`	`var valp *byte = nil`
`@@ -115,7 +115,7 @@ func (p Producer) produce(msg Message, msg_flags int, delivery_chan chan Event`
`115`	`115`	`return nil`
`116`	`116`	`}`
`117`	`117`
`118`		`-func (p Producer) Produce(msg Message, delivery_chan chan Event, opaque *interface{}) error {`
	`118`	`+func (p Producer) Produce(msg Message, delivery_chan chan Event, opaque interface{}) error {`
`119`	`119`	`return p.produce(msg, 0, delivery_chan, opaque)`
`120`	`120`	`}`
`121`	`121`