This is an automated email from the ASF dual-hosted git repository.
kishoreg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new c2e6251 Removing dependency on pinot-common and pinot-core from
pinot-connect… (#4940)
c2e6251 is described below
commit c2e6251275f05e4445d9e98ceda2a8a59c46668a
Author: Kishore Gopalakrishna <[email protected]>
AuthorDate: Thu Dec 19 08:39:56 2019 -0800
Removing dependency on pinot-common and pinot-core from pinot-connect…
(#4940)
* Removing dependency on pinot-common and pinot-core from pinot-connectors
(WIP)
* Fixing compilation issues
---
pinot-connectors/pinot-connector-kafka-0.9/pom.xml | 4 ----
.../pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java | 2 +-
pinot-connectors/pinot-connector-kafka-2.0/pom.xml | 8 --------
.../realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java | 2 +-
pinot-connectors/pinot-connector-kafka-base/pom.xml | 4 ++++
.../pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java | 5 -----
.../apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java | 4 ++--
pinot-connectors/pom.xml | 7 +++++++
8 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
b/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
index 862a0f5..18f39ae 100644
--- a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
+++ b/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
@@ -62,10 +62,6 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java
b/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java
index e5bbee1..dce36c1 100644
---
a/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java
+++
b/pinot-connectors/pinot-connector-kafka-0.9/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaLowLevelStreamConfig.java
@@ -20,7 +20,7 @@ package org.apache.pinot.core.realtime.impl.kafka;
import com.google.common.base.Preconditions;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.spi.utils.EqualityUtils;
import org.apache.pinot.spi.stream.StreamConfig;
diff --git a/pinot-connectors/pinot-connector-kafka-2.0/pom.xml
b/pinot-connectors/pinot-connector-kafka-2.0/pom.xml
index 728ff05..56d86f8 100644
--- a/pinot-connectors/pinot-connector-kafka-2.0/pom.xml
+++ b/pinot-connectors/pinot-connector-kafka-2.0/pom.xml
@@ -61,10 +61,6 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -89,10 +85,6 @@
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java
b/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java
index be9001c..6305007 100644
---
a/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java
+++
b/pinot-connectors/pinot-connector-kafka-2.0/src/main/java/org/apache/pinot/core/realtime/impl/kafka2/KafkaPartitionLevelStreamConfig.java
@@ -20,7 +20,7 @@ package org.apache.pinot.core.realtime.impl.kafka2;
import com.google.common.base.Preconditions;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pinot.spi.utils.EqualityUtils;
import org.apache.pinot.core.realtime.impl.kafka.KafkaStreamConfigProperties;
import org.apache.pinot.spi.stream.StreamConfig;
diff --git a/pinot-connectors/pinot-connector-kafka-base/pom.xml
b/pinot-connectors/pinot-connector-kafka-base/pom.xml
index 2a02620..8b2041a 100644
--- a/pinot-connectors/pinot-connector-kafka-base/pom.xml
+++ b/pinot-connectors/pinot-connector-kafka-base/pom.xml
@@ -37,6 +37,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-avro</artifactId>
+ </dependency>
<!-- test -->
<dependency>
<groupId>org.testng</groupId>
diff --git
a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java
b/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java
index b25cc68..0efa536 100644
---
a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java
+++
b/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaAvroMessageDecoder.java
@@ -37,7 +37,6 @@ import org.apache.avro.generic.GenericData.Record;
import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.io.DatumReader;
import org.apache.avro.io.DecoderFactory;
-import org.apache.commons.lang.StringUtils;
import org.apache.pinot.spi.data.Schema;
import org.apache.pinot.spi.utils.retry.RetryPolicies;
import org.apache.pinot.spi.data.readers.GenericRow;
@@ -84,10 +83,6 @@ public class KafkaAvroMessageDecoder implements
StreamMessageDecoder<byte[]> {
throws Exception {
schemaRegistryUrls =
parseSchemaRegistryUrls(props.get(SCHEMA_REGISTRY_REST_URL));
- for (String schemaRegistryUrl : schemaRegistryUrls) {
- StringUtils.chomp(schemaRegistryUrl, "/");
- }
-
String avroSchemaName = topicName;
if (props.containsKey(SCHEMA_REGISTRY_SCHEMA_NAME) &&
props.get(SCHEMA_REGISTRY_SCHEMA_NAME) != null && !props
.get(SCHEMA_REGISTRY_SCHEMA_NAME).isEmpty()) {
diff --git
a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java
b/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java
index efd8374..6b5e398 100644
---
a/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java
+++
b/pinot-connectors/pinot-connector-kafka-base/src/main/java/org/apache/pinot/core/realtime/impl/kafka/KafkaStarterUtils.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.ServiceLoader;
-import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.spi.stream.StreamConsumerFactory;
import org.apache.pinot.spi.stream.StreamDataProvider;
import org.apache.pinot.spi.stream.StreamDataServerStartable;
@@ -30,7 +29,8 @@ import org.apache.pinot.spi.stream.StreamDataServerStartable;
public class KafkaStarterUtils {
public static final int DEFAULT_BROKER_ID = 0;
- public static final String DEFAULT_ZK_STR = ZkStarter.DEFAULT_ZK_STR +
"/kafka";
+ public static final int DEFAULT_ZK_TEST_PORT = 2191;
+ public static final String DEFAULT_ZK_STR = "localhost:" +
DEFAULT_ZK_TEST_PORT + "/kafka";
public static int DEFAULT_KAFKA_PORT = 19092;
public static final String DEFAULT_KAFKA_BROKER = "localhost:" +
DEFAULT_KAFKA_PORT;
diff --git a/pinot-connectors/pom.xml b/pinot-connectors/pom.xml
index fdeb443..bb65ecc 100644
--- a/pinot-connectors/pom.xml
+++ b/pinot-connectors/pom.xml
@@ -46,6 +46,12 @@
<dependencies>
<dependency>
<groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
<scope>provided</scope>
<exclusions>
@@ -66,6 +72,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<!-- test -->
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
