patched batch insert

viant · Apr 17, 2019 · 4f6c472 · 4f6c472
1 parent e7ac89a
commit 4f6c472
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## April 15 2019 0.7.1
+    * Patched batch insert
+
 ## April 15 2019 0.7.0
     * Added dynamic sql driver
     * Added request limiter

diff --git a/manager.go b/manager.go
@@ -376,6 +376,7 @@ func (m *AbstractManager) PersistData(connection Connection, data interface{}, t
 	var processed = 0
 	dialect := GetDatastoreDialect(m.config.DriverName)
 	canUseBatch := dialect != nil && dialect.CanPersistBatch()
+	Logf("[%v]: canUseBatch: %v\n", m.config.DriverName, canUseBatch)
 	var batchControl = &batchControl{
 		values:      []interface{}{},
 		dataIndexes: []int{},
@@ -407,15 +408,18 @@ func (m *AbstractManager) PersistData(connection Connection, data interface{}, t
 			collection[index] = structPointerValue.Elem().Interface()
 		}
 	}
+
 	var batchSize = m.config.GetInt(BatchSizeKey, defaultBatchSize)
+	Logf("batch size: %v\n", batchSize)
+
 	persist := func(index int, item interface{}) error {
 		parametrizedSQL := sqlProvider(item)
 		if len(parametrizedSQL.Values) == 1 && parametrizedSQL.Type == SQLTypeUpdate {
 			//nothing to udpate, one parameter is ID=? without values to update
 			return nil
 		}
 
-		if parametrizedSQL.Type == SQLTypeInsert && canUseBatch && batchControl.firstSeq > 0 {
+		if parametrizedSQL.Type == SQLTypeInsert && canUseBatch {
 			if len(batchControl.dataIndexes) > batchSize {
 				if _, err := batchControl.Flush(connection, updateId); err != nil {
 					return err

diff --git a/sql_dialect_test.go b/sql_dialect_test.go
@@ -63,4 +63,8 @@ func TestSqlDialect(t *testing.T) {
 
 	assert.Nil(t, dialect.DropDatastore(manager, "bar"))
 
+	{
+		mySQLDialect := dsc.GetDatastoreDialect("mysql")
+		assert.True(t, mySQLDialect.CanPersistBatch())
+	}
 }