Skip to content

Commit 3cdf790

Browse files
authored
Revert "chore(GLAM): Support setting of slot reservation and enable it for Gl…" (#8572)
This reverts commit 1b22d98.
1 parent 3742cad commit 3cdf790

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

script/glam/generate_and_run_desktop_sql

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ IMPORT=true source script/glam/run_glam_sql
1111
function generate_and_run_sql {
1212
local probe_type=$1
1313
local windows_release_sample_percent=$2
14-
local use_slots=$3
15-
local process=$4
14+
local process=$3
1615
local script_type
1716
local destination_table
1817
local write_disposition
@@ -61,12 +60,12 @@ function generate_and_run_sql {
6160
run_query "clients_daily_${script_type}_aggregates_v1" \
6261
true 0 99 "clients_daily_${probe_type}_aggregates_${table_name_suffix}v1" \
6362
"$write_disposition --clustering_fields=app_version,channel --time_partitioning_field=submission_date" \
64-
"$(if [[ -n $windows_release_sample_percent ]]; then echo $windows_release_sample_percent; fi)" \
65-
"$(if [[ -n $use_slots ]]; then echo $use_slots; fi)"
63+
"$(if [[ -n $windows_release_sample_percent ]]; then echo $windows_release_sample_percent; fi)"
64+
6665
}
6766

6867
probe_types=${1:-"scalar" "keyed_boolean" "keyed_scalar" "histogram" "keyed_histogram"}
6968

7069
for probe_type in ${probe_types[@]}; do
71-
generate_and_run_sql $probe_type $2 $3 $4
70+
generate_and_run_sql $probe_type $2 $3
7271
done

script/glam/run_glam_sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ function run_query {
5252
local query_location=${5:-$destination_table}
5353
local additional_arguments="${6:---replace}"
5454
local sample_size=${7:-10}
55-
local use_slots=${8:-true}
5655
local query="sql/$PROJECT/$PROD_DATASET/$query_location/query.sql"
5756

5857
# add an option to write to a time-partitioned table
@@ -75,7 +74,6 @@ function run_query {
7574
--parameter="max_sample_id:INT64:$max_sample_id" \
7675
--parameter="sample_size:INT64:$sample_size" \
7776
"$(if $time_partition; then echo --time_partitioning_type="DAY"; fi)" \
78-
"$(if $use_slots; then echo --reservation_id=glam; fi)" \
7977
< "$tmp"
8078
}
8179

0 commit comments

Comments
 (0)