test: make it easier to run tests without a main keyspace #17501
+24
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andres Taylor <[email protected]>
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
systay
added
Component: Query Serving
Type: Testing
and removed
NeedsDescriptionUpdate
frouioui
approved these changes
Jan 9, 2025
frouioui
requested review from
harshit-gangal and
GuptaManan100
and removed request for
deepthi
Signed-off-by: Andres Taylor <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #17501 +/- ##
=======================================
Coverage 67.68% 67.69%
=======================================
Files 1584 1584
Lines 254466 254511 +45
=======================================
+ Hits 172235 172289 +54
+ Misses 82231 82222 -9 ☔ View full report in Codecov by Sentry. |
Comment on lines
-304
to
296
| return vw.V.Keyspaces["main"].Keyspace, nil | ||
| return vw.AnyKeyspace() | ||
| } |
Comment on lines
-308
to
+300
| return vw.SelectedKeyspace() | ||
| ks, found := vw.V.Keyspaces["main"] | ||
| if found { |
There was a problem hiding this comment.
same here
use vw. Vcursor
Comment on lines
-312
to
321
| return vw.V.Keyspaces["main"].Keyspace, nil | ||
| return vw.AnyKeyspace() | ||
| } |
Comment on lines
356
to
+360
| destKeyspace, destTabletType, _, err := topoproto.ParseDestination(tab.Qualifier.String(), topodatapb.TabletType_PRIMARY) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| mirrorRule, err := vs.V.FindMirrorRule(destKeyspace, tab.Name.String(), destTabletType) | ||
| mirrorRule, err := vw.V.FindMirrorRule(destKeyspace, tab.Name.String(), destTabletType) |
There was a problem hiding this comment.
possibly duplicate logic,
we now have vw. Vcursor, that could be used here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When using keyspaces in tests, the current schema wrapper we use makes it hard if we are missing a
mainkeyspace. This change makes it easier to handle situations without this keyspace.Checklist