Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Vitess v8 VTctld custom branch + sizes-only #201

Conversation

setassociative
Copy link

There were merge conflicts here, would appreciate extra eyes.

Two items of note

1️⃣ the following diff no longer seemed relevant given that the grpc interface had been evolved to support sizes only as a first class flag

+       if *tableSizesOnly {
+               sizeTds := make([]*tabletmanagerdatapb.TableDefinition, len(sd.TableDefinitions))
+               for i, td := range sd.TableDefinitions {
+                       sizeTds[i] = &tabletmanagerdatapb.TableDefinition{
+                               Name:       td.Name,
+                               Type:       td.Type,
+                               RowCount:   td.RowCount,
+                               DataLength: td.DataLength,
+                       }
+               }
+
+               sd.TableDefinitions = sizeTds
+       }

2️⃣ The other call out is. that the incoming change wanted to return printJSON(wr.Logger(), resp.Schema) as the return type which diverged from upstream's mainline so I believe this is the render bug we fixed previously.

ajm188 and others added 2 commits March 17, 2021 12:03
Add option to GetSchema to only send the row count and data length over the wire
Copy link

@ajm188 ajm188 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actual guts of the GetSchema look good, but there's an issue with the conflict resolution that needs to be fixed first!

@@ -116,6 +116,7 @@ import (
"vitess.io/vitess/go/vt/wrangler"

replicationdatapb "vitess.io/vitess/go/vt/proto/replicationdata"
tabletmanagerdatapb "vitess.io/vitess/go/vt/proto/tabletmanagerdata"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is unused (it was, before you could pass TableSizesOnly directly to the rpc), and probably will cause go build to not succeed

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already go it but not before you saw :shamebell:

Signed-off-by: Richard Bailey <rbailey@slack-corp.com>
@setassociative setassociative merged commit 196d850 into slack-vitess-8-2021.03.03r0.vtctld Mar 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants