Browse Source

update Act to 1.8.8-rc8 (#3796)

* add act-ebean-pgsql-rythm to compare rythm vs mustache template engine

* update act to 1.8.8-RC4

* update act to 1.8.8-RC5-SNAPSHOT for performance fix

* WIP

* WIP

* WIP

* WIP

* update to act-1.8.8-RC8

* [ci fw-only Java/act] update commit message to notify CI to build act only
Green Luo 7 years ago
parent
commit
6580a437a9

+ 3 - 16
frameworks/Java/act/pom.xml

@@ -22,7 +22,7 @@
   <groupId>com.techempower</groupId>
   <groupId>com.techempower</groupId>
   <artifactId>actframework</artifactId>
   <artifactId>actframework</artifactId>
   <packaging>jar</packaging>
   <packaging>jar</packaging>
-  <version>1.8.8.2</version>
+  <version>1.8.8.4</version>
 
 
   <name>TEB ActFramework Project</name>
   <name>TEB ActFramework Project</name>
   <description>TEB benchmark project with ActFramework</description>
   <description>TEB benchmark project with ActFramework</description>
@@ -36,7 +36,7 @@
   <parent>
   <parent>
     <groupId>org.actframework</groupId>
     <groupId>org.actframework</groupId>
     <artifactId>act-starter-parent</artifactId>
     <artifactId>act-starter-parent</artifactId>
-    <version>1.8.8.2</version>
+    <version>1.8.8.4</version>
   </parent>
   </parent>
 
 
   <properties>
   <properties>
@@ -45,14 +45,9 @@
     <postgres-jdbc.version>42.2.2</postgres-jdbc.version>
     <postgres-jdbc.version>42.2.2</postgres-jdbc.version>
     <morphia.version>1.3.2</morphia.version>
     <morphia.version>1.3.2</morphia.version>
     <ebean-annotation.version>3.4</ebean-annotation.version>
     <ebean-annotation.version>3.4</ebean-annotation.version>
-    <act-sql-common.version>1.3.4</act-sql-common.version>
     <app.entry>com.techempower.act.AppEntry</app.entry>
     <app.entry>com.techempower.act.AppEntry</app.entry>
   </properties>
   </properties>
 
 
-  <build>
-    <finalName>${project.artifactId}-${project.version}-r${buildNumber}</finalName>
-  </build>
-
   <dependencies>
   <dependencies>
 
 
     <dependency>
     <dependency>
@@ -75,7 +70,6 @@
     <dependency>
     <dependency>
       <groupId>org.actframework</groupId>
       <groupId>org.actframework</groupId>
       <artifactId>act-sql-common</artifactId>
       <artifactId>act-sql-common</artifactId>
-      <version>${act-sql-common.version}</version>
       <exclusions>
       <exclusions>
         <exclusion>
         <exclusion>
           <groupId>org.avaje.ebean</groupId>
           <groupId>org.avaje.ebean</groupId>
@@ -90,6 +84,7 @@
 
 
   </dependencies>
   </dependencies>
 
 
+
   <profiles>
   <profiles>
     <profile>
     <profile>
       <id>mongo</id>
       <id>mongo</id>
@@ -160,10 +155,6 @@
           <artifactId>mysql-connector-java</artifactId>
           <artifactId>mysql-connector-java</artifactId>
           <version>${mysql.version}</version>
           <version>${mysql.version}</version>
         </dependency>
         </dependency>
-        <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP</artifactId>
-        </dependency>
       </dependencies>
       </dependencies>
     </profile>
     </profile>
     <profile>
     <profile>
@@ -223,10 +214,6 @@
           <artifactId>postgresql</artifactId>
           <artifactId>postgresql</artifactId>
           <version>${postgres-jdbc.version}</version>
           <version>${postgres-jdbc.version}</version>
         </dependency>
         </dependency>
-        <dependency>
-          <groupId>com.zaxxer</groupId>
-          <artifactId>HikariCP</artifactId>
-        </dependency>
       </dependencies>
       </dependencies>
     </profile>
     </profile>
   </profiles>
   </profiles>

+ 7 - 2
frameworks/Java/act/src/main/resources/conf/db.properties

@@ -1,8 +1,10 @@
 db.username=benchmarkdbuser
 db.username=benchmarkdbuser
 db.password=benchmarkdbpass
 db.password=benchmarkdbpass
 db.isolationLevel=1
 db.isolationLevel=1
-db.maxConnections=256
-db.minConnections=128
+db.maxConnections=128
+db.minConnections=64
+db.slave.maxConnections=256
+db.slave.minConnections=128
 db.poolServerPrepStmts=true
 db.poolServerPrepStmts=true
 db.autoCommit=false
 db.autoCommit=false
 db.prepStmtCacheSqlLimit=2048
 db.prepStmtCacheSqlLimit=2048
@@ -19,3 +21,6 @@ db.traceProtocol=false
 #db.useReadAheadInput=false
 #db.useReadAheadInput=false
 db.maintainTimeStats=false
 db.maintainTimeStats=false
 db.cacheRSMetadata=true
 db.cacheRSMetadata=true
+
+db.eclipselink.jdbc.cache-statements=true
+db.eclipselink.cache.shared.default=false

+ 0 - 2
frameworks/Java/act/src/main/resources/conf/eclipselink_mysql/db.properties

@@ -1,7 +1,5 @@
 mysql.host=localhost
 mysql.host=localhost
-
 app.batch_save=false
 app.batch_save=false
 
 
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
 db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
-db.eclipselink.cache.shared.default=false

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/eclipselink_mysql_rythm/db.properties

@@ -4,4 +4,4 @@ app.batch_save=false
 
 
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
 db.url=jdbc:mysql://${mysql.host}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&serverTimezone=UTC&useSSL=false
-db.eclipselink.cache.shared.default=false
+

+ 0 - 1
frameworks/Java/act/src/main/resources/conf/eclipselink_pgsql/db.properties

@@ -4,4 +4,3 @@ app.batch.save=false
 
 
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.url=jdbc:postgresql://${pgsql.host}:5432/hello_world?logLevel=OFF
 db.url=jdbc:postgresql://${pgsql.host}:5432/hello_world?logLevel=OFF
-db.eclipselink.cache.shared.default=false

+ 1 - 1
frameworks/Java/act/src/main/resources/conf/eclipselink_pgsql_rythm/db.properties

@@ -4,4 +4,4 @@ app.batch.save=false
 
 
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.impl=act.db.eclipselink.EclipseLinkPlugin
 db.url=jdbc:postgresql://${pgsql.host}:5432/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
 db.url=jdbc:postgresql://${pgsql.host}:5432/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
-db.eclipselink.cache.shared.default=false
+

+ 1 - 1
frameworks/Java/minijax/minijax.properties

@@ -1,4 +1,4 @@
-javax.persistence.jdbc.url=jdbc:mysql://tfb-database:3306/hello_world?jdbcCompliantTruncation=false&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&useSSL=false
+javax.persistence.jdbc.url=jdbc:mysql://tfb-database:3306/hello_world?jdbcCompliantTruncation=false&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts=true&cacheRSMetadata=true&useSSL=false&serverTimezone=UTC
 javax.persistence.jdbc.driver=com.mysql.cj.jdbc.Driver
 javax.persistence.jdbc.driver=com.mysql.cj.jdbc.Driver
 javax.persistence.jdbc.user=benchmarkdbuser
 javax.persistence.jdbc.user=benchmarkdbuser
 javax.persistence.jdbc.password=benchmarkdbpass
 javax.persistence.jdbc.password=benchmarkdbpass