Sfoglia il codice sorgente

go 1.0 compatibility; all we lose is ipv6 zones

Evan Huus 12 anni fa
parent
commit
e4ff187a56
5 ha cambiato i file con 17 aggiunte e 13 eliminazioni
  1. 3 1
      broker.go
  2. 2 0
      consumer.go
  3. 2 2
      errors.go
  4. 2 2
      producer.go
  5. 8 8
      real_decoder.go

+ 3 - 1
broker.go

@@ -49,7 +49,7 @@ func (b *Broker) Connect() error {
 		return err
 	}
 
-	b.conn, err = net.DialTCP("tcp", nil, &net.TCPAddr{IP: addr.IP, Port: int(b.port), Zone: addr.Zone})
+	b.conn, err = net.DialTCP("tcp", nil, &net.TCPAddr{IP: addr.IP, Port: int(b.port)})
 	if err != nil {
 		return err
 	}
@@ -226,6 +226,8 @@ func (b *Broker) sendAndReceive(clientID string, req requestEncoder, res decoder
 	case err = <-promise.errors:
 		return err
 	}
+
+	return nil
 }
 
 func (b *Broker) decode(pd packetDecoder) (err error) {

+ 2 - 0
consumer.go

@@ -80,6 +80,8 @@ func (c *Consumer) sendError(err error) bool {
 	case c.errors <- err:
 		return true
 	}
+
+	return true
 }
 
 func (c *Consumer) fetchMessages() {

+ 2 - 2
errors.go

@@ -89,7 +89,7 @@ func (err KError) Error() string {
 		return "kafka server: Stale controller epoch code. ???"
 	case OFFSET_METADATA_TOO_LARGE:
 		return "kafka server: Specified a string larger than the configured maximum for offset metadata."
-	default:
-		return "Unknown error, how did this happen?"
 	}
+
+	return "Unknown error, how did this happen?"
 }

+ 2 - 2
producer.go

@@ -110,7 +110,7 @@ func (p *Producer) safeSendMessage(key, value Encoder, retry bool) error {
 			return err
 		}
 		return p.safeSendMessage(key, value, false)
-	default:
-		return block.Err
 	}
+
+	return block.Err
 }

+ 8 - 8
real_decoder.go

@@ -90,11 +90,11 @@ func (rd *realDecoder) getBytes() ([]byte, error) {
 	case n > rd.remaining():
 		rd.off = len(rd.raw)
 		return nil, InsufficientData
-	default:
-		tmp := rd.raw[rd.off : rd.off+n]
-		rd.off += n
-		return tmp, nil
 	}
+
+	tmpStr := rd.raw[rd.off : rd.off+n]
+	rd.off += n
+	return tmpStr, nil
 }
 
 func (rd *realDecoder) getString() (string, error) {
@@ -116,11 +116,11 @@ func (rd *realDecoder) getString() (string, error) {
 	case n > rd.remaining():
 		rd.off = len(rd.raw)
 		return "", InsufficientData
-	default:
-		tmp := string(rd.raw[rd.off : rd.off+n])
-		rd.off += n
-		return tmp, nil
 	}
+
+	tmpStr := string(rd.raw[rd.off : rd.off+n])
+	rd.off += n
+	return tmpStr, nil
 }
 
 func (rd *realDecoder) getInt32Array() ([]int32, error) {