merge(travis): pull changes from uptake#28;

.gitignore

@@ -5,4 +5,5 @@
 *.o
 *.so
 *.DS_Store
-fRanz/inst/librdkafka*
+franz/src/librdkafka
+librdkafka*

README.md

@@ -11,6 +11,13 @@
 fRanz is an open source R kafka client that allows users to read and write messages from kafka. It leverages the stability and performance of [librdkafka](https://github.com/edenhill/librdkafka) and implements ididiomatic R workflows ontop of it. 
 
 
+## Installation 
+
+We're working on it. Currently you need librdkafka as a system available library in order to load the R package. In order to install from source you also need the headers. A make recipe in the top level `make librdkafka` should work for *nix systems.
+
+
+No attempt has been made for windows compatability.
+
 ## Example of sending and reading a message
 
 ```r

fRanz/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: fRanz
 Type: Package
-Title: An R Kafka Client
+Title: An R Kafka Client.
 Version: 0.1.0
 Date: 2019-05-13
 Authors@R: c(

fRanz/NAMESPACE

@@ -2,8 +2,11 @@
 
 export(GetRdConsumer)
 export(GetRdProducer)
+export(KafkaBroker)
 export(KafkaConsume)
+export(KafkaConsumer)
 export(KafkaProduce)
+export(KafkaProducer)
 export(RdSubscribe)
 importFrom(R6,R6Class)
 importFrom(Rcpp,sourceCpp)

fRanz/R/KafkaBroker.R

@@ -1,6 +1,7 @@
 #' @title KafkaBroker
-#' @name Kafka Broker
+#' @name KafkaBroker
 #' @description TDB
+#' @export
 #' @importFrom R6 R6Class
 KafkaBroker <- R6::R6Class(
     classname = "KafkaBroker"

fRanz/R/KafkaConsumer.R

@@ -1,6 +1,7 @@
 #' @title Kakfa Consumer
 #' @name KafkaConsumer
 #' @description TDB
+#' @export
 #' @importFrom R6 R6Class
 KafkaConsumer <- R6::R6Class(
     classname = "KafkaConsumer"

fRanz/R/KafkaProducer.R

@@ -1,6 +1,7 @@
 #' @title Kakfa Producer
 #' @name KafkaProducer
 #' @description TDB
+#' @export
 #' @importFrom R6 R6Class
 KafkaProducer <- R6::R6Class(
     classname = "KafkaProducer"

fRanz/R/RcppExports.R

@@ -3,7 +3,7 @@
 
 #' @title GetRdConsumer
 #' @name GetRdConsumer
-#' @description Creates an Rcpp::XPtr<RdKafka::Consumer>. For more details on options \link{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}
+#' @description Creates an Rcpp::XPtr<RdKafka::Consumer>. For more details on options \href{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}{Configuration}
 #' @param keys a character vector indicating option keys to parameterize the RdKafka::Consumer
 #' @param values a character vector indicating option values to parameterize the RdKafka::Consumer. Must be of same length as keys.
 #' @return a Rcpp::XPtr<RdKafka::Consumer>
@@ -26,18 +26,19 @@ RdSubscribe <- function(consumerPtr, Rtopics) {
 
 #' @title KafkaConsume
 #' @name KafkaConsume
-#' @description
+#' @description A method to that takes a consumer pointer and returns at most the specified number of results, unless the timeout is reached
 #' @param consumerPtr a reference to a Rcpp::XPtr<RdKafka::KafkaConsumer>
 #' @param numResults how many results should be consumed before returning. Will return early if offset is at maximum
+#' @param timeout the timeout in milliseconds. Default is 10000
 #' @return a list of length numResults with values list(key=key,value=value)
 #' @export
-KafkaConsume <- function(consumerPtr, numResults) {
-    .Call('_fRanz_KafkaConsume', PACKAGE = 'fRanz', consumerPtr, numResults)
+KafkaConsume <- function(consumerPtr, numResults, timeout = 10000L) {
+    .Call('_fRanz_KafkaConsume', PACKAGE = 'fRanz', consumerPtr, numResults, timeout)
 }
 
 #' @title GetRdProducer
 #' @name GetRdProducer
-#' @description Creates an Rcpp::XPtr<RdKafka::Producer>. For more details on options \link{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}
+#' @description Creates an Rcpp::XPtr<RdKafka::Producer>. For more details on options \href{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}{Configuration}
 #' @param keys a character vector indicating option keys to parameterize the RdKafka::Producer
 #' @param values a character vector indicating option values to parameterize the RdKafka::Producer. Must be of same length as keys.
 #' @return a Rcpp::XPtr<RdKafka::Producer>

fRanz/src/Makevars

@@ -1,23 +1,2 @@
-INSTALLDIR = $(HOME)/.fRanz/librdkafka
-LIBRDKAFKADIR = $(PWD)/../inst/librdkafka-0.11.6
-
-PKG_LIBS = -L$(INSTALLDIR)/src-cpp -lrdkafka++
-PKG_CXXFLAGS = -std=c++11 -I$(INSTALLDIR)/src-cpp
-
-.PHONY: all install_librdkadka
-
-all: install_librdkadka
-
-install_librdkadka:
-	if [ ! -s $(INSTALLDIR)/src-cpp/librdkafka++.a ] ; \
-	then \
-		mkdir -p $(INSTALLDIR) && \
-		cd $(shell dirname $(LIBRDKAFKADIR)) && \
-		tar xzf $(LIBRDKAFKADIR).tar.gz && \
-		cd $(LIBRDKAFKADIR) && \
-		./configure && \
-		$(MAKE) && \
-                $(MAKE) install && \
-		mv * $(INSTALLDIR) ; \
-	fi
-
+PKG_LIBS = -lrdkafka++
+CXX_STD=CXX11

fRanz/src/RcppExports.cpp

@@ -30,14 +30,15 @@ BEGIN_RCPP
 END_RCPP
 }
 // KafkaConsume
-Rcpp::List KafkaConsume(SEXP consumerPtr, int numResults);
-RcppExport SEXP _fRanz_KafkaConsume(SEXP consumerPtrSEXP, SEXP numResultsSEXP) {
+Rcpp::List KafkaConsume(SEXP consumerPtr, int numResults, int timeout);
+RcppExport SEXP _fRanz_KafkaConsume(SEXP consumerPtrSEXP, SEXP numResultsSEXP, SEXP timeoutSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< SEXP >::type consumerPtr(consumerPtrSEXP);
     Rcpp::traits::input_parameter< int >::type numResults(numResultsSEXP);
-    rcpp_result_gen = Rcpp::wrap(KafkaConsume(consumerPtr, numResults));
+    Rcpp::traits::input_parameter< int >::type timeout(timeoutSEXP);
+    rcpp_result_gen = Rcpp::wrap(KafkaConsume(consumerPtr, numResults, timeout));
     return rcpp_result_gen;
 END_RCPP
 }
@@ -72,7 +73,7 @@ END_RCPP
 static const R_CallMethodDef CallEntries[] = {
     {"_fRanz_GetRdConsumer", (DL_FUNC) &_fRanz_GetRdConsumer, 2},
     {"_fRanz_RdSubscribe", (DL_FUNC) &_fRanz_RdSubscribe, 2},
-    {"_fRanz_KafkaConsume", (DL_FUNC) &_fRanz_KafkaConsume, 2},
+    {"_fRanz_KafkaConsume", (DL_FUNC) &_fRanz_KafkaConsume, 3},
     {"_fRanz_GetRdProducer", (DL_FUNC) &_fRanz_GetRdProducer, 2},
     {"_fRanz_KafkaProduce", (DL_FUNC) &_fRanz_KafkaProduce, 5},
     {NULL, NULL, 0}

fRanz/src/consumer.cpp

@@ -1,19 +1,11 @@
-#include <rdkafkacpp.h>
+#include <librdkafka/rdkafkacpp.h>
 #include <Rcpp.h>
 #include "utils.h"
-#include <iostream>
-#include <string>
-#include <cstdlib>
-#include <cstdio>
-#include <csignal>
-#include <thread>
-#include <chrono>
-#include <cstring>
 
 ////////////////////////////////////////////////////////////////////////////////////////
 //' @title GetRdConsumer
 //' @name GetRdConsumer
-//' @description Creates an Rcpp::XPtr<RdKafka::Consumer>. For more details on options \link{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}
+//' @description Creates an Rcpp::XPtr<RdKafka::Consumer>. For more details on options \href{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}{Configuration}
 //' @param keys a character vector indicating option keys to parameterize the RdKafka::Consumer
 //' @param values a character vector indicating option values to parameterize the RdKafka::Consumer. Must be of same length as keys.
 //' @return a Rcpp::XPtr<RdKafka::Consumer>
@@ -52,18 +44,19 @@ int RdSubscribe(SEXP consumerPtr, const Rcpp::StringVector Rtopics) {
 
 //' @title KafkaConsume
 //' @name KafkaConsume
-//' @description
+//' @description A method to that takes a consumer pointer and returns at most the specified number of results, unless the timeout is reached
 //' @param consumerPtr a reference to a Rcpp::XPtr<RdKafka::KafkaConsumer>
 //' @param numResults how many results should be consumed before returning. Will return early if offset is at maximum
+//' @param timeout the timeout in milliseconds. Default is 10000
 //' @return a list of length numResults with values list(key=key,value=value)
 //' @export
 // [[Rcpp::export]]
-Rcpp::List KafkaConsume(SEXP consumerPtr, int numResults) {
+Rcpp::List KafkaConsume(SEXP consumerPtr, int numResults, int timeout = 10000) {
     Rcpp::XPtr<RdKafka::KafkaConsumer> consumer(consumerPtr);
 
     Rcpp::List messages(numResults);
     for(int i = 0; i < numResults; i++) {
-        RdKafka::Message *msg = consumer->consume(10000);
+        RdKafka::Message *msg = consumer->consume(timeout);
         switch(msg->err()){
             case RdKafka::ERR_NO_ERROR: {
                 Rcpp::List message = Rcpp::List::create(Rcpp::Named("key") = *msg->key(),

fRanz/src/producer.cpp

@@ -1,16 +1,10 @@
-#include <rdkafkacpp.h>
+#include <librdkafka/rdkafkacpp.h>
 #include <Rcpp.h>
 #include "utils.h"
-#include <iostream>
-#include <string>
-#include <cstdlib>
-#include <cstdio>
-#include <csignal>
-#include <cstring>
 
 //' @title GetRdProducer
 //' @name GetRdProducer
-//' @description Creates an Rcpp::XPtr<RdKafka::Producer>. For more details on options \link{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}
+//' @description Creates an Rcpp::XPtr<RdKafka::Producer>. For more details on options \href{https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md}{Configuration}
 //' @param keys a character vector indicating option keys to parameterize the RdKafka::Producer
 //' @param values a character vector indicating option values to parameterize the RdKafka::Producer. Must be of same length as keys.
 //' @return a Rcpp::XPtr<RdKafka::Producer>

fRanz/src/utils.cpp

@@ -1,5 +1,5 @@
 #include <Rcpp.h>
-#include <rdkafkacpp.h>
+#include <librdkafka/rdkafkacpp.h>
 
 
 

fRanz/src/utils.h

@@ -1,4 +1,4 @@
 #include <Rcpp.h>
-#include <rdkafkacpp.h>
+#include <librdkafka/rdkafkacpp.h>
 
 RdKafka::Conf* MakeKafkaConfig(Rcpp::StringVector keys, Rcpp::StringVector values);

fRanz/tests/testthat/test-KafkaConsumer.R

@@ -2,6 +2,7 @@ context("KafkaConsumer and KafkaProducer")
 
 
 testthat::test_that("Testing KafkaConsumer and KafkaProducer work consuming 1 message",{
+    testthat::skip_on_cran()
     ## Standard Set Up
     topic <- uuid::UUIDgenerate()
     group <- uuid::UUIDgenerate()
@@ -25,6 +26,7 @@ testthat::test_that("Testing KafkaConsumer and KafkaProducer work consuming 1 me
 
 
 testthat::test_that("Testing KafkaConsumer and KafkaProducer work consuming random number of messages",{
+    testthat::skip_on_cran()
     ## Standard Set Up
     topic <- uuid::UUIDgenerate()
     group <- uuid::UUIDgenerate()