Initial value of InsertsType changed from BULK to BATCH.

future-architect · May 12, 2020 · 2899bfa · 2899bfa
1 parent 6bfffd1
commit 2899bfa
Show file tree

Hide file tree

Showing 3 changed files with 370 additions and 16 deletions.
diff --git a/src/main/java/jp/co/future/uroborosql/AbstractAgent.java b/src/main/java/jp/co/future/uroborosql/AbstractAgent.java
@@ -78,16 +78,17 @@ public abstract class AbstractAgent implements SqlAgent {
 	/** 例外発生にロールバックが必要なDBでリトライを実現するために設定するSavepointの名前 */
 	protected static final String RETRY_SAVEPOINT_NAME = "__retry_savepoint";
 
-	/** バッチカウントの初期値 */
-	protected static final int DEFAULT_BATCH_COUNT = 1000;
+	/** BATCH-INSERT用のバッチフレームの判定条件 */
+	protected static final InsertsCondition<Object> DEFAULT_BATCH_INSERTS_WHEN_CONDITION = (context, count,
+			row) -> count == 1000;
 
-	/** 一括INSERT用のバッチフレームの判定条件 */
-	protected static final InsertsCondition<Object> DEFAULT_INSERTS_WHEN_CONDITION = (context, count,
-			row) -> count == DEFAULT_BATCH_COUNT;
+	/** BULK-INSERT用のバッチフレームの判定条件 */
+	protected static final InsertsCondition<Object> DEFAULT_BULK_INSERTS_WHEN_CONDITION = (context, count,
+			row) -> count == 10;
 
 	/** 一括UPDATE用のバッチフレームの判定条件 */
 	protected static final UpdatesCondition<Object> DEFAULT_UPDATES_WHEN_CONDITION = (context, count,
-			row) -> count == DEFAULT_BATCH_COUNT;
+			row) -> count == 1000;
 
 	/** カバレッジハンドラ */
 	protected static AtomicReference<CoverageHandler> coverageHandlerRef = new AtomicReference<>();
@@ -120,7 +121,7 @@ public abstract class AbstractAgent implements SqlAgent {
 	protected CaseFormat defaultMapKeyCaseFormat = CaseFormat.UPPER_SNAKE_CASE;
 
 	/** デフォルトの{@link InsertsType} */
-	protected InsertsType defaultInsertsType = InsertsType.BULK;
+	protected InsertsType defaultInsertsType = InsertsType.BATCH;
 
 	static {
 		// SQLカバレッジ取得用のクラス名を設定する。指定がない場合、またはfalseが指定された場合はカバレッジを収集しない。
@@ -671,7 +672,9 @@ public <E> int inserts(final Class<E> entityType, final Stream<E> entities,
 	 */
 	@Override
 	public <E> int inserts(final Class<E> entityType, final Stream<E> entities) {
-		return inserts(entityType, entities, DEFAULT_INSERTS_WHEN_CONDITION);
+		return inserts(entityType, entities,
+				InsertsType.BATCH.equals(defaultInsertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+						: DEFAULT_BULK_INSERTS_WHEN_CONDITION);
 	}
 
 	/**
@@ -681,7 +684,10 @@ public <E> int inserts(final Class<E> entityType, final Stream<E> entities) {
 	 */
 	@Override
 	public <E> int inserts(final Class<E> entityType, final Stream<E> entities, final InsertsType insertsType) {
-		return inserts(entityType, entities, DEFAULT_INSERTS_WHEN_CONDITION, insertsType);
+		return inserts(entityType, entities,
+				InsertsType.BATCH.equals(insertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+						: DEFAULT_BULK_INSERTS_WHEN_CONDITION,
+				insertsType);
 	}
 
 	/**
@@ -726,7 +732,8 @@ public <E> int inserts(final Stream<E> entities, final InsertsCondition<? super
 	 */
 	@Override
 	public <E> int inserts(final Stream<E> entities) {
-		return inserts(entities, DEFAULT_INSERTS_WHEN_CONDITION);
+		return inserts(entities, InsertsType.BATCH.equals(defaultInsertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+				: DEFAULT_BULK_INSERTS_WHEN_CONDITION);
 	}
 
 	/**
@@ -736,7 +743,8 @@ public <E> int inserts(final Stream<E> entities) {
 	 */
 	@Override
 	public <E> int inserts(final Stream<E> entities, final InsertsType insertsType) {
-		return inserts(entities, DEFAULT_INSERTS_WHEN_CONDITION, insertsType);
+		return inserts(entities, InsertsType.BATCH.equals(insertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+				: DEFAULT_BULK_INSERTS_WHEN_CONDITION, insertsType);
 	}
 
 	/**
@@ -775,7 +783,9 @@ public <E> Stream<E> insertsAndReturn(final Class<E> entityType, final Stream<E>
 	 */
 	@Override
 	public <E> Stream<E> insertsAndReturn(final Class<E> entityType, final Stream<E> entities) {
-		return insertsAndReturn(entityType, entities, DEFAULT_INSERTS_WHEN_CONDITION);
+		return insertsAndReturn(entityType, entities,
+				InsertsType.BATCH.equals(defaultInsertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+						: DEFAULT_BULK_INSERTS_WHEN_CONDITION);
 	}
 
 	/**
@@ -786,7 +796,10 @@ public <E> Stream<E> insertsAndReturn(final Class<E> entityType, final Stream<E>
 	@Override
 	public <E> Stream<E> insertsAndReturn(final Class<E> entityType, final Stream<E> entities,
 			final InsertsType insertsType) {
-		return insertsAndReturn(entityType, entities, DEFAULT_INSERTS_WHEN_CONDITION, insertsType);
+		return insertsAndReturn(entityType, entities,
+				InsertsType.BATCH.equals(insertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+						: DEFAULT_BULK_INSERTS_WHEN_CONDITION,
+				insertsType);
 	}
 
 	/**
@@ -831,7 +844,9 @@ public <E> Stream<E> insertsAndReturn(final Stream<E> entities, final InsertsCon
 	 */
 	@Override
 	public <E> Stream<E> insertsAndReturn(final Stream<E> entities) {
-		return insertsAndReturn(entities, DEFAULT_INSERTS_WHEN_CONDITION);
+		return insertsAndReturn(entities,
+				InsertsType.BATCH.equals(defaultInsertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+						: DEFAULT_BULK_INSERTS_WHEN_CONDITION);
 	}
 
 	/**
@@ -841,7 +856,8 @@ public <E> Stream<E> insertsAndReturn(final Stream<E> entities) {
 	 */
 	@Override
 	public <E> Stream<E> insertsAndReturn(final Stream<E> entities, final InsertsType insertsType) {
-		return insertsAndReturn(entities, DEFAULT_INSERTS_WHEN_CONDITION, insertsType);
+		return insertsAndReturn(entities, InsertsType.BATCH.equals(insertsType) ? DEFAULT_BATCH_INSERTS_WHEN_CONDITION
+				: DEFAULT_BULK_INSERTS_WHEN_CONDITION, insertsType);
 	}
 
 	/**

diff --git a/src/main/java/jp/co/future/uroborosql/SqlAgentFactoryImpl.java b/src/main/java/jp/co/future/uroborosql/SqlAgentFactoryImpl.java
@@ -310,7 +310,7 @@ public SqlAgentFactory setDefaultMapKeyCaseFormat(final CaseFormat defaultMapKey
 	@Override
 	public InsertsType getDefaultInsertsType() {
 		return InsertsType.valueOf(getDefaultProps().getOrDefault(PROPS_KEY_DEFAULT_INSERTS_TYPE,
-				InsertsType.BULK.toString()));
+				InsertsType.BATCH.toString()));
 	}
 
 	/**