You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by hv...@apache.org on 2023/02/24 17:05:38 UTC

[spark] branch branch-3.4 updated: [SPARK-41823][CONNECT] Scala Client resolve ambiguous columns in Join

This is an automated email from the ASF dual-hosted git repository.

hvanhovell pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.4 by this push:
     new e7a57309dc7 [SPARK-41823][CONNECT] Scala Client resolve ambiguous columns in Join
e7a57309dc7 is described below

commit e7a57309dc71c3576dbfea1100fb80e526b7e3bd
Author: Herman van Hovell <he...@databricks.com>
AuthorDate: Fri Feb 24 13:05:11 2023 -0400

    [SPARK-41823][CONNECT] Scala Client resolve ambiguous columns in Join
    
    ### What changes were proposed in this pull request?
    This is the scala version of https://github.com/apache/spark/pull/39925.
    
    We introduce a plan_id that is both used for each plan created by the scala client, and by the columns created when calling `Dataframe.col(..)` and `Dataframe.apply(..)`. This way we can later properly resolve the columns created for a specific Dataframe.
    
    ### Why are the changes needed?
    Joining columns  created using Dataframe.apply(...) does not work when the column names are ambiguous. We should be able to figure out where a column comes from when they are created like this.
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    Updated golden files. Added test case to ClientE2ETestSuite.
    
    Closes #40156 from hvanhovell/SPARK-41823.
    
    Authored-by: Herman van Hovell <he...@databricks.com>
    Signed-off-by: Herman van Hovell <he...@databricks.com>
    (cherry picked from commit 6a2433070e60ad02c69ae45706a49cdd0b88a082)
    Signed-off-by: Herman van Hovell <he...@databricks.com>
---
 .../main/scala/org/apache/spark/sql/Column.scala   |   7 +-
 .../main/scala/org/apache/spark/sql/Dataset.scala  |  11 +-
 .../scala/org/apache/spark/sql/SparkSession.scala  |  22 +++-
 .../org/apache/spark/sql/ClientE2ETestSuite.scala  |   9 +-
 .../scala/org/apache/spark/sql/DatasetSuite.scala  |  73 +++----------
 .../apache/spark/sql/PlanGenerationTestSuite.scala |  23 ++--
 .../org/apache/spark/sql/SparkSessionSuite.scala   | 120 ---------------------
 .../connect/client/SparkConnectClientSuite.scala   |  22 +++-
 .../query-tests/queries/alias_string.json          |   6 ++
 .../query-tests/queries/alias_string.proto.bin     | Bin 47 -> 55 bytes
 .../query-tests/queries/alias_symbol.json          |   6 ++
 .../query-tests/queries/alias_symbol.proto.bin     | Bin 46 -> 54 bytes
 .../test/resources/query-tests/queries/apply.json  |   9 +-
 .../resources/query-tests/queries/apply.proto.bin  | Bin 47 -> 57 bytes
 .../resources/query-tests/queries/as_string.json   |   6 ++
 .../query-tests/queries/as_string.proto.bin        | Bin 46 -> 54 bytes
 .../resources/query-tests/queries/as_symbol.json   |   6 ++
 .../query-tests/queries/as_symbol.proto.bin        | Bin 46 -> 54 bytes
 .../resources/query-tests/queries/coalesce.json    |   6 ++
 .../query-tests/queries/coalesce.proto.bin         | Bin 45 -> 53 bytes
 .../test/resources/query-tests/queries/col.json    |  12 ++-
 .../resources/query-tests/queries/col.proto.bin    | Bin 55 -> 67 bytes
 .../resources/query-tests/queries/colRegex.json    |   6 ++
 .../query-tests/queries/colRegex.proto.bin         | Bin 52 -> 60 bytes
 .../resources/query-tests/queries/column_add.json  |   6 ++
 .../query-tests/queries/column_add.proto.bin       | Bin 169 -> 177 bytes
 .../query-tests/queries/column_alias.json          |   6 ++
 .../query-tests/queries/column_alias.proto.bin     | Bin 162 -> 170 bytes
 .../resources/query-tests/queries/column_and.json  |   6 ++
 .../query-tests/queries/column_and.proto.bin       | Bin 204 -> 212 bytes
 .../query-tests/queries/column_apply.json          |   6 ++
 .../query-tests/queries/column_apply.proto.bin     | Bin 180 -> 188 bytes
 .../query-tests/queries/column_as_multi.json       |   6 ++
 .../query-tests/queries/column_as_multi.proto.bin  | Bin 191 -> 199 bytes
 .../queries/column_as_with_metadata.json           |   6 ++
 .../queries/column_as_with_metadata.proto.bin      | Bin 198 -> 206 bytes
 .../resources/query-tests/queries/column_asc.json  |   6 ++
 .../query-tests/queries/column_asc.proto.bin       | Bin 163 -> 171 bytes
 .../queries/column_asc_nulls_first.json            |   6 ++
 .../queries/column_asc_nulls_first.proto.bin       | Bin 163 -> 171 bytes
 .../query-tests/queries/column_asc_nulls_last.json |   6 ++
 .../queries/column_asc_nulls_last.proto.bin        | Bin 163 -> 171 bytes
 .../query-tests/queries/column_between.json        |   6 ++
 .../query-tests/queries/column_between.proto.bin   | Bin 199 -> 207 bytes
 .../query-tests/queries/column_bitwiseAND.json     |   6 ++
 .../queries/column_bitwiseAND.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/column_bitwiseOR.json      |   6 ++
 .../query-tests/queries/column_bitwiseOR.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/column_bitwiseXOR.json     |   6 ++
 .../queries/column_bitwiseXOR.proto.bin            | Bin 168 -> 176 bytes
 .../resources/query-tests/queries/column_cast.json |   6 ++
 .../query-tests/queries/column_cast.proto.bin      | Bin 163 -> 171 bytes
 .../query-tests/queries/column_contains.json       |   6 ++
 .../query-tests/queries/column_contains.proto.bin  | Bin 178 -> 186 bytes
 .../resources/query-tests/queries/column_desc.json |   6 ++
 .../query-tests/queries/column_desc.proto.bin      | Bin 163 -> 171 bytes
 .../queries/column_desc_nulls_first.json           |   6 ++
 .../queries/column_desc_nulls_first.proto.bin      | Bin 163 -> 171 bytes
 .../queries/column_desc_nulls_last.json            |   6 ++
 .../queries/column_desc_nulls_last.proto.bin       | Bin 163 -> 171 bytes
 .../query-tests/queries/column_divide.json         |   6 ++
 .../query-tests/queries/column_divide.proto.bin    | Bin 169 -> 177 bytes
 .../query-tests/queries/column_dropFields.json     |   6 ++
 .../queries/column_dropFields.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/column_endsWith.json       |   6 ++
 .../query-tests/queries/column_endsWith.proto.bin  | Bin 182 -> 190 bytes
 .../query-tests/queries/column_eqNullSafe.json     |   6 ++
 .../queries/column_eqNullSafe.proto.bin            | Bin 171 -> 179 bytes
 .../query-tests/queries/column_equals.json         |   6 ++
 .../query-tests/queries/column_equals.proto.bin    | Bin 169 -> 177 bytes
 .../resources/query-tests/queries/column_geq.json  |   6 ++
 .../query-tests/queries/column_geq.proto.bin       | Bin 170 -> 178 bytes
 .../query-tests/queries/column_getField.json       |   6 ++
 .../query-tests/queries/column_getField.proto.bin  | Bin 166 -> 174 bytes
 .../query-tests/queries/column_getItem.json        |   6 ++
 .../query-tests/queries/column_getItem.proto.bin   | Bin 165 -> 173 bytes
 .../resources/query-tests/queries/column_gt.json   |   6 ++
 .../query-tests/queries/column_gt.proto.bin        | Bin 169 -> 177 bytes
 .../query-tests/queries/column_ilike.json          |   6 ++
 .../query-tests/queries/column_ilike.proto.bin     | Bin 176 -> 184 bytes
 .../query-tests/queries/column_isNaN.json          |   6 ++
 .../query-tests/queries/column_isNaN.proto.bin     | Bin 166 -> 174 bytes
 .../query-tests/queries/column_isNotNull.json      |   6 ++
 .../query-tests/queries/column_isNotNull.proto.bin | Bin 170 -> 178 bytes
 .../query-tests/queries/column_isNull.json         |   6 ++
 .../query-tests/queries/column_isNull.proto.bin    | Bin 167 -> 175 bytes
 .../resources/query-tests/queries/column_isin.json |   6 ++
 .../query-tests/queries/column_isin.proto.bin      | Bin 194 -> 202 bytes
 .../resources/query-tests/queries/column_leq.json  |   6 ++
 .../query-tests/queries/column_leq.proto.bin       | Bin 170 -> 178 bytes
 .../resources/query-tests/queries/column_like.json |   6 ++
 .../query-tests/queries/column_like.proto.bin      | Bin 176 -> 184 bytes
 .../resources/query-tests/queries/column_lt.json   |   6 ++
 .../query-tests/queries/column_lt.proto.bin        | Bin 169 -> 177 bytes
 .../query-tests/queries/column_modulo.json         |   6 ++
 .../query-tests/queries/column_modulo.proto.bin    | Bin 168 -> 176 bytes
 .../query-tests/queries/column_multiply.json       |   6 ++
 .../query-tests/queries/column_multiply.proto.bin  | Bin 169 -> 177 bytes
 .../resources/query-tests/queries/column_not.json  |   6 ++
 .../query-tests/queries/column_not.proto.bin       | Bin 161 -> 169 bytes
 .../query-tests/queries/column_not_equals.json     |   6 ++
 .../queries/column_not_equals.proto.bin            | Bin 176 -> 184 bytes
 .../resources/query-tests/queries/column_or.json   |   6 ++
 .../query-tests/queries/column_or.proto.bin        | Bin 203 -> 211 bytes
 .../query-tests/queries/column_rlike.json          |   6 ++
 .../query-tests/queries/column_rlike.proto.bin     | Bin 179 -> 187 bytes
 .../resources/query-tests/queries/column_star.json |   6 ++
 .../query-tests/queries/column_star.proto.bin      | Bin 152 -> 160 bytes
 .../queries/column_star_with_target.json           |   6 ++
 .../queries/column_star_with_target.proto.bin      | Bin 157 -> 165 bytes
 .../query-tests/queries/column_startsWith.json     |   6 ++
 .../queries/column_startsWith.proto.bin            | Bin 184 -> 192 bytes
 .../query-tests/queries/column_substr.json         |   6 ++
 .../query-tests/queries/column_substr.proto.bin    | Bin 179 -> 187 bytes
 .../query-tests/queries/column_subtract.json       |   6 ++
 .../query-tests/queries/column_subtract.proto.bin  | Bin 169 -> 177 bytes
 .../query-tests/queries/column_unary_minus.json    |   6 ++
 .../queries/column_unary_minus.proto.bin           | Bin 168 -> 176 bytes
 .../query-tests/queries/column_when_otherwise.json |   6 ++
 .../queries/column_when_otherwise.proto.bin        | Bin 229 -> 237 bytes
 .../query-tests/queries/column_withField.json      |   6 ++
 .../query-tests/queries/column_withField.proto.bin | Bin 170 -> 178 bytes
 .../resources/query-tests/queries/crossJoin.json   |   9 ++
 .../query-tests/queries/crossJoin.proto.bin        | Bin 86 -> 98 bytes
 .../resources/query-tests/queries/cube_column.json |   6 ++
 .../query-tests/queries/cube_column.proto.bin      | Bin 84 -> 92 bytes
 .../resources/query-tests/queries/cube_string.json |   6 ++
 .../query-tests/queries/cube_string.proto.bin      | Bin 84 -> 92 bytes
 .../resources/query-tests/queries/describe.json    |   6 ++
 .../query-tests/queries/describe.proto.bin         | Bin 48 -> 56 bytes
 .../resources/query-tests/queries/distinct.json    |   6 ++
 .../query-tests/queries/distinct.proto.bin         | Bin 42 -> 50 bytes
 .../query-tests/queries/dropDuplicates.json        |   6 ++
 .../query-tests/queries/dropDuplicates.proto.bin   | Bin 42 -> 50 bytes
 .../queries/dropDuplicates_names_array.json        |   6 ++
 .../queries/dropDuplicates_names_array.proto.bin   | Bin 47 -> 55 bytes
 .../queries/dropDuplicates_names_seq.json          |   6 ++
 .../queries/dropDuplicates_names_seq.proto.bin     | Bin 46 -> 54 bytes
 .../queries/dropDuplicates_varargs.json            |   6 ++
 .../queries/dropDuplicates_varargs.proto.bin       | Bin 50 -> 58 bytes
 .../query-tests/queries/drop_multiple_column.json  |   6 ++
 .../queries/drop_multiple_column.proto.bin         | Bin 56 -> 64 bytes
 .../query-tests/queries/drop_multiple_strings.json |   6 ++
 .../queries/drop_multiple_strings.proto.bin        | Bin 63 -> 71 bytes
 .../query-tests/queries/drop_single_column.json    |   6 ++
 .../queries/drop_single_column.proto.bin           | Bin 48 -> 56 bytes
 .../query-tests/queries/drop_single_string.json    |   6 ++
 .../queries/drop_single_string.proto.bin           | Bin 48 -> 56 bytes
 .../test/resources/query-tests/queries/except.json |   9 ++
 .../resources/query-tests/queries/except.proto.bin | Bin 82 -> 94 bytes
 .../resources/query-tests/queries/exceptAll.json   |   9 ++
 .../query-tests/queries/exceptAll.proto.bin        | Bin 82 -> 94 bytes
 .../test/resources/query-tests/queries/filter.json |   6 ++
 .../resources/query-tests/queries/filter.proto.bin | Bin 61 -> 69 bytes
 .../resources/query-tests/queries/filter_expr.json |   6 ++
 .../query-tests/queries/filter_expr.proto.bin      | Bin 59 -> 67 bytes
 .../query-tests/queries/function_abs.json          |   6 ++
 .../query-tests/queries/function_abs.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_acos.json         |   6 ++
 .../query-tests/queries/function_acos.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_acosh.json        |   6 ++
 .../query-tests/queries/function_acosh.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_add_months.json   |   6 ++
 .../queries/function_add_months.proto.bin          | Bin 122 -> 130 bytes
 .../query-tests/queries/function_aggregate.json    |   6 ++
 .../queries/function_aggregate.proto.bin           | Bin 227 -> 235 bytes
 .../queries/function_approx_count_distinct.json    |   6 ++
 .../function_approx_count_distinct.proto.bin       | Bin 182 -> 190 bytes
 .../function_approx_count_distinct_rsd.json        |   6 ++
 .../function_approx_count_distinct_rsd.proto.bin   | Bin 195 -> 203 bytes
 .../query-tests/queries/function_array.json        |   6 ++
 .../query-tests/queries/function_array.proto.bin   | Bin 173 -> 181 bytes
 .../query-tests/queries/function_array_append.json |   6 ++
 .../queries/function_array_append.proto.bin        | Bin 179 -> 187 bytes
 .../queries/function_array_compact.json            |   6 ++
 .../queries/function_array_compact.proto.bin       | Bin 174 -> 182 bytes
 .../queries/function_array_contains.json           |   6 ++
 .../queries/function_array_contains.proto.bin      | Bin 181 -> 189 bytes
 .../queries/function_array_distinct.json           |   6 ++
 .../queries/function_array_distinct.proto.bin      | Bin 175 -> 183 bytes
 .../query-tests/queries/function_array_except.json |   6 ++
 .../queries/function_array_except.proto.bin        | Bin 202 -> 210 bytes
 .../query-tests/queries/function_array_insert.json |   6 ++
 .../queries/function_array_insert.proto.bin        | Bin 185 -> 193 bytes
 .../queries/function_array_intersect.json          |   6 ++
 .../queries/function_array_intersect.proto.bin     | Bin 199 -> 207 bytes
 .../query-tests/queries/function_array_join.json   |   6 ++
 .../queries/function_array_join.proto.bin          | Bin 178 -> 186 bytes
 .../function_array_join_with_null_replacement.json |   6 ++
 ...tion_array_join_with_null_replacement.proto.bin | Bin 188 -> 196 bytes
 .../query-tests/queries/function_array_max.json    |   6 ++
 .../queries/function_array_max.proto.bin           | Bin 170 -> 178 bytes
 .../query-tests/queries/function_array_min.json    |   6 ++
 .../queries/function_array_min.proto.bin           | Bin 170 -> 178 bytes
 .../queries/function_array_position.json           |   6 ++
 .../queries/function_array_position.proto.bin      | Bin 181 -> 189 bytes
 .../query-tests/queries/function_array_remove.json |   6 ++
 .../queries/function_array_remove.proto.bin        | Bin 180 -> 188 bytes
 .../query-tests/queries/function_array_repeat.json |   6 ++
 .../queries/function_array_repeat.proto.bin        | Bin 179 -> 187 bytes
 .../query-tests/queries/function_array_sort.json   |   6 ++
 .../queries/function_array_sort.proto.bin          | Bin 171 -> 179 bytes
 .../function_array_sort_with_comparator.json       |   6 ++
 .../function_array_sort_with_comparator.proto.bin  | Bin 206 -> 214 bytes
 .../query-tests/queries/function_array_union.json  |   6 ++
 .../queries/function_array_union.proto.bin         | Bin 201 -> 209 bytes
 .../queries/function_arrays_overlap.json           |   6 ++
 .../queries/function_arrays_overlap.proto.bin      | Bin 198 -> 206 bytes
 .../query-tests/queries/function_arrays_zip.json   |   6 ++
 .../queries/function_arrays_zip.proto.bin          | Bin 203 -> 211 bytes
 .../query-tests/queries/function_asc.json          |   6 ++
 .../query-tests/queries/function_asc.proto.bin     | Bin 163 -> 171 bytes
 .../queries/function_asc_nulls_first.json          |   6 ++
 .../queries/function_asc_nulls_first.proto.bin     | Bin 163 -> 171 bytes
 .../queries/function_asc_nulls_last.json           |   6 ++
 .../queries/function_asc_nulls_last.proto.bin      | Bin 163 -> 171 bytes
 .../query-tests/queries/function_ascii.json        |   6 ++
 .../query-tests/queries/function_ascii.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_asin.json         |   6 ++
 .../query-tests/queries/function_asin.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_asinh.json        |   6 ++
 .../query-tests/queries/function_asinh.proto.bin   | Bin 166 -> 174 bytes
 .../queries/function_assert_true_with_message.json |   6 ++
 .../function_assert_true_with_message.proto.bin    | Bin 204 -> 212 bytes
 .../query-tests/queries/function_atan.json         |   6 ++
 .../query-tests/queries/function_atan.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_atan2.json        |   6 ++
 .../query-tests/queries/function_atan2.proto.bin   | Bin 181 -> 189 bytes
 .../query-tests/queries/function_atanh.json        |   6 ++
 .../query-tests/queries/function_atanh.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_avg.json          |   6 ++
 .../query-tests/queries/function_avg.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_base64.json       |   6 ++
 .../query-tests/queries/function_base64.proto.bin  | Bin 175 -> 183 bytes
 .../query-tests/queries/function_bin.json          |   6 ++
 .../query-tests/queries/function_bin.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_bit_length.json   |   6 ++
 .../queries/function_bit_length.proto.bin          | Bin 171 -> 179 bytes
 .../query-tests/queries/function_bitwise_not.json  |   6 ++
 .../queries/function_bitwise_not.proto.bin         | Bin 162 -> 170 bytes
 .../query-tests/queries/function_bround.json       |   6 ++
 .../query-tests/queries/function_bround.proto.bin  | Bin 172 -> 180 bytes
 .../query-tests/queries/function_bucket.json       |   6 ++
 .../query-tests/queries/function_bucket.proto.bin  | Bin 173 -> 181 bytes
 .../query-tests/queries/function_ceil.json         |   6 ++
 .../query-tests/queries/function_ceil.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_ceil_scale.json   |   6 ++
 .../queries/function_ceil_scale.proto.bin          | Bin 171 -> 179 bytes
 .../query-tests/queries/function_coalesce.json     |   6 ++
 .../queries/function_coalesce.proto.bin            | Bin 175 -> 183 bytes
 .../query-tests/queries/function_col.json          |   6 ++
 .../query-tests/queries/function_col.proto.bin     | Bin 156 -> 164 bytes
 .../query-tests/queries/function_collect_list.json |   6 ++
 .../queries/function_collect_list.proto.bin        | Bin 173 -> 181 bytes
 .../query-tests/queries/function_collect_set.json  |   6 ++
 .../queries/function_collect_set.proto.bin         | Bin 172 -> 180 bytes
 .../query-tests/queries/function_concat.json       |   6 ++
 .../query-tests/queries/function_concat.proto.bin  | Bin 222 -> 230 bytes
 .../query-tests/queries/function_concat_ws.json    |   6 ++
 .../queries/function_concat_ws.proto.bin           | Bin 196 -> 204 bytes
 .../query-tests/queries/function_conv.json         |   6 ++
 .../query-tests/queries/function_conv.proto.bin    | Bin 177 -> 185 bytes
 .../query-tests/queries/function_corr.json         |   6 ++
 .../query-tests/queries/function_corr.proto.bin    | Bin 172 -> 180 bytes
 .../query-tests/queries/function_cos.json          |   6 ++
 .../query-tests/queries/function_cos.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_cosh.json         |   6 ++
 .../query-tests/queries/function_cosh.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_cot.json          |   6 ++
 .../query-tests/queries/function_cot.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_count.json        |   6 ++
 .../query-tests/queries/function_count.proto.bin   | Bin 166 -> 174 bytes
 .../queries/function_countDistinct.json            |   6 ++
 .../queries/function_countDistinct.proto.bin       | Bin 175 -> 183 bytes
 .../query-tests/queries/function_covar_pop.json    |   6 ++
 .../queries/function_covar_pop.proto.bin           | Bin 177 -> 185 bytes
 .../query-tests/queries/function_covar_samp.json   |   6 ++
 .../queries/function_covar_samp.proto.bin          | Bin 178 -> 186 bytes
 .../query-tests/queries/function_crc32.json        |   6 ++
 .../query-tests/queries/function_crc32.proto.bin   | Bin 174 -> 182 bytes
 .../query-tests/queries/function_csc.json          |   6 ++
 .../query-tests/queries/function_csc.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_cume_dist.json    |   6 ++
 .../queries/function_cume_dist.proto.bin           | Bin 188 -> 196 bytes
 .../query-tests/queries/function_current_date.json |   6 ++
 .../queries/function_current_date.proto.bin        | Bin 111 -> 119 bytes
 .../queries/function_current_timestamp.json        |   6 ++
 .../queries/function_current_timestamp.proto.bin   | Bin 116 -> 124 bytes
 .../query-tests/queries/function_date_add.json     |   6 ++
 .../queries/function_date_add.proto.bin            | Bin 120 -> 128 bytes
 .../query-tests/queries/function_date_format.json  |   6 ++
 .../queries/function_date_format.proto.bin         | Bin 134 -> 142 bytes
 .../query-tests/queries/function_date_sub.json     |   6 ++
 .../queries/function_date_sub.proto.bin            | Bin 120 -> 128 bytes
 .../query-tests/queries/function_date_trunc.json   |   6 ++
 .../queries/function_date_trunc.proto.bin          | Bin 123 -> 131 bytes
 .../query-tests/queries/function_datediff.json     |   6 ++
 .../queries/function_datediff.proto.bin            | Bin 149 -> 157 bytes
 .../query-tests/queries/function_dayofmonth.json   |   6 ++
 .../queries/function_dayofmonth.proto.bin          | Bin 116 -> 124 bytes
 .../query-tests/queries/function_dayofweek.json    |   6 ++
 .../queries/function_dayofweek.proto.bin           | Bin 115 -> 123 bytes
 .../query-tests/queries/function_dayofyear.json    |   6 ++
 .../queries/function_dayofyear.proto.bin           | Bin 115 -> 123 bytes
 .../query-tests/queries/function_days.json         |   6 ++
 .../query-tests/queries/function_days.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_decode.json       |   6 ++
 .../query-tests/queries/function_decode.proto.bin  | Bin 186 -> 194 bytes
 .../query-tests/queries/function_degrees.json      |   6 ++
 .../query-tests/queries/function_degrees.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_dense_rank.json   |   6 ++
 .../queries/function_dense_rank.proto.bin          | Bin 189 -> 197 bytes
 .../query-tests/queries/function_desc.json         |   6 ++
 .../query-tests/queries/function_desc.proto.bin    | Bin 163 -> 171 bytes
 .../queries/function_desc_nulls_first.json         |   6 ++
 .../queries/function_desc_nulls_first.proto.bin    | Bin 163 -> 171 bytes
 .../queries/function_desc_nulls_last.json          |   6 ++
 .../queries/function_desc_nulls_last.proto.bin     | Bin 163 -> 171 bytes
 .../query-tests/queries/function_element_at.json   |   6 ++
 .../queries/function_element_at.proto.bin          | Bin 180 -> 188 bytes
 .../query-tests/queries/function_encode.json       |   6 ++
 .../query-tests/queries/function_encode.proto.bin  | Bin 178 -> 186 bytes
 .../query-tests/queries/function_exists.json       |   6 ++
 .../query-tests/queries/function_exists.proto.bin  | Bin 196 -> 204 bytes
 .../query-tests/queries/function_exp.json          |   6 ++
 .../query-tests/queries/function_exp.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_explode.json      |   6 ++
 .../query-tests/queries/function_explode.proto.bin | Bin 168 -> 176 bytes
 .../queries/function_explode_outer.json            |   6 ++
 .../queries/function_explode_outer.proto.bin       | Bin 174 -> 182 bytes
 .../query-tests/queries/function_expm1.json        |   6 ++
 .../query-tests/queries/function_expm1.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_expr.json         |   6 ++
 .../query-tests/queries/function_expr.proto.bin    | Bin 159 -> 167 bytes
 .../query-tests/queries/function_factorial.json    |   6 ++
 .../queries/function_factorial.proto.bin           | Bin 183 -> 191 bytes
 .../query-tests/queries/function_filter.json       |   6 ++
 .../query-tests/queries/function_filter.proto.bin  | Bin 196 -> 204 bytes
 .../queries/function_filter_with_pair_input.json   |   6 ++
 .../function_filter_with_pair_input.proto.bin      | Bin 230 -> 238 bytes
 .../query-tests/queries/function_first.json        |   6 ++
 .../query-tests/queries/function_first.proto.bin   | Bin 172 -> 180 bytes
 .../query-tests/queries/function_flatten.json      |   6 ++
 .../query-tests/queries/function_flatten.proto.bin | Bin 211 -> 219 bytes
 .../query-tests/queries/function_floor.json        |   6 ++
 .../query-tests/queries/function_floor.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_floor_scale.json  |   6 ++
 .../queries/function_floor_scale.proto.bin         | Bin 172 -> 180 bytes
 .../query-tests/queries/function_forall.json       |   6 ++
 .../query-tests/queries/function_forall.proto.bin  | Bin 196 -> 204 bytes
 .../queries/function_format_number.json            |   6 ++
 .../queries/function_format_number.proto.bin       | Bin 180 -> 188 bytes
 .../query-tests/queries/function_from_csv.json     |   6 ++
 .../queries/function_from_csv.proto.bin            | Bin 232 -> 240 bytes
 .../query-tests/queries/function_from_json.json    |   6 ++
 .../queries/function_from_json.proto.bin           | Bin 386 -> 394 bytes
 .../queries/function_from_unixtime.json            |   6 ++
 .../queries/function_from_unixtime.proto.bin       | Bin 118 -> 126 bytes
 .../queries/function_from_utc_timestamp.json       |   6 ++
 .../queries/function_from_utc_timestamp.proto.bin  | Bin 137 -> 145 bytes
 .../query-tests/queries/function_get.json          |   6 ++
 .../query-tests/queries/function_get.proto.bin     | Bin 170 -> 178 bytes
 .../queries/function_get_json_object.json          |   6 ++
 .../queries/function_get_json_object.proto.bin     | Bin 195 -> 203 bytes
 .../query-tests/queries/function_greatest.json     |   6 ++
 .../queries/function_greatest.proto.bin            | Bin 187 -> 195 bytes
 .../query-tests/queries/function_hash.json         |   6 ++
 .../query-tests/queries/function_hash.proto.bin    | Bin 173 -> 181 bytes
 .../query-tests/queries/function_hex.json          |   6 ++
 .../query-tests/queries/function_hex.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_hour.json         |   6 ++
 .../query-tests/queries/function_hour.proto.bin    | Bin 110 -> 118 bytes
 .../query-tests/queries/function_hours.json        |   6 ++
 .../query-tests/queries/function_hours.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_hypot.json        |   6 ++
 .../query-tests/queries/function_hypot.proto.bin   | Bin 173 -> 181 bytes
 .../query-tests/queries/function_initcap.json      |   6 ++
 .../query-tests/queries/function_initcap.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_inline.json       |   6 ++
 .../query-tests/queries/function_inline.proto.bin  | Bin 183 -> 191 bytes
 .../query-tests/queries/function_inline_outer.json |   6 ++
 .../queries/function_inline_outer.proto.bin        | Bin 189 -> 197 bytes
 .../queries/function_input_file_name.json          |   6 ++
 .../queries/function_input_file_name.proto.bin     | Bin 169 -> 177 bytes
 .../query-tests/queries/function_isnan.json        |   6 ++
 .../query-tests/queries/function_isnan.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_isnull.json       |   6 ++
 .../query-tests/queries/function_isnull.proto.bin  | Bin 167 -> 175 bytes
 .../query-tests/queries/function_json_tuple.json   |   6 ++
 .../queries/function_json_tuple.proto.bin          | Bin 193 -> 201 bytes
 .../query-tests/queries/function_kurtosis.json     |   6 ++
 .../queries/function_kurtosis.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_lag.json          |   6 ++
 .../query-tests/queries/function_lag.proto.bin     | Bin 209 -> 217 bytes
 .../query-tests/queries/function_last.json         |   6 ++
 .../query-tests/queries/function_last.proto.bin    | Bin 171 -> 179 bytes
 .../query-tests/queries/function_last_day.json     |   6 ++
 .../queries/function_last_day.proto.bin            | Bin 114 -> 122 bytes
 .../query-tests/queries/function_lead.json         |   6 ++
 .../query-tests/queries/function_lead.proto.bin    | Bin 210 -> 218 bytes
 .../query-tests/queries/function_least.json        |   6 ++
 .../query-tests/queries/function_least.proto.bin   | Bin 184 -> 192 bytes
 .../query-tests/queries/function_length.json       |   6 ++
 .../query-tests/queries/function_length.proto.bin  | Bin 167 -> 175 bytes
 .../query-tests/queries/function_levenshtein.json  |   6 ++
 .../queries/function_levenshtein.proto.bin         | Bin 181 -> 189 bytes
 .../query-tests/queries/function_lit.json          |   6 ++
 .../query-tests/queries/function_lit.proto.bin     | Bin 254 -> 262 bytes
 .../queries/function_localtimestamp.json           |   6 ++
 .../queries/function_localtimestamp.proto.bin      | Bin 113 -> 121 bytes
 .../query-tests/queries/function_locate.json       |   6 ++
 .../query-tests/queries/function_locate.proto.bin  | Bin 176 -> 184 bytes
 .../queries/function_locate_with_pos.json          |   6 ++
 .../queries/function_locate_with_pos.proto.bin     | Bin 182 -> 190 bytes
 .../query-tests/queries/function_log.json          |   6 ++
 .../query-tests/queries/function_log.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_log10.json        |   6 ++
 .../query-tests/queries/function_log10.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_log1p.json        |   6 ++
 .../query-tests/queries/function_log1p.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_log2.json         |   6 ++
 .../query-tests/queries/function_log2.proto.bin    | Bin 165 -> 173 bytes
 .../queries/function_log_with_base.json            |   6 ++
 .../queries/function_log_with_base.proto.bin       | Bin 177 -> 185 bytes
 .../query-tests/queries/function_lower.json        |   6 ++
 .../query-tests/queries/function_lower.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_lpad.json         |   6 ++
 .../query-tests/queries/function_lpad.proto.bin    | Bin 178 -> 186 bytes
 .../query-tests/queries/function_lpad_binary.json  |   6 ++
 .../queries/function_lpad_binary.proto.bin         | Bin 75 -> 83 bytes
 .../query-tests/queries/function_ltrim.json        |   6 ++
 .../query-tests/queries/function_ltrim.proto.bin   | Bin 166 -> 174 bytes
 .../queries/function_ltrim_with_pattern.json       |   6 ++
 .../queries/function_ltrim_with_pattern.proto.bin  | Bin 175 -> 183 bytes
 .../query-tests/queries/function_make_date.json    |   6 ++
 .../queries/function_make_date.proto.bin           | Bin 127 -> 136 bytes
 .../query-tests/queries/function_map.json          |   6 ++
 .../query-tests/queries/function_map.proto.bin     | Bin 188 -> 196 bytes
 .../query-tests/queries/function_map_concat.json   |   6 ++
 .../queries/function_map_concat.proto.bin          | Bin 248 -> 256 bytes
 .../queries/function_map_contains_key.json         |   6 ++
 .../queries/function_map_contains_key.proto.bin    | Bin 186 -> 194 bytes
 .../query-tests/queries/function_map_entries.json  |   6 ++
 .../queries/function_map_entries.proto.bin         | Bin 172 -> 180 bytes
 .../query-tests/queries/function_map_filter.json   |   6 ++
 .../queries/function_map_filter.proto.bin          | Bin 215 -> 223 bytes
 .../queries/function_map_from_arrays.json          |   6 ++
 .../queries/function_map_from_arrays.proto.bin     | Bin 221 -> 229 bytes
 .../queries/function_map_from_entries.json         |   6 ++
 .../queries/function_map_from_entries.proto.bin    | Bin 232 -> 240 bytes
 .../query-tests/queries/function_map_keys.json     |   6 ++
 .../queries/function_map_keys.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_map_values.json   |   6 ++
 .../queries/function_map_values.proto.bin          | Bin 171 -> 179 bytes
 .../query-tests/queries/function_map_zip_with.json |   6 ++
 .../queries/function_map_zip_with.proto.bin        | Bin 244 -> 252 bytes
 .../query-tests/queries/function_max.json          |   6 ++
 .../query-tests/queries/function_max.proto.bin     | Bin 57 -> 65 bytes
 .../query-tests/queries/function_max_by.json       |   6 ++
 .../query-tests/queries/function_max_by.proto.bin  | Bin 174 -> 182 bytes
 .../query-tests/queries/function_md5.json          |   6 ++
 .../query-tests/queries/function_md5.proto.bin     | Bin 172 -> 180 bytes
 .../query-tests/queries/function_median.json       |   6 ++
 .../query-tests/queries/function_median.proto.bin  | Bin 167 -> 175 bytes
 .../query-tests/queries/function_min.json          |   6 ++
 .../query-tests/queries/function_min.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_min_by.json       |   6 ++
 .../query-tests/queries/function_min_by.proto.bin  | Bin 174 -> 182 bytes
 .../query-tests/queries/function_minute.json       |   6 ++
 .../query-tests/queries/function_minute.proto.bin  | Bin 112 -> 120 bytes
 .../query-tests/queries/function_mode.json         |   6 ++
 .../query-tests/queries/function_mode.proto.bin    | Bin 165 -> 173 bytes
 .../function_monotonically_increasing_id.json      |   6 ++
 .../function_monotonically_increasing_id.proto.bin | Bin 181 -> 189 bytes
 .../query-tests/queries/function_month.json        |   6 ++
 .../query-tests/queries/function_month.proto.bin   | Bin 111 -> 119 bytes
 .../query-tests/queries/function_months.json       |   6 ++
 .../query-tests/queries/function_months.proto.bin  | Bin 167 -> 175 bytes
 .../queries/function_months_between.json           |   6 ++
 .../queries/function_months_between.proto.bin      | Bin 139 -> 147 bytes
 .../function_months_between_with_roundoff.json     |   6 ++
 ...function_months_between_with_roundoff.proto.bin | Bin 145 -> 153 bytes
 .../query-tests/queries/function_nanvl.json        |   6 ++
 .../query-tests/queries/function_nanvl.proto.bin   | Bin 179 -> 187 bytes
 .../query-tests/queries/function_negate.json       |   6 ++
 .../query-tests/queries/function_negate.proto.bin  | Bin 169 -> 177 bytes
 .../query-tests/queries/function_next_day.json     |   6 ++
 .../queries/function_next_day.proto.bin            | Bin 123 -> 131 bytes
 .../query-tests/queries/function_nth_value.json    |   6 ++
 .../queries/function_nth_value.proto.bin           | Bin 207 -> 215 bytes
 .../query-tests/queries/function_ntile.json        |   6 ++
 .../query-tests/queries/function_ntile.proto.bin   | Bin 190 -> 198 bytes
 .../query-tests/queries/function_octet_length.json |   6 ++
 .../queries/function_octet_length.proto.bin        | Bin 173 -> 181 bytes
 .../query-tests/queries/function_overlay.json      |   6 ++
 .../query-tests/queries/function_overlay.proto.bin | Bin 183 -> 191 bytes
 .../queries/function_overlay_with_len.json         |   6 ++
 .../queries/function_overlay_with_len.proto.bin    | Bin 190 -> 198 bytes
 .../query-tests/queries/function_percent_rank.json |   6 ++
 .../queries/function_percent_rank.proto.bin        | Bin 191 -> 199 bytes
 .../queries/function_percentile_approx.json        |   6 ++
 .../queries/function_percentile_approx.proto.bin   | Bin 197 -> 205 bytes
 .../query-tests/queries/function_pmod.json         |   6 ++
 .../query-tests/queries/function_pmod.proto.bin    | Bin 171 -> 179 bytes
 .../query-tests/queries/function_posexplode.json   |   6 ++
 .../queries/function_posexplode.proto.bin          | Bin 171 -> 179 bytes
 .../queries/function_posexplode_outer.json         |   6 ++
 .../queries/function_posexplode_outer.proto.bin    | Bin 177 -> 185 bytes
 .../query-tests/queries/function_pow.json          |   6 ++
 .../query-tests/queries/function_pow.proto.bin     | Bin 173 -> 181 bytes
 .../query-tests/queries/function_product.json      |   6 ++
 .../query-tests/queries/function_product.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_quarter.json      |   6 ++
 .../query-tests/queries/function_quarter.proto.bin | Bin 113 -> 121 bytes
 .../query-tests/queries/function_radians.json      |   6 ++
 .../query-tests/queries/function_radians.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_raise_error.json  |   6 ++
 .../queries/function_raise_error.proto.bin         | Bin 177 -> 185 bytes
 .../queries/function_rand_with_seed.json           |   6 ++
 .../queries/function_rand_with_seed.proto.bin      | Bin 165 -> 173 bytes
 .../queries/function_randn_with_seed.json          |   6 ++
 .../queries/function_randn_with_seed.proto.bin     | Bin 166 -> 174 bytes
 .../query-tests/queries/function_rank.json         |   6 ++
 .../query-tests/queries/function_rank.proto.bin    | Bin 183 -> 191 bytes
 .../queries/function_regexp_extract.json           |   6 ++
 .../queries/function_regexp_extract.proto.bin      | Bin 198 -> 206 bytes
 .../queries/function_regexp_replace.json           |   6 ++
 .../queries/function_regexp_replace.proto.bin      | Bin 195 -> 203 bytes
 .../query-tests/queries/function_reverse.json      |   6 ++
 .../query-tests/queries/function_reverse.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_rint.json         |   6 ++
 .../query-tests/queries/function_rint.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_round.json        |   6 ++
 .../query-tests/queries/function_round.proto.bin   | Bin 172 -> 180 bytes
 .../query-tests/queries/function_row_number.json   |   6 ++
 .../queries/function_row_number.proto.bin          | Bin 189 -> 197 bytes
 .../query-tests/queries/function_rpad.json         |   6 ++
 .../query-tests/queries/function_rpad.proto.bin    | Bin 178 -> 186 bytes
 .../query-tests/queries/function_rpad_binary.json  |   6 ++
 .../queries/function_rpad_binary.proto.bin         | Bin 75 -> 83 bytes
 .../query-tests/queries/function_rtrim.json        |   6 ++
 .../query-tests/queries/function_rtrim.proto.bin   | Bin 166 -> 174 bytes
 .../queries/function_rtrim_with_pattern.json       |   6 ++
 .../queries/function_rtrim_with_pattern.proto.bin  | Bin 175 -> 183 bytes
 .../queries/function_schema_of_csv.json            |   6 ++
 .../queries/function_schema_of_csv.proto.bin       | Bin 203 -> 211 bytes
 .../queries/function_schema_of_json.json           |   6 ++
 .../queries/function_schema_of_json.proto.bin      | Bin 186 -> 194 bytes
 .../function_schema_of_json_with_options.json      |   6 ++
 .../function_schema_of_json_with_options.proto.bin | Bin 235 -> 243 bytes
 .../query-tests/queries/function_sec.json          |   6 ++
 .../query-tests/queries/function_sec.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_second.json       |   6 ++
 .../query-tests/queries/function_second.proto.bin  | Bin 112 -> 120 bytes
 .../query-tests/queries/function_sentences.json    |   6 ++
 .../queries/function_sentences.proto.bin           | Bin 170 -> 178 bytes
 .../queries/function_sentences_with_locale.json    |   6 ++
 .../function_sentences_with_locale.proto.bin       | Bin 186 -> 194 bytes
 .../query-tests/queries/function_sequence.json     |   6 ++
 .../queries/function_sequence.proto.bin            | Bin 180 -> 188 bytes
 .../queries/function_session_window.json           |   6 ++
 .../queries/function_session_window.proto.bin      | Bin 157 -> 165 bytes
 .../query-tests/queries/function_sha1.json         |   6 ++
 .../query-tests/queries/function_sha1.proto.bin    | Bin 173 -> 181 bytes
 .../query-tests/queries/function_sha2.json         |   6 ++
 .../query-tests/queries/function_sha2.proto.bin    | Bin 180 -> 188 bytes
 .../query-tests/queries/function_shiftleft.json    |   6 ++
 .../queries/function_shiftleft.proto.bin           | Bin 176 -> 184 bytes
 .../query-tests/queries/function_shiftright.json   |   6 ++
 .../queries/function_shiftright.proto.bin          | Bin 177 -> 185 bytes
 .../queries/function_shiftrightunsigned.json       |   6 ++
 .../queries/function_shiftrightunsigned.proto.bin  | Bin 185 -> 193 bytes
 .../query-tests/queries/function_signum.json       |   6 ++
 .../query-tests/queries/function_signum.proto.bin  | Bin 167 -> 175 bytes
 .../query-tests/queries/function_sin.json          |   6 ++
 .../query-tests/queries/function_sin.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_sinh.json         |   6 ++
 .../query-tests/queries/function_sinh.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_size.json         |   6 ++
 .../query-tests/queries/function_size.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_skewness.json     |   6 ++
 .../queries/function_skewness.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_slice.json        |   6 ++
 .../query-tests/queries/function_slice.proto.bin   | Bin 178 -> 186 bytes
 .../query-tests/queries/function_sort_array.json   |   6 ++
 .../queries/function_sort_array.proto.bin          | Bin 177 -> 185 bytes
 .../queries/function_spark_partition_id.json       |   6 ++
 .../queries/function_spark_partition_id.proto.bin  | Bin 172 -> 180 bytes
 .../query-tests/queries/function_split.json        |   6 ++
 .../query-tests/queries/function_split.proto.bin   | Bin 173 -> 181 bytes
 .../queries/function_split_with_limit.json         |   6 ++
 .../queries/function_split_with_limit.proto.bin    | Bin 179 -> 187 bytes
 .../query-tests/queries/function_sqrt.json         |   6 ++
 .../query-tests/queries/function_sqrt.proto.bin    | Bin 165 -> 173 bytes
 .../query-tests/queries/function_stddev.json       |   6 ++
 .../query-tests/queries/function_stddev.proto.bin  | Bin 167 -> 175 bytes
 .../query-tests/queries/function_stddev_pop.json   |   6 ++
 .../queries/function_stddev_pop.proto.bin          | Bin 171 -> 179 bytes
 .../query-tests/queries/function_stddev_samp.json  |   6 ++
 .../queries/function_stddev_samp.proto.bin         | Bin 172 -> 180 bytes
 .../query-tests/queries/function_struct.json       |   6 ++
 .../query-tests/queries/function_struct.proto.bin  | Bin 174 -> 182 bytes
 .../query-tests/queries/function_substring.json    |   6 ++
 .../queries/function_substring.proto.bin           | Bin 182 -> 190 bytes
 .../queries/function_substring_index.json          |   6 ++
 .../queries/function_substring_index.proto.bin     | Bin 189 -> 197 bytes
 .../query-tests/queries/function_sum.json          |   6 ++
 .../query-tests/queries/function_sum.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_sum_distinct.json |   6 ++
 .../queries/function_sum_distinct.proto.bin        | Bin 166 -> 174 bytes
 .../query-tests/queries/function_tan.json          |   6 ++
 .../query-tests/queries/function_tan.proto.bin     | Bin 164 -> 172 bytes
 .../query-tests/queries/function_tanh.json         |   6 ++
 .../query-tests/queries/function_tanh.proto.bin    | Bin 165 -> 173 bytes
 .../queries/function_timestamp_seconds.json        |   6 ++
 .../queries/function_timestamp_seconds.proto.bin   | Bin 123 -> 131 bytes
 .../query-tests/queries/function_to_csv.json       |   6 ++
 .../query-tests/queries/function_to_csv.proto.bin  | Bin 192 -> 200 bytes
 .../query-tests/queries/function_to_date.json      |   6 ++
 .../query-tests/queries/function_to_date.proto.bin | Bin 113 -> 121 bytes
 .../queries/function_to_date_with_format.json      |   6 ++
 .../queries/function_to_date_with_format.proto.bin | Bin 129 -> 138 bytes
 .../query-tests/queries/function_to_json.json      |   6 ++
 .../query-tests/queries/function_to_json.proto.bin | Bin 214 -> 222 bytes
 .../query-tests/queries/function_to_timestamp.json |   6 ++
 .../queries/function_to_timestamp.proto.bin        | Bin 118 -> 126 bytes
 .../queries/function_to_timestamp_with_format.json |   6 ++
 .../function_to_timestamp_with_format.proto.bin    | Bin 149 -> 157 bytes
 .../queries/function_to_utc_timestamp.json         |   6 ++
 .../queries/function_to_utc_timestamp.proto.bin    | Bin 135 -> 143 bytes
 .../query-tests/queries/function_transform.json    |   6 ++
 .../queries/function_transform.proto.bin           | Bin 199 -> 207 bytes
 .../queries/function_transform_keys.json           |   6 ++
 .../queries/function_transform_keys.proto.bin      | Bin 227 -> 235 bytes
 .../queries/function_transform_values.json         |   6 ++
 .../queries/function_transform_values.proto.bin    | Bin 214 -> 222 bytes
 .../queries/function_transform_with_index.json     |   6 ++
 .../function_transform_with_index.proto.bin        | Bin 205 -> 213 bytes
 .../query-tests/queries/function_translate.json    |   6 ++
 .../queries/function_translate.proto.bin           | Bin 188 -> 196 bytes
 .../query-tests/queries/function_trim.json         |   6 ++
 .../query-tests/queries/function_trim.proto.bin    | Bin 165 -> 173 bytes
 .../queries/function_trim_with_pattern.json        |   6 ++
 .../queries/function_trim_with_pattern.proto.bin   | Bin 174 -> 182 bytes
 .../query-tests/queries/function_trunc.json        |   6 ++
 .../query-tests/queries/function_trunc.proto.bin   | Bin 119 -> 127 bytes
 .../query-tests/queries/function_unbase64.json     |   6 ++
 .../queries/function_unbase64.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_unhex.json        |   6 ++
 .../query-tests/queries/function_unhex.proto.bin   | Bin 166 -> 174 bytes
 .../queries/function_unix_timestamp.json           |   6 ++
 .../queries/function_unix_timestamp.proto.bin      | Bin 137 -> 145 bytes
 .../function_unix_timestamp_with_format.json       |   6 ++
 .../function_unix_timestamp_with_format.proto.bin  | Bin 151 -> 159 bytes
 .../query-tests/queries/function_upper.json        |   6 ++
 .../query-tests/queries/function_upper.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_var_pop.json      |   6 ++
 .../query-tests/queries/function_var_pop.proto.bin | Bin 168 -> 176 bytes
 .../query-tests/queries/function_var_samp.json     |   6 ++
 .../queries/function_var_samp.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_variance.json     |   6 ++
 .../queries/function_variance.proto.bin            | Bin 169 -> 177 bytes
 .../query-tests/queries/function_weekofyear.json   |   6 ++
 .../queries/function_weekofyear.proto.bin          | Bin 116 -> 124 bytes
 .../query-tests/queries/function_window.json       |   6 ++
 .../query-tests/queries/function_window.proto.bin  | Bin 155 -> 163 bytes
 .../query-tests/queries/function_window_time.json  |  12 ++-
 .../queries/function_window_time.proto.bin         | Bin 167 -> 181 bytes
 .../query-tests/queries/function_xxhash64.json     |   6 ++
 .../queries/function_xxhash64.proto.bin            | Bin 191 -> 199 bytes
 .../query-tests/queries/function_year.json         |   6 ++
 .../query-tests/queries/function_year.proto.bin    | Bin 110 -> 118 bytes
 .../query-tests/queries/function_years.json        |   6 ++
 .../query-tests/queries/function_years.proto.bin   | Bin 166 -> 174 bytes
 .../query-tests/queries/function_zip_with.json     |   6 ++
 .../queries/function_zip_with.proto.bin            | Bin 211 -> 219 bytes
 .../resources/query-tests/queries/groupby_agg.json |  27 +++--
 .../query-tests/queries/groupby_agg.proto.bin      | Bin 186 -> 208 bytes
 .../query-tests/queries/groupby_agg_columns.json   |   6 ++
 .../queries/groupby_agg_columns.proto.bin          | Bin 82 -> 90 bytes
 .../resources/query-tests/queries/groupby_avg.json |   6 ++
 .../query-tests/queries/groupby_avg.proto.bin      | Bin 82 -> 90 bytes
 .../query-tests/queries/groupby_count.json         |   6 ++
 .../query-tests/queries/groupby_count.proto.bin    | Bin 78 -> 86 bytes
 .../resources/query-tests/queries/groupby_max.json |   6 ++
 .../query-tests/queries/groupby_max.proto.bin      | Bin 82 -> 90 bytes
 .../query-tests/queries/groupby_mean.json          |   6 ++
 .../query-tests/queries/groupby_mean.proto.bin     | Bin 82 -> 90 bytes
 .../resources/query-tests/queries/groupby_min.json |   6 ++
 .../query-tests/queries/groupby_min.proto.bin      | Bin 82 -> 90 bytes
 .../resources/query-tests/queries/groupby_sum.json |   6 ++
 .../query-tests/queries/groupby_sum.proto.bin      | Bin 82 -> 90 bytes
 .../test/resources/query-tests/queries/hint.json   |   6 ++
 .../resources/query-tests/queries/hint.proto.bin   | Bin 57 -> 65 bytes
 .../resources/query-tests/queries/intersect.json   |   9 ++
 .../query-tests/queries/intersect.proto.bin        | Bin 82 -> 94 bytes
 .../query-tests/queries/intersectAll.json          |   9 ++
 .../query-tests/queries/intersectAll.proto.bin     | Bin 82 -> 94 bytes
 .../query-tests/queries/join_condition.json        |  15 +++
 .../query-tests/queries/join_condition.proto.bin   | Bin 129 -> 150 bytes
 .../query-tests/queries/join_inner_condition.json  |  15 +++
 .../queries/join_inner_condition.proto.bin         | Bin 127 -> 148 bytes
 .../queries/join_inner_no_condition.json           |   9 ++
 .../queries/join_inner_no_condition.proto.bin      | Bin 86 -> 98 bytes
 .../join_inner_using_multiple_col_array.json       |   9 ++
 .../join_inner_using_multiple_col_array.proto.bin  | Bin 93 -> 105 bytes
 .../queries/join_inner_using_multiple_col_seq.json |   9 ++
 .../join_inner_using_multiple_col_seq.proto.bin    | Bin 93 -> 105 bytes
 .../queries/join_inner_using_single_col.json       |   9 ++
 .../queries/join_inner_using_single_col.proto.bin  | Bin 90 -> 102 bytes
 .../queries/join_using_multiple_col_array.json     |   9 ++
 .../join_using_multiple_col_array.proto.bin        | Bin 93 -> 105 bytes
 .../queries/join_using_multiple_col_seq.json       |   9 ++
 .../queries/join_using_multiple_col_seq.proto.bin  | Bin 93 -> 105 bytes
 .../query-tests/queries/join_using_single_col.json |   9 ++
 .../queries/join_using_single_col.proto.bin        | Bin 90 -> 102 bytes
 .../test/resources/query-tests/queries/limit.json  |   6 ++
 .../resources/query-tests/queries/limit.proto.bin  | Bin 42 -> 50 bytes
 .../query-tests/queries/melt_no_values.json        |   6 ++
 .../query-tests/queries/melt_no_values.proto.bin   | Bin 63 -> 71 bytes
 .../resources/query-tests/queries/melt_values.json |   6 ++
 .../query-tests/queries/melt_values.proto.bin      | Bin 65 -> 73 bytes
 .../test/resources/query-tests/queries/offset.json |   6 ++
 .../resources/query-tests/queries/offset.proto.bin | Bin 43 -> 51 bytes
 .../query-tests/queries/orderBy_columns.json       |   6 ++
 .../query-tests/queries/orderBy_columns.proto.bin  | Bin 82 -> 90 bytes
 .../query-tests/queries/orderBy_strings.json       |   6 ++
 .../query-tests/queries/orderBy_strings.proto.bin  | Bin 82 -> 90 bytes
 .../query-tests/queries/parameterized_sql.json     |   3 +
 .../queries/parameterized_sql.proto.bin            | Bin 37 -> 41 bytes
 .../test/resources/query-tests/queries/range.json  |   3 +
 .../resources/query-tests/queries/range.proto.bin  | Bin 10 -> 14 bytes
 .../test/resources/query-tests/queries/read.json   |   3 +
 .../resources/query-tests/queries/read.proto.bin   | Bin 138 -> 142 bytes
 .../resources/query-tests/queries/read_csv.json    |   3 +
 .../query-tests/queries/read_csv.proto.bin         | Bin 72 -> 76 bytes
 .../resources/query-tests/queries/read_json.json   |   3 +
 .../query-tests/queries/read_json.proto.bin        | Bin 74 -> 78 bytes
 .../resources/query-tests/queries/read_orc.json    |   3 +
 .../query-tests/queries/read_orc.proto.bin         | Bin 71 -> 75 bytes
 .../query-tests/queries/read_parquet.json          |   3 +
 .../query-tests/queries/read_parquet.proto.bin     | Bin 79 -> 83 bytes
 .../resources/query-tests/queries/read_table.json  |   3 +
 .../query-tests/queries/read_table.proto.bin       | Bin 13 -> 17 bytes
 .../resources/query-tests/queries/read_text.json   |   3 +
 .../query-tests/queries/read_text.proto.bin        | Bin 73 -> 77 bytes
 .../resources/query-tests/queries/repartition.json |   6 ++
 .../query-tests/queries/repartition.proto.bin      | Bin 45 -> 53 bytes
 .../queries/repartitionByRange_expressions.json    |   6 ++
 .../repartitionByRange_expressions.proto.bin       | Bin 72 -> 80 bytes
 ...artitionByRange_num_partitions_expressions.json |   6 ++
 ...ionByRange_num_partitions_expressions.proto.bin | Bin 74 -> 82 bytes
 .../queries/repartition_expressions.json           |   6 ++
 .../queries/repartition_expressions.proto.bin      | Bin 56 -> 64 bytes
 .../repartition_num_partitions_expressions.json    |   6 ++
 ...epartition_num_partitions_expressions.proto.bin | Bin 58 -> 66 bytes
 .../query-tests/queries/rollup_column.json         |   6 ++
 .../query-tests/queries/rollup_column.proto.bin    | Bin 84 -> 92 bytes
 .../query-tests/queries/rollup_string.json         |   6 ++
 .../query-tests/queries/rollup_string.proto.bin    | Bin 84 -> 92 bytes
 .../query-tests/queries/sample_fraction_seed.json  |   6 ++
 .../queries/sample_fraction_seed.proto.bin         | Bin 56 -> 64 bytes
 .../sample_withReplacement_fraction_seed.json      |   6 ++
 .../sample_withReplacement_fraction_seed.proto.bin | Bin 54 -> 62 bytes
 .../test/resources/query-tests/queries/select.json |   6 ++
 .../resources/query-tests/queries/select.proto.bin | Bin 48 -> 56 bytes
 .../resources/query-tests/queries/selectExpr.json  |   6 ++
 .../query-tests/queries/selectExpr.proto.bin       | Bin 77 -> 85 bytes
 .../query-tests/queries/select_strings.json        |   6 ++
 .../query-tests/queries/select_strings.proto.bin   | Bin 55 -> 63 bytes
 .../queries/sortWithinPartitions_columns.json      |   6 ++
 .../queries/sortWithinPartitions_columns.proto.bin | Bin 69 -> 77 bytes
 .../queries/sortWithinPartitions_strings.json      |   6 ++
 .../queries/sortWithinPartitions_strings.proto.bin | Bin 69 -> 77 bytes
 .../query-tests/queries/sort_columns.json          |   6 ++
 .../query-tests/queries/sort_columns.proto.bin     | Bin 69 -> 77 bytes
 .../query-tests/queries/sort_strings.json          |   6 ++
 .../query-tests/queries/sort_strings.proto.bin     | Bin 68 -> 76 bytes
 .../test/resources/query-tests/queries/sql.json    |   3 +
 .../resources/query-tests/queries/sql.proto.bin    | Bin 12 -> 16 bytes
 .../resources/query-tests/queries/summary.json     |   6 ++
 .../query-tests/queries/summary.proto.bin          | Bin 52 -> 60 bytes
 .../test/resources/query-tests/queries/table.json  |   3 +
 .../resources/query-tests/queries/table.proto.bin  | Bin 13 -> 17 bytes
 .../src/test/resources/query-tests/queries/to.json |   6 ++
 .../resources/query-tests/queries/to.proto.bin     | Bin 69 -> 77 bytes
 .../test/resources/query-tests/queries/toDF.json   |   6 ++
 .../resources/query-tests/queries/toDF.proto.bin   | Bin 53 -> 61 bytes
 .../test/resources/query-tests/queries/union.json  |   9 ++
 .../resources/query-tests/queries/union.proto.bin  | Bin 82 -> 94 bytes
 .../resources/query-tests/queries/unionAll.json    |   9 ++
 .../query-tests/queries/unionAll.proto.bin         | Bin 82 -> 94 bytes
 .../resources/query-tests/queries/unionByName.json |  15 +++
 .../query-tests/queries/unionByName.proto.bin      | Bin 122 -> 143 bytes
 .../queries/unionByName_allowMissingColumns.json   |   9 ++
 .../unionByName_allowMissingColumns.proto.bin      | Bin 92 -> 104 bytes
 .../query-tests/queries/unpivot_no_values.json     |   6 ++
 .../queries/unpivot_no_values.proto.bin            | Bin 56 -> 64 bytes
 .../query-tests/queries/unpivot_values.json        |   6 ++
 .../query-tests/queries/unpivot_values.proto.bin   | Bin 72 -> 80 bytes
 .../query-tests/queries/where_column.json          |   6 ++
 .../query-tests/queries/where_column.proto.bin     | Bin 61 -> 69 bytes
 .../resources/query-tests/queries/where_expr.json  |   6 ++
 .../query-tests/queries/where_expr.proto.bin       | Bin 59 -> 67 bytes
 .../test/resources/query-tests/queries/window.json |   6 ++
 .../resources/query-tests/queries/window.proto.bin | Bin 336 -> 344 bytes
 .../queries/withColumnRenamed_java_map.json        |   6 ++
 .../queries/withColumnRenamed_java_map.proto.bin   | Bin 64 -> 72 bytes
 .../queries/withColumnRenamed_scala_map.json       |   6 ++
 .../queries/withColumnRenamed_scala_map.proto.bin  | Bin 64 -> 72 bytes
 .../queries/withColumnRenamed_single.json          |   6 ++
 .../queries/withColumnRenamed_single.proto.bin     | Bin 52 -> 60 bytes
 .../query-tests/queries/withColumn_single.json     |   6 ++
 .../queries/withColumn_single.proto.bin            | Bin 59 -> 67 bytes
 .../query-tests/queries/withColumns_java_map.json  |   6 ++
 .../queries/withColumns_java_map.proto.bin         | Bin 68 -> 76 bytes
 .../query-tests/queries/withColumns_scala_map.json |   6 ++
 .../queries/withColumns_scala_map.proto.bin        | Bin 78 -> 86 bytes
 .../query-tests/queries/withMetadata.json          |   9 +-
 .../query-tests/queries/withMetadata.proto.bin     | Bin 92 -> 102 bytes
 820 files changed, 2592 insertions(+), 209 deletions(-)

diff --git a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Column.scala b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Column.scala
index fde17963bfd..734535c2e14 100644
--- a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Column.scala
+++ b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Column.scala
@@ -1270,14 +1270,17 @@ class Column private[sql] (private[sql] val expr: proto.Expression) extends Logg
 
 private[sql] object Column {
 
-  def apply(name: String): Column = Column { builder =>
+  def apply(name: String): Column = Column(name, None)
+
+  def apply(name: String, planId: Option[Long]): Column = Column { builder =>
     name match {
       case "*" =>
         builder.getUnresolvedStarBuilder
       case _ if name.endsWith(".*") =>
         builder.getUnresolvedStarBuilder.setUnparsedTarget(name)
       case _ =>
-        builder.getUnresolvedAttributeBuilder.setUnparsedIdentifier(name)
+        val attributeBuilder = builder.getUnresolvedAttributeBuilder.setUnparsedIdentifier(name)
+        planId.foreach(attributeBuilder.setPlanId)
     }
   }
 
diff --git a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Dataset.scala b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Dataset.scala
index 560276d154e..87aadfe437b 100644
--- a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Dataset.scala
+++ b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/Dataset.scala
@@ -117,6 +117,8 @@ import org.apache.spark.util.Utils
  */
 class Dataset[T] private[sql] (val session: SparkSession, private[sql] val plan: proto.Plan)
     extends Serializable {
+  // Make sure we don't forget to set plan id.
+  assert(plan.getRoot.getCommon.hasPlanId)
 
   override def toString: String = {
     try {
@@ -873,7 +875,14 @@ class Dataset[T] private[sql] (val session: SparkSession, private[sql] val plan:
    * @group untypedrel
    * @since 3.4.0
    */
-  def col(colName: String): Column = functions.col(colName)
+  def col(colName: String): Column = {
+    val planId = if (plan.getRoot.hasCommon && plan.getRoot.getCommon.hasPlanId) {
+      Option(plan.getRoot.getCommon.getPlanId)
+    } else {
+      None
+    }
+    Column.apply(colName, planId)
+  }
 
   /**
    * Selects column based on the column name specified as a regex and returns it as [[Column]].
diff --git a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala
index 0e5aaace20d..a63c23e6bf1 100644
--- a/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala
+++ b/connector/connect/client/jvm/src/main/scala/org/apache/spark/sql/SparkSession.scala
@@ -17,6 +17,7 @@
 package org.apache.spark.sql
 
 import java.io.Closeable
+import java.util.concurrent.atomic.AtomicLong
 
 import scala.collection.JavaConverters._
 
@@ -48,7 +49,10 @@ import org.apache.spark.sql.connect.client.util.Cleaner
  *     .getOrCreate()
  * }}}
  */
-class SparkSession(private val client: SparkConnectClient, private val cleaner: Cleaner)
+class SparkSession(
+    private val client: SparkConnectClient,
+    private val cleaner: Cleaner,
+    private val planIdGenerator: AtomicLong)
     extends Serializable
     with Closeable
     with Logging {
@@ -183,6 +187,7 @@ class SparkSession(private val client: SparkConnectClient, private val cleaner:
   private[sql] def newDataset[T](f: proto.Relation.Builder => Unit): Dataset[T] = {
     val builder = proto.Relation.newBuilder()
     f(builder)
+    builder.getCommonBuilder.setPlanId(planIdGenerator.getAndIncrement())
     val plan = proto.Plan.newBuilder().setRoot(builder).build()
     new Dataset[T](this, plan)
   }
@@ -204,6 +209,15 @@ class SparkSession(private val client: SparkConnectClient, private val cleaner:
     client.execute(plan).asScala.foreach(_ => ())
   }
 
+  /**
+   * This resets the plan id generator so we can produce plans that are comparable.
+   *
+   * For testing only!
+   */
+  private[sql] def resetPlanIdGenerator(): Unit = {
+    planIdGenerator.set(0)
+  }
+
   override def close(): Unit = {
     client.shutdown()
     allocator.close()
@@ -213,9 +227,11 @@ class SparkSession(private val client: SparkConnectClient, private val cleaner:
 // The minimal builder needed to create a spark session.
 // TODO: implements all methods mentioned in the scaladoc of [[SparkSession]]
 object SparkSession extends Logging {
+  private val planIdGenerator = new AtomicLong
+
   def builder(): Builder = new Builder()
 
-  private lazy val cleaner = {
+  private[sql] lazy val cleaner = {
     val cleaner = new Cleaner
     cleaner.start()
     cleaner
@@ -238,7 +254,7 @@ object SparkSession extends Logging {
       if (_client == null) {
         _client = SparkConnectClient.builder().build()
       }
-      new SparkSession(_client, cleaner)
+      new SparkSession(_client, cleaner, planIdGenerator)
     }
   }
 }
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
index c9d9f43cbaf..7077d8c94e8 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ClientE2ETestSuite.scala
@@ -27,7 +27,7 @@ import org.apache.commons.io.output.TeeOutputStream
 import org.scalactic.TolerantNumerics
 
 import org.apache.spark.sql.connect.client.util.{IntegrationTestUtils, RemoteSparkSession}
-import org.apache.spark.sql.functions.{aggregate, array, col, lit, sequence, shuffle, transform, udf}
+import org.apache.spark.sql.functions.{aggregate, array, col, lit, rand, sequence, shuffle, transform, udf}
 import org.apache.spark.sql.types._
 
 class ClientE2ETestSuite extends RemoteSparkSession {
@@ -399,4 +399,11 @@ class ClientE2ETestSuite extends RemoteSparkSession {
       .getSeq[Int](0)
     assert(result.toSet === Set(1, 2, 3, 74))
   }
+
+  test("ambiguous joins") {
+    val left = spark.range(100).select(col("id"), rand(10).as("a"))
+    val right = spark.range(100).select(col("id"), rand(12).as("a"))
+    val joined = left.join(right, left("id") === right("id")).select(left("id"), right("a"))
+    assert(joined.schema.catalogString === "struct<id:bigint,a:double>")
+  }
 }
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
index 412371c4186..c3c80a08379 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
@@ -16,11 +16,11 @@
  */
 package org.apache.spark.sql
 
-import scala.collection.JavaConverters._
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicLong
 
 import io.grpc.Server
-import io.grpc.netty.NettyServerBuilder
-import java.util.concurrent.TimeUnit
+import io.grpc.inprocess.{InProcessChannelBuilder, InProcessServerBuilder}
 import org.scalatest.BeforeAndAfterEach
 import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
 
@@ -40,33 +40,27 @@ class DatasetSuite
   private var service: DummySparkConnectService = _
   private var ss: SparkSession = _
 
-  private def getNewSparkSession(port: Int): SparkSession = {
-    assert(port != 0)
-    SparkSession
-      .builder()
-      .client(
-        SparkConnectClient
-          .builder()
-          .connectionString(s"sc://localhost:$port")
-          .build())
-      .build()
+  private def newSparkSession(): SparkSession = {
+    val client = new SparkConnectClient(
+      proto.UserContext.newBuilder().build(),
+      InProcessChannelBuilder.forName(getClass.getName).directExecutor().build(),
+      "test")
+    new SparkSession(client, cleaner = SparkSession.cleaner, planIdGenerator = new AtomicLong)
   }
 
   private def startDummyServer(): Unit = {
     service = new DummySparkConnectService()
-    val sb = NettyServerBuilder
-      // Let server bind to any free port
-      .forPort(0)
+    server = InProcessServerBuilder
+      .forName(getClass.getName)
       .addService(service)
-
-    server = sb.build
+      .build()
     server.start()
   }
 
   override def beforeEach(): Unit = {
     super.beforeEach()
     startDummyServer()
-    ss = getNewSparkSession(server.getPort)
+    ss = newSparkSession()
   }
 
   override def afterEach(): Unit = {
@@ -76,47 +70,6 @@ class DatasetSuite
     }
   }
 
-  test("limit") {
-    val df = ss.newDataset(_ => ())
-    val builder = proto.Relation.newBuilder()
-    builder.getLimitBuilder.setInput(df.plan.getRoot).setLimit(10)
-
-    val expectedPlan = proto.Plan.newBuilder().setRoot(builder).build()
-    df.limit(10).analyze
-    val actualPlan = service.getAndClearLatestInputPlan()
-    assert(actualPlan.equals(expectedPlan))
-  }
-
-  test("select") {
-    val df = ss.newDataset(_ => ())
-
-    val builder = proto.Relation.newBuilder()
-    val dummyCols = Seq[Column](Column("a"), Column("b"))
-    builder.getProjectBuilder
-      .setInput(df.plan.getRoot)
-      .addAllExpressions(dummyCols.map(_.expr).asJava)
-    val expectedPlan = proto.Plan.newBuilder().setRoot(builder).build()
-
-    df.select(dummyCols: _*).analyze
-    val actualPlan = service.getAndClearLatestInputPlan()
-    assert(actualPlan.equals(expectedPlan))
-  }
-
-  test("filter") {
-    val df = ss.newDataset(_ => ())
-
-    val builder = proto.Relation.newBuilder()
-    val dummyCondition = Column.fn("dummy func", Column("a"))
-    builder.getFilterBuilder
-      .setInput(df.plan.getRoot)
-      .setCondition(dummyCondition.expr)
-    val expectedPlan = proto.Plan.newBuilder().setRoot(builder).build()
-
-    df.filter(dummyCondition).analyze
-    val actualPlan = service.getAndClearLatestInputPlan()
-    assert(actualPlan.equals(expectedPlan))
-  }
-
   test("write") {
     val df = ss.newDataset(_ => ()).limit(10)
 
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
index b759471e777..f7589d957ca 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
@@ -18,13 +18,14 @@ package org.apache.spark.sql
 
 import java.nio.file.{Files, Path}
 import java.util.Collections
+import java.util.concurrent.atomic.AtomicLong
 
 import scala.collection.mutable
 import scala.util.{Failure, Success, Try}
 
 import com.google.protobuf.util.JsonFormat
 import io.grpc.inprocess.InProcessChannelBuilder
-import org.scalatest.BeforeAndAfterAll
+import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
 import org.scalatest.funsuite.{AnyFunSuite => ConnectFunSuite} // scalastyle:ignore funsuite
 
 import org.apache.spark.connect.proto
@@ -55,7 +56,11 @@ import org.apache.spark.sql.types._
  * `connector/connect/server` module
  */
 // scalastyle:on
-class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll with Logging {
+class PlanGenerationTestSuite
+    extends ConnectFunSuite
+    with BeforeAndAfterAll
+    with BeforeAndAfterEach
+    with Logging {
 
   // Borrowed from SparkFunSuite
   private val regenerateGoldenFiles: Boolean = System.getenv("SPARK_GENERATE_GOLDEN_FILES") == "1"
@@ -102,8 +107,12 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
     val client = SparkConnectClient(
       proto.UserContext.newBuilder().build(),
       InProcessChannelBuilder.forName("/dev/null").build())
-    val builder = SparkSession.builder().client(client)
-    session = builder.build()
+    session =
+      new SparkSession(client, cleaner = SparkSession.cleaner, planIdGenerator = new AtomicLong)
+  }
+
+  override protected def beforeEach(): Unit = {
+    session.resetPlanIdGenerator()
   }
 
   override protected def afterAll(): Unit = {
@@ -361,7 +370,8 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   test("apply") {
-    simple.select(simple.apply("a"))
+    val stable = simple
+    stable.select(stable("a"))
   }
 
   test("hint") {
@@ -369,7 +379,8 @@ class PlanGenerationTestSuite extends ConnectFunSuite with BeforeAndAfterAll wit
   }
 
   test("col") {
-    simple.select(simple.col("id"), simple.col("b"))
+    val stable = simple
+    stable.select(stable.col("id"), stable.col("b"))
   }
 
   test("colRegex") {
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/SparkSessionSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/SparkSessionSuite.scala
deleted file mode 100644
index 8410073d6ec..00000000000
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/SparkSessionSuite.scala
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.spark.sql
-
-import io.grpc.Server
-import io.grpc.netty.NettyServerBuilder
-import java.util.concurrent.TimeUnit
-import org.scalatest.BeforeAndAfterEach
-import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
-
-import org.apache.spark.connect.proto
-import org.apache.spark.sql.connect.client.{DummySparkConnectService, SparkConnectClient}
-
-class SparkSessionSuite
-    extends AnyFunSuite // scalastyle:ignore funsuite
-    with BeforeAndAfterEach {
-
-  private var server: Server = _
-  private var service: DummySparkConnectService = _
-  private val SERVER_PORT = 15250
-
-  private def startDummyServer(port: Int): Unit = {
-    service = new DummySparkConnectService()
-    val sb = NettyServerBuilder
-      .forPort(port)
-      .addService(service)
-
-    server = sb.build
-    server.start()
-  }
-
-  override def beforeEach(): Unit = {
-    super.beforeEach()
-    startDummyServer(SERVER_PORT)
-  }
-
-  override def afterEach(): Unit = {
-    if (server != null) {
-      server.shutdownNow()
-      assert(server.awaitTermination(5, TimeUnit.SECONDS), "server failed to shutdown")
-    }
-  }
-
-  test("SparkSession initialisation with connection string") {
-    val ss = SparkSession
-      .builder()
-      .client(
-        SparkConnectClient
-          .builder()
-          .connectionString(s"sc://localhost:$SERVER_PORT")
-          .build())
-      .build()
-    val plan = proto.Plan.newBuilder().build()
-    ss.analyze(plan, proto.Explain.ExplainMode.SIMPLE)
-    assert(plan.equals(service.getAndClearLatestInputPlan()))
-  }
-
-  private def rangePlanCreator(
-      start: Long,
-      end: Long,
-      step: Long,
-      numPartitions: Option[Int]): proto.Plan = {
-    val builder = proto.Relation.newBuilder()
-    val rangeBuilder = builder.getRangeBuilder
-      .setStart(start)
-      .setEnd(end)
-      .setStep(step)
-    numPartitions.foreach(rangeBuilder.setNumPartitions)
-    proto.Plan.newBuilder().setRoot(builder).build()
-  }
-
-  private def testRange(
-      start: Long,
-      end: Long,
-      step: Long,
-      numPartitions: Option[Int],
-      failureHint: String): Unit = {
-    val expectedPlan = rangePlanCreator(start, end, step, numPartitions)
-    val actualPlan = service.getAndClearLatestInputPlan()
-    assert(actualPlan.equals(expectedPlan), failureHint)
-  }
-
-  test("range query") {
-    val ss = SparkSession
-      .builder()
-      .client(
-        SparkConnectClient
-          .builder()
-          .connectionString(s"sc://localhost:$SERVER_PORT")
-          .build())
-      .build()
-
-    ss.range(10).analyze
-    testRange(0, 10, 1, None, "Case: range(10)")
-
-    ss.range(0, 20).analyze
-    testRange(0, 20, 1, None, "Case: range(0, 20)")
-
-    ss.range(6, 20, 3).analyze
-    testRange(6, 20, 3, None, "Case: range(6, 20, 3)")
-
-    ss.range(10, 100, 5, 2).analyze
-    testRange(10, 100, 5, Some(2), "Case: range(6, 20, 3, Some(2))")
-  }
-
-}
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
index 98dacbcab89..8e827007950 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
@@ -26,6 +26,7 @@ import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
 
 import org.apache.spark.connect.proto
 import org.apache.spark.connect.proto.{AnalyzePlanRequest, AnalyzePlanResponse, ExecutePlanRequest, ExecutePlanResponse, SparkConnectServiceGrpc}
+import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.connect.common.config.ConnectCommon
 
 class SparkConnectClientSuite
@@ -33,20 +34,23 @@ class SparkConnectClientSuite
     with BeforeAndAfterEach {
 
   private var client: SparkConnectClient = _
+  private var service: DummySparkConnectService = _
   private var server: Server = _
 
   private def startDummyServer(port: Int): Unit = {
-    val sb = NettyServerBuilder
+    service = new DummySparkConnectService
+    server = NettyServerBuilder
       .forPort(port)
-      .addService(new DummySparkConnectService())
-
-    server = sb.build
+      .addService(service)
+      .build()
     server.start()
   }
+
   override def beforeEach(): Unit = {
     super.beforeEach()
     client = null
     server = null
+    service = null
   }
 
   override def afterEach(): Unit = {
@@ -104,6 +108,16 @@ class SparkConnectClientSuite
     }
   }
 
+  test("SparkSession initialisation with connection string") {
+    val testPort = 16002
+    client = SparkConnectClient.builder().connectionString(s"sc://localhost:$testPort").build()
+    startDummyServer(testPort)
+    val session = SparkSession.builder().client(client).build()
+    val df = session.range(10)
+    df.analyze // Trigger RPC
+    assert(df.plan === service.getAndClearLatestInputPlan())
+  }
+
   private case class TestPackURI(
       connectionString: String,
       isCorrect: Boolean,
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/alias_string.json b/connector/connect/common/src/test/resources/query-tests/queries/alias_string.json
index 1209a4dfb87..98ea62f986b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/alias_string.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/alias_string.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "subqueryAlias": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin
index 1f969506e38..6e8467cccde 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/alias_string.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.json b/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.json
index ba861c077fb..b469cbd0a33 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "subqueryAlias": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin
index 788038972d8..7034d39cd8a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/alias_symbol.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/apply.json b/connector/connect/common/src/test/resources/query-tests/queries/apply.json
index d53d24efef8..e484781708e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/apply.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/apply.json
@@ -1,13 +1,20 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "expressions": [{
       "unresolvedAttribute": {
-        "unparsedIdentifier": "a"
+        "unparsedIdentifier": "a",
+        "planId": "0"
       }
     }]
   }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/apply.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/apply.proto.bin
index 80cb4ad244e..5d5efcead5e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/apply.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/apply.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/as_string.json b/connector/connect/common/src/test/resources/query-tests/queries/as_string.json
index 501189fbe13..d74c9d16a7f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/as_string.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/as_string.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "subqueryAlias": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin
index f433909e126..829d6083e09 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/as_string.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.json b/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.json
index e2a7d2bb193..ca69a743175 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "subqueryAlias": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin
index c9ad3f8e0c5..f7111a4651d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/as_symbol.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/coalesce.json b/connector/connect/common/src/test/resources/query-tests/queries/coalesce.json
index 34a329f893a..cb08412296a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/coalesce.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/coalesce.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartition": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin
index ed1a6ce29fa..b03e7d58a2b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/coalesce.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/col.json b/connector/connect/common/src/test/resources/query-tests/queries/col.json
index aa2c09ce0d7..f3abc8a81af 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/col.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/col.json
@@ -1,17 +1,25 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "expressions": [{
       "unresolvedAttribute": {
-        "unparsedIdentifier": "id"
+        "unparsedIdentifier": "id",
+        "planId": "0"
       }
     }, {
       "unresolvedAttribute": {
-        "unparsedIdentifier": "b"
+        "unparsedIdentifier": "b",
+        "planId": "0"
       }
     }]
   }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/col.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/col.proto.bin
index 6db0c6bb0b0..15c4eabb8d5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/col.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/col.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/colRegex.json b/connector/connect/common/src/test/resources/query-tests/queries/colRegex.json
index 90d35213bbb..56021594c88 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/colRegex.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/colRegex.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin
index 6503926be7a..2f3ab10233e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/colRegex.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_add.json b/connector/connect/common/src/test/resources/query-tests/queries/column_add.json
index c7c88bdc5d1..cfa40fac8c6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_add.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_add.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin
index 26ccd472276..10b410b5b08 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_add.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_alias.json b/connector/connect/common/src/test/resources/query-tests/queries/column_alias.json
index 559d7c7b254..4fe650db9d3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_alias.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_alias.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin
index b05b217b061..e9b90768328 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_alias.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_and.json b/connector/connect/common/src/test/resources/query-tests/queries/column_and.json
index 1faa3965b12..d3f8cd0e73c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_and.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_and.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin
index a566569f293..241f1a9303b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_and.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_apply.json b/connector/connect/common/src/test/resources/query-tests/queries/column_apply.json
index c72cdda0c29..b203a20a0ea 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_apply.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_apply.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin
index bbc3bacbd9c..9e56d5891f5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_apply.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.json b/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.json
index 15c6c6cf093..426fd1fbb75 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin
index 4762a9fad8c..602beafb01c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_as_multi.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json b/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
index dff2912f8b6..e943c01f26f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin
index 83592a71e5c..2952e871f6e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_as_with_metadata.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc.json b/connector/connect/common/src/test/resources/query-tests/queries/column_asc.json
index 11d2915091c..31f3102f77a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_asc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_asc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin
index 56e5c5d2076..ee5bda529c4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_asc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
index 11d2915091c..31f3102f77a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin
index 56e5c5d2076..ee5bda529c4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_first.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
index eac9be9e5ac..94326e0f662 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin
index 21665330de2..496fe40192d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_asc_nulls_last.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_between.json b/connector/connect/common/src/test/resources/query-tests/queries/column_between.json
index 8473a3e7cda..20927b93d84 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_between.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_between.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin
index c651f8856bb..d03dd02a2f3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_between.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
index 17431e74d94..bd3ac671fca 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin
index 3517777d8af..4815bc7dd1a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseAND.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
index cfd8e2dfb7f..eaa27ffa461 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin
index 16ea227007b..9cf110da4ad 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseOR.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
index d3e4c326c26..c51eb3140c3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin
index 2c154418bb7..70c61f96205 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_bitwiseXOR.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_cast.json b/connector/connect/common/src/test/resources/query-tests/queries/column_cast.json
index d014ce98803..1a1ee5ed4d5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_cast.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_cast.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin
index 3b3d04193ac..60e807b4c35 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_cast.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_contains.json b/connector/connect/common/src/test/resources/query-tests/queries/column_contains.json
index 862dd8cefa0..05d6ccf38b3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_contains.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_contains.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin
index 12a45de9ce6..9c796f9470c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_contains.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc.json b/connector/connect/common/src/test/resources/query-tests/queries/column_desc.json
index f882e4abad2..50efda387ec 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_desc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_desc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin
index 3d9b64634d9..df2589d8231 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_desc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
index 707ced41a16..bed300feea2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin
index 54ae15ef70b..b8caacc55b9 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_first.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
index f882e4abad2..50efda387ec 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin
index 3d9b64634d9..df2589d8231 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_desc_nulls_last.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_divide.json b/connector/connect/common/src/test/resources/query-tests/queries/column_divide.json
index 08171761822..8d71061b151 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_divide.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_divide.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin
index 856a7565591..49b5d8d2590 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_divide.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.json b/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.json
index ff39dfa6532..92639eeedc6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin
index b95d8d3dcd6..edafc8b1f1f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_dropFields.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.json b/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.json
index 99edefdc9a4..f4171c2792f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin
index c854a66c726..03f41a339f0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_endsWith.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json b/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
index 3481ee46e5a..eea1da49bc5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin
index d38e1836b3f..22de941ad44 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_eqNullSafe.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_equals.json b/connector/connect/common/src/test/resources/query-tests/queries/column_equals.json
index 834afc4dee7..7397f4fb46a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_equals.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_equals.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin
index e8505e38fdc..e226de59ddc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_equals.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_geq.json b/connector/connect/common/src/test/resources/query-tests/queries/column_geq.json
index aca63fadf09..9f24bc25173 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_geq.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_geq.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin
index c0762cef053..1c4af866109 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_geq.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_getField.json b/connector/connect/common/src/test/resources/query-tests/queries/column_getField.json
index d68d274a406..21d5bb6f23d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_getField.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_getField.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin
index eac146d122f..c76b69bf5fa 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_getField.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.json b/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.json
index 41eb3eadafc..e3bfd3d6e84 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin
index 92083231b14..9120801100f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_getItem.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_gt.json b/connector/connect/common/src/test/resources/query-tests/queries/column_gt.json
index 658a17c00ab..4bb8fb41f24 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_gt.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_gt.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin
index 9304b3dae72..44ca37fbb40 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_gt.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.json b/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.json
index bc751f0ce1d..47c1b63abe3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin
index 10226e50caa..285400db7da 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_ilike.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.json b/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.json
index 0eb722a08ec..f594918ed93 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin
index 1f96b82d070..1030abda5b8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_isNaN.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json b/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
index bb2403f1d19..f34d3f4eac5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin
index 45574baf87c..e8cccdf0249 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_isNotNull.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.json b/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.json
index 386ad8898eb..74e990622a3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin
index 44b48593580..8fc24a9e21b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_isNull.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isin.json b/connector/connect/common/src/test/resources/query-tests/queries/column_isin.json
index 1a990cc0851..d8811a4e780 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_isin.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_isin.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin
index 9e61c9d26d6..365e07f35bb 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_isin.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_leq.json b/connector/connect/common/src/test/resources/query-tests/queries/column_leq.json
index 9ea4d99f9b7..cda8694c043 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_leq.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_leq.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin
index 7f62d95ee34..e8463292e40 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_leq.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_like.json b/connector/connect/common/src/test/resources/query-tests/queries/column_like.json
index 2afab4b0329..1390451af55 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_like.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_like.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin
index dee7e79301c..07382ec1643 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_like.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_lt.json b/connector/connect/common/src/test/resources/query-tests/queries/column_lt.json
index 019e33cd106..c927e75de18 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_lt.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_lt.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin
index ff658957cee..f4c3a110b12 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_lt.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.json b/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.json
index 7cbe8a11fd9..0c5a78eea2d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin
index 461b09b0b82..55bfeba04ed 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_modulo.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.json b/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.json
index 58ebb2604da..8c17581c67d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin
index 4ca350de10b..8fd1b3941d1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_multiply.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_not.json b/connector/connect/common/src/test/resources/query-tests/queries/column_not.json
index 39417760083..2f873196ba1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_not.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_not.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin
index 59a14a40198..19609b6ee85 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_not.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.json b/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.json
index de8f07fb478..589d57a18b9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin
index 006450915a3..cdf0b4290e6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_not_equals.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_or.json b/connector/connect/common/src/test/resources/query-tests/queries/column_or.json
index 091280b2ae6..ae1424f763f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_or.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_or.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin
index aaf78e293e9..69f219e938a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_or.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.json b/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.json
index 490766a88d7..e53403db41c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin
index 7e2b6996c70..7dd56baf042 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_rlike.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_star.json b/connector/connect/common/src/test/resources/query-tests/queries/column_star.json
index ecb84fee174..ef88067a7a4 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_star.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_star.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin
index bde97f5f8ef..3ca04d082d7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_star.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json b/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
index 26372cb4e50..e1159b5673d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin
index 63c5c7f5330..af744b7d6b4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_star_with_target.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.json b/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.json
index fe66f718e23..431e13d8186 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin
index dd10f51fcdd..fa1132c73de 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_startsWith.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_substr.json b/connector/connect/common/src/test/resources/query-tests/queries/column_substr.json
index 6c074decbba..3b02117cc6e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_substr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_substr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin
index e050495220d..636a46a4806 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_substr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.json b/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.json
index 79a42858f09..d15c2941ee1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin
index 794972c95bf..f5716427588 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_subtract.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json b/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
index 5e39ebe6074..0db558e49e3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin
index 7ff0a7c8ad5..66343bea4e2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_unary_minus.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json b/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
index 8c0004a6abb..db2ceccfd22 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin
index 51e8c7ce37e..031c3683c5e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_when_otherwise.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_withField.json b/connector/connect/common/src/test/resources/query-tests/queries/column_withField.json
index ba9d22bcc5d..86b9396a4e1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/column_withField.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/column_withField.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin
index 33be23b4c61..a413740fa50 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/column_withField.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.json b/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.json
index bac0eebf8ee..fecba18096b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin
index b86654bb57f..ff6d2f3b4a7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/crossJoin.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/cube_column.json b/connector/connect/common/src/test/resources/query-tests/queries/cube_column.json
index 49016593a34..5b9709ff065 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/cube_column.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/cube_column.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin
index c706144de59..d46e40b39dc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/cube_column.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/cube_string.json b/connector/connect/common/src/test/resources/query-tests/queries/cube_string.json
index 49016593a34..5b9709ff065 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/cube_string.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/cube_string.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin
index c706144de59..d46e40b39dc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/cube_string.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/describe.json b/connector/connect/common/src/test/resources/query-tests/queries/describe.json
index c3e9ded3133..d767db5241f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/describe.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/describe.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "describe": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/describe.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/describe.proto.bin
index a39ee7fc80c..8a2117e519f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/describe.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/describe.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/distinct.json b/connector/connect/common/src/test/resources/query-tests/queries/distinct.json
index 094caa14208..ae796b52035 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/distinct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/distinct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "deduplicate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin
index 4892a7c7162..07430c43831 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/distinct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
index 094caa14208..ae796b52035 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "deduplicate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin
index 4892a7c7162..07430c43831 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
index e55248a383e..e72e23c86ca 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "deduplicate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin
index 51d419de570..c8e3885fbf8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_array.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
index d2a9e041418..754cecac4b2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "deduplicate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin
index 57c97010bdd..1a2d635e58e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_names_seq.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
index 7b2468c70a6..c4a8df30c58 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "deduplicate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin
index 496dc9e4516..719a373c2e3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/dropDuplicates_varargs.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
index 275f15a04e1..6a8546d9326 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "drop": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin
index 65d2cac04cc..f4585af804a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_column.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
index 96d50cef533..69c31ec5858 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "drop": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin
index 29ae3de0fcc..c085f69fc54 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/drop_multiple_strings.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.json b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.json
index 454bb1744b8..7f4cd227186 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "drop": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin
index 3cf2a6b652a..37d71479cdb 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_column.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.json b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.json
index 812fc60d9d2..7e4c4e8feb1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "drop": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin
index a4146717a0b..9d704de48c8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/drop_single_string.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/except.json b/connector/connect/common/src/test/resources/query-tests/queries/except.json
index d88134dc268..6544e03f6e1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/except.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/except.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/except.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/except.proto.bin
index 64fcb2a45c9..0e9efea2f94 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/except.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/except.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.json b/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.json
index dfb04bf53a1..e77b583b9c2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin
index cc746e54e00..19f9231eb26 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/exceptAll.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/filter.json b/connector/connect/common/src/test/resources/query-tests/queries/filter.json
index eeb5c269541..1046e126215 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/filter.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/filter.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "filter": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/filter.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/filter.proto.bin
index adaec008b76..069171ead32 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/filter.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/filter.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.json b/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.json
index 77635b51172..a2c49ec98c6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "filter": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin
index e7ddb9c54fa..56e5be56543 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/filter_expr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_abs.json b/connector/connect/common/src/test/resources/query-tests/queries/function_abs.json
index 16002c3f4d1..13df3437dda 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_abs.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_abs.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin
index 3f56daaa382..86cfbc09a8f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_abs.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_acos.json b/connector/connect/common/src/test/resources/query-tests/queries/function_acos.json
index 01f3eb936eb..7506c0f6cb6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_acos.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_acos.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin
index e42dfe0c28d..cc6a279cb18 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_acos.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.json
index d3af379493c..6a83b4ab008 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin
index 5d6e171aee5..e16ed2ba92e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_acosh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.json b/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.json
index 2a9a5f17640..b1b2e78a084 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin
index b257a77e26b..6abacc9cc2b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_add_months.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.json b/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.json
index 833350ad0b3..3116837aeb8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin
index 5fec870563f..f97843e086a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_aggregate.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
index 069fe54c6dc..5579faf1196 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin
index 1c06f900447..bac82f670b2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
index fbdc69cd793..851862082ca 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin
index 12f2ec5362d..fd61420fd1e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_approx_count_distinct_rsd.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array.json
index 7c75a9def64..20fe495bb9b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin
index 0a5b09e8b99..2b679eb4c6d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.json
index 7e2a7e300a2..cabd44c063d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin
index 9832323a527..76f2f0255bf 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_append.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.json
index 4c81b0c8b38..c3ebf313190 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin
index 28a30d579b2..949d66cb951 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_compact.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.json
index 6e43c2768db..a362d66d9d6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin
index cdb20044cc9..d8764f60364 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_contains.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
index c512dd362c4..d38f4194bcd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin
index 5adda1b1f45..e6359c074bf 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_distinct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.json
index f27cce41199..17d50c87161 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin
index a7a06cb7ec3..692511b2f74 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_except.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.json
index 6c6b9593393..f4540edbf41 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin
index c18114edbd0..6e2178ad124 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_insert.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
index 5149f675e8c..1b95a6724f8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin
index bab4ead039a..67fb497cf27 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_intersect.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.json
index 8dcaad72daf..94e8c176cef 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin
index db6dc1adff8..fbab1b20860 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
index bbad2109ff2..ad580c33e47 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin
index 0604d19d0c9..e3fb6b3bf67 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_join_with_null_replacement.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.json
index 1270be928a9..ba67984758a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin
index f96db47323a..f7a98c08cd1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_max.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.json
index e36f2275c4f..a342ae18f9e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin
index 4b01ad39674..02cfdfeb215 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_min.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.json
index d13d31d467b..4c212cb0282 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin
index c26fbff6f06..4ef2b11273f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_position.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.json
index 99fa5f3a1bb..8c562247714 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin
index 68b37cdbfbe..95e2872ad77 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_remove.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
index b445ce38ee0..c9d9f1f9ca7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin
index 186b8027bea..e370db16e97 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_repeat.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.json
index 2e851777cbf..406dc54c8cd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin
index da38e74e5db..2074caae163 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
index df8c94c6257..95be74d0b4c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin
index 3217e0b59d1..c1e2363f0fd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_sort_with_comparator.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.json b/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.json
index f6e83f316c7..7d54079cdb4 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin
index 951d5681399..fc3d9d7cd0f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_array_union.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
index 94c87c477db..ce1d288e00d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin
index 771dd700f13..216f306507d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_overlap.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
index 80d9c8c85c2..14769082725 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin
index ea88aa58041..609f52db324 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_arrays_zip.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc.json b/connector/connect/common/src/test/resources/query-tests/queries/function_asc.json
index 9d963d55ec1..30740c81ba4 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_asc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_asc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin
index 8236485b4f6..7c5bc4213a6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_asc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
index 9d963d55ec1..30740c81ba4 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin
index 8236485b4f6..7c5bc4213a6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_first.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
index cf6adf0cc36..b8bbbb73544 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin
index 8292c9d24d7..1eb6f88cac8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_asc_nulls_last.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.json
index 5d815ff83bf..3c4dcb70fea 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin
index 26505e95912..5989bd3b5c6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ascii.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asin.json b/connector/connect/common/src/test/resources/query-tests/queries/function_asin.json
index fd61c2ffbf1..4bf89be7534 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_asin.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_asin.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin
index 3b4b86cc15b..737ad789da2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_asin.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.json
index 6d41470ca61..238571b0231 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin
index c125ca3114a..01ea4675b22 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_asinh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json b/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
index 35312d1fbb3..5520b70a025 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin
index b88dab9c58e..6992604efe1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_assert_true_with_message.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atan.json b/connector/connect/common/src/test/resources/query-tests/queries/function_atan.json
index bab8ef27ec3..3ae4e7ef188 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_atan.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_atan.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin
index e946720aad4..b932086941f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_atan.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.json b/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.json
index 04a3490df12..7d08116c40a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin
index 3271fecbf81..372ae835849 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_atan2.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.json
index 2ae1d25ed06..8daec881391 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin
index 89c594f4baa..0aa2f3527ae 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_atanh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_avg.json b/connector/connect/common/src/test/resources/query-tests/queries/function_avg.json
index f9e582b9219..b433f1ea89c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_avg.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_avg.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin
index 24bbef4be5e..9d9bd296dbd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_avg.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_base64.json b/connector/connect/common/src/test/resources/query-tests/queries/function_base64.json
index fc8e388be9b..97739dca283 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_base64.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_base64.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin
index bcc329dc78b..fc854d97475 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_base64.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bin.json b/connector/connect/common/src/test/resources/query-tests/queries/function_bin.json
index 658990a6f90..304e56504ba 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_bin.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_bin.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin
index d499f54e721..e8d55fb8d61 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_bin.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.json b/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.json
index 771ac0fdc02..df21871cb53 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin
index 52c0ca8df49..860c2eaec0e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_bit_length.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json b/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
index c350c65312d..7ddf73253e0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin
index 9acca430f5f..bfaefb2a200 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_bitwise_not.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bround.json b/connector/connect/common/src/test/resources/query-tests/queries/function_bround.json
index c9080049212..585a0befb22 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_bround.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_bround.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin
index 90b949a0a68..8625ccb1a58 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_bround.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.json b/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.json
index 4ec5fb5f27b..971660144a5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin
index 4ccecb3d59c..1b389401f15 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_bucket.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.json
index 5f3753452ea..5a9961ab47f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin
index ce56aea7a56..3761deb1663 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
index 94a61a5fd05..bda5e85924c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin
index 4d3b25dada4..8db402ac167 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ceil_scale.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.json b/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.json
index aa36f12c054..497922b5df7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin
index 36b892c6476..ec871018489 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_coalesce.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_col.json b/connector/connect/common/src/test/resources/query-tests/queries/function_col.json
index 63988117f43..0420a3d12f6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_col.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_col.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin
index 4a4eb9b5986..e113880f31b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_col.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.json b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.json
index 109392a141e..c5bae4baef3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin
index b96919003c0..e3827b9f650 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_list.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.json b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.json
index fa06e613e75..615386d050e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin
index dda4b4f0ff2..5fb97f27d25 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_collect_set.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_concat.json b/connector/connect/common/src/test/resources/query-tests/queries/function_concat.json
index c2517692977..4a053d9c3c3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_concat.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_concat.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin
index 293ab94e506..e53eb7a75b8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_concat.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json b/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
index bd88b533d6a..b9ba89b4218 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin
index 7da2b070493..2fbc4f70904 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_concat_ws.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_conv.json b/connector/connect/common/src/test/resources/query-tests/queries/function_conv.json
index 6ea114c4511..c6734936bfc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_conv.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_conv.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin
index 9dd42bd34c0..373b997b792 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_conv.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_corr.json b/connector/connect/common/src/test/resources/query-tests/queries/function_corr.json
index d1fc5417f8d..6fadb038562 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_corr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_corr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin
index d8bb18b3c06..fdeeb4fd12d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_corr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cos.json b/connector/connect/common/src/test/resources/query-tests/queries/function_cos.json
index f53521db9c2..f7072dff034 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_cos.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_cos.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin
index d21e15b0aa0..09fd198b097 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_cos.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.json
index 151c7f835eb..3bcab61d37a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin
index 202a4ba8a8f..54d5da8fabf 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_cosh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cot.json b/connector/connect/common/src/test/resources/query-tests/queries/function_cot.json
index 2100af7d09e..62ce963fa87 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_cot.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_cot.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin
index d26a2d30cca..e79c32660a7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_cot.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_count.json b/connector/connect/common/src/test/resources/query-tests/queries/function_count.json
index 77eff56f6ef..126a0ca242c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_count.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_count.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin
index 97667ca8360..6c87a809ad0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_count.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json b/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
index d33f9d958e1..eb211ceb239 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin
index a4582f98013..591e2300ec6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_countDistinct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
index a1227d5b54a..3c4df70a5fb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin
index ffcfae52acb..4a7202f15e7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_pop.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
index c7d6ddf1273..7c723069e46 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin
index c830d80acc3..ebff687730e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_covar_samp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.json b/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.json
index ecb8f964a84..1892a9af85d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin
index ceb4e60fa91..54ad14dedae 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_crc32.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_csc.json b/connector/connect/common/src/test/resources/query-tests/queries/function_csc.json
index ceb722b1b1f..88504ed9c52 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_csc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_csc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin
index 147af78100d..0ed5022a73a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_csc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json b/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
index 4e22d94aa30..ac488411990 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin
index fe9c87a0a03..7578245aabe 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_cume_dist.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.json b/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.json
index 0c4d080f71d..6dab8c39d62 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin
index ef6fcd56b17..f32c3f541c4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_current_date.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
index 48e5b84689c..16af5eb9ba0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin
index b4f0e65d307..5a1f3de6c3a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_current_timestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.json b/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.json
index 6453851f7bc..f81ad333524 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin
index ce4b1a6e8bb..f4dbc16b05c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_date_add.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.json b/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.json
index 8a65dbcb016..9b3d469ed4e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin
index f1322a228e9..7226c20974b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_date_format.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.json b/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.json
index 90d9ea0f7ad..f1dde0902a2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin
index fe779f24a10..43b630c27ed 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_date_sub.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json b/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
index a1cadc2b269..363da9b9b90 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin
index 7fcaf3be6bd..f037fb8d34a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_date_trunc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.json b/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.json
index 4ab99ffbbed..b5ef560486d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin
index 0f567ba2a94..02e917b4068 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_datediff.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
index 4e9156323cb..3e453c1f7a6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin
index d0a12815c27..3a2973e21e5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofmonth.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
index b8ff1c59613..74715de151e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin
index 9a4d4cc7735..fceea203c79 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofweek.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
index 047142c10b0..d23c6790a47 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin
index 5d8efe15f66..a526b449ae0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_dayofyear.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_days.json b/connector/connect/common/src/test/resources/query-tests/queries/function_days.json
index 8fb62b4a2e4..9e20c48729a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_days.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_days.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin
index ecfa97f445c..b0a8472f8c4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_days.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_decode.json b/connector/connect/common/src/test/resources/query-tests/queries/function_decode.json
index 67ec30bf4c3..6be60808e64 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_decode.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_decode.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin
index 952b5c6ed04..18b8bbcf6a0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_decode.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.json b/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.json
index 152c92cbe6c..e096b07e4dc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin
index 772d2ee9d3b..e2d264bb2e1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_degrees.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json b/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
index 3cc81b32613..46c5e1eaddf 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin
index 2df47f4ce65..4597e63be83 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_dense_rank.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc.json b/connector/connect/common/src/test/resources/query-tests/queries/function_desc.json
index 8f1d61d70ac..0841b33b8fb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_desc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_desc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin
index a1237f80486..bd549431a83 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_desc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
index fa0654bbda7..683de2af238 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin
index 22de37fb20f..b46e09d6ef3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_first.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
index 8f1d61d70ac..0841b33b8fb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin
index a1237f80486..bd549431a83 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_desc_nulls_last.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.json b/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.json
index a037f4155e2..ef555144093 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin
index ceb7df30178..993818c6cb4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_element_at.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_encode.json b/connector/connect/common/src/test/resources/query-tests/queries/function_encode.json
index 1f3767de7c8..92e95f2c946 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_encode.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_encode.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin
index e46a529ccf4..9644825af47 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_encode.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_exists.json b/connector/connect/common/src/test/resources/query-tests/queries/function_exists.json
index abf4410f76f..76d107092ae 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_exists.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_exists.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin
index edd91a6c341..27fbc03c698 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_exists.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_exp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_exp.json
index a563d4dfbe5..d317efef75e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_exp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_exp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin
index 290c68a7f1f..7def20c94df 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_exp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_explode.json b/connector/connect/common/src/test/resources/query-tests/queries/function_explode.json
index 4f8614806c1..35ad40ccdd0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_explode.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_explode.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin
index c95b243aba7..9c15f942bb1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_explode.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json b/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
index 3ac00c24995..efd7f4b524d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin
index 151dce8fff6..9f2cf9554dd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_explode_outer.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.json b/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.json
index 7d18209a0f7..d425a6de709 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin
index 09ddfe15343..3c310cb04ce 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_expm1.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_expr.json b/connector/connect/common/src/test/resources/query-tests/queries/function_expr.json
index 30c40ef354c..99c69b8e890 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_expr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_expr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin
index d0ef70d31e7..2e59d436bc8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_expr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.json b/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.json
index a2f3f83141c..7f13a104809 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin
index 15d31d60740..ac776eb60d2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_factorial.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_filter.json b/connector/connect/common/src/test/resources/query-tests/queries/function_filter.json
index 687f6c0bc23..f6b565324b8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_filter.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_filter.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin
index 85831fc0f71..a53c5545986 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_filter.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json b/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
index 51ad29afbb6..1d9667c8890 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin
index a378a54db7f..5b7db291cc3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_filter_with_pair_input.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_first.json b/connector/connect/common/src/test/resources/query-tests/queries/function_first.json
index e483363cec5..dc33bad3c50 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_first.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_first.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_first.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_first.proto.bin
index a52b2870750..cb029dfd26b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_first.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_first.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.json b/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.json
index 88b318c79ac..32da97271d2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin
index 36f77dcb073..e6bb018a370 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_flatten.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_floor.json b/connector/connect/common/src/test/resources/query-tests/queries/function_floor.json
index 02607b93e47..78924f5f336 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_floor.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_floor.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin
index 3e9ccb0b2a8..b52696ca4d0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_floor.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json b/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
index fd092a4e07e..394621e4dd3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin
index c03a3ceb086..ee0665bab64 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_floor_scale.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_forall.json b/connector/connect/common/src/test/resources/query-tests/queries/function_forall.json
index c63c5b5897a..93134aba0fa 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_forall.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_forall.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin
index a515a03d995..3199c758c04 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_forall.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.json b/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.json
index 89b9807f7a8..daa648c0a59 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin
index f4263f97b49..81e2c4d5fd5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_format_number.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.json b/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.json
index c23894d1bd1..798e79e6618 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin
index 8a01afa326f..8acd3b619b4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_from_csv.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.json b/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.json
index b86b8c12960..ddfa91abca0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin
index 23d781bbb92..ad95d0f2b34 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_from_json.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json b/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
index e6bb43f9628..81d6608adb1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin
index 16125102a33..b1c34caaf62 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_from_unixtime.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
index 8345dfbb6ec..5d63fd829f3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin
index 934b8465135..34bf9c64f3a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_from_utc_timestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_get.json b/connector/connect/common/src/test/resources/query-tests/queries/function_get.json
index 0980e6fbdca..7a2a89447c0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_get.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_get.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin
index 11f56f6a85a..be40df955a4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_get.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json b/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
index 1e2771d53dd..17adf9230a6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin
index b3dc06c1d8f..08ad8f4f91b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_get_json_object.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.json b/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.json
index 80d411803e7..bf5d50edec8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin
index 3f8f3a5e37d..44d9d5f8cfb 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_greatest.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hash.json b/connector/connect/common/src/test/resources/query-tests/queries/function_hash.json
index 926ca2716c8..6ef504a0064 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_hash.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_hash.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin
index ef8fe3f1908..284700c4c5e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_hash.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hex.json b/connector/connect/common/src/test/resources/query-tests/queries/function_hex.json
index 051304a992a..af9d0dd2982 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_hex.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_hex.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin
index a5961db2133..9d8c3b5e235 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_hex.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hour.json b/connector/connect/common/src/test/resources/query-tests/queries/function_hour.json
index b2a3ae64381..2621b9f8191 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_hour.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_hour.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin
index 265086f56fe..6cdb50364c1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_hour.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hours.json b/connector/connect/common/src/test/resources/query-tests/queries/function_hours.json
index 4cccc0eef47..a72a8656362 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_hours.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_hours.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin
index 17cb707448a..6e8203b89e3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_hours.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.json b/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.json
index 3e64ad01515..2d0d6be0164 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin
index 4250484e005..3ad07a2a1ee 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_hypot.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.json b/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.json
index 14dd59387b1..896bb3d0209 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin
index 1c7822a645d..72df35bd9b3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_initcap.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_inline.json b/connector/connect/common/src/test/resources/query-tests/queries/function_inline.json
index 1e55f7680a2..4abdac736d0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_inline.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_inline.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin
index a0210b7cfc1..261e28e3aca 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_inline.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json b/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
index a89cbd96e21..d74ee83eeff 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin
index cc316078c3a..d757e5afe30 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_inline_outer.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json b/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
index 9d3c651874a..47f2e461eba 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin
index 4d773db4952..c3c6414d5d8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_input_file_name.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.json b/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.json
index 0eb722a08ec..f594918ed93 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin
index 1f96b82d070..1030abda5b8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_isnan.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.json b/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.json
index 3d51a2f8748..7443fc97f42 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin
index 8abf3ceadc1..3d1fbd4dedf 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_isnull.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json b/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
index bcded73e4f9..32de63452c3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin
index 9b908290bbd..e51be42b38d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_json_tuple.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json b/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
index 0d987d1252e..7399d7a6da3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin
index ea0ec7f993b..848a4842e24 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_kurtosis.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lag.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lag.json
index ee529f00dc5..dd1cba376f3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lag.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lag.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin
index 908b872ec53..7fd85861fb8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lag.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_last.json b/connector/connect/common/src/test/resources/query-tests/queries/function_last.json
index 428660970ab..f26e5887ed5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_last.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_last.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_last.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_last.proto.bin
index e14ee792a6c..69221737be6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_last.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_last.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.json b/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.json
index 21e5d982c60..2cb1635caf4 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin
index c211151c0a3..1afb5c02ae3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_last_day.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lead.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lead.json
index 8c38eec6daf..ef76586d381 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lead.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lead.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin
index 45f9e784037..9bcdcdb3617 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lead.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_least.json b/connector/connect/common/src/test/resources/query-tests/queries/function_least.json
index 1c83d818738..403531c9f69 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_least.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_least.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin
index 9533cf00cf4..c9ead802a96 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_least.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_length.json b/connector/connect/common/src/test/resources/query-tests/queries/function_length.json
index 9c9ed8a6c60..f2c3c692558 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_length.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_length.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin
index c2d14367850..a14f94085b3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_length.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json b/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
index 8220a56ba3f..10caaf184fe 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin
index 49cdc5adc4f..75b48541b76 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_levenshtein.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lit.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lit.json
index 2ca89e900b8..3cb1f421207 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lit.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lit.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin
index 2644023b372..9149628d7a3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lit.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
index 4c0ae1e1b5a..68281d2e6d9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin
index f793457110f..b1a9e70c7c8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_localtimestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_locate.json b/connector/connect/common/src/test/resources/query-tests/queries/function_locate.json
index bbf2ef9480d..7939fdd2c75 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_locate.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_locate.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin
index b1677c5d73a..cc7ced9957a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_locate.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json b/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
index 996107c534c..269f3970160 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin
index f2ab262aaaa..162ab0108c1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_locate_with_pos.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log.json b/connector/connect/common/src/test/resources/query-tests/queries/function_log.json
index b9628776cbb..1b2d0ed0b14 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_log.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_log.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin
index 537849aed11..548fb480dd2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_log.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log10.json b/connector/connect/common/src/test/resources/query-tests/queries/function_log10.json
index 6aa99f1521a..13292d83c47 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_log10.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_log10.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin
index f508b2aeebd..22d4655a6ef 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_log10.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.json b/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.json
index 359ab79adf3..4e9e6847c3c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin
index f1b7134a1d9..9a72c377b0c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_log1p.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log2.json b/connector/connect/common/src/test/resources/query-tests/queries/function_log2.json
index ade59f2f866..ec29e154a0e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_log2.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_log2.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin
index a7fec7a802f..34e37806505 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_log2.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json b/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
index 185d36b202d..6bc2a4ec333 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin
index 172793b7d46..2e64e15ed55 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_log_with_base.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lower.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lower.json
index 34693974e1a..f7fe5beba2c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lower.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lower.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin
index e3022e48ebe..7c736d93f77 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lower.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.json
index 7d722e655b7..b9f3e6700bf 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin
index 71f692f5059..470ab1cc44a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
index 0bd0d27b0d1..aeb39ba09ad 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,bytes:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin
index 25d14fd459f..b4acebb394c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_lpad_binary.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.json
index a5c4b69cbef..dd3b4595202 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin
index 5b78a82e346..162b6a7337b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
index 266ccfa36ce..3c4825792dc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin
index c842be406c8..13455d7091e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ltrim_with_pattern.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.json b/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.json
index 33c1bbcba65..a363298dd12 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin
index 8eff6951ba8..0526825fcca 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_make_date.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map.json
index 3f2bb1cf110..ca9d3bf2bcc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin
index a774137b38c..229a48b7513 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.json
index 2a1369806c5..f56f6cee20a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin
index 2b03aedd396..0a76d3a1193 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_concat.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
index b7f9c2b1b6b..56833f96510 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin
index 6ae21121eb7..e517479020e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_contains_key.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.json
index 2cb5a2af142..02265065450 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin
index f8e5894ffe5..f1451d4ad7b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_entries.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.json
index d49f546bedc..5099377a52a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin
index cff017d65eb..fac64e79a5b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_filter.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
index 9a999a689ff..1eb1f7d2ef0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin
index 1cc02430683..f5333b1c882 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_arrays.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
index 0b4983881f0..399ba8d1021 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin
index 6ef02d02827..2938c84f771 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_from_entries.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.json
index 3719473dfe7..5af013295cd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin
index ed11768367a..ee19968bacc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_keys.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.json
index b935f371cc4..3c5eb651801 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin
index df3bf18c8f2..4cd7c488ada 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json b/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
index e9206324ed9..9d035545eb3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin
index 28ed3380aeb..f14eb1a3c93 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_map_zip_with.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_max.json b/connector/connect/common/src/test/resources/query-tests/queries/function_max.json
index 2aba75d4337..b23dd9d14c6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_max.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_max.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin
index 34d523d28b8..788c9539b57 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_max.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.json b/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.json
index dff4f19d5b6..da311e340cc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin
index ae2694bd057..284c2453af8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_max_by.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_md5.json b/connector/connect/common/src/test/resources/query-tests/queries/function_md5.json
index 8147dabc97c..e8718594b0b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_md5.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_md5.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin
index 4a962d74d35..d3ec7c26a2e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_md5.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_median.json b/connector/connect/common/src/test/resources/query-tests/queries/function_median.json
index f09852dc5e3..7331454b9ec 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_median.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_median.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin
index 9e68ef19aae..59533e5be59 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_median.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_min.json b/connector/connect/common/src/test/resources/query-tests/queries/function_min.json
index 35ab6361cdf..1b7266b6774 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_min.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_min.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin
index aa820535cfb..b82f4c53092 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_min.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.json b/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.json
index 84a56f69c25..d2478f5e81a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin
index a746bab5389..ddc642b9500 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_min_by.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_minute.json b/connector/connect/common/src/test/resources/query-tests/queries/function_minute.json
index 12f54f6cf58..7c749cdff82 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_minute.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_minute.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin
index cda3703a46e..e81b7dad853 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_minute.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_mode.json b/connector/connect/common/src/test/resources/query-tests/queries/function_mode.json
index 257a1e6ba7d..8e8183e9e08 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_mode.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_mode.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin
index d7fb046953e..dca0953a387 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_mode.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json b/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
index e4caa30e4ef..0a14f100897 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin
index 04cdd9f2590..724ce3ac690 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_monotonically_increasing_id.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_month.json b/connector/connect/common/src/test/resources/query-tests/queries/function_month.json
index 8065be8dc73..7ea1e5d0375 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_month.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_month.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin
index a4637b35831..b97100a6fe2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_month.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months.json b/connector/connect/common/src/test/resources/query-tests/queries/function_months.json
index 189def244d2..278bab76a65 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_months.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_months.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin
index 9f6ea9641f6..fdcd96750dc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_months.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.json b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.json
index b5e91be905f..0fa772d26cd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin
index 50ff5c5d88d..22ddc1813e0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
index ae7b3f124f9..d11bfbd7f24 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin
index 7a5231cfe18..bf9c545911f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_months_between_with_roundoff.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.json b/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.json
index 0af98419ff1..69daab270c2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin
index 59f2d8a49f4..f314a73dcae 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_nanvl.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_negate.json b/connector/connect/common/src/test/resources/query-tests/queries/function_negate.json
index 7256a697270..e269fabe44b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_negate.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_negate.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin
index 7f45c5e08ee..9c56c111cee 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_negate.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.json b/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.json
index fef8b2fa899..486523dcad3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin
index 3e2716dbc8d..a97bd75f129 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_next_day.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.json b/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.json
index 4d14c28dfcf..4c764a5d560 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin
index 51d26e4c70b..f87e1695f22 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_nth_value.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.json b/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.json
index 1cd06b27791..2346a788b64 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin
index 6fec68ebb19..d9ccd2e8a60 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_ntile.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.json b/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.json
index 1cdb4d9289e..7be9ac82662 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin
index 3287d4ee314..484ebbb6487 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_octet_length.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.json b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.json
index 2243bb7f325..b580570f923 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin
index 9feb660a45a..2110ae9c146 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
index 383b0b8370a..99d5426c46f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin
index 0011bcdb748..9a09d28d84f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_overlay_with_len.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json b/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
index 3119e2af8b7..d8778ec8cd8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin
index 594de0f59b7..d668f7e1504 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_percent_rank.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json b/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
index 15569edc49e..6289464de2a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin
index 246a2c6b899..f44ec86888f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_percentile_approx.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.json b/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.json
index e1741769851..1dc2cb54cbb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin
index 36967776636..a2bb94dbb51 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_pmod.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.json b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.json
index 9e6b94da8f7..f8a9db37e62 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin
index a4676028ae4..fc50f5f4c85 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
index a272b1cfc6e..0e8cd4c1509 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin
index f7f093a0bf4..19d700665e7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_posexplode_outer.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_pow.json b/connector/connect/common/src/test/resources/query-tests/queries/function_pow.json
index 5816a7c8460..187636fb360 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_pow.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_pow.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin
index 00e5d023e0f..6e1d3b06fe8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_pow.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_product.json b/connector/connect/common/src/test/resources/query-tests/queries/function_product.json
index 7a3d4c43f9c..1dfb7f81912 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_product.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_product.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin
index 21a5feb50f4..8c3fbd31eb6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_product.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.json b/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.json
index b1554e4647d..b95867e0be9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin
index 2d99708f27c..fdc2d96fb08 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_quarter.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_radians.json b/connector/connect/common/src/test/resources/query-tests/queries/function_radians.json
index f585cf1089a..837960dedc6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_radians.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_radians.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin
index a4f6f9531f2..33a2521b22a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_radians.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.json b/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.json
index 454029736d4..5318466706b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin
index efc81b60598..7fbd33b9869 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_raise_error.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
index 4532f9fa850..453ea54bd0e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin
index 7ce12ed0d1e..566a49d6412 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rand_with_seed.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json b/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
index 88f12466cb7..ef84f05c3e1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin
index 3ba184d4d0c..b0064842bf3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_randn_with_seed.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rank.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rank.json
index ab199e7c6d2..93c8dc38d66 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rank.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rank.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin
index d15a9c6d0d6..3aef331fb17 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rank.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
index 154f4036531..5d9c7a5b4a5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin
index efaf5e83908..32ba8b6dcb5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_extract.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
index 66b3f0b0f6b..83dd7a8569f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin
index e543d8bbcb8..b7d3fde25cf 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_regexp_replace.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.json b/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.json
index efb54e0fff8..93869adfbed 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin
index 43bfdf13e3f..dd7f2d5de51 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_reverse.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rint.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rint.json
index 7e86e340854..ea5bcebf81d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rint.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rint.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin
index 81377729ceb..bd47adc8476 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rint.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_round.json b/connector/connect/common/src/test/resources/query-tests/queries/function_round.json
index c9080049212..585a0befb22 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_round.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_round.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin
index 90b949a0a68..8625ccb1a58 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_round.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.json b/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.json
index 2185a41e2fb..3d5ac8afe3d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin
index 080d1fc35b8..90b4fcb27d3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_row_number.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.json
index 0692f80247a..d9b78a0cfd7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin
index 91589824481..d4c355afee0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
index 0c83e6add70..0daaf1636f1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,bytes:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin
index fd510d0c241..c6f9f22146c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rpad_binary.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.json
index 8f74f50a8b7..5fe66e8e335 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin
index 0c2884acdf5..4320bf6ac39 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
index be88802d778..d4c3c0ca68e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin
index 4caf46240c7..37f4782f461 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_rtrim_with_pattern.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
index 4548b63ee43..6df6438a1a9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin
index 130f29db338..99475ddf30d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_csv.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
index e2b8452a5a9..06110d326e1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin
index 85260e2e944..c4ca00e6292 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
index e4017e52169..ab05ffa940c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin
index dd8cc70aec6..482485501dd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_schema_of_json_with_options.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sec.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sec.json
index 9c5b436dfa2..1cab2239755 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sec.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sec.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin
index a3e2a41d7c3..8760f57a6d4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sec.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_second.json b/connector/connect/common/src/test/resources/query-tests/queries/function_second.json
index 629782e5bd2..c77a572b88a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_second.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_second.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin
index 91ded71d17b..193c46e917b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_second.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.json
index ac483d09d96..412ac0272dd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin
index cdfcb458aed..4b62f22574d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
index 09ab7def589..991b42faddb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin
index 56360a6c15e..01c0136c6df 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sentences_with_locale.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.json
index 646c0d974e5..84bced640ff 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin
index 79a44c8cff8..09e1ab3be7d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sequence.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.json b/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.json
index 21d989e79f3..5c7d953402b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin
index 34da8ae34c6..7f4ee24d536 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_session_window.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.json
index 21f43ef833a..ce5014ac2f7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin
index c5db8db0150..3fdfdb2a072 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sha1.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.json
index 03ab5463692..5278d604e97 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin
index 8eec0a9be58..20a0ee1082a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sha2.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
index 5f2f9aaec54..12decd300ab 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin
index 11f8f737d72..94bfbc99fce 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftleft.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.json b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.json
index 9da302a0061..c2295c4abaa 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin
index 6775161f619..910d12f50d6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftright.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
index 4565a88d45e..875e26a5a56 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin
index 3c13eef3d45..aba9c425dca 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_shiftrightunsigned.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_signum.json b/connector/connect/common/src/test/resources/query-tests/queries/function_signum.json
index 4b29b4ef04a..bcf6ad7eb17 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_signum.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_signum.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin
index 2fddfe1d63f..af52abfb7f2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_signum.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sin.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sin.json
index 238b7bfb7a3..cb5b0da0734 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sin.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sin.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin
index 2743ff0a1ec..a63f574fa59 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sin.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.json
index 5d4f56b387f..e0f46b42861 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin
index 13492acdba5..2f17ab02a6d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sinh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_size.json b/connector/connect/common/src/test/resources/query-tests/queries/function_size.json
index e75665d8144..37c9cd1ac1b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_size.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_size.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin
index a0dbe3709cb..a8ae600a3dd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_size.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.json b/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.json
index f328e02df8a..4b14c8d5ca7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin
index c4ecdc95ab3..889f96b2d2a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_skewness.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_slice.json b/connector/connect/common/src/test/resources/query-tests/queries/function_slice.json
index 497a1626eef..b0a63248784 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_slice.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_slice.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin
index 3e1ff1ec8c8..620a006f775 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_slice.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.json
index e8b279c0a93..b42bede5cd1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin
index 9fe1405d5d2..994048af2af 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sort_array.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json b/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
index d07adf80e1a..851745b32eb 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin
index 16dfd3e4755..df99cd64e72 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_spark_partition_id.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_split.json b/connector/connect/common/src/test/resources/query-tests/queries/function_split.json
index 4fc19aa5811..001d44dcaaf 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_split.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_split.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin
index b4b2004d3bc..cab0bde7b6d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_split.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json b/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
index d22760653b0..45a7588838f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin
index 5ed2b1d2ce9..497297fad87 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_split_with_limit.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.json
index fe4b6ac5e7f..f9a2b76520c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin
index bd86cdf8ee9..e98e3bdfdb6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sqrt.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.json b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.json
index 766918cadf1..1403817886c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin
index 5558c9428ec..8d214eea8e7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
index 4f3e80c8db1..35e3a08b219 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin
index 8ae3277a81e..b679f55014f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_pop.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
index dc8450d608e..17cd0fd5e59 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin
index cb5ec806228..9f22eba5e39 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_stddev_samp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_struct.json b/connector/connect/common/src/test/resources/query-tests/queries/function_struct.json
index 4efade2ea12..ba950215a25 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_struct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_struct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin
index 62537a07c99..079c2be3c52 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_struct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_substring.json b/connector/connect/common/src/test/resources/query-tests/queries/function_substring.json
index ca8ea713cfb..84a70cf1c02 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_substring.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_substring.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin
index 9f7b06da99a..d302cd95c74 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_substring.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.json b/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.json
index 5d5afc5960d..dc81d925957 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin
index bda6160177e..192bb2e300d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_substring_index.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sum.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sum.json
index 6735b7a0e16..e9526a20b67 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sum.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sum.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin
index 47e99c8d52a..0e347bbc0a1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sum.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json b/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
index d4335e2d1ef..4614cf99ad3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin
index 1f1026cbd60..b4cf704391a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_sum_distinct.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_tan.json b/connector/connect/common/src/test/resources/query-tests/queries/function_tan.json
index 73442dc5b69..ead160a7e3a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_tan.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_tan.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin
index 5849d81e189..d674dc033b2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_tan.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.json b/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.json
index 6e257193545..bcd12c66442 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin
index f17641e49c2..21c28c3ef88 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_tanh.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json b/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
index 8d5a686db61..e6892d17708 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin
index c3a483e3870..102afbdda90 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_timestamp_seconds.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.json
index e06e9f57e1e..6b3856f5ac0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin
index fb670fcccee..a3017643a33 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_csv.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.json
index 5d21ca96079..8b9d50aa578 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin
index 6c73117c536..59178487eef 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
index b2f487085d3..48ae80d1e70 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin
index e71ebdd9c60..2641d660ff6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_date_with_format.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.json
index e58801c815e..7ceeb9d113c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin
index 6cb8d1290aa..c9461c1aa96 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_json.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
index e0f3d6cc0f5..323c57e2ef5 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin
index 3f854a07963..ec6bd64f981 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
index 89b91463b6e..30f34528319 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin
index 81ee545465e..9c2d6d354ca 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_timestamp_with_format.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
index b826851c2c9..015fbb5cf53 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin
index 229ab9e87ee..b2b65089604 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_to_utc_timestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform.json b/connector/connect/common/src/test/resources/query-tests/queries/function_transform.json
index bc8749cc022..2b357a35773 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_transform.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_transform.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin
index 73e56968131..44b83a9b98c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_transform.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
index 400c2b0cc86..0b6a6c24504 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin
index 97533b22067..338aa87e018 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_keys.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.json b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.json
index 97a80e48457..71911ab5ed9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin
index 7118b0b15a1..10cf8c503f4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
index 7f538460838..1b296e891bc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin
index 41c1878fbf6..86f29399b95 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_transform_with_index.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_translate.json b/connector/connect/common/src/test/resources/query-tests/queries/function_translate.json
index 314cef73c2b..93d155c2857 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_translate.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_translate.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin
index da9da35e74e..1ce32c8d284 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_translate.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trim.json b/connector/connect/common/src/test/resources/query-tests/queries/function_trim.json
index 7b58028d904..d2700174bca 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_trim.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_trim.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin
index 7d6b4f38fbf..d5f4f21510f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_trim.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json b/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
index cc7d4e103b5..82b1616ef38 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin
index 70f9b0b39a4..6a86e87c985 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_trim_with_pattern.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.json b/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.json
index 2270ecf3c1d..4c596cd8632 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin
index 132e23ec803..cdcee95af63 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_trunc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.json b/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.json
index e41a3f0433e..6af2a00ed16 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin
index fe11d1d7845..f37ceb91bf4 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_unbase64.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.json b/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.json
index dff5f2c2edd..7c409d023f7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin
index 493c70a49f7..fbac2821fdb 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_unhex.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
index 509a7f90960..e590f7778f2 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin
index 5db43e06c9a..cb3d967ae01 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
index adf3b0a4c1c..d2e087a5d8a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin
index 54b5642b550..ddfcdff63d1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_unix_timestamp_with_format.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_upper.json b/connector/connect/common/src/test/resources/query-tests/queries/function_upper.json
index 91f321d27e8..208ee9231a1 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_upper.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_upper.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin
index 2fc03cc69bb..5ddbfce96e7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_upper.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.json b/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.json
index 4cf7abc8b84..9c74ce4a984 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin
index 2646cfadba0..7ca6e8d3b81 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_var_pop.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.json b/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.json
index 7077feb5c5e..979313dd051 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin
index 93ac12e8119..9bd042ad339 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_var_samp.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_variance.json b/connector/connect/common/src/test/resources/query-tests/queries/function_variance.json
index 61310a665d6..90a97c3becf 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_variance.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_variance.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin
index fec1298adc2..fd494fc4963 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_variance.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json b/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
index b7c1f68937f..3f46a98569e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin
index c0a1601fc20..ec9b2252236 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_weekofyear.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_window.json b/connector/connect/common/src/test/resources/query-tests/queries/function_window.json
index 05322ab6543..bdcb6a39880 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_window.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_window.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin
index 0226aa0c382..8cffcc1e9f6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_window.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.json b/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.json
index de6b0a38fda..4809ea21261 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.json
@@ -1,8 +1,17 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "1"
+      },
       "withColumns": {
         "input": {
+          "common": {
+            "planId": "0"
+          },
           "localRelation": {
             "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
           }
@@ -10,7 +19,8 @@
         "aliases": [{
           "expr": {
             "unresolvedAttribute": {
-              "unparsedIdentifier": "wt"
+              "unparsedIdentifier": "wt",
+              "planId": "0"
             }
           },
           "name": ["wt"],
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin
index e39dd78802c..c143520df08 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_window_time.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json b/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
index fac2a4ed0be..c20739d09ff 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin
index 6ed2e2a243a..414c76fc5ce 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_xxhash64.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_year.json b/connector/connect/common/src/test/resources/query-tests/queries/function_year.json
index 502a7b5f1dc..b8a4ee5a165 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_year.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_year.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cd:date,t:timestamp,s:string,x:bigint,wt:struct\u003cstart:timestamp,end:timestamp\u003e\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin
index 74f3e61f816..623bc9ac6d8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_year.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_years.json b/connector/connect/common/src/test/resources/query-tests/queries/function_years.json
index a0b6f4228d0..2e873073202 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_years.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_years.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin
index f1e2a949fb4..30c25423fd5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_years.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.json b/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.json
index a7c603ed6bb..d1d0e7293c8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double,d:struct\u003cid:bigint,a:int,b:double\u003e,e:array\u003cint\u003e,f:map\u003cstring,struct\u003cid:bigint,a:int,b:double\u003e\u003e,g:string\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin
index 2d6bec136a7..c9a6dff8473 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/function_zip_with.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.json
index 4cf2ae0c8c2..4a1cfddb028 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
@@ -16,7 +22,8 @@
         "functionName": "max",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "a"
+            "unparsedIdentifier": "a",
+            "planId": "0"
           }
         }]
       }
@@ -25,7 +32,8 @@
         "functionName": "stddev",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "b"
+            "unparsedIdentifier": "b",
+            "planId": "0"
           }
         }]
       }
@@ -34,7 +42,8 @@
         "functionName": "stddev",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "b"
+            "unparsedIdentifier": "b",
+            "planId": "0"
           }
         }]
       }
@@ -43,7 +52,8 @@
         "functionName": "avg",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "b"
+            "unparsedIdentifier": "b",
+            "planId": "0"
           }
         }]
       }
@@ -52,7 +62,8 @@
         "functionName": "avg",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "b"
+            "unparsedIdentifier": "b",
+            "planId": "0"
           }
         }]
       }
@@ -61,7 +72,8 @@
         "functionName": "avg",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "b"
+            "unparsedIdentifier": "b",
+            "planId": "0"
           }
         }]
       }
@@ -78,7 +90,8 @@
         "functionName": "count",
         "arguments": [{
           "unresolvedAttribute": {
-            "unparsedIdentifier": "a"
+            "unparsedIdentifier": "a",
+            "planId": "0"
           }
         }]
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin
index eed57649c45..cfd6c2daa84 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
index fd2264fd2ae..e6161678615 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin
index b12dd5229db..d6daa1cc31f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_agg_columns.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.json
index df4216bdd51..5785eee2cad 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin
index 33cbb49f1fe..4a18ea2d82d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_avg.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.json
index c28c167f21b..f92e22493e0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin
index d3920650eb5..5bb539195df 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_count.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.json
index 262232063dd..3225a475a9b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin
index e43c9e3e325..651274b1afc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_max.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.json
index df4216bdd51..5785eee2cad 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin
index 33cbb49f1fe..4a18ea2d82d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_mean.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.json
index c6c55dde8b4..afcc07d2c86 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin
index c7ad1785cd8..6e038bf0b31 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_min.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.json b/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.json
index 48d3820dea9..74dd5b045aa 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin
index 673b7452703..fe2451ca18f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/groupby_sum.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/hint.json b/connector/connect/common/src/test/resources/query-tests/queries/hint.json
index 38f3ff1ab7a..bb5b848b744 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/hint.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/hint.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "hint": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/hint.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/hint.proto.bin
index 8832794f792..8eb4f412035 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/hint.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/hint.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/intersect.json b/connector/connect/common/src/test/resources/query-tests/queries/intersect.json
index cd8167116c0..f290397c55c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/intersect.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/intersect.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin
index 71816354cda..0ea7edc5cee 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/intersect.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.json b/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.json
index 9fd2a7a3727..d8fe5fe0b7e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin
index 5e3325c73c1..6df2125682b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/intersectAll.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_condition.json b/connector/connect/common/src/test/resources/query-tests/queries/join_condition.json
index 94abd7a159f..993cd98a7dd 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_condition.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_condition.json
@@ -1,8 +1,17 @@
 {
+  "common": {
+    "planId": "4"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "1"
+      },
       "subqueryAlias": {
         "input": {
+          "common": {
+            "planId": "0"
+          },
           "localRelation": {
             "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
           }
@@ -11,8 +20,14 @@
       }
     },
     "right": {
+      "common": {
+        "planId": "3"
+      },
       "subqueryAlias": {
         "input": {
+          "common": {
+            "planId": "2"
+          },
           "localRelation": {
             "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
           }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin
index 84ddc108103..1d11fe5e75b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_condition.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
index 36e203a4256..527338c56ae 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.json
@@ -1,8 +1,17 @@
 {
+  "common": {
+    "planId": "4"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "1"
+      },
       "subqueryAlias": {
         "input": {
+          "common": {
+            "planId": "0"
+          },
           "localRelation": {
             "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
           }
@@ -11,8 +20,14 @@
       }
     },
     "right": {
+      "common": {
+        "planId": "3"
+      },
       "subqueryAlias": {
         "input": {
+          "common": {
+            "planId": "2"
+          },
           "localRelation": {
             "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
           }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin
index c1cc916d327..5d3de55da9c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_condition.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
index 0308a128db3..8c53a193162 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin
index 9a269059bf7..44bf1a6793c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_no_condition.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
index 9f9f1a0cf30..42b4eec5d9f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin
index 0e4192d7afc..98e2a4fe9b5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_array.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
index 9f9f1a0cf30..42b4eec5d9f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin
index 0e4192d7afc..98e2a4fe9b5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_multiple_col_seq.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
index b5137f978a9..2c2bde49b19 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin
index 0708749bd47..7d4a1aeb11e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_inner_using_single_col.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
index 4bd0b9ec2c7..9b592426cf9 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin
index 954128f8c1e..4c4b6ecb207 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_array.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
index 3d06f7ab31f..3f1c46f08e8 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin
index 5878e776d87..2a5410fc063 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_using_multiple_col_seq.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json b/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
index b5b8b3a40f9..46f144de61a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "join": {
     "left": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "right": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin
index 0c72726a8c2..c2fa60619d7 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/join_using_single_col.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/limit.json b/connector/connect/common/src/test/resources/query-tests/queries/limit.json
index e755944a82e..acf01c19689 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/limit.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/limit.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "limit": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/limit.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/limit.proto.bin
index 71249c1f2c9..f3f4771fe4d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/limit.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/limit.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.json b/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.json
index 292adb11b17..12db0a5abe3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "unpivot": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin
index dc1a40f8d48..23a6aa1289a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/melt_no_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/melt_values.json b/connector/connect/common/src/test/resources/query-tests/queries/melt_values.json
index 79d494c3c5d..e2a004f46e7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/melt_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/melt_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "unpivot": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin
index 1ac7cb290f8..e021e1110de 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/melt_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/offset.json b/connector/connect/common/src/test/resources/query-tests/queries/offset.json
index e03d5072ea4..80796160b96 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/offset.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/offset.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "offset": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/offset.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/offset.proto.bin
index 8c7dde8f92c..6671eebb931 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/offset.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/offset.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
index d935be14ee6..72ea72d7954 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin
index bebe09e64a9..00fa9f8b5c0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_columns.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
index 22508b999d3..e7f63a15c28 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin
index 3e7b74ea6b5..a907e66a130 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/orderBy_strings.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.json b/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.json
index 99268661e72..5ceb1d5a087 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "sql": {
     "query": "select 1",
     "args": {
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.proto.bin
index fd9304b4e47..50bc8457f31 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/parameterized_sql.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/range.json b/connector/connect/common/src/test/resources/query-tests/queries/range.json
index b9d83e3e594..8afa44fac6c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/range.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/range.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "range": {
     "start": "1",
     "end": "10",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/range.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/range.proto.bin
index 717b9adab66..277a02cea55 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/range.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/range.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read.json b/connector/connect/common/src/test/resources/query-tests/queries/read.json
index f5ffb3c961b..d5580c1321e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "csv",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read.proto.bin
index ede57af1130..c50391bb1a8 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_csv.json b/connector/connect/common/src/test/resources/query-tests/queries/read_csv.json
index 6095d200f62..ec1eed1c6cf 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_csv.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_csv.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "csv",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin
index 9bbab0fe2af..d8b5ca93f2f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_csv.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_json.json b/connector/connect/common/src/test/resources/query-tests/queries/read_json.json
index 2e2f83d1191..63dadc129dc 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_json.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_json.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "json",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin
index 22557aca38d..1d829df6bbc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_json.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_orc.json b/connector/connect/common/src/test/resources/query-tests/queries/read_orc.json
index caa6c951d3e..b78d7d6ecd6 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_orc.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_orc.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "orc",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin
index 95d07fd0a9b..6a67db561dc 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_orc.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.json b/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.json
index 05d799fd9cb..0a201a43c74 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "parquet",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin
index 5fc1954428f..f16b28dcce0 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_parquet.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_table.json b/connector/connect/common/src/test/resources/query-tests/queries/read_table.json
index 634310c27ff..b2cd4ae0a5b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_table.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_table.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "namedTable": {
       "unparsedIdentifier": "myTable"
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin
index f6ffaf988e7..956da78861d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_table.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_text.json b/connector/connect/common/src/test/resources/query-tests/queries/read_text.json
index 8dc1e26a70e..de7a306a52f 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/read_text.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/read_text.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "dataSource": {
       "format": "text",
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin
index 97d167f6e2e..3f3bbf8769c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/read_text.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition.json b/connector/connect/common/src/test/resources/query-tests/queries/repartition.json
index 770b227b707..163742886c3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/repartition.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/repartition.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartition": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin
index 03bb4787617..5265e0e6175 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/repartition.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
index deb4c618885..98bd4c988ab 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartitionByExpression": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin
index 531737b7548..8ee220833d9 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_expressions.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
index eede8a4b1ac..604d0330fed 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartitionByExpression": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin
index 8139f2cb397..a3f1546cca1 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/repartitionByRange_num_partitions_expressions.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json b/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
index c91a30eb0e9..81113afea35 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartitionByExpression": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin
index c217e9d9d93..50ff8c590cd 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/repartition_expressions.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json b/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
index d70380d1228..996beda2253 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "repartitionByExpression": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin
index 47b3ab9daf5..73e22f120ed 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/repartition_num_partitions_expressions.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.json b/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.json
index f976e4ea10f..1102db18830 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin
index 89ef8ff947b..64dbb597c36 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/rollup_column.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.json b/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.json
index f976e4ea10f..1102db18830 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "aggregate": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin
index 89ef8ff947b..64dbb597c36 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/rollup_string.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json b/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
index 3f4dbedac3a..88e80a3f60c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sample": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin
index 7754a5e213d..546c9c9c69c 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sample_fraction_seed.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json b/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
index 5f9f6f21966..75d3b242160 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sample": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin
index 2e1efe2e527..48650897e67 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sample_withReplacement_fraction_seed.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/select.json b/connector/connect/common/src/test/resources/query-tests/queries/select.json
index 8d4b511b1f9..8ef46a6cc2a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/select.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/select.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/select.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/select.proto.bin
index e926353d836..2bc4bd85a58 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/select.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/select.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.json b/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.json
index b38c071d823..9c2815cffb7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin
index 9f203955a8d..88824d7f896 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/selectExpr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/select_strings.json b/connector/connect/common/src/test/resources/query-tests/queries/select_strings.json
index cde5f0721a3..421b9aa1200 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/select_strings.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/select_strings.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin
index 507d3c15e61..f868b46f3e5 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/select_strings.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
index 08d98935f40..c45a326a01b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin
index 5c076fa9d12..49e24e6f6f2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_columns.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
index 6b13151641d..dcded7cb32d 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin
index 572abd9c7a0..f5ff3298238 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sortWithinPartitions_strings.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.json b/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.json
index 65354a13130..76b4d92d71c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin
index f3f7a40246b..9c059d244ae 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sort_columns.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.json b/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.json
index 6d127fa5c3c..7955221d7d7 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "sort": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin
index 1c7568f4f34..e780d351c8a 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sort_strings.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sql.json b/connector/connect/common/src/test/resources/query-tests/queries/sql.json
index c36812b9791..c4bc9b2c082 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/sql.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/sql.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "sql": {
     "query": "select 1"
   }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/sql.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/sql.proto.bin
index 92499c516c3..3d4394f23af 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/sql.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/sql.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/summary.json b/connector/connect/common/src/test/resources/query-tests/queries/summary.json
index 48c336fbf7c..cbfe9bcf7b0 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/summary.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/summary.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "summary": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/summary.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/summary.proto.bin
index 69363710ef2..a88d61cdc76 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/summary.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/summary.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/table.json b/connector/connect/common/src/test/resources/query-tests/queries/table.json
index 634310c27ff..b2cd4ae0a5b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/table.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/table.json
@@ -1,4 +1,7 @@
 {
+  "common": {
+    "planId": "0"
+  },
   "read": {
     "namedTable": {
       "unparsedIdentifier": "myTable"
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/table.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/table.proto.bin
index f6ffaf988e7..956da78861d 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/table.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/table.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/to.json b/connector/connect/common/src/test/resources/query-tests/queries/to.json
index e09913ff562..a3e07202c10 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/to.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/to.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "toSchema": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/to.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/to.proto.bin
index ce3c1509673..8e15aa6c279 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/to.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/to.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/toDF.json b/connector/connect/common/src/test/resources/query-tests/queries/toDF.json
index e753b7d0e3a..8111bc76a8a 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/toDF.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/toDF.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "toDf": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin
index b88bdf99169..3238291e879 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/toDF.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/union.json b/connector/connect/common/src/test/resources/query-tests/queries/union.json
index 170e0f09cf9..9048133ca63 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/union.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/union.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/union.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/union.proto.bin
index 7c4f869e44f..caafd1ef998 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/union.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/union.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionAll.json b/connector/connect/common/src/test/resources/query-tests/queries/unionAll.json
index 170e0f09cf9..9048133ca63 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/unionAll.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/unionAll.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin
index 7c4f869e44f..caafd1ef998 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/unionAll.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionByName.json b/connector/connect/common/src/test/resources/query-tests/queries/unionByName.json
index 9446f0127e9..9244eb08790 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/unionByName.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/unionByName.json
@@ -1,8 +1,17 @@
 {
+  "common": {
+    "planId": "4"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "1"
+      },
       "drop": {
         "input": {
+          "common": {
+            "planId": "0"
+          },
           "localRelation": {
             "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
           }
@@ -15,8 +24,14 @@
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "3"
+      },
       "drop": {
         "input": {
+          "common": {
+            "planId": "2"
+          },
           "localRelation": {
             "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
           }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin
index 522c1bb0a16..64d9fb901d2 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/unionByName.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json b/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
index 70e770c135f..98870ffe717 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.json
@@ -1,11 +1,20 @@
 {
+  "common": {
+    "planId": "2"
+  },
   "setOp": {
     "leftInput": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
     },
     "rightInput": {
+      "common": {
+        "planId": "1"
+      },
       "localRelation": {
         "schema": "struct\u003ca:int,id:bigint,payload:binary\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin
index 29e0896b6c6..4facbbc553e 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/unionByName_allowMissingColumns.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
index 662328af9a7..9f550c03191 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "unpivot": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin
index 9f2600404f2..ac3bad8bd04 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_no_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.json b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.json
index 3557958fd29..92bc19d195c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "unpivot": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin
index 9fb45c9c0c1..7f717cb2351 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/unpivot_values.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/where_column.json b/connector/connect/common/src/test/resources/query-tests/queries/where_column.json
index f8ec863648c..bef80a7e6ed 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/where_column.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/where_column.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "filter": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin
index eae5db282ca..e472ed0715b 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/where_column.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/where_expr.json b/connector/connect/common/src/test/resources/query-tests/queries/where_expr.json
index c244ff0e891..dc7523bcaad 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/where_expr.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/where_expr.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "filter": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin
index 63b44b32b63..380a1763b81 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/where_expr.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/window.json b/connector/connect/common/src/test/resources/query-tests/queries/window.json
index 8649a9d6e54..23fd5c1556e 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/window.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/window.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "project": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/window.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/window.proto.bin
index caa9d66934c..a89c0d6a6a3 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/window.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/window.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
index ba7d76aec99..731cf844afe 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumnsRenamed": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin
index 38130a873d8..64fcf7855ec 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_java_map.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
index ee507379fa4..570bfa32233 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumnsRenamed": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin
index 5a8cfaa51ee..42df8ea1d11 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_scala_map.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
index 8d0bfc254eb..23b2e1d41d3 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumnsRenamed": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin
index 5c60a64d3ad..f46d01646c6 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumnRenamed_single.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.json
index 5bf8b01d5c4..8863d15f276 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumns": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin
index f6693d6b8b8..6d53a883a5f 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumn_single.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
index 21e75d07aef..a59f4abd47c 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumns": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin
index f71f6248959..be381f62594 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_java_map.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
index aca9ce7db7d..99405a73041 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumns": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin
index 52a22ed9cec..77ee1900e73 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withColumns_scala_map.proto.bin differ
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.json b/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.json
index 0f28e7655a4..6ba7e5cd55b 100644
--- a/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.json
+++ b/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.json
@@ -1,6 +1,12 @@
 {
+  "common": {
+    "planId": "1"
+  },
   "withColumns": {
     "input": {
+      "common": {
+        "planId": "0"
+      },
       "localRelation": {
         "schema": "struct\u003cid:bigint,a:int,b:double\u003e"
       }
@@ -8,7 +14,8 @@
     "aliases": [{
       "expr": {
         "unresolvedAttribute": {
-          "unparsedIdentifier": "id"
+          "unparsedIdentifier": "id",
+          "planId": "0"
         }
       },
       "name": ["id"],
diff --git a/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin b/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin
index e9aa65874e4..f814b37d0ac 100644
Binary files a/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin and b/connector/connect/common/src/test/resources/query-tests/queries/withMetadata.proto.bin differ


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org