You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ki...@apache.org on 2019/12/23 04:02:12 UTC
[incubator-pinot] branch pinot-clients created (now 75edce5)
This is an automated email from the ASF dual-hosted git repository.
kishoreg pushed a change to branch pinot-clients
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at 75edce5 Moving pinot-api to pinot-clients/pinot-java-client
This branch includes the following new commits:
new 75edce5 Moving pinot-api to pinot-clients/pinot-java-client
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Moving pinot-api to
pinot-clients/pinot-java-client
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kishoreg pushed a commit to branch pinot-clients
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 75edce5623c8de96ebffb7c06a90036f748a8105
Author: kishoreg <g....@gmail.com>
AuthorDate: Sun Dec 22 20:01:47 2019 -0800
Moving pinot-api to pinot-clients/pinot-java-client
---
.../pinot-java-client}/pom.xml | 8 +--
.../org/apache/pinot/client/AbstractResultSet.java | 0
.../apache/pinot/client/AggregationResultSet.java | 0
.../org/apache/pinot/client/BrokerResponse.java | 0
.../org/apache/pinot/client/BrokerSelector.java | 0
.../java/org/apache/pinot/client/Connection.java | 0
.../org/apache/pinot/client/ConnectionFactory.java | 0
.../apache/pinot/client/DynamicBrokerSelector.java | 0
.../apache/pinot/client/ExternalViewReader.java | 0
.../org/apache/pinot/client/GroupByResultSet.java | 0
.../client/JsonAsyncHttpPinotClientTransport.java | 0
.../JsonAsyncHttpPinotClientTransportFactory.java | 0
.../apache/pinot/client/PinotClientException.java | 0
.../apache/pinot/client/PinotClientTransport.java | 0
.../pinot/client/PinotClientTransportFactory.java | 0
.../org/apache/pinot/client/PreparedStatement.java | 0
.../main/java/org/apache/pinot/client/Request.java | 0
.../java/org/apache/pinot/client/ResultSet.java | 0
.../org/apache/pinot/client/ResultSetGroup.java | 0
.../apache/pinot/client/SelectionResultSet.java | 0
.../apache/pinot/client/SimpleBrokerSelector.java | 0
.../java/org/apache/pinot/client/TextTable.java | 0
.../java/org/apache/pinot/client/package-info.java | 0
.../apache/pinot/client/ConnectionFactoryTest.java | 0
.../apache/pinot/client/PreparedStatementTest.java | 0
.../apache/pinot/client/ResultSetGroupTest.java | 0
.../src/test/resources/log4j2.xml | 0
.../org/apache/pinot/client/aggregation.json | 0
.../apache/pinot/client/aggregationGroupBy.json | 0
.../org/apache/pinot/client/exception.json | 0
.../org/apache/pinot/client/selection.json | 0
pinot-clients/pom.xml | 57 ++++++++++++++++++++++
pinot-distribution/pom.xml | 27 +---------
pinot-integration-tests/pom.xml | 2 +-
pom.xml | 13 ++---
35 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/pinot-api/pom.xml b/pinot-clients/pinot-java-client/pom.xml
similarity index 94%
rename from pinot-api/pom.xml
rename to pinot-clients/pinot-java-client/pom.xml
index 9ea3077..cc0d6cc 100644
--- a/pinot-api/pom.xml
+++ b/pinot-clients/pinot-java-client/pom.xml
@@ -23,15 +23,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>pinot</artifactId>
+ <artifactId>pinot-clients</artifactId>
<groupId>org.apache.pinot</groupId>
<version>0.3.0-SNAPSHOT</version>
</parent>
- <artifactId>pinot-api</artifactId>
- <name>Pinot API</name>
+ <artifactId>pinot-java-client</artifactId>
+ <name>Pinot Java Client</name>
<url>https://pinot.apache.org/</url>
<properties>
- <pinot.root>${basedir}/..</pinot.root>
+ <pinot.root>${basedir}/../..</pinot.root>
</properties>
<build>
<plugins>
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/AbstractResultSet.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/AbstractResultSet.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/AbstractResultSet.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/AggregationResultSet.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/AggregationResultSet.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/AggregationResultSet.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/BrokerResponse.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerResponse.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/BrokerSelector.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/BrokerSelector.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/Connection.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/Connection.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Connection.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/ConnectionFactory.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ConnectionFactory.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/DynamicBrokerSelector.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ExternalViewReader.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/ExternalViewReader.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ExternalViewReader.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/GroupByResultSet.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/GroupByResultSet.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/GroupByResultSet.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientException.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/PinotClientException.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientException.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransport.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransport.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PinotClientTransportFactory.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/PreparedStatement.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/PreparedStatement.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/Request.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Request.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/Request.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/Request.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ResultSet.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/ResultSet.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ResultSet.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ResultSetGroup.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/ResultSetGroup.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/ResultSetGroup.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SelectionResultSet.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/SelectionResultSet.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SelectionResultSet.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/SimpleBrokerSelector.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/TextTable.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/TextTable.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/TextTable.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/TextTable.java
diff --git a/pinot-api/src/main/java/org/apache/pinot/client/package-info.java b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/package-info.java
similarity index 100%
rename from pinot-api/src/main/java/org/apache/pinot/client/package-info.java
rename to pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/package-info.java
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
similarity index 100%
rename from pinot-api/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
rename to pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ConnectionFactoryTest.java
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
similarity index 100%
rename from pinot-api/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
rename to pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/PreparedStatementTest.java
diff --git a/pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
similarity index 100%
rename from pinot-api/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
rename to pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/ResultSetGroupTest.java
diff --git a/pinot-api/src/test/resources/log4j2.xml b/pinot-clients/pinot-java-client/src/test/resources/log4j2.xml
similarity index 100%
rename from pinot-api/src/test/resources/log4j2.xml
rename to pinot-clients/pinot-java-client/src/test/resources/log4j2.xml
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json
similarity index 100%
rename from pinot-api/src/test/resources/org/apache/pinot/client/aggregation.json
rename to pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregation.json
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
similarity index 100%
rename from pinot-api/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
rename to pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/aggregationGroupBy.json
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/exception.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json
similarity index 100%
rename from pinot-api/src/test/resources/org/apache/pinot/client/exception.json
rename to pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/exception.json
diff --git a/pinot-api/src/test/resources/org/apache/pinot/client/selection.json b/pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json
similarity index 100%
rename from pinot-api/src/test/resources/org/apache/pinot/client/selection.json
rename to pinot-clients/pinot-java-client/src/test/resources/org/apache/pinot/client/selection.json
diff --git a/pinot-clients/pom.xml b/pinot-clients/pom.xml
new file mode 100644
index 0000000..52e1cb9
--- /dev/null
+++ b/pinot-clients/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>pinot</artifactId>
+ <groupId>org.apache.pinot</groupId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>pinot-clients</artifactId>
+ <packaging>pom</packaging>
+ <name>Pinot Clients</name>
+ <url>https://pinot.apache.org/</url>
+ <properties>
+ <pinot.root>${basedir}/..</pinot.root>
+ </properties>
+
+ <modules>
+ <module>pinot-java-client</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/pinot-distribution/pom.xml b/pinot-distribution/pom.xml
index 970ec69..372ce92 100644
--- a/pinot-distribution/pom.xml
+++ b/pinot-distribution/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-api</artifactId>
+ <artifactId>pinot-java-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
@@ -60,31 +60,6 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-controller</artifactId>
</dependency>
- <!--<dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-hadoop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-azure-filesystem</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-gcs-filesystem</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.cloud</groupId>
- <artifactId>google-cloud-storage</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-orc</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-tools</artifactId>
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index 29663a4..bf4b0ce 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -119,7 +119,7 @@
<dependencies>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-api</artifactId>
+ <artifactId>pinot-java-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
diff --git a/pom.xml b/pom.xml
index 1eaffe9..2b6d384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<module>pinot-spi</module>
<module>pinot-broker</module>
<module>pinot-common</module>
- <module>pinot-api</module>
+ <module>pinot-clients</module>
<module>pinot-server</module>
<module>pinot-core</module>
<module>pinot-controller</module>
@@ -234,7 +234,7 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-api</artifactId>
+ <artifactId>pinot-java-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -279,12 +279,12 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-hadoop-filesystem</artifactId>
+ <artifactId>pinot-hdfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-azure-filesystem</artifactId>
+ <artifactId>pinot-azure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -298,11 +298,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-gcs-filesystem</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>1.7.2</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org