Merge pull request #237 V3 fix reader arg order

Author: rekby

Diff for: CHANGELOG.md

@@ -1,5 +1,6 @@
 * Fixed global_allow_split_transactions
 * Added reader.receive_message() method
+* Swap topic_path and consumer arguments in topic_client.reader method
 
 ## 3.0.1b10 ##
 * fixed sqlalchemy get_columns method with not null columns

Diff for: tests/topics/test_topic_reader.py

@@ -8,7 +8,7 @@ class TestTopicReaderAsyncIO:
     async def test_read_batch(
         self, driver, topic_path, topic_with_messages, topic_consumer
     ):
-        reader = driver.topic_client.reader(topic_consumer, topic_path)
+        reader = driver.topic_client.reader(topic_path, topic_consumer)
         batch = await reader.receive_batch()
 
         assert batch is not None
@@ -19,7 +19,7 @@ async def test_read_batch(
     async def test_read_message(
         self, driver, topic_path, topic_with_messages, topic_consumer
     ):
-        reader = driver.topic_client.reader(topic_consumer, topic_path)
+        reader = driver.topic_client.reader(topic_path, topic_consumer)
         msg = await reader.receive_message()
 
         assert msg is not None
@@ -31,11 +31,11 @@ async def test_read_and_commit_message(
         self, driver, topic_path, topic_with_messages, topic_consumer
     ):
 
-        reader = driver.topic_client.reader(topic_consumer, topic_path)
+        reader = driver.topic_client.reader(topic_path, topic_consumer)
         batch = await reader.receive_batch()
         await reader.commit_with_ack(batch)
 
-        reader = driver.topic_client.reader(topic_consumer, topic_path)
+        reader = driver.topic_client.reader(topic_path, topic_consumer)
         batch2 = await reader.receive_batch()
         assert batch.messages[0] != batch2.messages[0]
 
@@ -47,7 +47,7 @@ async def test_read_compressed_messages(self, driver, topic_path, topic_consumer
         ) as writer:
             await writer.write("123")
 
-        async with driver.topic_client.reader(topic_consumer, topic_path) as reader:
+        async with driver.topic_client.reader(topic_path, topic_consumer) as reader:
             batch = await reader.receive_batch()
             assert batch.messages[0].data.decode() == "123"
 
@@ -66,7 +66,7 @@ def decode(b: bytes):
             await writer.write("123")
 
         async with driver.topic_client.reader(
-            topic_consumer, topic_path, decoders={codec: decode}
+            topic_path, topic_consumer, decoders={codec: decode}
         ) as reader:
             batch = await reader.receive_batch()
             assert batch.messages[0].data.decode() == "123"
@@ -76,7 +76,7 @@ class TestTopicReaderSync:
     def test_read_batch(
         self, driver_sync, topic_path, topic_with_messages, topic_consumer
     ):
-        reader = driver_sync.topic_client.reader(topic_consumer, topic_path)
+        reader = driver_sync.topic_client.reader(topic_path, topic_consumer)
         batch = reader.receive_batch()
 
         assert batch is not None
@@ -87,7 +87,7 @@ def test_read_batch(
     def test_read_message(
         self, driver_sync, topic_path, topic_with_messages, topic_consumer
     ):
-        reader = driver_sync.topic_client.reader(topic_consumer, topic_path)
+        reader = driver_sync.topic_client.reader(topic_path, topic_consumer)
         msg = reader.receive_message()
 
         assert msg is not None
@@ -98,11 +98,11 @@ def test_read_message(
     def test_read_and_commit_message(
         self, driver_sync, topic_path, topic_with_messages, topic_consumer
     ):
-        reader = driver_sync.topic_client.reader(topic_consumer, topic_path)
+        reader = driver_sync.topic_client.reader(topic_path, topic_consumer)
         batch = reader.receive_batch()
         reader.commit_with_ack(batch)
 
-        reader = driver_sync.topic_client.reader(topic_consumer, topic_path)
+        reader = driver_sync.topic_client.reader(topic_path, topic_consumer)
         batch2 = reader.receive_batch()
         assert batch.messages[0] != batch2.messages[0]
 
@@ -112,7 +112,7 @@ def test_read_compressed_messages(self, driver_sync, topic_path, topic_consumer)
         ) as writer:
             writer.write("123")
 
-        with driver_sync.topic_client.reader(topic_consumer, topic_path) as reader:
+        with driver_sync.topic_client.reader(topic_path, topic_consumer) as reader:
             batch = reader.receive_batch()
             assert batch.messages[0].data.decode() == "123"
 
@@ -131,7 +131,7 @@ def decode(b: bytes):
             writer.write("123")
 
         with driver_sync.topic_client.reader(
-            topic_consumer, topic_path, decoders={codec: decode}
+            topic_path, topic_consumer, decoders={codec: decode}
         ) as reader:
             batch = reader.receive_batch()
             assert batch.messages[0].data.decode() == "123"

Diff for: ydb/topic.py

@@ -137,8 +137,8 @@ async def drop_topic(self, path: str):
 
     def reader(
         self,
-        consumer: str,
         topic: str,
+        consumer: str,
         buffer_size_bytes: int = 50 * 1024 * 1024,
         # decoders: map[codec_code] func(encoded_bytes)->decoded_bytes
         decoders: Union[Mapping[int, Callable[[bytes], bytes]], None] = None,
@@ -306,8 +306,8 @@ def drop_topic(self, path: str):
 
     def reader(
         self,
-        consumer: str,
         topic: str,
+        consumer: str,
         buffer_size_bytes: int = 50 * 1024 * 1024,
         # decoders: map[codec_code] func(encoded_bytes)->decoded_bytes
         decoders: Union[Mapping[int, Callable[[bytes], bytes]], None] = None,