kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-04-28 16:00:29 +05:30
Code Issues Projects Releases Wiki Activity

Attempt to migrate to Java 19.

Browse Source
This commit is contained in:
Kavin 2023-03-09 13:00:37 +00:00
parent 10758f595b
commit 4a533e9513
No known key found for this signature in database
GPG Key ID: 49451E4482CC5BCD
10 changed files with 63 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java: [ 17 ] java: [ 19 ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@ -20,7 +20,6 @@ jobs:
with: with:
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
distribution: temurin distribution: temurin
check-latest: true
cache: "gradle" cache: "gradle"
- name: Run Build - name: Run Build
run: ./gradlew build run: ./gradlew build

8
.github/workflows/docker-build-test.yml vendored
View File

@ -21,17 +21,17 @@ jobs:
dockerfile: dockerfile:
- Dockerfile.ci - Dockerfile.ci
- Dockerfile.openj9.ci - Dockerfile.openj9.ci
- Dockerfile.graalvm-jvm.ci # - Dockerfile.graalvm-jvm.ci
fail-fast: false
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Create Version File - name: Create Version File
run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
- name: set up JDK 17 - name: set up JDK 19
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 17 java-version: 19
distribution: temurin distribution: temurin
check-latest: true
cache: "gradle" cache: "gradle"
- name: Run Build - name: Run Build
run: ./gradlew shadowJar run: ./gradlew shadowJar

5
.github/workflows/docker-build.yml vendored
View File

@ -23,12 +23,11 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Create Version File - name: Create Version File
run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION run: echo $(git log -1 --date=short --pretty=format:%cd)-$(git rev-parse --short HEAD) > VERSION
- name: set up JDK 17 - name: set up JDK 19
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
java-version: 17 java-version: 19
distribution: temurin distribution: temurin
check-latest: true
cache: "gradle" cache: "gradle"
- name: Run Build - name: Run Build
run: ./gradlew shadowJar run: ./gradlew shadowJar

6
Dockerfile
View File

@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jdk AS build FROM eclipse-temurin:19-jdk AS build
WORKDIR /app/ WORKDIR /app/
@ -7,7 +7,7 @@ COPY . /app/
RUN --mount=type=cache,target=/root/.gradle/caches/ \ RUN --mount=type=cache,target=/root/.gradle/caches/ \
./gradlew shadowJar ./gradlew shadowJar
FROM eclipse-temurin:17-jre FROM eclipse-temurin:19-jre
WORKDIR /app/ WORKDIR /app/
@ -17,4 +17,4 @@ COPY VERSION .
EXPOSE 8080 EXPOSE 8080
CMD java -jar /app/piped.jar CMD ["java", "--enable-preview", "-jar", "/app/piped.jar"]

4
Dockerfile.ci
View File

@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre FROM eclipse-temurin:19-jre
WORKDIR /app/ WORKDIR /app/
@ -8,4 +8,4 @@ COPY VERSION .
EXPOSE 8080 EXPOSE 8080
CMD java -jar /app/piped.jar CMD ["java", "--enable-preview", "-jar", "/app/piped.jar"]

6
Dockerfile.openj9
View File

@ -1,4 +1,4 @@
FROM ibm-semeru-runtimes:open-17-jdk AS build FROM 1337kavin/openj9-19 AS build
WORKDIR /app/ WORKDIR /app/
@ -7,7 +7,7 @@ COPY . /app/
RUN --mount=type=cache,target=/root/.gradle/caches/ \ RUN --mount=type=cache,target=/root/.gradle/caches/ \
./gradlew shadowJar ./gradlew shadowJar
FROM ibm-semeru-runtimes:open-17-jre FROM 1337kavin/openj9-19:latest-jre
WORKDIR /app/ WORKDIR /app/
@ -17,4 +17,4 @@ COPY VERSION .
EXPOSE 8080 EXPOSE 8080
CMD java -server -Xmx1G -Xaggressive -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+IdleTuningGcOnIdle -Xgcpolicy:gencon -Xshareclasses:allowClasspaths -Xtune:virtualized -jar /app/piped.jar CMD java -server -Xmx1G -Xaggressive -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+IdleTuningGcOnIdle -Xgcpolicy:gencon -Xshareclasses:allowClasspaths -Xtune:virtualized --enable-preview -jar /app/piped.jar

4
Dockerfile.openj9.ci
View File

@ -1,4 +1,4 @@
FROM ibm-semeru-runtimes:open-17-jre FROM 1337kavin/openj9-19:latest-jre
WORKDIR /app/ WORKDIR /app/
@ -8,4 +8,4 @@ COPY VERSION .
EXPOSE 8080 EXPOSE 8080
CMD java -server -Xmx1G -Xaggressive -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+IdleTuningGcOnIdle -Xgcpolicy:gencon -Xshareclasses:allowClasspaths -Xtune:virtualized -jar /app/piped.jar CMD java -server -Xmx1G -Xaggressive -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+IdleTuningGcOnIdle -Xgcpolicy:gencon -Xshareclasses:allowClasspaths -Xtune:virtualized --enable-preview -jar /app/piped.jar

8
build.gradle
View File

@ -56,7 +56,11 @@ jar {
} }
} }
tasks.withType(JavaCompile).each {
it.options.compilerArgs.add('--enable-preview')
}
group = 'me.kavin.piped' group = 'me.kavin.piped'
version = '1.0' version = '1.0'
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_19
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_19

2
src/main/java/me/kavin/piped/utils/Multithreading.java
View File

@ -7,7 +7,7 @@ import java.util.function.Supplier;
public class Multithreading { public class Multithreading {
private static final ExecutorService es = Executors.newCachedThreadPool(); private static final ExecutorService es = Executors.newVirtualThreadPerTaskExecutor();
private static final ExecutorService esLimited = Executors private static final ExecutorService esLimited = Executors
.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 8); .newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 8);
private static final ExecutorService esLimitedPubSub = Executors private static final ExecutorService esLimitedPubSub = Executors

78
testing/docker-compose.yugabytedb.yml
View File

@ -1,40 +1,40 @@
services: services:
piped: piped:
image: 1337kavin/piped:latest image: 1337kavin/piped:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- "127.0.0.1:8080:8080" - "127.0.0.1:8080:8080"
volumes: volumes:
- ./config.yugabytedb.properties:/app/config.properties - ./config.yugabytedb.properties:/app/config.properties
depends_on: depends_on:
- yb-tserver - yb-tserver
command: [ "sh", "-c", "sleep 10 && java -jar piped.jar" ] command: [ "sh", "-c", "sleep 10 && java --enable-preview -jar piped.jar" ]
yb-master: yb-master:
image: yugabytedb/yugabyte:latest image: yugabytedb/yugabyte:latest
command: command:
[ [
"/home/yugabyte/bin/yb-master", "/home/yugabyte/bin/yb-master",
"--fs_data_dirs=/mnt/master", "--fs_data_dirs=/mnt/master",
"--master_addresses=yb-master:7100", "--master_addresses=yb-master:7100",
"--rpc_bind_addresses=yb-master:7100", "--rpc_bind_addresses=yb-master:7100",
"--replication_factor=1" "--replication_factor=1"
] ]
environment: environment:
SERVICE_7000_NAME: yb-master SERVICE_7000_NAME: yb-master
yb-tserver: yb-tserver:
image: yugabytedb/yugabyte:latest image: yugabytedb/yugabyte:latest
command: command:
[ [
"/home/yugabyte/bin/yb-tserver", "/home/yugabyte/bin/yb-tserver",
"--fs_data_dirs=/mnt/tserver", "--fs_data_dirs=/mnt/tserver",
"--start_pgsql_proxy", "--start_pgsql_proxy",
"--rpc_bind_addresses=yb-tserver:9100", "--rpc_bind_addresses=yb-tserver:9100",
"--tserver_master_addrs=yb-master:7100" "--tserver_master_addrs=yb-master:7100"
] ]
environment: environment:
SERVICE_5433_NAME: ysql SERVICE_5433_NAME: ysql
SERVICE_9042_NAME: ycql SERVICE_9042_NAME: ycql
SERVICE_6379_NAME: yedis SERVICE_6379_NAME: yedis
SERVICE_9000_NAME: yb-tserver SERVICE_9000_NAME: yb-tserver
depends_on: depends_on:
- yb-master - yb-master