Skip to content

Commit 8cfd1dd

Browse files
authored
Merge branch 'apache:master' into master
2 parents 6f8a9a7 + b556b37 commit 8cfd1dd

File tree

820 files changed

+43216
-13195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

820 files changed

+43216
-13195
lines changed

.asf.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ github:
3131
rebase: false
3232
collaborators:
3333
- sullis
34-
- shenyu0127
35-
- tibrewalpratik17
36-
- abhioncbr
37-
- zhtaoxiang
34+
- yashmayya
3835
- shounakmk219
3936
- itschrispeck
37+
- zhtaoxiang
4038
- soumitra-st
41-
- swaminathanmanish
42-
- yashmayya
39+
- suddendust
40+
- vrajat
41+
- deepthi912
42+
- timveil

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ updates:
2525
schedule:
2626
interval: "daily"
2727
open-pull-requests-limit: 20
28+
ignore:
29+
- dependency-name: "org.apache.pinot:pinot-dropwizard"
30+
# Locked test resource for pinot-spi/src/test/java/org/apache/pinot/spi/plugin/ClassLoaderTest.java
31+
versions: ["0.10.0"]
32+
- dependency-name: "org.apache.pinot:pinot-yammer"
33+
# Locked test resource for pinot-spi/src/test/java/org/apache/pinot/spi/plugin/ClassLoaderTest.java
34+
versions: ["0.10.0"]
35+
- dependency-name: "commons-io:commons-io"
36+
# Locked test resource for pinot-spi/src/test/java/org/apache/pinot/spi/plugin/ClassLoaderTest.java
37+
versions: ["2.11.0"]
38+
- dependency-name: "com.yammer.metrics:metrics-core"
39+
# Locked test resource for pinot-spi/src/test/java/org/apache/pinot/spi/plugin/ClassLoaderTest.java
40+
versions: ["2.1.5"]
2841

2942
- package-ecosystem: "npm"
3043
directory: "/pinot-controller/src/main/resources"

.github/workflows/pinot_tests.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ jobs:
123123
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
124124
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
125125
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
126+
--add-opens=java.base/java.nio=ALL-UNNAMED
127+
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
128+
--add-opens=java.base/java.lang=ALL-UNNAMED
129+
--add-opens=java.base/java.util=ALL-UNNAMED
130+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
126131
run: .github/workflows/scripts/pr-tests/.pinot_tests_build.sh
127132
- name: Unit Test
128133
env:
@@ -140,6 +145,11 @@ jobs:
140145
--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
141146
--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
142147
--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
148+
--add-opens=java.base/java.nio=ALL-UNNAMED
149+
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
150+
--add-opens=java.base/java.lang=ALL-UNNAMED
151+
--add-opens=java.base/java.util=ALL-UNNAMED
152+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
143153
run: .github/workflows/scripts/pr-tests/.pinot_tests_unit.sh
144154
- name: Upload coverage to Codecov
145155
uses: codecov/codecov-action@v4

.github/workflows/scripts/pr-tests/.pinot_tests_custom_integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ netstat -i
2929
cd pinot-integration-tests || exit 1
3030
if [ "$RUN_TEST_SET" == "1" ]; then
3131
mvn test \
32-
-P github-actions,custom-cluster-integration-test-suite || exit 1
32+
-P github-actions,codecoverage,custom-cluster-integration-test-suite || exit 1
3333
fi

.github/workflows/scripts/pr-tests/.pinot_tests_integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ netstat -i
2929
cd pinot-integration-tests || exit 1
3030
if [ "$RUN_TEST_SET" == "1" ]; then
3131
mvn test \
32-
-P github-actions,integration-tests-set-1 && exit 0 || exit 1
32+
-P github-actions,codecoverage,integration-tests-set-1 && exit 0 || exit 1
3333
fi
3434
if [ "$RUN_TEST_SET" == "2" ]; then
3535
mvn test \
36-
-P github-actions,integration-tests-set-2 && exit 0 || exit 1
36+
-P github-actions,codecoverage,integration-tests-set-2 && exit 0 || exit 1
3737
fi

.github/workflows/scripts/pr-tests/.pinot_tests_unit.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "$RUN_TEST_SET" == "1" ]; then
3737
-pl 'pinot-core' \
3838
-pl 'pinot-query-planner' \
3939
-pl 'pinot-query-runtime' \
40-
-P github-actions,no-integration-tests || exit 1
40+
-P github-actions,codecoverage,no-integration-tests || exit 1
4141
fi
4242
if [ "$RUN_TEST_SET" == "2" ]; then
4343
mvn test -T 16 \
@@ -48,5 +48,7 @@ if [ "$RUN_TEST_SET" == "2" ]; then
4848
-pl '!pinot-query-planner' \
4949
-pl '!pinot-query-runtime' \
5050
-pl '!:pinot-yammer' \
51-
-P github-actions,no-integration-tests || exit 1
51+
-P github-actions,codecoverage,no-integration-tests || exit 1
5252
fi
53+
54+
mvn jacoco:report-aggregate@report -P codecoverage || exit 1

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ cscope.*
66
.externalToolBuilders/
77
maven-eclipse.xml
88
target/
9-
examples/
9+
/examples/
10+
/logs/
1011
bin/
1112
*/bin/
1213
.idea
@@ -45,7 +46,8 @@ yarn-error.log*
4546
quickstart*
4647

4748
#build symlink directory
48-
build*
49+
build
50+
build/*
4951

5052
#helm related files
5153
kubernetes/helm/**/charts/

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<extension>
2929
<groupId>com.gradle</groupId>
3030
<artifactId>common-custom-user-data-maven-extension</artifactId>
31-
<version>2</version>
31+
<version>2.0.1</version>
3232
</extension>
3333
</extensions>

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ SELECT sum(clicks), sum(impressions) FROM AdAnalyticsTable
8787
daysSinceEpoch TOP 100
8888
```
8989

90+
## Contributing to Pinot
91+
Please refer to the [Contribution Guide](https://docs.pinot.apache.org/developers/developers-and-contributors/contribution-guidelines) for
92+
more information on how to contribute to Apache Pinot.
93+
94+
Normal Pinot builds are done using the `mvn clean install` command.
95+
However this command can take a long time to run.
96+
For faster builds it is recommended to use `mvn verify -Ppinot-fastdev`, which disables some plugins that are not
97+
actually needed for development.
98+
9099
## Building Pinot
91100
More detailed instructions can be found at [Quick Demo](https://docs.pinot.apache.org/basics/getting-started/quick-start) section in the documentation.
92101
```
@@ -95,7 +104,9 @@ $ git clone https://github.com/apache/pinot.git
95104
$ cd pinot
96105
97106
# Build Pinot
98-
$ mvn clean install -DskipTests -Pbin-dist
107+
# -Pbin-dist is required to build the binary distribution
108+
# -Pbuild-shaded-jar is required to build the shaded jar, which is necessary for some features like spark connectors
109+
$ mvn clean install -DskipTests -Pbin-dist -Pbuild-shaded-jar
99110
100111
# Run the Quick Demo
101112
$ cd build/

docker/images/pinot-base/pinot-base-runtime/ms-openjdk.dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,19 @@
2020
ARG JAVA_VERSION=11
2121
ARG JDK_IMAGE=mcr.microsoft.com/openjdk/jdk
2222

23-
FROM ${JDK_IMAGE}:${JAVA_VERSION}-ubuntu
23+
FROM ${JDK_IMAGE}:${JAVA_VERSION}-ubuntu AS builder
24+
25+
FROM ubuntu:24.10
26+
ARG JAVA_VERSION
27+
ENV LANG=en_US.UTF-8
28+
ENV JAVA_HOME="/usr/lib/jvm/msopenjdk-${JAVA_VERSION}"
29+
ENV PATH="${JAVA_HOME}/bin:${PATH}"
30+
COPY --from=builder $JAVA_HOME $JAVA_HOME
2431

2532
2633

2734
RUN apt-get update && \
28-
apt-get install -y --no-install-recommends vim less wget curl git python sysstat procps linux-tools-generic libtasn1-6 zstd && \
35+
apt-get install -y --no-install-recommends vim less wget curl git python-is-python3 sysstat procps linux-tools-generic libtasn1-6 zstd ca-certificates && \
2936
rm -rf /var/lib/apt/lists/*
3037

3138
RUN case `uname -m` in \

0 commit comments

Comments
 (0)