hermann 0.23.0.236 → 0.23.0.240

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTY5YjNkMzk4YWIwY2Q2MzJmYjYxODBjMmU1YTA1YzYwNDE1YzBlMg==
+    YmI3YjVlZTYxZDYwOTUzYmRiM2IzZjJlNjJlNGU4NzczMDFhMjhjYg==
   data.tar.gz: !binary |-
-    NWVlZjNiMTdjOTkzNjljMDRkN2M5NTg4MjY5YTUyNTgwYzMwMzhjNQ==
+    Y2VmZjViOWM3NzdmM2E4NTEyODQxMzY4Njc2NzYyYjc3ODIzN2UyNw==
 SHA512:
   metadata.gz: !binary |-
-    N2YyNmJhMTg0YjA4ZmI4ZDlhNWIzYjNhMGU2ZjYzNTVlYzMzZGY1YThhZGRk
-    OGM1MTM2ODk3OTUxZDg1NmQ5NjM5YjNhM2VhMWIxNTk3MzM4MTM4NGNkNWFm
-    MTJkNmJhNzFiNjhkNmYxZGM5NjAxN2Q5MThkNTcwNjBlMzgwMzY=
+    YTZlZGJkODEwM2NlYWIyZDIxNjExZTJiMWM4YjQ4YTY1YmVmZDg0NDBiNWRk
+    NTAzNTgwMTA4M2JhNmRiYjNiNzUzMzk5NzllNGE3OTM3NmQyNjg2YzIzOTA1
+    ZjJhZmIwZTE2MzEwZTBkZjJkNTNkZmE1MjI5NDBmN2Q2MzBlYTc=
   data.tar.gz: !binary |-
-    NzJkYmI3YzM1MjI4NzUzZWZiYTA2ZTFmNzhjZjE4ZGUxNTU4ZGRmZmEyOThk
-    MTIzMzY4MmIzODYyZTY1YjZjMDZlODM0OWU1OTI5NWMwYTFiZjA5YjU1NjAy
-    YTI5NzlmMWUwNThhMmY0MjRmNjU3Yzk4NWM1MGNkZjMwZTcxNTU=
+    ZDU5NDc5YjVjOTljNjUyYjIwOGNiOTVkYWFjYjEzYmE2NzAyOWZhZTQxNDRk
+    ZWE5ODAzMDhkOTU2OWNjYjczOWRkMDYzY2I4MzYyZDQ5ZWMxMTFkYWNjOGRi
+    YjZlNGM4ZTU2ZGQzMjVjNWM2ZGY1ZGMyNWYwNjhhNzA2NDE4NzU=

data/ext/hermann/hermann_lib.c

@@ -321,9 +321,6 @@ void consumer_init_kafka(HermannInstanceConfig* config) {
 	rd_kafka_set_logger(config->rk, logger);
 	rd_kafka_set_log_level(config->rk, LOG_DEBUG);
 
-	/* TODO: offset calculation */
-	config->start_offset = RD_KAFKA_OFFSET_END;
-
 	/* Add brokers */
 	if (rd_kafka_brokers_add(config->rk, config->brokers) == 0) {
 		fprintf(stderr, "%% No valid brokers specified\n");
@@ -820,11 +817,13 @@ static VALUE consumer_allocate(VALUE klass) {
  *  @param  topic	   VALUE   a Ruby string
  *  @param  brokers	 VALUE   a Ruby string containing list of host:port
  *  @param  partition   VALUE   a Ruby number
+ *  @param  offset      VALUE   a Ruby number
  */
 static VALUE consumer_initialize(VALUE self,
 								 VALUE topic,
 								 VALUE brokers,
-								 VALUE partition) {
+								 VALUE partition,
+								 VALUE offset) {
 
 	HermannInstanceConfig* consumerConfig;
 	char* topicPtr;
@@ -845,6 +844,17 @@ static VALUE consumer_initialize(VALUE self,
 	consumerConfig->exit_eof = 0;
 	consumerConfig->quiet = 0;
 
+	if ( FIXNUM_P(offset) ) {
+		consumerConfig->start_offset = FIX2LONG(offset);
+	} else if ( SYMBOL_P(offset) ) {
+		if ( offset == ID2SYM(rb_intern("start")) )
+			consumerConfig->start_offset = RD_KAFKA_OFFSET_BEGINNING;
+		else if ( offset == ID2SYM(rb_intern("end")) )
+			consumerConfig->start_offset = RD_KAFKA_OFFSET_END;
+	} else {
+		consumerConfig->start_offset = RD_KAFKA_OFFSET_END;
+	}
+
 	return self;
 }
 
@@ -1033,7 +1043,7 @@ void Init_hermann_lib() {
 	rb_define_alloc_func(c_consumer, consumer_allocate);
 
 	/* Initialize */
-	rb_define_method(c_consumer, "initialize", consumer_initialize, 3);
+	rb_define_method(c_consumer, "initialize", consumer_initialize, 4);
 	rb_define_method(c_consumer, "initialize_copy", consumer_init_copy, 1);
 
 	/* Consumer has method 'consume' */

data/ext/hermann/hermann_lib.h

@@ -96,6 +96,7 @@ typedef struct HermannInstanceConfig {
 	int isConnected;
 
 	int isErrored;
+
 	char *error;
 } HermannInstanceConfig;
 

data/lib/hermann/consumer.rb

@@ -1,4 +1,5 @@
 require 'hermann'
+require 'hermann/errors'
 
 if Hermann.jruby?
   require 'hermann/provider/java_simple_consumer'
@@ -17,13 +18,18 @@ module Hermann
     #
     # @params [String] kafka topic
     # @params [Hash] options for Consumer
-    # @option opts [String]  :brokers    (for MRI) Comma separated list of brokers
-    # @option opts [Integer] :partition  (for MRI) The kafka partition
+    # @option opts [String]        :brokers    (for MRI) Comma separated list of brokers
+    # @option opts [Integer]       :partition  (for MRI) The kafka partition
+    # @option opts [Symbol|Fixnum] :offset     (for MRI) Starting consumer offset.  either :start, :end, or Fixnum
     # @option opts [Integer] :zookeepers (for jruby) list of zookeeper servers
     # @option opts [Integer] :group_id   (for jruby) client group_id
     #
     def initialize(topic, opts = {})
       @topic = topic
+
+      offset = opts.delete(:offset)
+      raise Hermann::Errors::InvalidOffsetError.new("Bad offset: #{offset}") unless valid_offset?(offset)
+
       if Hermann.jruby?
         zookeepers, group_id = require_values_at(opts, :zookeepers, :group_id)
 
@@ -31,7 +37,7 @@ module Hermann
       else
         brokers, partition = require_values_at(opts, :brokers, :partition)
 
-        @internal = Hermann::Lib::Consumer.new(topic, brokers, partition)
+        @internal = Hermann::Lib::Consumer.new(topic, brokers, partition, offset)
       end
     end
 
@@ -49,6 +55,12 @@ module Hermann
       end
     end
 
+    private
+
+    def valid_offset?(offset)
+      offset.nil? || offset.is_a?(Fixnum) || offset == :start || offset == :end
+    end
+
     def require_values_at(opts, *args)
       args.map do |a|
         raise "Please provide :#{a} option!" unless opts[a]

data/lib/hermann/errors.rb

@@ -24,6 +24,9 @@ module Hermann
 
     # cannot discover brokers from zookeeper
     class NoBrokersError < GeneralError; end
+
+    # offsets can only be two symbols or a fixnum
+    class InvalidOffsetError < GeneralError; end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermann
 version: !ruby/object:Gem::Version
-  version: 0.23.0.236
+  version: 0.23.0.240
 platform: ruby
 authors:
 - R. Tyler Croy