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.

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

Revert "fix(eap): Switch to sampling_weight_2 in entity (#6287)" #6296

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ schema:
{ name: name, type: String },
{ name: sampling_factor, type: Float, args: { size: 64 } },
{ name: sampling_weight, type: Float, args: { size: 64 } },
{ name: sampling_weight_2, type: UInt, args: { size: 64 } },
Copy link
Member

Choose a reason for hiding this comment

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

This PR seems to have weird merge conflict with https://github.com/getsentry/snuba/pull/6290/files#diff-438e988ddb8c60638398f11a2f2232da05c36cd13ed90683531bd73bc6418779R25-R27 - you can refer to the float version with sampling_weight above, no need to delete sampling_weight_2 ?

{ name: sign, type: Int, args: { size: 8 } },
{ name: attr_str, type: Map, args: { key: { type: String }, value: { type: String } } },
{ name: attr_num, type: Map, args: { key: { type: String }, value: { type: Float, args: { size: 64 } } } },
Expand All @@ -40,7 +39,6 @@ storages:
from_col_name: timestamp
to_table_name: null
to_col_name: _sort_timestamp

subscriptables:
- mapper: SubscriptableHashBucketMapper
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ schema:
{ name: name, type: String },
{ name: sampling_factor, type: Float, args: { size: 64 } },
{ name: sampling_weight, type: Float, args: { size: 64 } },
{ name: sampling_weight_2, type: UInt, args: { size: 64 } },
{ name: sign, type: Int, args: { size: 8 } },
{ name: attr_str_0, type: Map, args: { key: { type: String }, value: { type: String } } },
{ name: attr_str_1, type: Map, args: { key: { type: String }, value: { type: String } } },
Expand Down
Loading