Browse Source

remove mysql test (#7231)

Redkale 3 years ago
parent
commit
ddf41d51e6

+ 6 - 61
frameworks/Java/redkale/benchmark_config.json

@@ -5,6 +5,11 @@
             "default": {
             "default": {
                 "plaintext_url": "/plaintext",
                 "plaintext_url": "/plaintext",
                 "json_url": "/json",
                 "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,
                 "port": 8080,
                 "approach": "Realistic",
                 "approach": "Realistic",
                 "classification": "Fullstack",
                 "classification": "Fullstack",
@@ -51,7 +56,7 @@
                 "db_url": "/db",
                 "db_url": "/db",
                 "query_url": "/queries?q=", 
                 "query_url": "/queries?q=", 
                 "fortune_url": "/fortunes",
                 "fortune_url": "/fortunes",
-                "update_url2": "/updates?q=",
+                "update_url": "/updates?q=",
                 "cached_query_url": "/cached-worlds?q=",
                 "cached_query_url": "/cached-worlds?q=",
                 "port": 8080,
                 "port": 8080,
                 "approach": "Realistic",
                 "approach": "Realistic",
@@ -68,66 +73,6 @@
                 "display_name": "redkale-native",
                 "display_name": "redkale-native",
                 "notes": "",
                 "notes": "",
                 "versus": "Redkale"
                 "versus": "Redkale"
-            },
-            "cache": {
-                "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",
-                "notes": "",
-                "versus": "Redkale"
-            },
-            "postgres": {
-                "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",
-                "notes": "",
-                "versus": "Redkale"
-            },
-            "mongodb": {
-                "db_url": "/db",
-                "query_url2": "/queries?q=", 
-                "fortune_url": "/fortunes",
-                "update_url2": "/updates?q=",
-                "port": 8080,
-                "approach": "Realistic",
-                "classification": "Fullstack",
-                "database": "Mongodb",
-                "framework": "Redkale",
-                "language": "Java",
-                "flavor": "None",
-                "orm": "Raw",
-                "platform": "Redkale",
-                "webserver": "Redkale",
-                "os": "Linux",
-                "database_os": "Linux",
-                "display_name": "redkale-mongodb",
-                "notes": "",
-                "versus": "Redkale"
             }
             }
         }
         }
     ]
     ]

+ 0 - 21
frameworks/Java/redkale/conf/persistence-mongodb.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0">
-    
-    <persistence-unit name=".read" transaction-type="RESOURCE_LOCAL">
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="mongodb://tfb-database/hello_world"/>
-            <property name="javax.persistence.connections.limit" value="512"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name=".write" transaction-type="RESOURCE_LOCAL">
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="mongodb://tfb-database/hello_world"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-   
-</persistence>

+ 0 - 20
frameworks/Java/redkale/conf/persistence-mysql.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0">
-    
-    <persistence-unit name=".read" transaction-type="RESOURCE_LOCAL">
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://tfb-database:3306/hello_world?useSSL=false&amp;rewriteBatchedStatements=true&amp;serverTimezone=UTC&amp;characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name=".write" transaction-type="RESOURCE_LOCAL">
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://tfb-database:3306/hello_world?useSSL=false&amp;rewriteBatchedStatements=true&amp;serverTimezone=UTC&amp;characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-   
-</persistence>

+ 0 - 22
frameworks/Java/redkale/conf/persistence.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0">
-    
-    <persistence-unit name=".read" transaction-type="RESOURCE_LOCAL">
-        <shared-cache-mode>ALL</shared-cache-mode>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://tfb-database:5432/hello_world"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-    
-    <persistence-unit name=".write" transaction-type="RESOURCE_LOCAL">
-        <shared-cache-mode>ALL</shared-cache-mode>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://tfb-database:5432/hello_world"/>
-            <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
-            <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>
-        </properties>
-    </persistence-unit>
-   
-</persistence>

+ 10 - 0
frameworks/Java/redkale/conf/source.properties

@@ -0,0 +1,10 @@
+
+
+############ DataSource ############
+redkale.datasource[].read.url = jdbc:postgresql://tfb-database:5432/hello_world
+redkale.datasource[].read.user = benchmarkdbuser
+redkale.datasource[].read.password = benchmarkdbpass
+
+redkale.datasource[].write.url = jdbc:postgresql://tfb-database:5432/hello_world
+redkale.datasource[].write.user = benchmarkdbuser
+redkale.datasource[].write.password = benchmarkdbpass

+ 6 - 43
frameworks/Java/redkale/config.toml

@@ -4,19 +4,6 @@ name = "redkale"
 [main]
 [main]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.json = "/json"
-approach = "Realistic"
-classification = "Fullstack"
-database = "None"
-database_os = "Linux"
-os = "Linux"
-orm = "Raw"
-platform = "Redkale"
-webserver = "Redkale"
-versus = "Redkale"
-
-[graalvm]
-urls.plaintext = "/plaintext"
-urls.json = "/json"
 urls.db = "/db"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="
 urls.query = "/queries?q="
@@ -32,25 +19,13 @@ platform = "Redkale"
 webserver = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 versus = "Redkale"
 
 
-[native]
+[graalvm]
 urls.plaintext = "/plaintext"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.json = "/json"
 urls.db = "/db"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="
 urls.query = "/queries?q="
-urls.update2 = "/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"
-
-[cache]
+urls.update = "/updates?q="
 urls.cached_query = "/cached-worlds?q="
 urls.cached_query = "/cached-worlds?q="
 approach = "Realistic"
 approach = "Realistic"
 classification = "Fullstack"
 classification = "Fullstack"
@@ -62,11 +37,14 @@ platform = "Redkale"
 webserver = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 versus = "Redkale"
 
 
-[postgres]
+[native]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
 urls.db = "/db"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="
 urls.query = "/queries?q="
 urls.update = "/updates?q="
 urls.update = "/updates?q="
+urls.cached_query = "/cached-worlds?q="
 approach = "Realistic"
 approach = "Realistic"
 classification = "Fullstack"
 classification = "Fullstack"
 database = "Postgres"
 database = "Postgres"
@@ -76,18 +54,3 @@ orm = "Raw"
 platform = "Redkale"
 platform = "Redkale"
 webserver = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
 versus = "Redkale"
-
-[mongodb]
-urls.db = "/db"
-urls.fortune = "/fortunes"
-urls.query2 = "/queries?q="
-urls.update2 = "/updates?q="
-approach = "Realistic"
-classification = "Fullstack"
-database = "Mongodb"
-database_os = "Linux"
-os = "Linux"
-orm = "Raw"
-platform = "Redkale"
-webserver = "Redkale"
-versus = "Redkale"

+ 0 - 123
frameworks/Java/redkale/pom-mongodb.xml

@@ -1,123 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.redkalex</groupId>
-    <artifactId>redkale-benchmark</artifactId>
-    <version>1.0.0</version>
-
-    <properties>
-        <!-- the main class -->
-        <main.class>org.redkale.boot.Application</main.class>
-		<redkale.version>2.7.0-SNAPSHOT</redkale.version>
-        <stack.version>1.0.0</stack.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties> 
-
-    <dependencies>  
-        <dependency>
-            <groupId>org.redkale</groupId>
-            <artifactId>redkale</artifactId>
-            <version>${redkale.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.redkalex</groupId>
-            <artifactId>redkale-plugins</artifactId>
-            <version>${redkale.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-reactivestreams</artifactId>
-            <version>4.3.2</version>
-        </dependency>
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </repository>
-        <repository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>central</id>
-            <name>Central Repository</name>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository> 
-    </pluginRepositories>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>                         
-            </plugin>
-                 
-            <plugin>
-                <groupId>org.redkale.maven.plugins</groupId>
-                <artifactId>redkale-maven-plugin</artifactId>
-                <version>1.1.0-SNAPSHOT</version>                                                
-                <configuration>		
-                    <nativeimageArgs>
-                        <arg>--allow-incomplete-classpath</arg>
-                        <arg>--no-fallback</arg>
-                    </nativeimageArgs>
-                </configuration>                                    
-                <executions>
-                    <execution>
-                        <id>redkale-compile</id> 
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>                   
-                    </execution>
-                </executions>    
-            </plugin>
-                 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${main.class}</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-    </build>
-
-</project>

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

@@ -8,7 +8,6 @@
     <properties>
     <properties>
         <main.class>org.redkale.boot.Application</main.class>
         <main.class>org.redkale.boot.Application</main.class>
 		<redkale.version>2.7.0-SNAPSHOT</redkale.version>
 		<redkale.version>2.7.0-SNAPSHOT</redkale.version>
-        <stack.version>1.0.0</stack.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.target>11</maven.compiler.target>

+ 0 - 10
frameworks/Java/redkale/redkale-cache.dockerfile

@@ -1,10 +0,0 @@
-FROM maven:3.8.4-openjdk-17-slim as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-COPY pom.xml pom.xml
-RUN mvn package -q
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-DAPP_HOME=./", "-jar", "/redkale/target/redkale-benchmark-1.0.0.jar"]

+ 0 - 12
frameworks/Java/redkale/redkale-mongodb.dockerfile

@@ -1,12 +0,0 @@
-FROM maven:3.8.4-openjdk-17-slim as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-RUN rm conf/persistence.xml
-RUN mv conf/persistence-mongodb.xml  conf/persistence.xml
-COPY pom-mongodb.xml pom.xml
-RUN mvn package -q
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-DAPP_HOME=./", "-jar", "/redkale/target/redkale-benchmark-1.0.0.jar"]

+ 0 - 12
frameworks/Java/redkale/redkale-mysql.dockerfile

@@ -1,12 +0,0 @@
-FROM maven:3.8.4-openjdk-17-slim as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-RUN rm conf/persistence.xml
-RUN mv conf/persistence-mysql.xml  conf/persistence.xml
-COPY pom.xml pom.xml
-RUN mvn package -q
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-DAPP_HOME=./", "-jar", "/redkale/target/redkale-benchmark-1.0.0.jar"]

+ 0 - 10
frameworks/Java/redkale/redkale-postgres.dockerfile

@@ -1,10 +0,0 @@
-FROM maven:3.8.4-openjdk-17-slim as maven
-WORKDIR /redkale
-COPY src src
-COPY conf conf
-COPY pom.xml pom.xml
-RUN mvn package -q
-
-EXPOSE 8080
-
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-DAPP_HOME=./", "-jar", "/redkale/target/redkale-benchmark-1.0.0.jar"]