Revert "sql: Add database ID to sampled query log"#85017
Revert "sql: Add database ID to sampled query log"#85017craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
|
This change is |
maryliag
left a comment
There was a problem hiding this comment.
Reviewable status:
complete! 1 of 0 LGTMs obtained
efe2a57 to
61eaa5f
Compare
maryliag
left a comment
There was a problem hiding this comment.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):
// Statement fingerprint ID of the query. uint64 statement_fingerprint_id = 12 [(gogoproto.customname) = "StatementFingerprintID", (gogoproto.jsontag) = ',omitempty'];
change back fingerprint to 13 and add 12 as reserved
61eaa5f to
a4ec92a
Compare
THardy98
left a comment
There was a problem hiding this comment.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):
Previously, maryliag (Marylia Gutierrez) wrote…
change back fingerprint to 13 and add 12 as reserved
Reserved 12 and reverted back to 13.
Small gen.go change to accomodate reserved fields in the proto.
maryliag
left a comment
There was a problem hiding this comment.
Reviewed 3 of 5 files at r1, 1 of 1 files at r2, 1 of 2 files at r3, all commit messages.
Reviewable status:
pkg/util/log/eventpb/telemetry.proto line 63 at r2 (raw file):
Previously, THardy98 (Thomas Hardy) wrote…
Reserved 12 and reverted back to 13.
Smallgen.gochange to accomodatereservedfields in the proto.
Move the reserved list to the end
a4ec92a to
7c08bab
Compare
|
bors r+ |
|
Build failed (retrying...): |
|
Merge conflict. |
|
bors r- |
Reverts: cockroachdb#84195 This reverts commit 307817e. Release note (sql change): Removes the DatabaseID field from the `SampledQuery` telemetry log due to the potential of indefinite blocking in the case of a lease acquisition failure.
7c08bab to
53d2cd6
Compare
|
bors r+ |
|
Build succeeded: |
Reverts: #84195
This reverts commit 307817e.
Removes the DatabaseID field from the
SampledQuerytelemetry log due to the potential of indefinite blockingin the case of a lease acquisition failure. Protobuf field not reserved as
no official build was released with these changes yet.
Release note (sql change): Removes the DatabaseID field from the
SampledQuerytelemetry log due to the potential of indefinite blockingin the case of a lease acquisition failure.