Merge pull request confluentinc#2 from mapr/mapr-26494

groghkov · web-flow · commit 1d6fb5325a24 · 2017-03-23T12:34:29.000+02:00
Mapr 26494
diff --git a/confluent_kafka/kafkatest/README b/confluent_kafka/kafkatest/README
diff --git a/examples/consumer.py b/examples/consumer.py
@@ -19,7 +19,7 @@
 # Example high-level Kafka 0.9 balanced Consumer
 #
 
-from confluent_kafka import Consumer, KafkaException, KafkaError
+from mapr_streams_python import Consumer, KafkaException, KafkaError
 import sys
 
 if __name__ == '__main__':
diff --git a/examples/integration_test.py b/examples/integration_test.py
@@ -19,7 +19,7 @@
 
 """ Test script for confluent_kafka module """
 
-import confluent_kafka
+import mapr_streams_python
 import re
 import time
 import uuid
@@ -83,7 +83,7 @@ def verify_producer():
             'default.topic.config':{'produce.offset.report': True}}
 
     # Create producer
-    p = confluent_kafka.Producer(**conf)
+    p = mapr_streams_python.Producer(**conf)
     print('producer at %s' % p)
 
     # Produce some messages
@@ -117,7 +117,7 @@ def verify_producer_performance(with_dr_cb=True):
     """ Time how long it takes to produce and delivery X messages """
     conf = {'error_cb': error_cb}
 
-    p = confluent_kafka.Producer(**conf)
+    p = mapr_streams_python.Producer(**conf)
 
     topic = '/test_stream:topic3'
     msgcnt = 1000000
@@ -216,7 +216,7 @@ def verify_consumer():
             }}
 
     # Create consumer
-    c = confluent_kafka.Consumer(**conf)
+    c = mapr_streams_python.Consumer(**conf)
 
     # Subscribe to a list of topics
     c.subscribe(["test"])
@@ -233,7 +233,7 @@ def verify_consumer():
             raise Exception('Got timeout from poll() without a timeout set: %s' % msg)
 
         if msg.error():
-            if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
+            if msg.error().code() == mapr_streams_python.KafkaError._PARTITION_EOF:
                 print('Reached end of %s [%d] at offset %d' % \
                       (msg.topic(), msg.partition(), msg.offset()))
                 break
@@ -263,8 +263,8 @@ def verify_consumer():
 
 
     # Start a new client and get the committed offsets
-    c = confluent_kafka.Consumer(**conf)
-    offsets = c.committed(list(map(lambda p: confluent_kafka.TopicPartition("test", p), range(0,3))))
+    c = mapr_streams_python.Consumer(**conf)
+    offsets = c.committed(list(map(lambda p: mapr_streams_python.TopicPartition("test", p), range(0, 3))))
     for tp in offsets:
         print(tp)
 
@@ -283,7 +283,7 @@ def verify_consumer_performance():
                 'auto.offset.reset': 'earliest'
             }}
 
-    c = confluent_kafka.Consumer(**conf)
+    c = mapr_streams_python.Consumer(**conf)
 
     def my_on_assign (consumer, partitions):
         print('on_assign:', len(partitions), 'partitions:')
@@ -318,11 +318,11 @@ def my_on_revoke (consumer, partitions):
                             (msgcnt, max_msgcnt))
 
         if msg.error():
-            if msg.error().code() == confluent_kafka.KafkaError._PARTITION_EOF:
+            if msg.error().code() == mapr_streams_python.KafkaError._PARTITION_EOF:
                 # Reached EOF for a partition, ignore.
                 continue
             else:
-                raise confluent_kafka.KafkaException(msg.error())
+                raise mapr_streams_python.KafkaException(msg.error())
 
 
         bytecnt += len(msg)
@@ -355,8 +355,8 @@ def my_on_revoke (consumer, partitions):
     if len(sys.argv) > 1:
         bootstrap_servers = sys.argv[1]
 
-    print('Using confluent_kafka module version %s (0x%x)' % confluent_kafka.version())
-    print('Using librdkafka version %s (0x%x)' % confluent_kafka.libversion())
+    print('Using confluent_kafka module version %s (0x%x)' % mapr_streams_python.version())
+    print('Using librdkafka version %s (0x%x)' % mapr_streams_python.libversion())
 
     print('=' * 30, 'Verifying Producer performance (with dr_cb)', '=' * 30)
     verify_producer_performance(with_dr_cb=True)
diff --git a/examples/producer.py b/examples/producer.py
@@ -20,7 +20,7 @@
 # Reads lines from stdin and sends to Kafka.
 #
 
-from confluent_kafka import Producer
+from mapr_streams_python import Producer
 import sys
 
 if __name__ == '__main__':
diff --git a/mapr_streams_python/__init__.py b/mapr_streams_python/__init__.py
diff --git a/mapr_streams_python/kafkatest/README b/mapr_streams_python/kafkatest/README
@@ -0,0 +1,8 @@
+FIXME: Instructions on how to use this.
+
+
+Usage:
+
+   python -m mapr_streams_python.kafkatest.verifiable_consumer <options>
+
+   python -m mapr_streams_python.kafkatest.verifiable_producer <options>
diff --git a/mapr_streams_python/kafkatest/__init__.py b/mapr_streams_python/kafkatest/__init__.py
diff --git a/mapr_streams_python/kafkatest/verifiable_client.py b/mapr_streams_python/kafkatest/verifiable_client.py
diff --git a/mapr_streams_python/kafkatest/verifiable_consumer.py b/mapr_streams_python/kafkatest/verifiable_consumer.py
@@ -16,7 +16,7 @@
 #
 
 import argparse, sys
-from confluent_kafka import Consumer, KafkaError, KafkaException
+from mapr_streams_python import Consumer, KafkaError, KafkaException
 from verifiable_client import VerifiableClient
 
 class VerifiableConsumer(VerifiableClient):
diff --git a/mapr_streams_python/kafkatest/verifiable_producer.py b/mapr_streams_python/kafkatest/verifiable_producer.py
@@ -16,7 +16,7 @@
 #
 
 import argparse, time
-from confluent_kafka import Producer, KafkaError, KafkaException
+from mapr_streams_python import Producer, KafkaError, KafkaException
 from verifiable_client import VerifiableClient
 
 class VerifiableProducer(VerifiableClient):
diff --git a/mapr_streams_python/src/Consumer.c b/mapr_streams_python/src/Consumer.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "confluent_kafka.h"
+#include "mapr_streams_python.h"
 
 
 /****************************************************************************
diff --git a/mapr_streams_python/src/Producer.c b/mapr_streams_python/src/Producer.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "confluent_kafka.h"
+#include "mapr_streams_python.h"
 
 
 /**
diff --git a/mapr_streams_python/src/mapr_streams_python.c b/mapr_streams_python/src/mapr_streams_python.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "confluent_kafka.h"
+#include "mapr_streams_python.h"
 
 #include <stdarg.h>
 
diff --git a/mapr_streams_python/src/mapr_streams_python.h b/mapr_streams_python/src/mapr_streams_python.h
diff --git a/setup.py b/setup.py
@@ -4,11 +4,11 @@
 from distutils.core import Extension
 
 
-module = Extension('confluent_kafka.cimpl',
+module = Extension('mapr_streams_python.cimpl',
                     libraries= ['rdkafka'],
-                    sources=['confluent_kafka/src/confluent_kafka.c',
-                             'confluent_kafka/src/Producer.c',
-                             'confluent_kafka/src/Consumer.c'])
+                    sources=['mapr_streams_python/src/mapr_streams_python.c',
+                             'mapr_streams_python/src/Producer.c',
+                             'mapr_streams_python/src/Consumer.c'])
 
 setup(name='mapr-streams-python',
       version='0.9.2',
diff --git a/tests/test_Consumer.py b/tests/test_Consumer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from confluent_kafka import Consumer, TopicPartition, KafkaError, KafkaException
+from mapr_streams_python import Consumer, TopicPartition, KafkaError, KafkaException
 import pytest
 import subprocess
 import utils as u
diff --git a/tests/test_KafkaError.py b/tests/test_KafkaError.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from confluent_kafka import Producer, KafkaError, KafkaException
+from mapr_streams_python import Producer, KafkaError, KafkaException
 import time
 
 seen_all_brokers_down = False
diff --git a/tests/test_Producer.py b/tests/test_Producer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from confluent_kafka import Producer, Consumer,  KafkaError, KafkaException, TopicPartition
+from mapr_streams_python import Producer, KafkaError, KafkaException
 import mock
 import pytest
 import subprocess
diff --git a/tests/test_TopicPartition.py b/tests/test_TopicPartition.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from confluent_kafka import TopicPartition
+from mapr_streams_python import TopicPartition
 
 def test_sort():
     """ TopicPartition sorting (rich comparator) """
diff --git a/tests/test_bahavior.py b/tests/test_bahavior.py
@@ -1,4 +1,4 @@
-from confluent_kafka import Consumer, Producer, TopicPartition, KafkaError, KafkaException
+from mapr_streams_python import Consumer, Producer, TopicPartition, KafkaError, KafkaException
 import pytest
 import utils as u
 
diff --git a/tests/test_consumer_streams.py b/tests/test_consumer_streams.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from confluent_kafka import Consumer, Producer, TopicPartition, KafkaError, KafkaException
+from mapr_streams_python import Consumer, Producer, TopicPartition, KafkaError, KafkaException
 import subprocess
 import pytest
 import mock
diff --git a/tests/test_docs.py b/tests/test_docs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import confluent_kafka
+import mapr_streams_python
 import re
 from types import ModuleType
 
@@ -9,12 +9,12 @@ def test_verify_docs():
     """
     fails = 0
 
-    for n in dir(confluent_kafka):
+    for n in dir(mapr_streams_python):
         if n.startswith('__'):
             # Skip internals
             continue
 
-        o = confluent_kafka.__dict__.get(n)
+        o = mapr_streams_python.__dict__.get(n)
         d = o.__doc__
         if not d:
             print('Missing __doc__ for: %s (type %s)' % (n, type(o)))
diff --git a/tests/test_enums.py b/tests/test_enums.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-import confluent_kafka
+import mapr_streams_python
 
 def test_enums():
     """ Make sure librdkafka error enums are reachable directly from the
         KafkaError class without an instantiated object. """
-    print(confluent_kafka.KafkaError._NO_OFFSET)
-    print(confluent_kafka.KafkaError.REBALANCE_IN_PROGRESS)
+    print(mapr_streams_python.KafkaError._NO_OFFSET)
+    print(mapr_streams_python.KafkaError.REBALANCE_IN_PROGRESS)
diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 
-import confluent_kafka
+import mapr_streams_python
 
 
 def test_version():
-    print('Using confluent_kafka module version %s (0x%x)' % confluent_kafka.version())
-    sver, iver = confluent_kafka.version()
+    print('Using confluent_kafka module version %s (0x%x)' % mapr_streams_python.version())
+    sver, iver = mapr_streams_python.version()
     assert len(sver) > 0
     assert iver > 0
 
-    print('Using librdkafka version %s (0x%x)' % confluent_kafka.libversion())
-    sver, iver = confluent_kafka.libversion()
+    print('Using librdkafka version %s (0x%x)' % mapr_streams_python.libversion())
+    sver, iver = mapr_streams_python.libversion()
     assert len(sver) > 0
     assert iver > 0
 
diff --git a/tests/test_threads.py b/tests/test_threads.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from confluent_kafka import Producer, KafkaError, KafkaException
+from mapr_streams_python import Producer, KafkaError, KafkaException
 import threading
 import time
 try:

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`# Example high-level Kafka 0.9 balanced Consumer`
`20`	`20`	`#`
`21`	`21`
`22`		`-from confluent_kafka import Consumer, KafkaException, KafkaError`
	`22`	`+from mapr_streams_python import Consumer, KafkaException, KafkaError`
`23`	`23`	`import sys`
`24`	`24`
`25`	`25`	`if __name__ == '__main__':`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# Reads lines from stdin and sends to Kafka.`
`21`	`21`	`#`
`22`	`22`
`23`		`-from confluent_kafka import Producer`
	`23`	`+from mapr_streams_python import Producer`
`24`	`24`	`import sys`
`25`	`25`
`26`	`26`	`if __name__ == '__main__':`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`import argparse, sys`
`19`		`-from confluent_kafka import Consumer, KafkaError, KafkaException`
	`19`	`+from mapr_streams_python import Consumer, KafkaError, KafkaException`
`20`	`20`	`from verifiable_client import VerifiableClient`
`21`	`21`
`22`	`22`	`class VerifiableConsumer(VerifiableClient):`