Skip to content

Commit 3cda1ac

Browse files
author
Luis Sanchez
committedDec 6, 2017
[FAB-7239] Update Kafka client
Updated to github.com/Shopify/sarama@6a8d89d Not claiming support for Kafka 0.11 or 1.0 with this changeset, but preliminary testing (e.g. running the bddtests) shows that we work with those versions of Kafka. Declaration of Kafka 1.0 support is left as a separate issue pending some further testing (which this patch enables). Change-Id: Ib5f72bfc8077645b22eb489f51fe4749617225f9 Signed-off-by: Luis Sanchez <sanchezl@us.ibm.com>
·
v3.1.0v1.1.0-alpha
1 parent 3974f15 commit 3cda1ac

33 files changed

+1525
-243
lines changed
 

‎common/viperutil/config_test.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,13 @@ func TestKafkaVersionDecode(t *testing.T) {
9595
{"0.10.2.1", sarama.V0_10_2_0, false},
9696
{"0.10.2.2", sarama.V0_10_2_0, false},
9797
{"0.10.2.3", sarama.V0_10_2_0, false},
98-
{"0.11", sarama.KafkaVersion{}, true},
99-
{"0.11.0", sarama.KafkaVersion{}, true},
100-
{"0.11.0.0", sarama.KafkaVersion{}, true},
98+
{"0.11", sarama.V0_11_0_0, false},
99+
{"0.11.0", sarama.V0_11_0_0, false},
100+
{"0.11.0.0", sarama.V0_11_0_0, false},
101+
{"1", sarama.V1_0_0_0, false},
102+
{"1.0", sarama.V1_0_0_0, false},
103+
{"1.0.0", sarama.V1_0_0_0, false},
104+
{"1.0.1", sarama.V1_0_0_0, true},
101105
{"Malformed", sarama.KafkaVersion{}, true},
102106
}
103107

‎common/viperutil/config_util.go

+2
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ func init() {
259259
kafkaVersionConstraints[sarama.V0_10_0_1], _ = version.NewConstraint(">=0.10.0.1,<0.10.1.0")
260260
kafkaVersionConstraints[sarama.V0_10_1_0], _ = version.NewConstraint(">=0.10.1.0,<0.10.2.0")
261261
kafkaVersionConstraints[sarama.V0_10_2_0], _ = version.NewConstraint(">=0.10.2.0,<0.11.0.0")
262+
kafkaVersionConstraints[sarama.V0_11_0_0], _ = version.NewConstraint(">=0.11.0.0,<1.0.0")
263+
kafkaVersionConstraints[sarama.V1_0_0_0], _ = version.NewConstraint(">=1.0.0,<1.0.1")
262264
}
263265

264266
func kafkaVersionDecodeHook() mapstructure.DecodeHookFunc {

‎vendor/github.com/Shopify/sarama/CHANGELOG.md

+46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/Makefile

+9-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/README.md

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/async_producer.go

+20-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/client.go

+35-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/config.go

+26-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/consumer.go

+141-70
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/crc32_field.go

+38-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/dev.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/fetch_request.go

+34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/fetch_response.go

+117-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/length_field.go

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/message.go

+11-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/mockresponses.go

+17-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/mocks/consumer.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/offset_manager.go

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/packet_decoder.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/packet_encoder.go

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/prep_encoder.go

+32-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/produce_request.go

+95-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/produce_response.go

+27-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/produce_set.go

+68-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/real_decoder.go

+67-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/real_encoder.go

+22-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/record.go

+113
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/record_batch.go

+260
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/records.go

+167
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/timestamp.go

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/utils.go

+35-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Shopify/sarama/vagrant/install_cluster.sh

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/vendor.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
"revisionTime": "2016-12-26T20:32:30Z"
2828
},
2929
{
30-
"checksumSHA1": "p7JEU9v4991/GEts6Wcm7+ZI30E=",
30+
"checksumSHA1": "ozSQbxQRv+irEWZC49jpe6Wvfn0=",
3131
"path": "github.com/Shopify/sarama",
32-
"revision": "c01858abb625b73a3af51d0798e4ad42c8147093",
33-
"revisionTime": "2017-05-08T18:36:27Z",
32+
"revision": "6a8d89d71d22bbdc14b6cb52778889a710be19a7",
33+
"revisionTime": "2017-11-29T14:03:49Z",
3434
"tree": true,
35-
"version": "v1.12.0",
36-
"versionExact": "v1.12.0"
35+
"version": "master",
36+
"versionExact": "master"
3737
},
3838
{
3939
"checksumSHA1": "yRNw/uu/4N7XHVe1PHtKPl6xtDg=",

0 commit comments

Comments
 (0)
Please sign in to comment.