Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VTGate Warnings: Add WarnUnshardedOnly to warnings counter #15033

Merged
merged 3 commits into from
Feb 14, 2024
Merged

VTGate Warnings: Add WarnUnshardedOnly to warnings counter #15033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee1b5f0
Add `WarnUnshardedOnly` to warnings counter
tycol7 Jan 25, 2024
0ba5d92
Merge remote-tracking branch 'upstream/main' into tdc-warn-unsharded-…
tycol7 Jan 25, 2024
20adf7e
Remove extraneous log file
tycol7 Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion go/vt/vtgate/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ func TestExecutorDDL(t *testing.T) {
"drop table t2",
`create table test_partitioned (
id bigint,
date_create int,
date_create int,
primary key(id)
) Engine=InnoDB /*!50100 PARTITION BY RANGE (date_create)
(PARTITION p2018_06_14 VALUES LESS THAN (1528959600) ENGINE = InnoDB,
Expand Down Expand Up @@ -2629,13 +2629,15 @@ func TestExecutorCallProc(t *testing.T) {
func TestExecutorTempTable(t *testing.T) {
executor, _, _, sbcUnsharded, ctx := createExecutorEnv(t)

initialWarningsCount := warnings.Counts()["WarnUnshardedOnly"]
executor.warnShardedOnly = true
creatQuery := "create temporary table temp_t(id bigint primary key)"
session := NewSafeSession(&vtgatepb.Session{TargetString: KsTestUnsharded})
_, err := executor.Execute(ctx, nil, "TestExecutorTempTable", session, creatQuery, nil)
require.NoError(t, err)
assert.EqualValues(t, 1, sbcUnsharded.ExecCount.Load())
assert.NotEmpty(t, session.Warnings)
assert.Equal(t, initialWarningsCount+1, warnings.Counts()["WarnUnshardedOnly"], "warnings count")

before := executor.plans.Len()

Expand Down
1 change: 1 addition & 0 deletions go/vt/vtgate/vcursor_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,7 @@ func (vc *vcursorImpl) WarnUnshardedOnly(format string, params ...any) {
Code: uint32(sqlerror.ERNotSupportedYet),
Message: fmt.Sprintf(format, params...),
})
warnings.Add("WarnUnshardedOnly", 1)
}
}

Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/vtgate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ var (
// Error counters should be global so they can be set from anywhere
errorCounts = stats.NewCountersWithMultiLabels("VtgateApiErrorCounts", "Vtgate API error counts per error type", []string{"Operation", "Keyspace", "DbType", "Code"})

warnings = stats.NewCountersWithSingleLabel("VtGateWarnings", "Vtgate warnings", "type", "IgnoredSet", "ResultsExceeded", "WarnPayloadSizeExceeded")
warnings = stats.NewCountersWithSingleLabel("VtGateWarnings", "Vtgate warnings", "type", "IgnoredSet", "ResultsExceeded", "WarnPayloadSizeExceeded", "WarnUnshardedOnly")

vstreamSkewDelayCount = stats.NewCounter("VStreamEventsDelayedBySkewAlignment",
"Number of events that had to wait because the skew across shards was too high")
Expand Down
Loading