Skip to content

Commit 31973d7

Browse files
committed
Fix tests for gcc
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 02cbd2c commit 31973d7

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/carnot/planner/compiler/analyzer/convert_metadata_rule_test.cc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ TEST_F(ConvertMetadataRuleTest, missing_conversion_column) {
115115
}
116116

117117
TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
118+
std::string pod_name_col_prefix = "pod_name_";
118119
auto relation = Relation(http_events_relation);
119120
MetadataType conversion_column = MetadataType::UPID;
120121
std::string conversion_column_str = MetadataProperty::GetMetadataString(conversion_column);
@@ -144,10 +145,12 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
144145
EXPECT_NE(md_map, map);
145146

146147
FuncIR* upid_to_pod_name = nullptr;
148+
std::string upid_to_pod_name_col_name;
147149
for (auto col_expr : md_map->col_exprs()) {
148-
if (col_expr.name == "pod_name_0") {
150+
if (absl::StartsWith(col_expr.name, pod_name_col_prefix)) {
149151
EXPECT_MATCH(col_expr.node, Func());
150152
upid_to_pod_name = static_cast<FuncIR*>(col_expr.node);
153+
upid_to_pod_name_col_name = col_expr.name;
151154
}
152155
}
153156
EXPECT_NE(upid_to_pod_name, nullptr);
@@ -161,10 +164,13 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
161164
EXPECT_EQ(1, md_map->Children().size());
162165
auto fallback_map = static_cast<MapIR*>(md_map->Children()[0]);
163166
FuncIR* fallback_func_select = nullptr;
167+
std::string fallback_func_select_col_name;
164168
for (auto col_expr : fallback_map->col_exprs()) {
165-
if (col_expr.name == "pod_name_1") {
169+
if (absl::StartsWith(col_expr.name, pod_name_col_prefix) &&
170+
col_expr.name != upid_to_pod_name_col_name) {
166171
EXPECT_MATCH(col_expr.node, Func());
167172
fallback_func_select = static_cast<FuncIR*>(col_expr.node);
173+
fallback_func_select_col_name = col_expr.name;
168174
}
169175
}
170176

@@ -177,7 +183,7 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
177183
auto equals_func = static_cast<FuncIR*>(orig_func_check);
178184
EXPECT_EQ("equal", equals_func->func_name());
179185
EXPECT_EQ(2, equals_func->all_args().size());
180-
EXPECT_MATCH(equals_func->all_args()[0], ColumnNode("pod_name_0"));
186+
EXPECT_MATCH(equals_func->all_args()[0], ColumnNode(upid_to_pod_name_col_name));
181187
EXPECT_MATCH(equals_func->all_args()[1], String(""));
182188
EXPECT_MATCH(orig_func_check, ResolvedExpression());
183189

0 commit comments

Comments
 (0)