amend overflow fix

Author: elianddb

enginetest/queries/script_queries.go

@@ -120,6 +120,24 @@ type ScriptTestAssertion struct {
 // Unlike other engine tests, ScriptTests must be self-contained. No other tables are created outside the definition of
 // the tests.
 var ScriptTests = []ScriptTest{
+	{
+		// Regression test for https://github.com/dolthub/dolt/issues/9641
+		Name: "bit union regression test dolt#9641",
+		SetUpScript: []string{
+			"CREATE TABLE bit_union_test_9641 (id INT PRIMARY KEY, flag BIT(1))",
+			"INSERT INTO bit_union_test_9641 VALUES (1, 0), (2, 1)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "SELECT flag FROM bit_union_test_9641 WHERE id = 1 UNION SELECT NULL as flag",
+				Expected: []sql.Row{{int64(0)}, {nil}},
+			},
+			{
+				Query:    "SELECT flag FROM bit_union_test_9641 WHERE id = 1 UNION SELECT 48 as flag",
+				Expected: []sql.Row{{int64(0)}, {int64(48)}},
+			},
+		},
+	},
 	{
 		Name: "outer join finish unmatched right side",
 		SetUpScript: []string{

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
 	github.com/dolthub/vitess v0.0.0-20250730174048-497aebb8cea7
-	github.com/go-kit/kit v0.10.0
 	github.com/go-sql-driver/mysql v1.7.2-0.20231213112541-0004702b931d
 	github.com/gocraft/dbr/v2 v2.7.2
 	github.com/google/uuid v1.3.0
@@ -36,6 +35,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/tetratelabs/wazero v1.8.2 // indirect
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/protobuf v1.28.1 // indirect

go.sum

@@ -32,7 +32,6 @@ import (
 	"github.com/dolthub/vitess/go/sqltypes"
 	querypb "github.com/dolthub/vitess/go/vt/proto/query"
 	"github.com/dolthub/vitess/go/vt/sqlparser"
-	"github.com/go-kit/kit/metrics/discard"
 	"github.com/sirupsen/logrus"
 	"go.opentelemetry.io/otel/attribute"
 	otel "go.opentelemetry.io/otel/trace"
@@ -77,6 +76,10 @@ type Handler struct {
 	maxLoggedQueryLen int
 	encodeLoggedQuery bool
 	sel               ServerEventListener
+
+	queryCounter      Counter
+	queryErrorCounter Counter
+	queryHistogram    Histogram
 }
 
 var _ mysql.Handler = (*Handler)(nil)
@@ -456,7 +459,7 @@ func (h *Handler) doQuery(
 	}
 	sqlCtx.GetLogger().WithField(sql.QueryTimeLogKey, time.Now()).Debugf("Starting query")
 
-	finish := observeQuery(sqlCtx, query)
+	finish := h.observeQuery(sqlCtx, query)
 	defer func() {
 		finish(err)
 	}()
@@ -1090,30 +1093,27 @@ func schemaToFields(ctx *sql.Context, s sql.Schema) []*querypb.Field {
 	return fields
 }
 
-var (
-	// QueryCounter describes a metric that accumulates number of queries monotonically.
-	QueryCounter = discard.NewCounter()
-
-	// QueryErrorCounter describes a metric that accumulates number of failed queries monotonically.
-	QueryErrorCounter = discard.NewCounter()
-
-	// QueryHistogram describes a queries latency.
-	QueryHistogram = discard.NewHistogram()
-)
-
-func observeQuery(ctx *sql.Context, query string) func(err error) {
+func (h *Handler) observeQuery(ctx *sql.Context, query string) func(err error) {
 	span, ctx := ctx.Span("query", otel.WithAttributes(attribute.String("query", query)))
 
 	t := time.Now()
 	return func(err error) {
+		defer span.End()
+
 		if err != nil {
-			QueryErrorCounter.With("query", query, "error", err.Error()).Add(1)
-		} else {
-			QueryCounter.With("query", query).Add(1)
-			QueryHistogram.With("query", query, "duration", "seconds").Observe(time.Since(t).Seconds())
+			if h.queryErrorCounter != nil {
+				h.queryErrorCounter.With("query", query, "error", err.Error()).Add(1)
+			}
+			return
 		}
 
-		span.End()
+		if h.queryCounter != nil {
+			h.queryCounter.With("query", query).Add(1)
+		}
+
+		if h.queryHistogram != nil {
+			h.queryHistogram.With("query", query, "duration", "seconds").Observe(time.Since(t).Seconds())
+		}
 	}
 }
 

server/handler.go

@@ -0,0 +1,31 @@
+// Copyright 2025 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package server
+
+// Counter describes a metric that accumulates values monotonically.
+// An example of a counter is the number of received HTTP requests.
+type Counter interface {
+	With(labelValues ...string) Counter
+	Add(delta float64)
+}
+
+// Histogram describes a metric that takes repeated observations of the same
+// kind of thing, and produces a statistical summary of those observations,
+// typically expressed as quantiles or buckets. An example of a histogram is
+// HTTP request latencies.
+type Histogram interface {
+	With(labelValues ...string) Histogram
+	Observe(value float64)
+}

server/metrics.go

@@ -98,6 +98,10 @@ func NewServerWithHandler(
 		maxLoggedQueryLen: cfg.MaxLoggedQueryLen,
 		encodeLoggedQuery: cfg.EncodeLoggedQuery,
 		sel:               listener,
+
+		queryCounter:      cfg.QueryCounter,
+		queryErrorCounter: cfg.QueryErrorCounter,
+		queryHistogram:    cfg.QueryHistogram,
 	}
 
 	handler, err := wrapper(h)

server/server.go

@@ -94,6 +94,13 @@ type Config struct {
 	// Used to get the ProtocolListener on server start.
 	// If unset, defaults to MySQLProtocolListenerFactory.
 	ProtocolListenerFactory ProtocolListenerFunc
+
+	// QueryCounter is a metrics.Counter that counts the number of queries executed.
+	QueryCounter Counter
+	// QueryErrorCounter is a metrics.Counter that counts the number of queries that resulted in an error.
+	QueryErrorCounter Counter
+	// QueryHistogram is a metrics.Histogram that measures the duration of queries executed.
+	QueryHistogram Histogram
 }
 
 func (c Config) NewConfig() (Config, error) {

server/server_config.go

@@ -99,6 +99,10 @@ func finalizeUnions(ctx *sql.Context, a *Analyzer, n sql.Node, scope *plan.Scope
 		if err != nil {
 			return nil, transform.SameTree, err
 		}
+
+		// UNION operations can return multiple rows, so Max1Row optimization is invalid
+		qFlags.Unset(sql.QFlagMax1Row)
+
 		return newN, transform.NewTree, nil
 	})
 }

sql/analyzer/resolve_unions.go

@@ -123,6 +123,9 @@ func GetConvertToType(l, r sql.Type) string {
 	if types.IsDecimal(l) || types.IsDecimal(r) {
 		return ConvertToDecimal
 	}
+	if types.IsBit(l) || types.IsBit(r) {
+		return ConvertToSigned
+	}
 	if types.IsUnsigned(l) && types.IsUnsigned(r) {
 		return ConvertToUnsigned
 	}

sql/expression/convert.go

@@ -19,6 +19,7 @@ import (
 	"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
 const (
@@ -100,6 +101,7 @@ func (s *SetOp) Schema() sql.Schema {
 	for i := range ls {
 		c := *ls[i]
 		if i < len(rs) {
+			c.Type = types.GeneralizeTypes(ls[i].Type, rs[i].Type)
 			c.Nullable = ls[i].Nullable || rs[i].Nullable
 		}
 		ret[i] = &c