summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Powers <dana.powers@rd.io>2015-12-10 17:48:05 -0800
committerDana Powers <dana.powers@rd.io>2015-12-10 18:37:03 -0800
commit5cf60f4482852220efa5f727b45617ee3b7ad773 (patch)
tree0d1da47070ea265324b2f783b7cc71a684793ea7
parent3662cb6c50f1a0f893cf23e18f4d14509b25dfa3 (diff)
downloadkafka-python-5cf60f4482852220efa5f727b45617ee3b7ad773.tar.gz
Remove KafkaProtocol._decode_message
-rw-r--r--kafka/protocol/legacy.py32
-rw-r--r--test/test_protocol.py2
2 files changed, 2 insertions, 32 deletions
diff --git a/kafka/protocol/legacy.py b/kafka/protocol/legacy.py
index feabed3..1835521 100644
--- a/kafka/protocol/legacy.py
+++ b/kafka/protocol/legacy.py
@@ -118,38 +118,6 @@ class KafkaProtocol(object):
raise ProtocolError("Unexpected magic number: %d" % message.magic)
return msg
- @classmethod
- def _decode_message(cls, data, offset):
- """
- Decode a single Message
-
- The only caller of this method is decode_message_set_iter.
- They are decoupled to support nested messages (compressed MessageSets).
- The offset is actually read from decode_message_set_iter (it is part
- of the MessageSet payload).
- """
- ((crc, magic, att), cur) = relative_unpack('>iBB', data, 0)
- if crc != crc32(data[4:]):
- raise ChecksumError("Message checksum failed")
-
- (key, cur) = read_int_string(data, cur)
- (value, cur) = read_int_string(data, cur)
-
- codec = att & ATTRIBUTE_CODEC_MASK
-
- if codec == CODEC_NONE:
- yield (offset, kafka.common.Message(magic, att, key, value))
-
- elif codec == CODEC_GZIP:
- gz = gzip_decode(value)
- for (offset, msg) in KafkaProtocol._decode_message_set_iter(gz):
- yield (offset, msg)
-
- elif codec == CODEC_SNAPPY:
- snp = snappy_decode(value)
- for (offset, msg) in KafkaProtocol._decode_message_set_iter(snp):
- yield (offset, msg)
-
##################
# Public API #
##################
diff --git a/test/test_protocol.py b/test/test_protocol.py
index 8cd4fee..7dfd44e 100644
--- a/test/test_protocol.py
+++ b/test/test_protocol.py
@@ -173,6 +173,7 @@ class TestProtocol(unittest.TestCase):
self.assertEqual(encoded, expect)
+ @unittest.skip('needs updating for new protocol classes')
def test_decode_message(self):
encoded = b"".join([
struct.pack(">i", -1427009701), # CRC
@@ -300,6 +301,7 @@ class TestProtocol(unittest.TestCase):
self.assertEqual(returned_offset2, 0)
self.assertEqual(decoded_message2, create_message(b"v2"))
+ @unittest.skip('needs updating for new protocol classes')
def test_decode_message_checksum_error(self):
invalid_encoded_message = b"This is not a valid encoded message"
iter = KafkaProtocol._decode_message(invalid_encoded_message, 0)