[incubator-pinot] 01/01: Update Quickstart to take tmp dir as a parameter and default to current dir
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch enhance_quickstart
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 7504fbce9828b82448ec45bdf728a43c5fdee010
Author: Xiang Fu
AuthorDate: Mon May 25 21:15:18 2020 -0700
Update Quickstart to take tmp dir as a parameter and default to current dir
---
.../org/apache/pinot/tools/HybridQuickstart.java | 21 +++-
.../java/org/apache/pinot/tools/Quickstart.java| 18 +++---
.../org/apache/pinot/tools/RealtimeQuickStart.java | 18 +++---
.../tools/admin/command/QuickStartCommand.java | 29 +++---
4 files changed, 71 insertions(+), 15 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
index 3c55441..4fc2809 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
@@ -23,6 +23,9 @@ import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.utils.ZkStarter;
import org.apache.pinot.spi.config.table.TableConfig;
@@ -33,6 +36,7 @@ import org.apache.pinot.spi.stream.StreamDataProvider;
import org.apache.pinot.spi.stream.StreamDataServerStartable;
import org.apache.pinot.spi.utils.JsonUtils;
import org.apache.pinot.tools.Quickstart.Color;
+import org.apache.pinot.tools.admin.PinotAdministrator;
import org.apache.pinot.tools.admin.command.QuickstartRunner;
import org.apache.pinot.tools.streams.AirlineDataStream;
import org.apache.pinot.tools.utils.KafkaStarterUtils;
@@ -48,13 +52,19 @@ public class HybridQuickstart {
private File _realtimeTableConfigFile;
private File _dataFile;
private File _ingestionJobSpecFile;
+ private File _tmpDir = new File(HybridQuickstart.class.getName());
public static void main(String[] args)
throws Exception {
-// TODO: Explicitly call below method to load dependencies from
pinot-plugins libs which are excluded from pinot-tools packaging.
-// E.g. Kafka related libs are coming from pinot-kafka-* lib, avro libs
are coming from pinot-avro lib.
-PluginManager.get().init();
-new HybridQuickstart().execute();
+List arguments = new ArrayList<>();
+arguments.addAll(Arrays.asList("QuickStart", "-type", "HYBRID"));
+arguments.addAll(Arrays.asList(args));
+PinotAdministrator.main(arguments.toArray(new String[arguments.size()]));
+ }
+
+ public HybridQuickstart setTmpDir(String tmpDir) {
+this._tmpDir = new File(tmpDir);
+return this;
}
private QuickstartTableRequest prepareOfflineTableRequest(File configDir)
@@ -110,8 +120,7 @@ public class HybridQuickstart {
public void execute()
throws Exception {
-
-File quickstartTmpDir = new File(FileUtils.getTempDirectory(),
String.valueOf(System.currentTimeMillis()));
+File quickstartTmpDir = new File(_tmpDir,
String.valueOf(System.currentTimeMillis()));
File configDir = new File(quickstartTmpDir, "configs");
File dataDir = new File(quickstartTmpDir, "data");
Preconditions.checkState(configDir.mkdirs());
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
index 3c0b0d1..ec671a0 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
@@ -23,9 +23,13 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.File;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.spi.data.readers.FileFormat;
import org.apache.pinot.spi.plugin.PluginManager;
+import org.apache.pinot.tools.admin.PinotAdministrator;
import org.apache.pinot.tools.admin.command.QuickstartRunner;
@@ -33,6 +37,12 @@ public class Quickstart {
private static final String TAB = "\t\t";
private static final String NEW_LINE = "\n";
+ private File _tmpDir = new File(Quickstart.class.getName());;
+
+ public Quickstart setTmpDir(String tmpDir) {
+this._tmpDir = new File(tmpDir);
+return this;
+ }
public enum Color {
RESET("\u001B[0m"), GREEN("\u001B[32m"), YELLOW("\u001B[33m"),
CYAN("\u001B[36m");
@@ -115,7 +125,7 @@ public class Quickstart {
public void execute()
throws Exception {
-File quickstartTmpDir = new File(FileUtils.getTempDirectory(),
String.valueOf(System.currentTimeMillis()));
+File quickstartTmpDir = new File(_tmpDir,
String.valueOf(System.currentTimeMillis()));
File
[incubator-pinot] branch enhance_quickstart created (now 7504fbc)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch enhance_quickstart in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. at 7504fbc Update Quickstart to take tmp dir as a parameter and default to current dir This branch includes the following new commits: new 7504fbc Update Quickstart to take tmp dir as a parameter and default to current dir 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-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Prepare release-0.4.0-rc1
This is an automated email from the ASF dual-hosted git repository. haibow pushed a commit to branch release-0.4.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git commit 3800ca82149c337e69cff602e5c2666fce2f9a74 Author: Haibo Wang AuthorDate: Mon May 25 17:39:53 2020 -0700 Prepare release-0.4.0-rc1 --- LICENSE-binary | 154 ++--- NOTICE-binary | 52 ++- 2 files changed, 155 insertions(+), 51 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 5c0e3e4..b537893 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -211,28 +211,32 @@ com.clearspring.analytics:stream:2.7.0 com.fasterxml.jackson.core:jackson-annotations:2.9.8 com.fasterxml.jackson.core:jackson-core:2.9.8 com.fasterxml.jackson.core:jackson-databind:2.9.8 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.8 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.8 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.8 com.fasterxml.jackson.module:jackson-module-paranamer:2.6.5 com.fasterxml.jackson.module:jackson-module-scala_2.11:2.6.5 +com.fasterxml.woodstox:woodstox-core:5.0.3 com.github.jnr:jffi:1.2.9 com.github.jnr:jnr-constants:0.8.7 com.github.jnr:jnr-ffi:2.0.3 +com.google.api-client:google-api-client com.google.api.grpc:proto-google-common-protos:1.17.0 com.google.api.grpc:proto-google-iam-v1:0.13.0 com.google.api:api-common:1.8.1 com.google.api:gax:1.49.1 com.google.api:gax-httpjson:0.66.1 -com.google.api:google-api-client:1.30.4 -com.google.api:google-api-services-storage:v1-rev20190910-1.30.3.jar +com.google.apis:google-api-services-storage:v1-rev20190910-1.30.3 com.google.auth:google-auth-library-credentials:0.18.0 com.google.auth:google-auth-library-oauth2-http:0.18.0 com.google.auto.value:auto-value-annotations:1.6.6 com.google.cloud:google-cloud-core:1.91.3 com.google.cloud:google-cloud-core-http:1.91.3 -com.google.cloud:google-cloud-storage:1.101.0 +com.google.cloud:google-cloud-nio:0.120.0-alpha +com.google.cloud:google-cloud-storage:1.102.0 com.google.code.findbugs:jsr305:3.0.0 com.google.code.gson:gson:2.2.4 com.google.errorprone:error_prone_annotations:2.3.2 @@ -240,21 +244,20 @@ com.google.guava:guava:20.0 com.google.http-client:google-http-client-appengine:1.32.1 com.google.http-client:google-http-client-jackson2:1.32.1 com.google.http-client:google-http-client:1.32.1 -com.google.inject.extensions:guice-servlet:3.0 -com.google.inject:guice:3.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.30.3 com.google.protobuf:protobuf-java-util:3.10.0 com.google.protobuf:protobuf-java:2.5.0 com.google.protobuf:protobuf-java:3.10.0 com.jamesmurty.utils:java-xmlbuilder:0.4 +com.jamesmurty.utils:java-xmlbuilder:1.0 +com.jayway.jsonpath:json-path:2.4.0 com.lmax:disruptor:3.3.4 com.ning:async-http-client:1.9.21 com.ning:compress-lzf:1.0.3 com.tdunning:t-digest:3.2 -com.twitter:chill-java:0.8.0 -com.twitter:chill_2.11:0.8.0 -com.typesafe:config:1.3.2 +com.typesafe.netty:netty-reactive-streams-http:2.0.4 +com.typesafe.netty:netty-reactive-streams:2.0.4 com.typesafe.scala-logging:scala-logging_2.11:3.9.0 com.yammer.metrics:metrics-core:2.2.0 commons-beanutils:commons-beanutils:1.8.3 @@ -271,15 +274,35 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 commons-net:commons-net:3.1 io.airlift:aircompressor:0.10 +io.confluent:common-config:5.3.1 +io.confluent:common-utils:5.3.1 +io.confluent:kafka-avro-serializer:5.3.1 +io.confluent:kafka-schema-registry-client:5.3.1 io.dropwizard.metrics:metrics-core:3.2.3 -io.dropwizard.metrics:metrics-graphite:3.1.2 -io.dropwizard.metrics:metrics-json:3.1.2 -io.dropwizard.metrics:metrics-jvm:3.1.2 +io.dropwizard.metrics:metrics-graphite:3.2.3 +io.dropwizard.metrics:metrics-json:3.2.3 +io.dropwizard.metrics:metrics-jvm:3.2.3 io.grpc:grpc-context:1.22.1 +io.netty:netty-all:4.1.42.Final +io.netty:netty-buffer:4.1.42.Final +io.netty:netty-codec-http2:4.1.42.Final +io.netty:netty-codec-http:4.1.42.Final +io.netty:netty-codec-socks:4.1.42.Final +io.netty:netty-codec:4.1.42.Final +io.netty:netty-common:4.1.42.Final +io.netty:netty-handler-proxy:4.1.42.Final +io.netty:netty-handler:4.1.42.Final +io.netty:netty-resolver:4.1.42.Final +io.netty:netty-tcnative-boringssl-static:2.0.26.Final +io.netty:netty-transport-native-epoll:linux-x86_64:4.1.42.Final +io.netty:netty-transport-native-unix-common:4.1.42.Final +io.netty:netty-transport:4.1.42.Final io.netty:netty:3.9.6.Final -io.netty:netty-all:4.1.28.Final io.opencensus:opencensus-api:0.24.0 io.opencensus:opencensus-contrib-http-util:0.24.0 +io.projectreactor.addons:reactor-pool:0.1.0.RELEASE +io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
[incubator-pinot] branch release-0.4.0-rc1 updated (88f41ea -> 3800ca8)
This is an automated email from the ASF dual-hosted git repository. haibow pushed a change to branch release-0.4.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. discard 88f41ea WIP new 3800ca8 Prepare release-0.4.0-rc1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (88f41ea) \ N -- N -- N refs/heads/release-0.4.0-rc1 (3800ca8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: licenses-binary/LICENSE-gpl-2.0.txt | 125 1 file changed, 125 deletions(-) delete mode 100644 licenses-binary/LICENSE-gpl-2.0.txt - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch enhance_log4j updated (236ab23 -> 9b7be2f)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a change to branch enhance_log4j
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
discard 236ab23 Update Pinot-admin and quickstart log4j config
add 9b7be2f Update Pinot-admin and quickstart log4j config
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (236ab23)
\
N -- N -- N refs/heads/enhance_log4j (9b7be2f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
docs/batch_data_ingestion.rst | 4 +-
kubernetes/helm/README.md | 6 +-
kubernetes/helm/pinot/README.md| 6 +-
.../helm/pinot/pinot-github-events-setup.yml | 2 +-
kubernetes/helm/pinot/values.yaml | 6 +-
pinot-tools/pom.xml| 16 ++--
.../conf/{quickstart-log4j2.xml => log4j2.xml} | 5 +-
.../src/main/resources/conf/pinot-admin-log4j2.xml | 49
.../main/resources/conf/pinot-broker-log4j2.xml| 48
.../resources/conf/pinot-controller-log4j2.xml | 48
.../resources/conf/pinot-ingestion-job-log4j2.xml | 52 -
.../main/resources/conf/pinot-server-log4j2.xml| 48
.../src/main/resources/conf/pinot-tools-log4j2.xml | 40 --
pinot-tools/src/main/resources/log4j2.xml | 86 +++---
14 files changed, 51 insertions(+), 365 deletions(-)
rename pinot-tools/src/main/resources/conf/{quickstart-log4j2.xml =>
log4j2.xml} (89%)
delete mode 100644 pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
delete mode 100644 pinot-tools/src/main/resources/conf/pinot-broker-log4j2.xml
delete mode 100644
pinot-tools/src/main/resources/conf/pinot-controller-log4j2.xml
delete mode 100644
pinot-tools/src/main/resources/conf/pinot-ingestion-job-log4j2.xml
delete mode 100644 pinot-tools/src/main/resources/conf/pinot-server-log4j2.xml
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Update Pinot-admin and quickstart log4j config
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch enhance_log4j
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 236ab2305f39a41047ebb0b932f70a0418e85f6c
Author: Xiang Fu
AuthorDate: Mon May 25 16:34:59 2020 -0700
Update Pinot-admin and quickstart log4j config
---
.../src/main/resources/conf/pinot-admin-log4j2.xml | 37 +
.../src/main/resources/conf/quickstart-log4j2.xml | 64 ++
2 files changed, 32 insertions(+), 69 deletions(-)
diff --git a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
index a7d7b3c..bca2014 100644
--- a/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/pinot-admin-log4j2.xml
@@ -20,37 +20,30 @@
-->
+
+
+logs
+%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t]
%m%n
+
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
diff --git a/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
b/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
index e80ff2a..d9ba216 100644
--- a/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/quickstart-log4j2.xml
@@ -20,60 +20,30 @@
-->
-
-
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
-
-
-%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t] %m%n
-
-
+
+logs
+%d{/MM/dd HH:mm:ss.SSS} %p [%c{1}] [%t]
%m%n
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch enhance_log4j created (now 236ab23)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch enhance_log4j in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. at 236ab23 Update Pinot-admin and quickstart log4j config This branch includes the following new commits: new 236ab23 Update Pinot-admin and quickstart log4j config 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-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch release-0.4.0-rc1 updated: WIP
This is an automated email from the ASF dual-hosted git repository. haibow pushed a commit to branch release-0.4.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git The following commit(s) were added to refs/heads/release-0.4.0-rc1 by this push: new 88f41ea WIP 88f41ea is described below commit 88f41ea971258a11b437d75e248fc84140cb150f Author: haibow AuthorDate: Mon May 25 16:23:33 2020 -0700 WIP --- LICENSE-binary | 154 NOTICE-binary | 52 +++- licenses-binary/LICENSE-gpl-2.0.txt | 125 + 3 files changed, 280 insertions(+), 51 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 5c0e3e4..b537893 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -211,28 +211,32 @@ com.clearspring.analytics:stream:2.7.0 com.fasterxml.jackson.core:jackson-annotations:2.9.8 com.fasterxml.jackson.core:jackson-core:2.9.8 com.fasterxml.jackson.core:jackson-databind:2.9.8 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.8 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.0 com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.8 com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.8 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.8 com.fasterxml.jackson.module:jackson-module-paranamer:2.6.5 com.fasterxml.jackson.module:jackson-module-scala_2.11:2.6.5 +com.fasterxml.woodstox:woodstox-core:5.0.3 com.github.jnr:jffi:1.2.9 com.github.jnr:jnr-constants:0.8.7 com.github.jnr:jnr-ffi:2.0.3 +com.google.api-client:google-api-client com.google.api.grpc:proto-google-common-protos:1.17.0 com.google.api.grpc:proto-google-iam-v1:0.13.0 com.google.api:api-common:1.8.1 com.google.api:gax:1.49.1 com.google.api:gax-httpjson:0.66.1 -com.google.api:google-api-client:1.30.4 -com.google.api:google-api-services-storage:v1-rev20190910-1.30.3.jar +com.google.apis:google-api-services-storage:v1-rev20190910-1.30.3 com.google.auth:google-auth-library-credentials:0.18.0 com.google.auth:google-auth-library-oauth2-http:0.18.0 com.google.auto.value:auto-value-annotations:1.6.6 com.google.cloud:google-cloud-core:1.91.3 com.google.cloud:google-cloud-core-http:1.91.3 -com.google.cloud:google-cloud-storage:1.101.0 +com.google.cloud:google-cloud-nio:0.120.0-alpha +com.google.cloud:google-cloud-storage:1.102.0 com.google.code.findbugs:jsr305:3.0.0 com.google.code.gson:gson:2.2.4 com.google.errorprone:error_prone_annotations:2.3.2 @@ -240,21 +244,20 @@ com.google.guava:guava:20.0 com.google.http-client:google-http-client-appengine:1.32.1 com.google.http-client:google-http-client-jackson2:1.32.1 com.google.http-client:google-http-client:1.32.1 -com.google.inject.extensions:guice-servlet:3.0 -com.google.inject:guice:3.0 com.google.j2objc:j2objc-annotations:1.3 com.google.oauth-client:google-oauth-client:1.30.3 com.google.protobuf:protobuf-java-util:3.10.0 com.google.protobuf:protobuf-java:2.5.0 com.google.protobuf:protobuf-java:3.10.0 com.jamesmurty.utils:java-xmlbuilder:0.4 +com.jamesmurty.utils:java-xmlbuilder:1.0 +com.jayway.jsonpath:json-path:2.4.0 com.lmax:disruptor:3.3.4 com.ning:async-http-client:1.9.21 com.ning:compress-lzf:1.0.3 com.tdunning:t-digest:3.2 -com.twitter:chill-java:0.8.0 -com.twitter:chill_2.11:0.8.0 -com.typesafe:config:1.3.2 +com.typesafe.netty:netty-reactive-streams-http:2.0.4 +com.typesafe.netty:netty-reactive-streams:2.0.4 com.typesafe.scala-logging:scala-logging_2.11:3.9.0 com.yammer.metrics:metrics-core:2.2.0 commons-beanutils:commons-beanutils:1.8.3 @@ -271,15 +274,35 @@ commons-lang:commons-lang:2.6 commons-logging:commons-logging:1.2 commons-net:commons-net:3.1 io.airlift:aircompressor:0.10 +io.confluent:common-config:5.3.1 +io.confluent:common-utils:5.3.1 +io.confluent:kafka-avro-serializer:5.3.1 +io.confluent:kafka-schema-registry-client:5.3.1 io.dropwizard.metrics:metrics-core:3.2.3 -io.dropwizard.metrics:metrics-graphite:3.1.2 -io.dropwizard.metrics:metrics-json:3.1.2 -io.dropwizard.metrics:metrics-jvm:3.1.2 +io.dropwizard.metrics:metrics-graphite:3.2.3 +io.dropwizard.metrics:metrics-json:3.2.3 +io.dropwizard.metrics:metrics-jvm:3.2.3 io.grpc:grpc-context:1.22.1 +io.netty:netty-all:4.1.42.Final +io.netty:netty-buffer:4.1.42.Final +io.netty:netty-codec-http2:4.1.42.Final +io.netty:netty-codec-http:4.1.42.Final +io.netty:netty-codec-socks:4.1.42.Final +io.netty:netty-codec:4.1.42.Final +io.netty:netty-common:4.1.42.Final +io.netty:netty-handler-proxy:4.1.42.Final +io.netty:netty-handler:4.1.42.Final +io.netty:netty-resolver:4.1.42.Final +io.netty:netty-tcnative-boringssl-static:2.0.26.Final +io.netty:netty-transport-native-epoll:linux-x86_64:4.1.42.Final +io.netty:netty-transport-native-unix-common:4.1.42.Final +io.netty:netty-transport:4.1.42.Final io.netty:netty:3.9.6.Final -io.netty:netty-all:4.1.28.Final
[incubator-pinot] branch ignore-quickstart-files created (now 7aa6a60)
This is an automated email from the ASF dual-hosted git repository. kishoreg pushed a change to branch ignore-quickstart-files in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. at 7aa6a60 Adding files generated by running quickstart to gitignore This branch includes the following new commits: new 7aa6a60 Adding files generated by running quickstart to gitignore 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-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Adding files generated by running quickstart to gitignore
This is an automated email from the ASF dual-hosted git repository. kishoreg pushed a commit to branch ignore-quickstart-files in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git commit 7aa6a6019d60a937bd4a109d0106ebaf542c7d34 Author: kishoreg AuthorDate: Mon May 25 11:28:18 2020 -0700 Adding files generated by running quickstart to gitignore --- .gitignore | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49bc9dd..06ec757 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,8 @@ yarn.lock npm-debug.log* yarn-debug.log* -yarn-error.log* \ No newline at end of file +yarn-error.log* + +#quickstart files +examples/ +quickstart* - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch release-0.4.0-rc1 updated (d562e42 -> 5e49f27)
This is an automated email from the ASF dual-hosted git repository. haibow pushed a change to branch release-0.4.0-rc1 in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. from d562e42 Templatizing pinot helm chart configs, so it's possible to deploy multiple pinot helmCharts with different names in same namespace (#5433) add 5e49f27 Make Compilation time function evaluation after query parser (#5437) No new revisions were added by this update. Summary of changes: .../pinot/common/function/FunctionRegistry.java| 2 + .../pinot/common/function/StringFunctions.java | 16 ++-- .../apache/pinot/sql/parsers/CalciteSqlParser.java | 92 +- .../pinot/sql/parsers/CalciteSqlCompilerTest.java | 49 +++- 4 files changed, 114 insertions(+), 45 deletions(-) copy pinot-controller/src/main/java/org/apache/pinot/controller/helix/starter/HelixConfig.java => pinot-common/src/main/java/org/apache/pinot/common/function/StringFunctions.java (77%) - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch master updated (5e49f27 -> 5223abf)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. from 5e49f27 Make Compilation time function evaluation after query parser (#5437) add 5223abf Update thirdeye docker image build (#5439) No new revisions were added by this update. Summary of changes: docker/images/pinot-thirdeye/Dockerfile| 3 ++- docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +- 2 files changed, 7 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[GitHub] [incubator-pinot] fx19880617 merged pull request #5439: Update thirdeye docker image build
fx19880617 merged pull request #5439: URL: https://github.com/apache/incubator-pinot/pull/5439 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[GitHub] [incubator-pinot] KKcorps commented on a change in pull request #5440: Add UDFs for String Transformation
KKcorps commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r429854523
##
File path:
pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##
@@ -0,0 +1,170 @@
+/**
+ * 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.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List _nonLiteralArgIndices;
+ List _nonLiteralArgType;
+ List _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+_nonLiteralArgIndices = new ArrayList<>();
+_nonLiteralArgType = new ArrayList<>();
+_nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+_name = functionName;
+_info = info;
+_functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List arguments, Map
dataSourceMap) {
+Preconditions.checkArgument(arguments.size() ==
_functionInvoker.getParameterTypes().length,
+"The number of arguments are not same for scalar function and
transform function: %s", getName());
+
+_args = new Object[arguments.size()];
+for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+String literal = ((LiteralTransformFunction) function).getLiteral();
+Class paramType = _functionInvoker.getParameterTypes()[i];
+switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+_args[i] = Integer.parseInt(literal);
+break;
+ case "java.lang.String":
+_args[i] = literal;
+break;
+ case "java.lang.Double":
+_args[i] = Double.valueOf(literal);
+break;
+ case "java.lang.Long":
+_args[i] = Long.valueOf(literal);
+break;
+ default:
+throw new RuntimeException(
+"Unsupported data type " + paramType.getTypeName() + "for
transform function " + getName());
+}
+ } else {
+_nonLiteralArgIndices.add(i);
+_nonLiteralTransformFunction.add(function);
+Class paramType = _functionInvoker.getParameterTypes()[i];
+
+switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
+_nonLiteralArgType.add(FieldSpec.DataType.INT);
+break;
+ case "java.lang.String":
+_nonLiteralArgType.add(FieldSpec.DataType.STRING);
+break;
+ case "java.lang.Double":
+_nonLiteralArgType.add(FieldSpec.DataType.DOUBLE);
+break;
+ case "java.lang.Long":
+_nonLiteralArgType.add(FieldSpec.DataType.LONG);
+break;
+ default:
+throw new RuntimeException(
+"Unsupported data type " + paramType.getTypeName() + "for
transform function " + getName());
+}
+ }
+}
+ }
+
+ @Override
+ public TransformResultMetadata getResultMetadata() {
+return STRING_SV_NO_DICTIONARY_METADATA;
Review comment:
For return type just a switch won't work
Different return types will need a different function overrides
[GitHub] [incubator-pinot] fx19880617 commented on pull request #5440: Add UDFs for String Transformation
fx19880617 commented on pull request #5440: URL: https://github.com/apache/incubator-pinot/pull/5440#issuecomment-633471678 This is great! Could you add tests in: `CalciteSqlCompilerTest` to check sql parsing logic. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[GitHub] [incubator-pinot] kishoreg commented on a change in pull request #5440: Add UDFs for String Transformation
kishoreg commented on a change in pull request #5440:
URL: https://github.com/apache/incubator-pinot/pull/5440#discussion_r429800263
##
File path:
pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##
@@ -0,0 +1,170 @@
+/**
+ * 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.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import org.apache.pinot.spi.data.FieldSpec;
+
+
+public class GenericTransformFunction extends BaseTransformFunction {
+
+ private FunctionInfo _info;
+ FunctionInvoker _functionInvoker;
+ String _name;
+ Object[] _args;
+ List _nonLiteralArgIndices;
+ List _nonLiteralArgType;
+ List _nonLiteralTransformFunction;
+ String[] _stringResult;
+
+ public GenericTransformFunction() {
+_nonLiteralArgIndices = new ArrayList<>();
+_nonLiteralArgType = new ArrayList<>();
+_nonLiteralTransformFunction = new ArrayList<>();
+ }
+
+ @Override
+ public String getName() {
+return _name;
+ }
+
+ public void setFunction(String functionName, FunctionInfo info)
+ throws Exception {
+_name = functionName;
+_info = info;
+_functionInvoker = new FunctionInvoker(info);
+ }
+
+ @Override
+ public void init(List arguments, Map
dataSourceMap) {
+Preconditions.checkArgument(arguments.size() ==
_functionInvoker.getParameterTypes().length,
+"The number of arguments are not same for scalar function and
transform function: %s", getName());
+
+_args = new Object[arguments.size()];
+for (int i = 0; i < arguments.size(); i++) {
+ TransformFunction function = arguments.get(i);
+ if (function instanceof LiteralTransformFunction) {
+String literal = ((LiteralTransformFunction) function).getLiteral();
+Class paramType = _functionInvoker.getParameterTypes()[i];
+switch (paramType.getTypeName()) {
+ case "java.lang.Integer":
Review comment:
missing float
##
File path:
pinot-core/src/main/java/org/apache/pinot/core/operator/transform/function/GenericTransformFunction.java
##
@@ -0,0 +1,170 @@
+/**
+ * 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.
+ */
+package org.apache.pinot.core.operator.transform.function;
+
+import com.google.common.base.Preconditions;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.pinot.common.function.FunctionInfo;
+import org.apache.pinot.common.function.FunctionInvoker;
+import org.apache.pinot.core.common.DataSource;
+import org.apache.pinot.core.operator.blocks.ProjectionBlock;
+import org.apache.pinot.core.operator.transform.TransformResultMetadata;
+import org.apache.pinot.core.plan.DocIdSetPlanNode;
+import
[GitHub] [incubator-pinot] KKcorps opened a new pull request #5440: Add UDFs for String Transformation
KKcorps opened a new pull request #5440: URL: https://github.com/apache/incubator-pinot/pull/5440 - Functions Added in Function Registry - Generic Transform Function modified to handle more types Missing: - The return type of Generic Transform function is still restricted to String. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[GitHub] [incubator-pinot] fx19880617 opened a new pull request #5439: Update thirdeye docker image build
fx19880617 opened a new pull request #5439: URL: https://github.com/apache/incubator-pinot/pull/5439 Fixing docker build for thirdeye. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Update thirdeye docker image build
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit b41d488749463c5672fe4387d2a97c5697e48fd8
Author: Xiang Fu
AuthorDate: Sun May 24 23:12:48 2020 -0700
Update thirdeye docker image build
---
docker/images/pinot-thirdeye/Dockerfile| 3 ++-
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/docker/images/pinot-thirdeye/Dockerfile
b/docker/images/pinot-thirdeye/Dockerfile
index 712339b..a6d9a73 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -54,7 +54,8 @@ RUN git clone ${PINOT_GIT_URL} ${TE_BUILD_DIR} \
&& mkdir -p ${TE_HOME}/config/default \
&& mkdir -p ${TE_HOME}/bin \
&& cp -rp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/config/*
${TE_HOME}/config/default/. \
-&& cp
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-1.0-SNAPSHOT.jar
${TE_HOME}/bin/. \
+&& rm
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*-sources.jar \
+&& cp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*.jar
${TE_HOME}/bin/thirdeye-pinot.jar \
&& rm -rf ${TE_BUILD_DIR}
FROM openjdk:8-jdk-slim
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index f16169f..92b8d87 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -26,24 +26,24 @@ else
fi
echo "Starting H2 database server"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.Server -tcp
-baseDir "${CONFIG_DIR}/.." &
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.Server -tcp -baseDir
"${CONFIG_DIR}/.." &
sleep 1
echo "Creating ThirdEye database schema"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot-1.0-SNAPSHOT.jar!/schema/create-schema.sql"
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot.jar!/schema/create-schema.sql"
if [ -f "${CONFIG_DIR}/bootstrap.sql" ]; then
echo "Running database bootstrap script ${CONFIG_DIR}/bootstrap.sql"
- java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript
-user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
+ java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-backend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
wait
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch update_te_docker_build_script updated (1c45745 -> b41d488)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch update_te_docker_build_script in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. discard 1c45745 Update thirdeye docker image build new b41d488 Update thirdeye docker image build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1c45745) \ N -- N -- N refs/heads/update_te_docker_build_script (b41d488) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: docker/images/pinot-thirdeye/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch update_te_docker_build_script updated (99ae88c -> 1c45745)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch update_te_docker_build_script in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. discard 99ae88c Update thirdeye docker image build new 1c45745 Update thirdeye docker image build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (99ae88c) \ N -- N -- N refs/heads/update_te_docker_build_script (1c45745) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: docker/images/pinot-thirdeye/Dockerfile | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Update thirdeye docker image build
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 1c45745d0f2a2b40bef956ccc92529bdd3eb787d
Author: Xiang Fu
AuthorDate: Sun May 24 23:12:48 2020 -0700
Update thirdeye docker image build
---
docker/images/pinot-thirdeye/Dockerfile| 3 ++-
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/docker/images/pinot-thirdeye/Dockerfile
b/docker/images/pinot-thirdeye/Dockerfile
index 712339b..7295ac0 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -54,7 +54,8 @@ RUN git clone ${PINOT_GIT_URL} ${TE_BUILD_DIR} \
&& mkdir -p ${TE_HOME}/config/default \
&& mkdir -p ${TE_HOME}/bin \
&& cp -rp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/config/*
${TE_HOME}/config/default/. \
-&& cp
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-1.0-SNAPSHOT.jar
${TE_HOME}/bin/. \
+&& rm
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*-sources.jar
+&& cp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*.jar
${TE_HOME}/bin/thirdeye-pinot.jar \
&& rm -rf ${TE_BUILD_DIR}
FROM openjdk:8-jdk-slim
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index f16169f..92b8d87 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -26,24 +26,24 @@ else
fi
echo "Starting H2 database server"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.Server -tcp
-baseDir "${CONFIG_DIR}/.." &
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.Server -tcp -baseDir
"${CONFIG_DIR}/.." &
sleep 1
echo "Creating ThirdEye database schema"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot-1.0-SNAPSHOT.jar!/schema/create-schema.sql"
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot.jar!/schema/create-schema.sql"
if [ -f "${CONFIG_DIR}/bootstrap.sql" ]; then
echo "Running database bootstrap script ${CONFIG_DIR}/bootstrap.sql"
- java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript
-user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
+ java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-backend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
wait
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch update_te_docker_build_script updated (6086a12 -> 99ae88c)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch update_te_docker_build_script in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. discard 6086a12 Update thirdeye docker image build new 99ae88c Update thirdeye docker image build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6086a12) \ N -- N -- N refs/heads/update_te_docker_build_script (99ae88c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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. Summary of changes: docker/images/pinot-thirdeye/Dockerfile| 2 +- docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +- 2 files changed, 6 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Update thirdeye docker image build
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 99ae88c5d54377eadedf4ee8c255a0d8749728dc
Author: Xiang Fu
AuthorDate: Sun May 24 23:12:48 2020 -0700
Update thirdeye docker image build
---
docker/images/pinot-thirdeye/Dockerfile| 2 +-
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/images/pinot-thirdeye/Dockerfile
b/docker/images/pinot-thirdeye/Dockerfile
index 712339b..3d99510 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -54,7 +54,7 @@ RUN git clone ${PINOT_GIT_URL} ${TE_BUILD_DIR} \
&& mkdir -p ${TE_HOME}/config/default \
&& mkdir -p ${TE_HOME}/bin \
&& cp -rp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/config/*
${TE_HOME}/config/default/. \
-&& cp
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-1.0-SNAPSHOT.jar
${TE_HOME}/bin/. \
+&& cp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*.jar
${TE_HOME}/bin/thirdeye-pinot.jar \
&& rm -rf ${TE_BUILD_DIR}
FROM openjdk:8-jdk-slim
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index f16169f..92b8d87 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -26,24 +26,24 @@ else
fi
echo "Starting H2 database server"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.Server -tcp
-baseDir "${CONFIG_DIR}/.." &
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.Server -tcp -baseDir
"${CONFIG_DIR}/.." &
sleep 1
echo "Creating ThirdEye database schema"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot-1.0-SNAPSHOT.jar!/schema/create-schema.sql"
+java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot.jar!/schema/create-schema.sql"
if [ -f "${CONFIG_DIR}/bootstrap.sql" ]; then
echo "Running database bootstrap script ${CONFIG_DIR}/bootstrap.sql"
- java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript
-user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
+ java -cp "./bin/thirdeye-pinot.jar" org.h2.tools.RunScript -user "sa"
-password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-backend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
wait
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] 01/01: Update thirdeye docker image build
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch update_te_docker_build_script
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 6086a1276461c098aef3cf382bf8544cf59bc552
Author: Xiang Fu
AuthorDate: Sun May 24 23:12:48 2020 -0700
Update thirdeye docker image build
---
docker/images/pinot-thirdeye/Dockerfile| 2 +-
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/images/pinot-thirdeye/Dockerfile
b/docker/images/pinot-thirdeye/Dockerfile
index 712339b..9f060ae 100644
--- a/docker/images/pinot-thirdeye/Dockerfile
+++ b/docker/images/pinot-thirdeye/Dockerfile
@@ -54,7 +54,7 @@ RUN git clone ${PINOT_GIT_URL} ${TE_BUILD_DIR} \
&& mkdir -p ${TE_HOME}/config/default \
&& mkdir -p ${TE_HOME}/bin \
&& cp -rp ${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/config/*
${TE_HOME}/config/default/. \
-&& cp
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-1.0-SNAPSHOT.jar
${TE_HOME}/bin/. \
+&& cp
${TE_BUILD_DIR}/thirdeye/thirdeye-pinot/target/thirdeye-pinot-*-SNAPSHOT.jar
${TE_HOME}/bin/. \
&& rm -rf ${TE_BUILD_DIR}
FROM openjdk:8-jdk-slim
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index f16169f..f1d1d83 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -26,24 +26,24 @@ else
fi
echo "Starting H2 database server"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.Server -tcp
-baseDir "${CONFIG_DIR}/.." &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.Server -tcp
-baseDir "${CONFIG_DIR}/.." &
sleep 1
echo "Creating ThirdEye database schema"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot-1.0-SNAPSHOT.jar!/schema/create-schema.sql"
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"zip:./bin/thirdeye-pinot-*-SNAPSHOT.jar!/schema/create-schema.sql"
if [ -f "${CONFIG_DIR}/bootstrap.sql" ]; then
echo "Running database bootstrap script ${CONFIG_DIR}/bootstrap.sql"
- java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar" org.h2.tools.RunScript
-user "sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
+ java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar" org.h2.tools.RunScript -user
"sa" -password "sa" -url "jdbc:h2:tcp:localhost/h2db" -script
"${CONFIG_DIR}/bootstrap.sql"
fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-backend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar"
org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp
"${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml"
"${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot-1.0-SNAPSHOT.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
+java -cp "./bin/thirdeye-pinot-*-SNAPSHOT.jar"
org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication
"${CONFIG_DIR}" &
wait
-
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
[incubator-pinot] branch update_te_docker_build_script created (now 6086a12)
This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a change to branch update_te_docker_build_script in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git. at 6086a12 Update thirdeye docker image build This branch includes the following new commits: new 6086a12 Update thirdeye docker image build 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-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
