@@ -115,6 +115,7 @@ TEST_F(ConvertMetadataRuleTest, missing_conversion_column) {
115
115
}
116
116
117
117
TEST_F (ConvertMetadataRuleTest, multichild_with_fallback_func) {
118
+ std::string pod_name_col_prefix = " pod_name_" ;
118
119
auto relation = Relation (http_events_relation);
119
120
MetadataType conversion_column = MetadataType::UPID;
120
121
std::string conversion_column_str = MetadataProperty::GetMetadataString (conversion_column);
@@ -144,10 +145,12 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
144
145
EXPECT_NE (md_map, map);
145
146
146
147
FuncIR* upid_to_pod_name = nullptr ;
148
+ std::string upid_to_pod_name_col_name;
147
149
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) ) {
149
151
EXPECT_MATCH (col_expr.node , Func ());
150
152
upid_to_pod_name = static_cast <FuncIR*>(col_expr.node );
153
+ upid_to_pod_name_col_name = col_expr.name ;
151
154
}
152
155
}
153
156
EXPECT_NE (upid_to_pod_name, nullptr );
@@ -161,10 +164,13 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
161
164
EXPECT_EQ (1 , md_map->Children ().size ());
162
165
auto fallback_map = static_cast <MapIR*>(md_map->Children ()[0 ]);
163
166
FuncIR* fallback_func_select = nullptr ;
167
+ std::string fallback_func_select_col_name;
164
168
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) {
166
171
EXPECT_MATCH (col_expr.node , Func ());
167
172
fallback_func_select = static_cast <FuncIR*>(col_expr.node );
173
+ fallback_func_select_col_name = col_expr.name ;
168
174
}
169
175
}
170
176
@@ -177,7 +183,7 @@ TEST_F(ConvertMetadataRuleTest, multichild_with_fallback_func) {
177
183
auto equals_func = static_cast <FuncIR*>(orig_func_check);
178
184
EXPECT_EQ (" equal" , equals_func->func_name ());
179
185
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 ));
181
187
EXPECT_MATCH (equals_func->all_args ()[1 ], String (" " ));
182
188
EXPECT_MATCH (orig_func_check, ResolvedExpression ());
183
189
0 commit comments