From 213cf1c3753b32b0ae9638dc75179fc9d877be4d Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 10:43:44 -0800 Subject: [PATCH 01/16] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 3a836fd08f8..acde2bb219b 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250116005911-204fe88cb899 + github.com/dolthub/go-mysql-server v0.19.1-0.20250117093406-28d8b1d34c6c github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index db0db490ddd..36db7ed0d1b 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250116005911-204fe88cb899 h1:cjntkeERfjYl7Zi+RGWDwhiGk+SmS6AUXBMYkIfrLHc= -github.com/dolthub/go-mysql-server v0.19.1-0.20250116005911-204fe88cb899/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250117093406-28d8b1d34c6c h1:LYqmzU2W9Bq7SyVwqo8vtHjeC/TMLeOp5iyZyiOe1sY= +github.com/dolthub/go-mysql-server v0.19.1-0.20250117093406-28d8b1d34c6c/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 99c7e7e4b68d30a9ef75b3624a7f3abd12616931 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 11:29:40 -0800 Subject: [PATCH 02/16] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index c050d6aaac4..65a50387c04 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250117062529-729f39b6b665 + github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index 2a0138cc43b..5946c3a16bf 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250117062529-729f39b6b665 h1:7reAAOzBmGhXuULckV86svd4iJoubFTjXSro5JoLmBw= -github.com/dolthub/go-mysql-server v0.19.1-0.20250117062529-729f39b6b665/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9 h1:nbuVtH0SMRALM5OuuyX8IBUgjX3jIhYR97EQq9++1cQ= +github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 4d191da481bc573ab9ac3374435007262ae71964 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 12:01:39 -0800 Subject: [PATCH 03/16] fix --- go/libraries/doltcore/sqle/dsess/session.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/go/libraries/doltcore/sqle/dsess/session.go b/go/libraries/doltcore/sqle/dsess/session.go index cce58943e78..8bcd5cf79e0 100644 --- a/go/libraries/doltcore/sqle/dsess/session.go +++ b/go/libraries/doltcore/sqle/dsess/session.go @@ -448,6 +448,11 @@ func (d *DoltSession) CommitTransaction(ctx *sql.Context, tx sql.Transaction) (e return nil } + // There is no transaction to commit + if tx == nil { + return nil + } + dirties := d.dirtyWorkingSets() if len(dirties) == 0 { return nil From 0b523364f31ab2fd4a08fc45883c7d13f22362a7 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 15:10:02 -0800 Subject: [PATCH 04/16] transactions for import --- go/libraries/doltcore/mvdata/engine_table_writer.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index dc91cac6e7a..914a215629f 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -187,8 +187,13 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan } }() - line := 1 + // If there were create table statements, they are automatically committed, so we need to start a new transaction + _, _, _, err = s.se.Query(s.sqlCtx, "START TRANSACTION") + if err != nil { + return err + } + line := 1 for { if s.statsCB != nil && atomic.LoadInt32(&s.statOps) >= tableWriterStatUpdateRate { atomic.StoreInt32(&s.statOps, 0) From 9d78d98c1ca207f8a61f237392eb050a5b0e7a39 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 16:13:41 -0800 Subject: [PATCH 05/16] drop table --- go/libraries/doltcore/mvdata/engine_table_writer.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index 914a215629f..0ecc0f111ac 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -188,9 +188,11 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan }() // If there were create table statements, they are automatically committed, so we need to start a new transaction - _, _, _, err = s.se.Query(s.sqlCtx, "START TRANSACTION") - if err != nil { - return err + if s.importOption == CreateOp { + _, _, _, err = s.se.Query(s.sqlCtx, "START TRANSACTION") + if err != nil { + return err + } } line := 1 @@ -226,6 +228,10 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan quit := badRowCb(offendingRow, s.tableSchema, s.tableName, line, err) if quit { + // quitting import that created table, should drop table + if s.importOption == CreateOp { + s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) + } return err } } From ba5bc63410f25804164e80be0f3ac394ac542210 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 16:22:32 -0800 Subject: [PATCH 06/16] commit dropped tables --- go/libraries/doltcore/mvdata/engine_table_writer.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index 0ecc0f111ac..3383507b336 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -231,6 +231,7 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan // quitting import that created table, should drop table if s.importOption == CreateOp { s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) + s.se.Query(s.sqlCtx, "COMMIT") } return err } From 90f0c4c03b5ae67946f2fb14830f0f7e4d92f667 Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 16:26:37 -0800 Subject: [PATCH 07/16] fix test --- .../go-sql-server-driver/tests/sql-server-orig.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml b/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml index 6a34140460e..9cfa0444493 100644 --- a/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml +++ b/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml @@ -105,7 +105,7 @@ tests: - query: 'show tables' result: columns: ["Tables_in_repo1"] - rows: [] + rows: [["t"]] - on: repo1 queries: - exec: 'create table t(c0 int)' From a271d150c5f5ffc0fa5b8527d7953c600aff0eab Mon Sep 17 00:00:00 2001 From: James Cor Date: Fri, 17 Jan 2025 16:40:42 -0800 Subject: [PATCH 08/16] fix --- .../go-sql-server-driver/tests/sql-server-orig.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml b/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml index 9cfa0444493..469e477af2f 100644 --- a/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml +++ b/integration-tests/go-sql-server-driver/tests/sql-server-orig.yaml @@ -106,15 +106,6 @@ tests: result: columns: ["Tables_in_repo1"] rows: [["t"]] - - on: repo1 - queries: - - exec: 'create table t(c0 int)' - - on: repo1 - queries: - - query: 'show tables' - result: - columns: ["Tables_in_repo1"] - rows: [["t"]] - name: test basic querying via dolt sql-server repos: - name: repo1 From 9cf7d162bc3ad6de3f88fd8a754b62b4ced246ce Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 00:36:06 -0800 Subject: [PATCH 09/16] fix --- go/cmd/dolt/commands/tblcmds/import.go | 2 ++ .../doltcore/mvdata/engine_table_writer.go | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/go/cmd/dolt/commands/tblcmds/import.go b/go/cmd/dolt/commands/tblcmds/import.go index 82603be39ac..ad981e1d9e6 100644 --- a/go/cmd/dolt/commands/tblcmds/import.go +++ b/go/cmd/dolt/commands/tblcmds/import.go @@ -583,6 +583,7 @@ func move(ctx context.Context, rd table.SqlRowReader, wr *mvdata.SqlEngineTableW // only log info for the --continue option if !options.contOnErr { + rowErr = wr.DropCreatedTable() return true } @@ -620,6 +621,7 @@ func move(ctx context.Context, rd table.SqlRowReader, wr *mvdata.SqlEngineTableW err := g.Wait() if err != nil && err != io.EOF { + _ = wr.DropCreatedTable() // don't lose the rowErr if there is one if rowErr != nil { return badCount, fmt.Errorf("%w\n%s", err, rowErr.Error()) diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index 3383507b336..9fd5038a7d3 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -228,11 +228,6 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan quit := badRowCb(offendingRow, s.tableSchema, s.tableName, line, err) if quit { - // quitting import that created table, should drop table - if s.importOption == CreateOp { - s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) - s.se.Query(s.sqlCtx, "COMMIT") - } return err } } @@ -252,6 +247,22 @@ func (s *SqlEngineTableWriter) TableSchema() sql.PrimaryKeySchema { return s.tableSchema } +func (s *SqlEngineTableWriter) DropCreatedTable() error { + // quitting import that created table, should drop table + if s.importOption == CreateOp { + var err error + _, _, _, err = s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) + if err != nil { + return err + } + _, _, _, err = s.se.Query(s.sqlCtx, "COMMIT") + if err != nil { + return err + } + } + return nil +} + // forceDropTableIfNeeded drop the given table in case the -f parameter is passed. func (s *SqlEngineTableWriter) forceDropTableIfNeeded() error { if s.force { From e06ead692726243c1ad517b472b0cb93c5a1883a Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 00:41:33 -0800 Subject: [PATCH 10/16] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 65a50387c04..5316386b1e4 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9 + github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index 5946c3a16bf..4b42b6b84c4 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9 h1:nbuVtH0SMRALM5OuuyX8IBUgjX3jIhYR97EQq9++1cQ= -github.com/dolthub/go-mysql-server v0.19.1-0.20250117192616-e0a5ed7dfda9/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606 h1:KRwz25jzn8CaU45trRyiepyXfY9ZPNq/bt0JE24kyQ0= +github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 7a52606928b58361f104264ac0c7d0093e4c03bb Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 01:40:29 -0800 Subject: [PATCH 11/16] don't override error --- go/cmd/dolt/commands/tblcmds/import.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/cmd/dolt/commands/tblcmds/import.go b/go/cmd/dolt/commands/tblcmds/import.go index ad981e1d9e6..7712dcc43ff 100644 --- a/go/cmd/dolt/commands/tblcmds/import.go +++ b/go/cmd/dolt/commands/tblcmds/import.go @@ -583,7 +583,7 @@ func move(ctx context.Context, rd table.SqlRowReader, wr *mvdata.SqlEngineTableW // only log info for the --continue option if !options.contOnErr { - rowErr = wr.DropCreatedTable() + _ = wr.DropCreatedTable() return true } From d06a85c4c3454d40d621c841afa1f7e3f83f7316 Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 16:32:57 -0800 Subject: [PATCH 12/16] feedback and bump --- go/go.mod | 2 +- go/go.sum | 4 +- .../doltcore/mvdata/engine_table_writer.go | 51 +++++++++++++++++-- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/go/go.mod b/go/go.mod index 5316386b1e4..fa854ec44b0 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606 + github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index 4b42b6b84c4..d876173d21d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606 h1:KRwz25jzn8CaU45trRyiepyXfY9ZPNq/bt0JE24kyQ0= -github.com/dolthub/go-mysql-server v0.19.1-0.20250121083627-42ea0f357606/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d h1:j4yVH73eSn3nRZgFXRk0BR97QleHOfiAXjkvzs07q5k= +github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index 9fd5038a7d3..f36d731fd29 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -189,10 +189,19 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan // If there were create table statements, they are automatically committed, so we need to start a new transaction if s.importOption == CreateOp { - _, _, _, err = s.se.Query(s.sqlCtx, "START TRANSACTION") + _, iter, _, err := s.se.Query(s.sqlCtx, "START TRANSACTION") if err != nil { return err } + for { + _, err = iter.Next(s.sqlCtx) + if err == io.EOF { + break + } + if err != nil { + return err + } + } } line := 1 @@ -235,8 +244,20 @@ func (s *SqlEngineTableWriter) WriteRows(ctx context.Context, inputChannel chan } func (s *SqlEngineTableWriter) Commit(ctx context.Context) error { - _, _, _, err := s.se.Query(s.sqlCtx, "COMMIT") - return err + _, iter, _, err := s.se.Query(s.sqlCtx, "COMMIT") + if err != nil { + return err + } + for { + _, err = iter.Next(s.sqlCtx) + if err == io.EOF { + break + } + if err != nil { + return err + } + } + return nil } func (s *SqlEngineTableWriter) RowOperationSchema() sql.PrimaryKeySchema { @@ -251,14 +272,34 @@ func (s *SqlEngineTableWriter) DropCreatedTable() error { // quitting import that created table, should drop table if s.importOption == CreateOp { var err error - _, _, _, err = s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) + var iter sql.RowIter + _, iter, _, err = s.se.Query(s.sqlCtx, fmt.Sprintf("DROP TABLE IF EXISTS `%s`", s.tableName)) if err != nil { return err } - _, _, _, err = s.se.Query(s.sqlCtx, "COMMIT") + for { + _, err = iter.Next(s.sqlCtx) + if err == io.EOF { + break + } + if err != nil { + return err + } + } + + _, iter, _, err = s.se.Query(s.sqlCtx, "COMMIT") if err != nil { return err } + for { + _, err = iter.Next(s.sqlCtx) + if err == io.EOF { + break + } + if err != nil { + return err + } + } } return nil } From a8f4f09f3947ba3e6477c7812d8ecade723d64e4 Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 16:59:58 -0800 Subject: [PATCH 13/16] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index fa854ec44b0..95cad8e705e 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d + github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index d876173d21d..b4df5305a53 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d h1:j4yVH73eSn3nRZgFXRk0BR97QleHOfiAXjkvzs07q5k= -github.com/dolthub/go-mysql-server v0.19.1-0.20250121235849-b707510aaf2d/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6 h1:S1xoN9IDXv1AxRutsBmlDhm7Kcz3u0p5tdsoo14iRm0= +github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE= From 916031aec05076d8a14c5d6897c2fde95f66b6b3 Mon Sep 17 00:00:00 2001 From: James Cor Date: Tue, 21 Jan 2025 17:00:07 -0800 Subject: [PATCH 14/16] bazel fix --- .github/workflows/ci-check-repo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci-check-repo.yaml b/.github/workflows/ci-check-repo.yaml index b58c1cb66b6..49b782d01be 100644 --- a/.github/workflows/ci-check-repo.yaml +++ b/.github/workflows/ci-check-repo.yaml @@ -152,6 +152,8 @@ jobs: cwd: "." pull: "--ff" - name: Check generated protobufs + env: + USE_BAZEL_VERSION: 7.4.0 working-directory: ./proto run: | (cd third_party/protobuf && bazel build //:protoc) From c0d2b1c807ac77322deac99928acb36c49056f35 Mon Sep 17 00:00:00 2001 From: jycor Date: Wed, 22 Jan 2025 08:02:34 +0000 Subject: [PATCH 15/16] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/libraries/doltcore/sqle/dtables/help_table.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/sqle/dtables/help_table.go b/go/libraries/doltcore/sqle/dtables/help_table.go index d7a70967c01..b10e96e6dc1 100644 --- a/go/libraries/doltcore/sqle/dtables/help_table.go +++ b/go/libraries/doltcore/sqle/dtables/help_table.go @@ -19,11 +19,12 @@ import ( "io" "strings" + "github.com/dolthub/go-mysql-server/sql" + sqlTypes "github.com/dolthub/go-mysql-server/sql/types" + "github.com/dolthub/dolt/go/cmd/dolt/cli" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dprocedures" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/index" - "github.com/dolthub/go-mysql-server/sql" - sqlTypes "github.com/dolthub/go-mysql-server/sql/types" ) type HelpTable struct { From 3c1987e9b32088972fe22adc9b271a93570f0d1d Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 22 Jan 2025 02:07:50 -0800 Subject: [PATCH 16/16] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 95cad8e705e..3d3d9ec9673 100644 --- a/go/go.mod +++ b/go/go.mod @@ -56,7 +56,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6 + github.com/dolthub/go-mysql-server v0.19.1-0.20250122100341-c5d0e527c855 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/dolthub/swiss v0.1.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index b4df5305a53..e0e891707a5 100644 --- a/go/go.sum +++ b/go/go.sum @@ -179,8 +179,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90 h1:Sni8jrP0sy/w9ZYXoff4g/ixe+7bFCZlfCqXKJSU+zM= github.com/dolthub/go-icu-regex v0.0.0-20241215010122-db690dd53c90/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA= -github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6 h1:S1xoN9IDXv1AxRutsBmlDhm7Kcz3u0p5tdsoo14iRm0= -github.com/dolthub/go-mysql-server v0.19.1-0.20250122005732-1a607e2862a6/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= +github.com/dolthub/go-mysql-server v0.19.1-0.20250122100341-c5d0e527c855 h1:TpoMmjRofO1JOTxp14t/pDyr0RLi29ybLAMhV3ZZ+R0= +github.com/dolthub/go-mysql-server v0.19.1-0.20250122100341-c5d0e527c855/go.mod h1:5HtKnb+IAiv+27bo50KGANbUB4HAzGEF9rlFF2ZBLZg= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=