feat: insert or replace

project-tsurugi · Dec 14, 2023 · 50f5ae5 · 50f5ae5
1 parent 7175fb7
commit 50f5ae5
Show file tree

Hide file tree

Showing 26 changed files with 132 additions and 62 deletions.
diff --git a/...benchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/CostBenchDbManager.java b/...benchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/CostBenchDbManager.java
@@ -85,6 +85,10 @@ public boolean isTsurugi() {
         return this.isTsurugi;
     }
 
+    public DbManagerPurpose getPurpose() {
+        return this.purpose;
+    }
+
     // DAO
 
     public synchronized MeasurementMasterDao getMeasurementMasterDao() {

diff --git a/...rc/main/java/com/tsurugidb/benchmark/costaccounting/db/dao/ItemConstructionMasterDao.java b/...rc/main/java/com/tsurugidb/benchmark/costaccounting/db/dao/ItemConstructionMasterDao.java
@@ -48,7 +48,7 @@ public interface ItemConstructionMasterDao {
      */
     int insert(ItemConstructionMaster entity);
 
-    int[] insertBatch(Collection<ItemConstructionMaster> entityList);
+    int[] insertBatch(Collection<ItemConstructionMaster> entityList, boolean insertOnly);
 
     /**
      * <pre>

diff --git a/...-benchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/dao/ItemMasterDao.java b/...-benchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/dao/ItemMasterDao.java
@@ -40,12 +40,20 @@ public interface ItemMasterDao {
 
     /**
      * <pre>
-     * insert into item_master
+     * insert (or replace) into item_master
      * values(:entity)
      * </pre>
      */
     int insert(ItemMaster entity);
 
+    /**
+     * <pre>
+     * insert into item_master
+     * values(:entity)
+     * </pre>
+     */
+    int insertOnly(ItemMaster entity);
+
     int[] insertBatch(Collection<ItemMaster> entityList);
 
     /**

diff --git a/...c/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/CostMasterDaoIceaxe.java b/...c/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/CostMasterDaoIceaxe.java
@@ -50,12 +50,12 @@ public int deleteAll() {
 
     @Override
     public int insert(CostMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<CostMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...ain/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/FactoryMasterDaoIceaxe.java b/...ain/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/FactoryMasterDaoIceaxe.java
@@ -39,7 +39,7 @@ public int deleteAll() {
 
     @Override
     public int insert(FactoryMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override

diff --git a/...nchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/IceaxeDao.java b/...nchmark/src/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/IceaxeDao.java
@@ -55,6 +55,7 @@ public abstract class IceaxeDao<E> {
     private final String tableName;
     private final List<IceaxeColumn<E, ?>> columnList;
     private final Supplier<E> entitySupplier;
+    protected final String insert;
 
     protected static <E, T> void add(List<IceaxeColumn<E, ?>> list, TgBindVariable<T> variable, BiConsumer<E, T> entitySetter, Function<E, T> entityGetter, RecordGetter<T> recordGetter) {
         add(list, variable, entitySetter, entityGetter, recordGetter, false);
@@ -70,6 +71,7 @@ public IceaxeDao(CostBenchDbManagerIceaxe dbManager, String tableName, List<Icea
         this.tableName = tableName;
         this.columnList = columnList;
         this.entitySupplier = entitySupplier;
+        this.insert = BenchConst.sqlInsert(dbManager.getPurpose());
     }
 
     protected final TsurugiSession getSession() {
@@ -101,24 +103,24 @@ protected final int doDeleteAll() {
         }
     }
 
-    protected final int doInsert(E entity) {
-        var ps = insertCache.get();
+    protected final int doInsert(E entity, boolean insertOnly) {
+        var ps = getInsertPs(insertOnly);
         return executeAndGetCount(ps, entity);
     }
 
-    protected final int[] doInsert(Collection<E> entityList) {
+    protected final int[] doInsert(Collection<E> entityList, boolean insertOnly) {
         // TODO batch insertに切り替え
         switch (1) {
         default:
         case 0:
-            return doInsertWait(entityList);
+            return doInsertWait(entityList, insertOnly);
         case 1:
-            return doInsertNoWait(entityList);
+            return doInsertNoWait(entityList, insertOnly);
         }
     }
 
-    private int[] doInsertWait(Collection<E> entityList) {
-        var ps = insertCache.get();
+    private int[] doInsertWait(Collection<E> entityList, boolean insertOnly) {
+        var ps = getInsertPs(insertOnly);
         var result = new int[entityList.size()];
         int i = 0;
         for (var entity : entityList) {
@@ -127,12 +129,20 @@ private int[] doInsertWait(Collection<E> entityList) {
         return result;
     }
 
-    private int[] doInsertNoWait(Collection<E> entityList) {
-        var ps = insertCache.get();
+    private int[] doInsertNoWait(Collection<E> entityList, boolean insertOnly) {
+        var ps = getInsertPs(insertOnly);
         return executeAndGetCount(ps, entityList);
     }
 
-    private final CachePreparedStatement<E> insertCache = new CachePreparedStatement<>() {
+    private TsurugiSqlPreparedStatement<E> getInsertPs(boolean insertOnly) {
+        if (insertOnly) {
+            return insertOnlyCache.get();
+        } else {
+            return insertCache.get();
+        }
+    }
+
+    private final CachePreparedStatement<E> insertOnlyCache = new CachePreparedStatement<>() {
         @Override
         protected void initialize() {
             var names = getColumnNames();
@@ -142,6 +152,16 @@ protected void initialize() {
         }
     };
 
+    private final CachePreparedStatement<E> insertCache = new CachePreparedStatement<>() {
+        @Override
+        protected void initialize() {
+            var names = getColumnNames();
+            var values = columnList.stream().map(c -> c.getSqlName()).collect(Collectors.joining(","));
+            this.sql = insert + " into " + tableName + "(" + names + ") values (" + values + ")";
+            this.parameterMapping = getEntityParameterMapping();
+        }
+    };
+
     private TgEntityParameterMapping<E> getEntityParameterMapping() {
         var parameterMapping = TgEntityParameterMapping.<E>of();
         for (var column : columnList) {

diff --git a/...com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemConstructionMasterDaoIceaxe.java b/...com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemConstructionMasterDaoIceaxe.java
@@ -59,12 +59,12 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemConstructionMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
-    public int[] insertBatch(Collection<ItemConstructionMaster> entityList) {
-        return doInsert(entityList);
+    public int[] insertBatch(Collection<ItemConstructionMaster> entityList, boolean insertOnly) {
+        return doInsert(entityList, insertOnly);
     }
 
     @Override

diff --git a/...om/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemManufacturingMasterDaoIceaxe.java b/...om/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemManufacturingMasterDaoIceaxe.java
@@ -53,12 +53,12 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemManufacturingMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<ItemManufacturingMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...c/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemMasterDaoIceaxe.java b/...c/main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ItemMasterDaoIceaxe.java
@@ -60,12 +60,17 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
+    }
+
+    @Override
+    public int insertOnly(ItemMaster entity) {
+        return doInsert(entity, true);
     }
 
     @Override
     public int[] insertBatch(Collection<ItemMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/MeasurementMasterDaoIceaxe.java b/...java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/MeasurementMasterDaoIceaxe.java
@@ -38,7 +38,7 @@ public int deleteAll() {
 
     @Override
     public int insert(MeasurementMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override

diff --git a/.../main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ResultTableDaoIceaxe.java b/.../main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/ResultTableDaoIceaxe.java
@@ -131,12 +131,12 @@ protected void initialize() {
 
     @Override
     public int insert(ResultTable entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<ResultTable> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/StockHistoryDaoIceaxe.java b/...main/java/com/tsurugidb/benchmark/costaccounting/db/iceaxe/dao/StockHistoryDaoIceaxe.java
@@ -43,12 +43,12 @@ public int deleteAll() {
 
     @Override
     public int insert(StockHistory entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<StockHistory> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...ava/com/tsurugidb/benchmark/costaccounting/db/jdbc/dao/ItemConstructionMasterDaoJdbc.java b/...ava/com/tsurugidb/benchmark/costaccounting/db/jdbc/dao/ItemConstructionMasterDaoJdbc.java
@@ -58,7 +58,7 @@ public int insert(ItemConstructionMaster entity) {
     }
 
     @Override
-    public int[] insertBatch(Collection<ItemConstructionMaster> entityList) {
+    public int[] insertBatch(Collection<ItemConstructionMaster> entityList, boolean insertOnly) {
         return doInsert(entityList);
     }
 

diff --git a/...k/src/main/java/com/tsurugidb/benchmark/costaccounting/db/jdbc/dao/ItemMasterDaoJdbc.java b/...k/src/main/java/com/tsurugidb/benchmark/costaccounting/db/jdbc/dao/ItemMasterDaoJdbc.java
@@ -56,6 +56,11 @@ public int insert(ItemMaster entity) {
         return doInsert(entity);
     }
 
+    @Override
+    public int insertOnly(ItemMaster entity) {
+        return doInsert(entity);
+    }
+
     @Override
     public int[] insertBatch(Collection<ItemMaster> entityList) {
         return doInsert(entityList);

diff --git a/.../java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/CostMasterDaoTsubakuro.java b/.../java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/CostMasterDaoTsubakuro.java
@@ -46,12 +46,12 @@ public int deleteAll() {
 
     @Override
     public int insert(CostMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<CostMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...va/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/FactoryMasterDaoTsubakuro.java b/...va/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/FactoryMasterDaoTsubakuro.java
@@ -35,7 +35,7 @@ public int deleteAll() {
 
     @Override
     public int insert(FactoryMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override

diff --git a/...urugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemConstructionMasterDaoTsubakuro.java b/...urugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemConstructionMasterDaoTsubakuro.java
@@ -49,12 +49,12 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemConstructionMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
-    public int[] insertBatch(Collection<ItemConstructionMaster> entityList) {
-        return doInsert(entityList);
+    public int[] insertBatch(Collection<ItemConstructionMaster> entityList, boolean insertOnly) {
+        return doInsert(entityList, insertOnly);
     }
 
     @Override

diff --git a/...rugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemManufacturingMasterDaoTsubakuro.java b/...rugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemManufacturingMasterDaoTsubakuro.java
@@ -45,12 +45,12 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemManufacturingMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<ItemManufacturingMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/.../java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemMasterDaoTsubakuro.java b/.../java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/ItemMasterDaoTsubakuro.java
@@ -60,12 +60,17 @@ public int deleteAll() {
 
     @Override
     public int insert(ItemMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
+    }
+
+    @Override
+    public int insertOnly(ItemMaster entity) {
+        return doInsert(entity, true);
     }
 
     @Override
     public int[] insertBatch(Collection<ItemMaster> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...om/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/MeasurementMasterDaoTsubakuro.java b/...om/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/MeasurementMasterDaoTsubakuro.java
@@ -39,7 +39,7 @@ public int deleteAll() {
 
     @Override
     public int insert(MeasurementMaster entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override

diff --git a/...java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/ResultTableDaoTsubakuro.java b/...java/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/ResultTableDaoTsubakuro.java
@@ -101,12 +101,12 @@ public int deleteByProductId(int factoryId, LocalDate date, int productId) {
 
     @Override
     public int insert(ResultTable entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<ResultTable> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override

diff --git a/...ava/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/StockHistoryDaoTsubakuro.java b/...ava/com/tsurugidb/benchmark/costaccounting/db/tsubakuro/dao/StockHistoryDaoTsubakuro.java
@@ -45,12 +45,12 @@ public int deleteAll() {
 
     @Override
     public int insert(StockHistory entity) {
-        return doInsert(entity);
+        return doInsert(entity, false);
     }
 
     @Override
     public int[] insertBatch(Collection<StockHistory> entityList) {
-        return doInsert(entityList);
+        return doInsert(entityList, false);
     }
 
     @Override