use ebean

Author: SentryMan

frameworks/Java/avaje-jex/benchmark_config.json

@@ -18,7 +18,7 @@
         "platform": "httpserver",
         "database": "Postgres",
         "database_os": "Linux",
-        "orm": "Raw",
+        "orm": "Full",
         "webserver": "None",
         "os": "Linux",
         "notes": "avaje-jex using jdk.httpserver",
@@ -41,7 +41,7 @@
         "platform": "robaho",
         "database": "Postgres",
         "database_os": "Linux",
-        "orm": "Raw",
+        "orm": "Full",
         "webserver": "None",
         "os": "Linux",
         "notes": "avaje-jex using robaho's httpserver",
@@ -64,7 +64,7 @@
         "platform": "Jetty",
         "database": "Postgres",
         "database_os": "Linux",
-        "orm": "Raw",
+        "orm": "Full",
         "webserver": "None",
         "os": "Linux",
         "notes": "avaje-jex using Jetty",

frameworks/Java/avaje-jex/pom.xml

@@ -55,6 +55,12 @@
       <artifactId>HikariCP</artifactId>
       <version>6.3.0</version>
     </dependency>
+    
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-postgres</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
@@ -89,6 +95,11 @@
       <artifactId>avaje-jsonb-generator</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>querybean-generator</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

frameworks/Java/avaje-jex/src/main/java/benchmark/repository/EbeanDbService.java

@@ -0,0 +1,66 @@
+package benchmark.repository;
+
+import benchmark.model.Fortune;
+import benchmark.model.World;
+import io.ebean.Database;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+@Singleton
+public class EbeanDbService implements DbService {
+
+  Database readOnly;
+  Database updateOnly;
+
+  EbeanDbService(@Named("readOnly") Database readOnly, @Named("updateOnly") Database updateOnly) {
+    this.readOnly = readOnly;
+    this.updateOnly = updateOnly;
+  }
+
+  @Override
+  public List<World> getWorld(int num) {
+
+    String select = "select id, randomNumber from World where id IN (?)";
+
+    return readOnly.findDto(World.class, select).setParameter(getRandomNumberSet(num)).findList();
+  }
+
+  @Override
+  public List<Fortune> getFortune() throws SQLException {
+
+    String select = "select id, message from Fortune";
+    List<Fortune> fortuneList = new ArrayList<>(readOnly.findDto(Fortune.class, select).findList());
+
+    fortuneList.add(new Fortune(defaultFortuneId, defaultFortuneMessage));
+
+    fortuneList.sort(Comparator.comparing(Fortune::message));
+    return fortuneList;
+  }
+
+  @Override
+  public List<World> updateWorld(int num) throws SQLException {
+
+    String update = "update World set randomNumber = ? where id = ?";
+    List<World> worldList = getWorld(num);
+    var sqlUpdate = updateOnly.sqlUpdate(update);
+
+    for (World world : worldList) {
+      int newRandomNumber;
+      do {
+        newRandomNumber = getRandomNumber();
+      } while (newRandomNumber == world.getRandomNumber());
+
+      sqlUpdate.setParameter(1, newRandomNumber).setParameter(2, world.getId()).addBatch();
+
+      world.setRandomNumber(newRandomNumber);
+    }
+
+    sqlUpdate.executeBatch();
+
+    return worldList;
+  }
+}

frameworks/Java/avaje-jex/src/main/java/benchmark/repository/HikariFactory.java

@@ -1,29 +1,36 @@
 package benchmark.repository;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import io.avaje.config.Config;
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
-import javax.sql.DataSource;
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.datasource.DataSourceConfig;
+import jakarta.inject.Named;
 
 @Factory
 public class HikariFactory {
 
   @Bean
-  DataSource dataSource() {
-    int maxPoolSize;
-    var env = System.getenv("BENCHMARK_ENV");
-    if (Config.get("physicalTag").equals(env)) {
-      maxPoolSize = Config.getInt("postgresPhysicalPoolSize");
-    } else if (Config.get("cloudTag").equals(env)) {
-      maxPoolSize = Config.getInt("postgresCloudPoolSize");
-    } else {
-      maxPoolSize = Config.getInt("postgresDefaultPoolSize");
-    }
+  @Named("readOnly")
+  Database readOnly() {
+    var dataSourceConfig = new DataSourceConfig();
+    dataSourceConfig.autoCommit(true);
+    dataSourceConfig.readOnly(true);
+    DatabaseConfig config = new DatabaseConfig();
+    config.autoReadOnlyDataSource(true);
+    config.readOnlyDatabase(true);
+    config.setDataSourceConfig(dataSourceConfig);
+    return DatabaseFactory.create(config);
+  }
 
-    var hikari = new HikariDataSource(new HikariConfig("hikari.properties"));
-    hikari.setMaximumPoolSize(maxPoolSize);
-    return hikari;
+  @Bean
+  @Named("updateOnly")
+  Database updateOnly() {
+    var dataSourceConfig = new DataSourceConfig();
+    dataSourceConfig.autoCommit(false);
+    DatabaseConfig config = new DatabaseConfig();
+    config.setDataSourceConfig(dataSourceConfig);
+    return DatabaseFactory.create(config);
   }
 }

frameworks/Java/avaje-jex/src/main/java/benchmark/repository/JDBCDbService.java

@@ -6,6 +6,8 @@
   requires java.sql;
   requires org.postgresql.jdbc;
   requires com.zaxxer.hikari;
+  requires io.ebean.core;
+  requires io.ebean.querybean;
   // template engine
   requires io.jstach.jstachio;
   /// Configuration

frameworks/Java/avaje-jex/src/main/java/module-info.java

@@ -1,6 +1,3 @@
-physicalTag=Citrine
-cloudTag=Azure
-
-postgresPhysicalPoolSize=56
-postgresCloudPoolSize=16
-postgresDefaultPoolSize=10
+datasource.db.username=benchmarkdbuser
+datasource.db.password=benchmarkdbpass
+datasource.db.url=jdbc:postgresql://${host:tfb-database}:5432/hello_world?user=${datasource.db.username}&password=${datasource.db.password}