Browse Source

Remove redkale-graalvm (#9346)

Redkale 10 months ago
parent
commit
920ec79bd8

+ 0 - 78
frameworks/Java/redkale/BenchmarkService.java

@@ -1,78 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkalex.benchmark;
-
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Stream;
-import org.redkale.annotation.*;
-import org.redkale.net.http.*;
-import org.redkale.service.AbstractService;
-import org.redkale.source.DataSource;
-
-/**
- * 测试redkale-jdbc, 需要覆盖到原BenchmarkService
- *
- * @author zhangjx
- */
-@RestService(name = " ", repair = false)
-public class BenchmarkService extends AbstractService {
-
-    private static final byte[] helloBytes = "Hello, world!".getBytes();
-
-    @Resource
-    private DataSource source;
-
-    @NonBlocking
-    @RestMapping(auth = false)
-    public byte[] plaintext() {
-        return helloBytes;
-    }
-
-    @NonBlocking
-    @RestMapping(auth = false)
-    public Message json() {
-        return new Message("Hello, World!");
-    }
-
-    @RestMapping(auth = false)
-    public World db() {
-        return source.find(World.class, ThreadLocalRandom.current().nextInt(10000) + 1);
-    }
-
-    @RestMapping(auth = false)
-    public List<World> queries(int q) {
-        return source.findsList(World.class, random(q));
-    }
-
-    @RestMapping(auth = false)
-    public List<World> updates(int q) {
-        int size = Math.min(500, Math.max(1, q));
-        int[] newNumbers = ThreadLocalRandom.current().ints(size, 1, 10001).toArray();
-        List<World> words = source.findsList(World.class, random(q));
-        source.update(World.updateNewNumbers(words, newNumbers));
-        return words;
-    }
-
-    @RestMapping(auth = false)
-    public HttpScope fortunes() {
-        List<Fortune> fortunes = source.queryList(Fortune.class);
-        fortunes.add(new Fortune(0, "Additional fortune added at request time."));
-        Collections.sort(fortunes);
-        return HttpScope.refer("").referObj(fortunes);
-    }
-
-    @NonBlocking
-    @RestMapping(name = "cached-worlds", auth = false)
-    public CachedWorld[] cachedWorlds(int q) {
-        return source.finds(CachedWorld.class, random(q));
-    }
-
-    private Stream<Integer> random(int q) {
-        int size = Math.min(500, Math.max(1, q));
-        return ThreadLocalRandom.current().ints(size, 1, 10001).boxed();
-    }
-}

+ 0 - 46
frameworks/Java/redkale/benchmark_config.json

@@ -26,30 +26,6 @@
                 "notes": "",
                 "versus": "Redkale"
             },
-            "graalvm": {
-                "plaintext_url": "/plaintext",
-                "json_url": "/json",
-                "db_url": "/db",
-                "query_url": "/queries?q=", 
-                "fortune_url": "/fortunes",
-                "update_url": "/updates?q=",
-                "cached_query_url": "/cached-worlds?q=",
-                "port": 8080,
-                "approach": "Realistic",
-                "classification": "Fullstack",
-                "database": "Postgres",
-                "framework": "Redkale",
-                "language": "Java",
-                "flavor": "None",
-                "orm": "Raw",
-                "platform": "Redkale",
-                "webserver": "Redkale",
-                "os": "Linux",
-                "database_os": "Linux",
-                "display_name": "redkale-graalvm",
-                "notes": "",
-                "versus": "Redkale"
-            },
             "native": {
                 "plaintext_url": "/plaintext",
                 "json_url": "/json",
@@ -95,28 +71,6 @@
                 "notes": "",
                 "versus": "Redkale"
             },
-            "block": {
-                "plaintext_url": "/plaintext",
-                "db_url": "/db",
-                "query_url": "/queries?q=", 
-                "fortune_url": "/fortunes",
-                "update_url": "/updates?q=",
-                "port": 8080,
-                "approach": "Realistic",
-                "classification": "Fullstack",
-                "database": "Postgres",
-                "framework": "Redkale",
-                "language": "Java",
-                "flavor": "None",
-                "orm": "Raw",
-                "platform": "Redkale",
-                "webserver": "Redkale",
-                "os": "Linux",
-                "database_os": "Linux",
-                "display_name": "redkale-block",
-                "notes": "",
-                "versus": "Redkale"
-            },
             "pgclient": {
                 "db_url": "/db",
                 "query_url": "/queries?q=", 

+ 0 - 34
frameworks/Java/redkale/config.toml

@@ -19,24 +19,6 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[graalvm]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
-urls.db = "/db"
-urls.fortune = "/fortunes"
-urls.query = "/queries?q="
-urls.update = "/updates?q="
-urls.cached_query = "/cached-worlds?q="
-approach = "Realistic"
-classification = "Fullstack"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Raw"
-platform = "Redkale"
-webserver = "Redkale"
-versus = "Redkale"
-
 [native]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
@@ -70,22 +52,6 @@ platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 
-[block]
-urls.plaintext = "/plaintext"
-urls.db = "/db"
-urls.fortune = "/fortunes"
-urls.query = "/queries?q="
-urls.update = "/updates?q="
-approach = "Realistic"
-classification = "Fullstack"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Raw"
-platform = "Redkale"
-webserver = "Redkale"
-versus = "Redkale"
-
 [pgclient]
 urls.db = "/db"
 urls.fortune = "/fortunes"

+ 1 - 1
frameworks/Java/redkale/pom-jdbc.xml

@@ -8,7 +8,7 @@
     <properties>
         <main.class>org.redkale.boot.Application</main.class>
         <redkale.version>2.8.0-SNAPSHOT</redkale.version>
-        <redkale-maven.version>1.3.0-SNAPSHOT</redkale-maven.version>
+        <redkale-maven.version>1.2.0-SNAPSHOT</redkale-maven.version>
         <postgresql.version>42.7.2</postgresql.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>21</maven.compiler.source>

+ 2 - 0
frameworks/Java/redkale/pom.xml

@@ -79,6 +79,8 @@
                 <configuration>		
                     <nativeimageArgs>
                         <arg>--no-fallback</arg>
+                        <arg>-J-XX:+UseNUMA</arg>
+                        <arg>-J-XX:+UseParallelGC</arg>
                     </nativeimageArgs>
                 </configuration>                                    
                 <executions>

+ 0 - 17
frameworks/Java/redkale/redkale-block.dockerfile

@@ -1,17 +0,0 @@
-FROM maven:3.9.6-amazoncorretto-21-debian as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-COPY pom.xml pom.xml
-COPY BenchmarkService.java src/main/java/org/redkalex/benchmark/BenchmarkService.java
-RUN mvn package -q
-
-FROM openjdk:23-jdk-slim
-WORKDIR /redkale
-COPY conf conf
-RUN sed -i 's/sameHeader="true"/ /g' /redkale/conf/application.xml
-COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

+ 0 - 16
frameworks/Java/redkale/redkale-graalvm.dockerfile

@@ -1,16 +0,0 @@
-FROM maven:3.9.6-amazoncorretto-21-debian as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-COPY pom.xml pom.xml
-RUN mvn package -q
-
-
-FROM ghcr.io/graalvm/jdk-community:22.0.2
-WORKDIR /redkale
-COPY conf conf
-COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

+ 1 - 2
frameworks/Java/redkale/redkale-jdbc.dockerfile

@@ -3,7 +3,6 @@ WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom-jdbc.xml pom.xml
-COPY BenchmarkService.java src/main/java/org/redkalex/benchmark/BenchmarkService.java
 RUN mvn package -q
 
 FROM openjdk:23-jdk-slim
@@ -13,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

+ 1 - 1
frameworks/Java/redkale/redkale-pgclient.dockerfile

@@ -12,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

+ 1 - 1
frameworks/Java/redkale/redkale.dockerfile

@@ -12,4 +12,4 @@ COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]
+CMD ["java", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]