Skip to content

Commit cf8dddc

Browse files
Jackie-JiangJackie-Jiang
committed
Remove incubator from pinot and superset
1 parent 582d621 commit cf8dddc

File tree

15 files changed

+33
-34
lines changed

15 files changed

+33
-34
lines changed

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If your change is relatively minor, you can skip this step. If you are adding ne
3030

3131
### Create an issue for the change
3232

33-
Create a Pinot issue [here](https://github.com/apache/incubator-pinot/issues) for the change you would like to make. Provide information on why the change is needed and how you plan to address it. Use the conversations on the issue as a way to validate assumptions and the right way to proceed. Be sure to review sections on [Backward and Forward compatibility changes](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#backward-and-forward-compatibility-changes) and [External libraries](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#external-libraries).
33+
Create a Pinot issue [here](https://github.com/apache/pinot/issues) for the change you would like to make. Provide information on why the change is needed and how you plan to address it. Use the conversations on the issue as a way to validate assumptions and the right way to proceed. Be sure to review sections on [Backward and Forward compatibility changes](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#backward-and-forward-compatibility-changes) and [External libraries](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines#external-libraries).
3434

3535
If you have a design document, please refer to the design documents in your Issue. You may even want to create multiple issues depending on the extent of your change.
3636

@@ -73,7 +73,7 @@ Please ensure your code is adequately documented. Some things to consider for do
7373

7474
#### Code Formatting
7575
* Ensure that the code you add is properly formatted as per the Pinot style-sheets.
76-
* Pinot's style-sheets can be found in ```incubator-pinot/config```.
76+
* Pinot's style-sheets can be found in ```pinot/config```.
7777
* For information on how to import the style-sheet into your IDE, refer [here](https://docs.pinot.apache.org/developers/developers-and-contributors/code-setup#setup-ide).
7878

7979
#### Exceptions and Exception-Handling
@@ -181,7 +181,7 @@ $ git add <files required for the change>
181181
$ git commit -m "Meaningful oneliner for the change"
182182
$ git push origin <your issue branch>
183183
184-
After this, create a PullRequest in `github <https://github.com/apache/incubator-pinot/pulls>`_. Include the following information in the description:
184+
After this, create a PullRequest in `github <https://github.com/apache/pinot/pulls>`_. Include the following information in the description:
185185
186186
* The changes that are included in the PR.
187187

‎contrib/pinot-druid-benchmark/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ executionFrameworkSpec:
234234
segmentTarPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentTarPushJobRunner'
235235
segmentUriPushJobRunnerClassName: 'org.apache.pinot.plugin.ingestion.batch.standalone.SegmentUriPushJobRunner'
236236
jobType: SegmentCreationAndTarPush
237-
inputDirURI: '/absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/raw_data/'
237+
inputDirURI: '/absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/raw_data/'
238238
includeFileNamePattern: 'glob:**/*.csv'
239-
outputDirURI: '/absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/segments/'
239+
outputDirURI: '/absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/segments/'
240240
overwriteOutput: true
241241
pinotFSSpecs:
242242
- scheme: file
@@ -276,7 +276,7 @@ line appear in the output as:
276276

277277
```
278278
...
279-
outputDirURI: /absolute/path/to/incubator-pinot/contrib/pinot-druid-benchmark/data_out/segments/
279+
outputDirURI: /absolute/path/to/pinot/contrib/pinot-druid-benchmark/data_out/segments/
280280
...
281281
```
282282

‎docker/images/pinot-superset/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121

2222
# Superset
2323

24-
Docker image for [Superset](https://github.com/apache/incubator-superset) with Pinot integration.
24+
Docker image for [Superset](https://github.com/apache/superset) with Pinot integration.
2525

2626

2727
## How to build
2828

29-
Pinot Superset image is built on top of [apache/incubator-superset](https://hub.docker.com/r/apache/incubator-superset) with Pinotdb driver.
29+
Pinot Superset image is built on top of [apache/superset](https://hub.docker.com/r/apache/superset) with Pinotdb driver.
3030

31-
Below command will build Superset image based on `apache/incubator-superset:0.37` then tag it as `apachepinot/pinot-superset:0.37`.
31+
Below command will build Superset image based on `apache/superset:0.37` then tag it as `apachepinot/pinot-superset:0.37`.
3232

3333
```bash
3434
docker build --build-arg SUPERSET_IMAGE_TAG=0.37 --tag apachepinot/pinot-superset:0.37 .
@@ -42,7 +42,7 @@ docker push apachepinot/pinot-superset:0.37
4242

4343
## Configuration
4444

45-
Follow the [instructions](https://superset.incubator.apache.org/installation.html#configuration) provided by Apache Superset for writing your own `superset_config.py`.
45+
Follow the [instructions](https://superset.apache.org/installation.html#configuration) provided by Apache Superset for writing your own `superset_config.py`.
4646

4747
Place this file in a local directory and mount this directory to `/etc/superset` inside the container. This location is included in the image's `PYTHONPATH`. Mounting this file to a different location is possible, but it will need to be in the `PYTHONPATH`.
4848

‎docker/images/pinot-thirdeye/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM openjdk:8 AS thirdeye_build_env
2222
LABEL [email protected]
2323

2424
ARG PINOT_BRANCH=master
25-
ARG PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git"
25+
ARG PINOT_GIT_URL="https://github.com/apache/pinot.git"
2626
RUN echo "Trying to build Thirdeye from [ ${PINOT_GIT_URL} ] on branch [ ${PINOT_BRANCH} ]"
2727

2828
ENV TE_HOME=/opt/thirdeye

‎docker/images/pinot-thirdeye/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-->
2121

2222
# docker-pinot-thirdeye
23-
This is a docker image of [Apache Thirdeye](https://github.com/apache/incubator-pinot/tree/master/thirdeye).
23+
This is a docker image of [Apache Thirdeye](https://github.com/apache/pinot/tree/master/thirdeye).
2424

2525
## How to build a docker image
2626

@@ -40,11 +40,11 @@ The docker image is tagged as `[Docker Tag]`.
4040

4141
`Git Branch`: The Pinot branch to build. Default is `master`.
4242

43-
`Pinot Git URL`: The Pinot Git Repo to build, users can set it to their own fork. Please note that, the URL is `https://` based, not `git://`. Default is the Apache Repo: `https://github.com/apache/incubator-pinot.git`.
43+
`Pinot Git URL`: The Pinot Git Repo to build, users can set it to their own fork. Please note that, the URL is `https://` based, not `git://`. Default is the Apache Repo: `https://github.com/apache/pinot.git`.
4444

4545
* Example of building and tagging a snapshot on your own fork:
4646
```SHELL
47-
./docker-build.sh thirdeye:latest master https://github.com/apache/incubator-pinot.git
47+
./docker-build.sh thirdeye:latest master https://github.com/apache/pinot.git
4848
```
4949

5050
## How to publish a docker image
@@ -65,7 +65,7 @@ Script `docker-build-and-push.sh` builds and publishes this docker image to your
6565
* Example of building and publishing a image to [apachepinot/thirdeye](https://cloud.docker.com/u/apachepinot/repository/docker/apachepinot/thirdeye) dockerHub repo.
6666

6767
```SHELL
68-
./docker-build-and-push.sh apachepinot/thirdeye:latest master https://github.com/apache/incubator-pinot.git
68+
./docker-build-and-push.sh apachepinot/thirdeye:latest master https://github.com/apache/pinot.git
6969
```
7070

7171
## How to Run it

‎docker/images/pinot-thirdeye/docker-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [[ "$#" -gt 2 ]]
3939
then
4040
PINOT_GIT_URL=$3
4141
else
42-
PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git"
42+
PINOT_GIT_URL="https://github.com/apache/pinot.git"
4343
fi
4444

4545
echo "Trying to build Thirdeye docker image from Git URL: [ ${PINOT_GIT_URL} ] on branch: [ ${PINOT_BRANCH} ] and tag it as: [ ${DOCKER_TAG} ]."

‎docker/images/pinot/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ LABEL [email protected]
2525
ARG PINOT_BRANCH=master
2626
ARG KAFKA_VERSION=2.0
2727
ARG JDK_VERSION=11
28-
ARG PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git"
28+
ARG PINOT_GIT_URL="https://github.com/apache/pinot.git"
2929
RUN echo "Trying to build Pinot from [ ${PINOT_GIT_URL} ] on branch [ ${PINOT_BRANCH} ] with Kafka version [ ${KAFKA_VERSION} ]"
3030
ENV PINOT_HOME=/opt/pinot
3131
ENV PINOT_BUILD_DIR=/opt/pinot-build

‎docker/images/pinot/docker-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ if [[ "$#" -gt 2 ]]
3939
then
4040
PINOT_GIT_URL=$3
4141
else
42-
PINOT_GIT_URL="https://github.com/apache/incubator-pinot.git"
42+
PINOT_GIT_URL="https://github.com/apache/pinot.git"
4343
fi
4444

4545
if [[ "$#" -gt 3 ]]

‎kubernetes/helm/README-dev.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ This step will generate an `index.yaml` file which contains all the Charts infor
4242

4343
Update generated `index.yaml` accordingly:
4444
- Revert the changes for all previous Charts;
45-
- Change `entries.pinot.source` to `https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm`.
45+
- Change `entries.pinot.source` to `https://github.com/apache/pinot/tree/master/kubernetes/helm`.

‎kubernetes/helm/index.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ entries:
2525
name: pinot-dev
2626
name: pinot
2727
sources:
28-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
28+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
2929
urls:
3030
- pinot-0.2.4.tgz
3131
version: 0.2.4
@@ -53,7 +53,7 @@ entries:
5353
name: pinot-dev
5454
name: pinot
5555
sources:
56-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
56+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
5757
urls:
5858
- pinot-0.2.3.tgz
5959
version: 0.2.3
@@ -81,7 +81,7 @@ entries:
8181
name: pinot-dev
8282
name: pinot
8383
sources:
84-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
84+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
8585
urls:
8686
- pinot-0.2.2.tgz
8787
version: 0.2.2
@@ -109,7 +109,7 @@ entries:
109109
name: pinot-dev
110110
name: pinot
111111
sources:
112-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
112+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
113113
urls:
114114
- pinot-0.2.1.tgz
115115
version: 0.2.1
@@ -137,7 +137,7 @@ entries:
137137
name: pinot-dev
138138
name: pinot
139139
sources:
140-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
140+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
141141
urls:
142142
- pinot-0.2.0.tgz
143143
version: 0.2.0
@@ -159,7 +159,7 @@ entries:
159159
name: pinot-dev
160160
name: presto
161161
sources:
162-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
162+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
163163
urls:
164164
- presto-0.2.1.tgz
165165
version: 0.2.1
@@ -180,7 +180,7 @@ entries:
180180
name: pinot-dev
181181
name: presto
182182
sources:
183-
- https://github.com/apache/incubator-pinot/tree/master/kubernetes/helm
183+
- https://github.com/apache/pinot/tree/master/kubernetes/helm
184184
urls:
185185
- presto-0.2.0.tgz
186186
version: 0.2.0

0 commit comments

Comments
 (0)