Skip to content

Commit c5f76e0

Browse files
pthirunclaude
pthirun
and
claude
committed
Merge upstream/main: resolve conflicts between uncleanLeaderElection and
useAlternativeBackend Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2 parents 9f2967e + d8eef14 commit c5f76e0

287 files changed

Lines changed: 13424 additions & 4955 deletions

File tree

Some content is hidden

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

‎.classpath‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="src" path="bin/generated-sources/annotations">
6+
<attributes>
7+
<attribute name="optional" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry kind="output" path="bin/default"/>
11+
</classpath>

‎.factorypath‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<factorypath>
2+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker/3.48.3/ce08620d95495fb7d2fea5011519f66cf3fa0efe/checker-3.48.3-all.jar" enabled="true" runInBatchMode="false"/>
3+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-util/3.48.3/c518167682dec9369a10686b759238607e3fe0aa/checker-util-3.48.3.jar" enabled="true" runInBatchMode="false"/>
4+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.48.3/c48effe7d78de3cf5e8a98c614281ec6a2466a77/checker-qual-3.48.3.jar" enabled="true" runInBatchMode="false"/>
5+
</factorypath>

‎.github/workflows/VeniceCI-CompatibilityTests.yml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: |
3737
bash scripts/ci/util_free_space.sh > background_cleanup.log 2>&1 &
3838
- name: Run Avro Compatibility Tests
39-
run: ./gradlew -DmaxParallelForks=2 --parallel :internal:venice-avro-compatibility-test:test --continue
39+
run: ./gradlew -DmaxParallelForks=2 --parallel --build-cache :internal:venice-avro-compatibility-test:test --continue
4040
- name: Package Build Artifacts
4141
if: success() || failure()
4242
shell: bash
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
bash scripts/ci/util_free_space.sh > background_cleanup.log 2>&1 &
8585
- name: Run DuckDB Integration Tests
86-
run: ./gradlew -DforkEvery=1 -DmaxParallelForks=1 :integrations:venice-duckdb:integrationTest --continue
86+
run: ./gradlew -DforkEvery=1 -DmaxParallelForks=1 --parallel --build-cache :integrations:venice-duckdb:integrationTest --continue
8787
- name: Package Build Artifacts
8888
if: success() || failure()
8989
shell: bash
@@ -129,22 +129,29 @@ jobs:
129129
- name: Free up disk space in the background
130130
run: |
131131
bash scripts/ci/util_free_space.sh > background_cleanup.log 2>&1 &
132-
- name: Build with gradle
133-
run: ./gradlew assemble --continue --no-daemon -DforkEvery=1 -DmaxParallelForks=1
134-
135-
- name: Build docker images for Venice (latest-dev tag)
132+
- name: Build NAR, shadow jars, and Docker images
136133
shell: bash
137134
run: |
138-
cd ${{ github.workspace }}/docker
139-
./build-venice-docker-images.sh
140-
cd ${{ github.workspace }}
135+
# Single Gradle invocation: NAR for Pulsar connector + shadow jars for Venice Docker images
136+
./gradlew --parallel --build-cache --no-daemon \
137+
:integrations:venice-pulsar:nar \
138+
:services:venice-controller:shadowJar \
139+
:services:venice-server:shadowJar \
140+
:services:venice-router:shadowJar \
141+
:clients:venice-admin-tool:shadowJar \
142+
:clients:venice-thin-client:shadowJar \
143+
:clients:venice-push-job:shadowJar \
144+
:clients:venice-client:shadowJar
141145
142-
- name: Build docker images for Pulsar test (latest-dev tag)
143-
shell: bash
144-
run: |
145-
cd ${{ github.workspace }}/tests/docker-images/pulsar-sink
146-
docker build --tag=pulsar/venice-test:latest-dev ${{ github.workspace }} -f ./Dockerfile
147-
cd ${{ github.workspace }}
146+
# Build Pulsar and Venice Docker images in parallel
147+
docker build --tag=pulsar/venice-test:latest-dev -f tests/docker-images/pulsar-sink/Dockerfile . &
148+
pulsar_docker_pid=$!
149+
150+
cd docker
151+
./build-venice-docker-images.sh venicedb latest-dev "venice-controller venice-server venice-router venice-client"
152+
cd ..
153+
154+
wait $pulsar_docker_pid || { echo "Pulsar Docker build failed"; exit 1; }
148155
149156
- name: Run the test
150157
shell: bash

‎.github/workflows/build-and-publish-docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
run: |
9898
set -euo pipefail
9999
echo "Building Docker images for tag: $TAG_VERSION"
100-
bash docker/build-venice-docker-images.sh "ghcr.io/${{ github.repository }}" "$TAG_VERSION"
100+
bash docker/build-venice-docker-images.sh "ghcr.io/${{ github.repository }}" "$TAG_VERSION" "$DOCKER_TARGETS"
101101
102102
# Step 6: List generated Docker images
103103
- name: List generated Docker images

‎all-modules/.classpath‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="src" path="bin/generated-sources/annotations">
6+
<attributes>
7+
<attribute name="optional" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry kind="output" path="bin/default"/>
11+
</classpath>

‎all-modules/.factorypath‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<factorypath>
2+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker/3.48.3/ce08620d95495fb7d2fea5011519f66cf3fa0efe/checker-3.48.3-all.jar" enabled="true" runInBatchMode="false"/>
3+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-util/3.48.3/c518167682dec9369a10686b759238607e3fe0aa/checker-util-3.48.3.jar" enabled="true" runInBatchMode="false"/>
4+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.48.3/c48effe7d78de3cf5e8a98c614281ec6a2466a77/checker-qual-3.48.3.jar" enabled="true" runInBatchMode="false"/>
5+
</factorypath>

‎build.gradle‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,13 @@ task aggregateJavadoc(type: Javadoc) {
627627
}
628628

629629
spotless {
630-
ratchetFrom "${git.getUpstreamRemote()}/main"
630+
// Disable ratchetFrom in worktrees since JGit cannot resolve .git file references
631+
def dotGit = file("${rootDir}/.git")
632+
if (dotGit.isFile()) {
633+
// worktree: .git is a file, not a directory — skip ratchetFrom
634+
} else {
635+
ratchetFrom "${git.getUpstreamRemote()}/main"
636+
}
631637
java {
632638
importOrder()
633639
removeUnusedImports()

‎clients/.classpath‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="src" path="bin/generated-sources/annotations">
6+
<attributes>
7+
<attribute name="optional" value="true"/>
8+
</attributes>
9+
</classpathentry>
10+
<classpathentry kind="output" path="bin/default"/>
11+
</classpath>

‎clients/.factorypath‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<factorypath>
2+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker/3.48.3/ce08620d95495fb7d2fea5011519f66cf3fa0efe/checker-3.48.3-all.jar" enabled="true" runInBatchMode="false"/>
3+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-util/3.48.3/c518167682dec9369a10686b759238607e3fe0aa/checker-util-3.48.3.jar" enabled="true" runInBatchMode="false"/>
4+
<factorypathentry kind="EXTJAR" id="/Users/pthiruna/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.48.3/c48effe7d78de3cf5e8a98c614281ec6a2466a77/checker-qual-3.48.3.jar" enabled="true" runInBatchMode="false"/>
5+
</factorypath>

‎clients/da-vinci-client/.classpath‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="bin/main" path="src/main/java">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="bin/test" path="src/test/java">
10+
<attributes>
11+
<attribute name="gradle_scope" value="test"/>
12+
<attribute name="gradle_used_by_scope" value="test"/>
13+
<attribute name="test" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="src" output="bin/test" path="src/test/resources">
17+
<attributes>
18+
<attribute name="gradle_scope" value="test"/>
19+
<attribute name="gradle_used_by_scope" value="test"/>
20+
<attribute name="test" value="true"/>
21+
</attributes>
22+
</classpathentry>
23+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
24+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
25+
<classpathentry kind="output" path="bin/default"/>
26+
</classpath>

0 commit comments

Comments
 (0)