[batch] Stop writing to v2 billing tables #13892
Conversation
jigold
force-pushed
the
remove-v2-writes
branch
from
78fdfeb to
f50b57d
Compare
batch/sql/estimated-current.sql
Outdated
| INSERT INTO aggregated_billing_project_user_resources_v3 (billing_project, user, resource_id, token, `usage`) | ||
| SELECT batches.billing_project, batches.`user`, | ||
| attempt_resources.deduped_resource_id, | ||
| attempt_resources.resource_id, |
There was a problem hiding this comment.
Can you remind me why this column name is changing?
There was a problem hiding this comment.
At this point resource_id should always equal deduped_resource_id with the previous fixes to how we insert resources to not be duplicated. I made this change here in case we do decide to swap the columns "deduped_resource_id" -> "resource_id" and drop the original resource id column (has duplicates in it). We can save that for a separate step if that's easier.
There was a problem hiding this comment.
Ok, that checks out but ya I think I works prefer just doing that separately if that's alright.
| @@ -883,74 +825,25 @@ BEGIN | |||
| SET cur_billing_date = CAST(UTC_DATE() AS DATE); | |||
|
|
|||
| IF msec_diff_rollup != 0 THEN | |||
| INSERT INTO aggregated_billing_project_user_resources_v2 (billing_project, user, resource_id, token, `usage`) | |||
| INSERT INTO aggregated_billing_project_user_resources_v3 (billing_project, user, resource_id, token, `usage`) | |||
There was a problem hiding this comment.
And just checking here to make absolutely sure, resource_id and deduped_resource_id are the same in this table?
There was a problem hiding this comment.
In the billing tables, there is no deduped_resource_id. The v2 table is essentially the "resource_id" in attempt_resources and the v3 table "resource_id" is equivalent to the "deduped_resource_id" in the attempt resources table.
jigold
force-pushed
the
remove-v2-writes
branch
from
e4853b5 to
b282abb
Compare
|
@daniel-goldstein Can you re-review this? I rebased on latest main. |
This PR modifies the billing triggers to stop writing to the v2 billing tables as well as remove the check for whether the equivalent v2 rows have been "migrated" when writing to the v3 tables. Stacked on #13891.