Merge remote-tracking branch 'origin/main' into taylor/dolt-schema

Author: tbantle22

go/cmd/dolt/commands/sql_statement_scanner.go

@@ -96,16 +96,20 @@ func (s *streamScanner) Scan() bool {
 	}
 
 	// discard leading whitespace
-	for ; unicode.IsSpace(rune(s.buf[s.i])); s.i++ {
-		if s.buf[s.i] == '\n' {
-			s.lineNum++
-		}
+	for {
 		if s.i >= s.fill {
 			if err := s.read(); err != nil {
 				s.err = err
 				return false
 			}
 		}
+		if !unicode.IsSpace(rune(s.buf[s.i])) {
+			break
+		}
+		if s.buf[s.i] == '\n' {
+			s.lineNum++
+		}
+		s.i++
 	}
 	s.truncate()
 

go/cmd/dolt/commands/sql_statement_scanner_test.go

@@ -187,6 +187,14 @@ insert into foo values (1,2,3)|`,
 			},
 			lineNums: []int{1, 2},
 		},
+		{
+			// https://github.com/dolthub/dolt/issues/8495
+			input: strings.Repeat(" ", 4096) + `insert into foo values (1,2,3)`,
+			statements: []string{
+				"insert into foo values (1,2,3)",
+			},
+			lineNums: []int{1, 2},
+		},
 	}
 
 	for _, tt := range testcases {

go/cmd/dolt/commands/sqlserver/queryist_utils.go

@@ -68,7 +68,9 @@ func BuildConnectionStringQueryist(ctx context.Context, cwdFS filesys.Filesys, c
 	var lateBind cli.LateBindQueryist = func(ctx context.Context) (cli.Queryist, *sql.Context, func(), error) {
 		sqlCtx := sql.NewContext(ctx)
 		sqlCtx.SetCurrentDatabase(dbRev)
-		return queryist, sqlCtx, func() { conn.Conn(ctx) }, nil
+		return queryist, sqlCtx, func() {
+			conn.Conn(ctx)
+		}, nil
 	}
 
 	return lateBind, nil

go/cmd/dolt/doltversion/version.go

@@ -16,5 +16,5 @@
 package doltversion
 
 const (
-	Version = "1.43.8"
+	Version = "1.43.9"
 )

go/go.mod

@@ -57,7 +57,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.18.2-0.20241024233927-96a484368bea
+	github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/dolthub/swiss v0.1.0
 	github.com/goccy/go-json v0.10.2

go/go.sum

@@ -183,8 +183,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-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241024233927-96a484368bea h1:bqHfelpj4LTC4RQnnFeC8KiXda90E0YfG0Elg5AqV0w=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241024233927-96a484368bea/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6 h1:+RYghO025hK+Q2y9rPXv3mLOSnWOKllVjfg3vEJ4lfM=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241028173746-a6973b5e90d6/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms=
 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=

integration-tests/bats/processlist.bats

@@ -0,0 +1,29 @@
+#!/usr/bin/env bats
+load $BATS_TEST_DIRNAME/helper/common.bash
+
+setup() {
+    setup_common
+}
+
+teardown() {
+    teardown_common
+}
+
+@test "processlist: kill query" {
+    if [ "$SQL_ENGINE" != "remote-engine" ]; then
+      skip "processlist is remote-engine specific"
+    fi
+
+    dolt sql -q "select sleep(1000)" &
+    sleep 1
+
+    run dolt sql -q "SHOW PROCESSLIST"
+    [[ "$output" =~ "select sleep(1000)" ]] || false
+
+    qpid=$(dolt sql -q "show processlist" | grep --text "select sleep(1000)" | cut -d"|" -f2)
+    run dolt sql -q "kill query $qpid"
+    sleep 1
+
+    run dolt sql -q "SHOW PROCESSLIST"
+    [[ ! "$output" =~ "select sleep(1000)" ]] || false
+}

proto/README.md

@@ -10,8 +10,12 @@ Dependencies are git submodules in //proto/third_party. Make sure you have all t
 submodules synced. If not, you can sync them initially with:
   git submodule update --init 
 
-* You need to build protoc in //proto/third_party/protobuf by running `bazel
-  build //:protoc` from that directory. Currently tested with bazel version 3.1.0.
+* Get the 6.3.0 version of bazel from https://github.com/bazelbuild/bazel/releases/tag/6.3.0
+  Later versions don't currently work. Verify the version and ensure it's first in your path.
+
+* You need to build protoc in //proto/third_party/protobuf by running:
+  `bazel build //:protoc` from that directory.
+  WARNING: you may need to simplify your env with a prefix of `PATH=/usr/local/bin:/usr/bin:/bin`
 
 * You need to run `go build -o ._protoc-gen-go ./cmd/protoc-gen-go` in
   `third_party/protobuf-go`.