Dual write rule instances to new and old tables #3486
Conversation
dmjb
force-pushed
the
rule-instance-table
branch
3 times, most recently
from
763b0b4
to
dbca1ab
Compare
| @@ -28,7 +28,7 @@ INSERT INTO entity_profiles ( | |||
| $1, | |||
| $2, | |||
| sqlc.arg(contextual_rules)::jsonb, | |||
| FALSE | |||
| TRUE | |||
There was a problem hiding this comment.
At this point, any new or updated profiles will have rules in the new rule instance table, and thus can be considered migrated.
internal/profiles/service.go
Outdated
| RuleTypeID: entityRuleTuple.RuleID, | ||
| Name: rule.Name, | ||
| EntityType: entityType, | ||
| Def: pqtype.NullRawMessage{ |
There was a problem hiding this comment.
The PR looks good, the only question I have is how would we later instantiate the rule params and defs - right now the code seems to presume that they are non-nil:
result, err = r.ingester.Ingest(ctx, inf.Entity, params.GetRule().Params.AsMap())
so we'll have to check that we don't instantiate them as nil in this case.
Relates to #3485 Any time a profile is created or updated, write the rule instances to both the new and old rule instance tables. Mark the entries in the old tables as migrated so that we skip over them when we run the migration process.
|
|
||
| BEGIN; | ||
|
|
||
| ALTER TABLE rule_instances ALTER COLUMN def DROP NOT NULL; |
There was a problem hiding this comment.
Since we haven't written anything to the columns, this is safe to do.
|
|
||
| id, err := qtx.UpsertRuleInstance(ctx, newInstance) | ||
| Def: def, | ||
| Params: params, |
There was a problem hiding this comment.
I assume that if there's no params defined then json.Marshall returns {}? I wasn't sure about that since the previous code had an explicit params != nil check. But I guess we'd want to either store {} or make sure to on retrieval convert whatever value is stored to {} .
Relates to #3485
Any time a profile is created or updated, write the rule instances to both the new and old rule instance tables. Mark the entries in the old tables as migrated so that we skip over them when we run the migration process.
Summary
Provide a brief overview of the changes and the issue being addressed.
Explain the rationale and any background necessary for understanding the changes.
List dependencies required by this change, if any.
Fixes #(related issue)
Change Type
Mark the type of change your PR introduces:
Testing
Outline how the changes were tested, including steps to reproduce and any relevant configurations.
Attach screenshots if helpful.
Review Checklist: