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

Jump to bottom

fix(eap-api): delimeter for alias #6592

Merged
merged 3 commits into from
Nov 22, 2024
Merged

fix(eap-api): delimeter for alias #6592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eb6c08
c
Nov 21, 2024
37906c0
c
Nov 21, 2024
f8f06bb
ci
Nov 22, 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
2 changes: 1 addition & 1 deletion snuba/web/rpc/common/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def get_subscriptable_field(field: Expression) -> SubscriptableReference | None:

def attribute_key_to_expression(attr_key: AttributeKey) -> Expression:
def _build_label_mapping_key(attr_key: AttributeKey) -> str:
return attr_key.name + " " + AttributeKey.Type.Name(attr_key.type)
return attr_key.name + "_" + AttributeKey.Type.Name(attr_key.type)

if attr_key.type == AttributeKey.Type.TYPE_UNSPECIFIED:
raise BadSnubaRPCRequestException(
Expand Down
16 changes: 8 additions & 8 deletions tests/web/rpc/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_expression_trace_id(self) -> None:
type=AttributeKey.TYPE_STRING,
name="sentry.trace_id",
),
) == f.CAST(column("trace_id"), "String", alias="sentry.trace_id TYPE_STRING")
) == f.CAST(column("trace_id"), "String", alias="sentry.trace_id_TYPE_STRING")

def test_timestamp_columns(self) -> None:
for col in [
Expand All @@ -27,21 +27,21 @@ def test_timestamp_columns(self) -> None:
name=col,
),
) == f.CAST(
column(col[len("sentry.") :]), "String", alias=col + " TYPE_STRING"
column(col[len("sentry.") :]), "String", alias=col + "_TYPE_STRING"
)
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_INT,
name=col,
),
) == f.CAST(column(col[len("sentry.") :]), "Int64", alias=col + " TYPE_INT")
) == f.CAST(column(col[len("sentry.") :]), "Int64", alias=col + "_TYPE_INT")
assert attribute_key_to_expression(
AttributeKey(
type=AttributeKey.TYPE_FLOAT,
name=col,
),
) == f.CAST(
column(col[len("sentry.") :]), "Float64", alias=col + " TYPE_FLOAT"
column(col[len("sentry.") :]), "Float64", alias=col + "_TYPE_FLOAT"
)

def test_normalized_col(self) -> None:
Expand All @@ -62,13 +62,13 @@ def test_attributes(self) -> None:
assert attribute_key_to_expression(
AttributeKey(type=AttributeKey.TYPE_STRING, name="derp"),
) == SubscriptableReference(
alias="derp TYPE_STRING", column=column("attr_str"), key=literal("derp")
alias="derp_TYPE_STRING", column=column("attr_str"), key=literal("derp")
)

assert attribute_key_to_expression(
AttributeKey(type=AttributeKey.TYPE_FLOAT, name="derp"),
) == SubscriptableReference(
alias="derp TYPE_FLOAT", column=column("attr_num"), key=literal("derp")
alias="derp_TYPE_FLOAT", column=column("attr_num"), key=literal("derp")
)

assert attribute_key_to_expression(
Expand All @@ -80,7 +80,7 @@ def test_attributes(self) -> None:
key=literal("derp"),
),
"Int64",
alias="derp TYPE_INT",
alias="derp_TYPE_INT",
)

assert attribute_key_to_expression(
Expand All @@ -92,5 +92,5 @@ def test_attributes(self) -> None:
key=literal("derp"),
),
"Boolean",
alias="derp TYPE_BOOLEAN",
alias="derp_TYPE_BOOLEAN",
)
Loading