Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

feat(personhog): add RestorePersons for the person consistency repair (#118342)

Eli Reismandb39a126fda3
diff --git a/nodejs/src/common/generated/personhog/personhog/service/v1/service_pb.ts b/nodejs/src/common/generated/personhog/personhog/service/v1/service_pb.ts
index 26271d8e0967..6daa9cc1dee1 100644
--- a/nodejs/src/common/generated/personhog/personhog/service/v1/service_pb.ts
+++ b/nodejs/src/common/generated/personhog/personhog/service/v1/service_pb.ts
@@ -106,6 +106,8 @@ import type {
ReleaseFenceResponseSchema,
ReleaseFencesRequestSchema,
ReleaseFencesResponseSchema,
+ RestorePersonsRequestSchema,
+ RestorePersonsResponseSchema,
SetPersonDistinctIdVersionFloorRequestSchema,
SetPersonDistinctIdVersionFloorResponseSchema,
SetPersonVersionFloorRequestSchema,
@@ -123,7 +125,7 @@ import { file_personhog_types_v1_person } from '../../types/v1/person_pb'
export const file_personhog_service_v1_service: GenFile =
/*@__PURE__*/
fileDesc(
- 'CiJwZXJzb25ob2cvc2VydmljZS92MS9zZXJ2aWNlLnByb3RvEhRwZXJzb25ob2cuc2VydmljZS52MTLOMgoQUGVyc29uSG9nU2VydmljZRJYCglHZXRQZXJzb24SJC5wZXJzb25ob2cudHlwZXMudjEuR2V0UGVyc29uUmVxdWVzdBolLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25SZXNwb25zZRJYCgpHZXRQZXJzb25zEiUucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvbnNSZXF1ZXN0GiMucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbnNSZXNwb25zZRJkCg9HZXRQZXJzb25CeVV1aWQSKi5wZXJzb25ob2cudHlwZXMudjEuR2V0UGVyc29uQnlVdWlkUmVxdWVzdBolLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25SZXNwb25zZRJmChFHZXRQZXJzb25zQnlVdWlkcxIsLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlVdWlkc1JlcXVlc3QaIy5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc1Jlc3BvbnNlEnAKFUdldFBlcnNvbkJ5RGlzdGluY3RJZBIwLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25CeURpc3RpbmN0SWRSZXF1ZXN0GiUucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblJlc3BvbnNlEpEBCh1HZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbRI4LnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbVJlcXVlc3QaNi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc0J5RGlzdGluY3RJZHNJblRlYW1SZXNwb25zZRJ/ChdHZXRQZXJzb25zQnlEaXN0aW5jdElkcxIyLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlEaXN0aW5jdElkc1JlcXVlc3QaMC5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc0J5RGlzdGluY3RJZHNSZXNwb25zZRKCAQoXR2V0RGlzdGluY3RJZHNGb3JQZXJzb24SMi5wZXJzb25ob2cudHlwZXMudjEuR2V0RGlzdGluY3RJZHNGb3JQZXJzb25SZXF1ZXN0GjMucGVyc29uaG9nLnR5cGVzLnYxLkdldERpc3RpbmN0SWRzRm9yUGVyc29uUmVzcG9uc2UShQEKGEdldERpc3RpbmN0SWRzRm9yUGVyc29ucxIzLnBlcnNvbmhvZy50eXBlcy52MS5HZXREaXN0aW5jdElkc0ZvclBlcnNvbnNSZXF1ZXN0GjQucGVyc29uaG9nLnR5cGVzLnYxLkdldERpc3RpbmN0SWRzRm9yUGVyc29uc1Jlc3BvbnNlEogBChlHZXRIYXNoS2V5T3ZlcnJpZGVDb250ZXh0EjQucGVyc29uaG9nLnR5cGVzLnYxLkdldEhhc2hLZXlPdmVycmlkZUNvbnRleHRSZXF1ZXN0GjUucGVyc29uaG9nLnR5cGVzLnYxLkdldEhhc2hLZXlPdmVycmlkZUNvbnRleHRSZXNwb25zZRJ/ChZVcHNlcnRIYXNoS2V5T3ZlcnJpZGVzEjEucGVyc29uaG9nLnR5cGVzLnYxLlVwc2VydEhhc2hLZXlPdmVycmlkZXNSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLlVwc2VydEhhc2hLZXlPdmVycmlkZXNSZXNwb25zZRKUAQodRGVsZXRlSGFzaEtleU92ZXJyaWRlc0J5VGVhbXMSOC5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlSGFzaEtleU92ZXJyaWRlc0J5VGVhbXNSZXF1ZXN0GjkucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUhhc2hLZXlPdmVycmlkZXNCeVRlYW1zUmVzcG9uc2USdwoVQ2hlY2tDb2hvcnRNZW1iZXJzaGlwEjAucGVyc29uaG9nLnR5cGVzLnYxLkNoZWNrQ29ob3J0TWVtYmVyc2hpcFJlcXVlc3QaLC5wZXJzb25ob2cudHlwZXMudjEuQ29ob3J0TWVtYmVyc2hpcFJlc3BvbnNlEnMKEkNvdW50Q29ob3J0TWVtYmVycxItLnBlcnNvbmhvZy50eXBlcy52MS5Db3VudENvaG9ydE1lbWJlcnNSZXF1ZXN0Gi4ucGVyc29uaG9nLnR5cGVzLnYxLkNvdW50Q29ob3J0TWVtYmVyc1Jlc3BvbnNlEnMKEkRlbGV0ZUNvaG9ydE1lbWJlchItLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVDb2hvcnRNZW1iZXJSZXF1ZXN0Gi4ucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUNvaG9ydE1lbWJlclJlc3BvbnNlEoIBChdEZWxldGVDb2hvcnRNZW1iZXJzQnVsaxIyLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVDb2hvcnRNZW1iZXJzQnVsa1JlcXVlc3QaMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlQ29ob3J0TWVtYmVyc0J1bGtSZXNwb25zZRJ2ChNJbnNlcnRDb2hvcnRNZW1iZXJzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkluc2VydENvaG9ydE1lbWJlcnNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkluc2VydENvaG9ydE1lbWJlcnNSZXNwb25zZRJ2ChNMaXN0Q29ob3J0TWVtYmVySWRzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RDb2hvcnRNZW1iZXJJZHNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RDb2hvcnRNZW1iZXJJZHNSZXNwb25zZRJVCghHZXRHcm91cBIjLnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFJlcXVlc3QaJC5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBSZXNwb25zZRJVCglHZXRHcm91cHMSJC5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBzUmVxdWVzdBoiLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cHNSZXNwb25zZRJnCg5HZXRHcm91cHNCYXRjaBIpLnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cHNCYXRjaFJlcXVlc3QaKi5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBzQmF0Y2hSZXNwb25zZRJbCgpMaXN0R3JvdXBzEiUucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RHcm91cHNSZXF1ZXN0GiYucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RHcm91cHNSZXNwb25zZRKGAQocR2V0R3JvdXBUeXBlTWFwcGluZ3NCeVRlYW1JZBI3LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkUmVxdWVzdBotLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cFR5cGVNYXBwaW5nc1Jlc3BvbnNlEo0BCh1HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkcxI4LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkc1JlcXVlc3QaMi5wZXJzb25ob2cudHlwZXMudjEuR3JvdXBUeXBlTWFwcGluZ3NCYXRjaFJlc3BvbnNlEowBCh9HZXRHcm91cFR5cGVNYXBwaW5nc0J5UHJvamVjdElkEjoucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRSZXF1ZXN0Gi0ucGVyc29uaG9nLnR5cGVzLnYxLkdyb3VwVHlwZU1hcHBpbmdzUmVzcG9uc2USkwEKIEdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRzEjsucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRzUmVxdWVzdBoyLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cFR5cGVNYXBwaW5nc0JhdGNoUmVzcG9uc2USnQEKIEdldEdyb3VwVHlwZU1hcHBpbmdCeURhc2hib2FyZElkEjsucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdCeURhc2hib2FyZElkUmVxdWVzdBo8LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nQnlEYXNoYm9hcmRJZFJlc3BvbnNlEn8KFkNvdW50R3JvdXBUeXBlTWFwcGluZ3MSMS5wZXJzb25ob2cudHlwZXMudjEuQ291bnRHcm91cFR5cGVNYXBwaW5nc1JlcXVlc3QaMi5wZXJzb25ob2cudHlwZXMudjEuQ291bnRHcm91cFR5cGVNYXBwaW5nc1Jlc3BvbnNlEl4KC0NyZWF0ZUdyb3VwEiYucGVyc29uaG9nLnR5cGVzLnYxLkNyZWF0ZUdyb3VwUmVxdWVzdBonLnBlcnNvbmhvZy50eXBlcy52MS5DcmVhdGVHcm91cFJlc3BvbnNlEl4KC1VwZGF0ZUdyb3VwEiYucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwUmVxdWVzdBonLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVHcm91cFJlc3BvbnNlEoUBChhEZWxldGVHcm91cHNCYXRjaEZvclRlYW0SMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlR3JvdXBzQmF0Y2hGb3JUZWFtUmVxdWVzdBo0LnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVHcm91cHNCYXRjaEZvclRlYW1SZXNwb25zZRJ/ChZVcGRhdGVHcm91cFR5cGVNYXBwaW5nEjEucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwVHlwZU1hcHBpbmdSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwVHlwZU1hcHBpbmdSZXNwb25zZRJ/ChZEZWxldGVHcm91cFR5cGVNYXBwaW5nEjEucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdSZXNwb25zZRKmAQojRGVsZXRlR3JvdXBUeXBlTWFwcGluZ3NCYXRjaEZvclRlYW0SPi5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlR3JvdXBUeXBlTWFwcGluZ3NCYXRjaEZvclRlYW1SZXF1ZXN0Gj8ucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdzQmF0Y2hGb3JUZWFtUmVzcG9uc2USfwoWVXBkYXRlUGVyc29uUHJvcGVydGllcxIxLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVQZXJzb25Qcm9wZXJ0aWVzUmVxdWVzdBoyLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVQZXJzb25Qcm9wZXJ0aWVzUmVzcG9uc2USXgoLRmVuY2VQZXJzb24SJi5wZXJzb25ob2cudHlwZXMudjEuRmVuY2VQZXJzb25SZXF1ZXN0GicucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlUGVyc29uUmVzcG9uc2USYQoMRmVuY2VQZXJzb25zEicucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlUGVyc29uc1JlcXVlc3QaKC5wZXJzb25ob2cudHlwZXMudjEuRmVuY2VQZXJzb25zUmVzcG9uc2USYQoMUmVsZWFzZUZlbmNlEicucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VGZW5jZVJlcXVlc3QaKC5wZXJzb25ob2cudHlwZXMudjEuUmVsZWFzZUZlbmNlUmVzcG9uc2USZAoNUmVsZWFzZUZlbmNlcxIoLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlRmVuY2VzUmVxdWVzdBopLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlRmVuY2VzUmVzcG9uc2UScwoSRm9sZFBlcnNvbkRvY3VtZW50Ei0ucGVyc29uaG9nLnR5cGVzLnYxLkZvbGRQZXJzb25Eb2N1bWVudFJlcXVlc3QaLi5wZXJzb25ob2cudHlwZXMudjEuRm9sZFBlcnNvbkRvY3VtZW50UmVzcG9uc2USZAoNRGVsZXRlUGVyc29ucxIoLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVQZXJzb25zUmVxdWVzdBopLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVQZXJzb25zUmVzcG9uc2USiAEKGURlbGV0ZVBlcnNvbnNCYXRjaEZvclRlYW0SNC5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc0JhdGNoRm9yVGVhbVJlcXVlc3QaNS5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc0JhdGNoRm9yVGVhbVJlc3BvbnNlEoIBChdEZWxldGVUb21ic3RvbmVkUGVyc29ucxIyLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVUb21ic3RvbmVkUGVyc29uc1JlcXVlc3QaMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXNwb25zZRJ2ChNHZXRQZXJzb25Ub21ic3RvbmVzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblRvbWJzdG9uZXNSZXNwb25zZRJ2ChNBY2tQZXJzb25Ub21ic3RvbmVzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkFja1BlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkFja1BlcnNvblRvbWJzdG9uZXNSZXNwb25zZRKFAQoYTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlEjMucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RQZXJzb25Ub21ic3RvbmVRdWV1ZVJlcXVlc3QaNC5wZXJzb25ob2cudHlwZXMudjEuTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlUmVzcG9uc2USXgoLU3BsaXRQZXJzb24SJi5wZXJzb25ob2cudHlwZXMudjEuU3BsaXRQZXJzb25SZXF1ZXN0GicucGVyc29uaG9nLnR5cGVzLnYxLlNwbGl0UGVyc29uUmVzcG9uc2USmgEKH1NldFBlcnNvbkRpc3RpbmN0SWRWZXJzaW9uRmxvb3ISOi5wZXJzb25ob2cudHlwZXMudjEuU2V0UGVyc29uRGlzdGluY3RJZFZlcnNpb25GbG9vclJlcXVlc3QaOy5wZXJzb25ob2cudHlwZXMudjEuU2V0UGVyc29uRGlzdGluY3RJZFZlcnNpb25GbG9vclJlc3BvbnNlEnwKFVNldFBlcnNvblZlcnNpb25GbG9vchIwLnBlcnNvbmhvZy50eXBlcy52MS5TZXRQZXJzb25WZXJzaW9uRmxvb3JSZXF1ZXN0GjEucGVyc29uaG9nLnR5cGVzLnYxLlNldFBlcnNvblZlcnNpb25GbG9vclJlc3BvbnNlEogBChlFbnN1cmVQZXJzb25WZXJzaW9uRmxvb3JzEjQucGVyc29uaG9nLnR5cGVzLnYxLkVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXF1ZXN0GjUucGVyc29uaG9nLnR5cGVzLnYxLkVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXNwb25zZRJwChFHZXREaXN0aW5jdElkUm93cxIsLnBlcnNvbmhvZy50eXBlcy52MS5HZXREaXN0aW5jdElkUm93c1JlcXVlc3QaLS5wZXJzb25ob2cudHlwZXMudjEuR2V0RGlzdGluY3RJZFJvd3NSZXNwb25zZRJzChJMaXN0UGVyc29uc0ZvclRlYW0SLS5wZXJzb25ob2cudHlwZXMudjEuTGlzdFBlcnNvbnNGb3JUZWFtUmVxdWVzdBouLnBlcnNvbmhvZy50eXBlcy52MS5MaXN0UGVyc29uc0ZvclRlYW1SZXNwb25zZRKFAQoYUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzEjMucGVyc29uaG9nLnR5cGVzLnYxLlJhaXNlUGVyc29uVmVyc2lvbkZsb29yc1JlcXVlc3QaNC5wZXJzb25ob2cudHlwZXMudjEuUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzUmVzcG9uc2ViBnByb3RvMw',
+ 'CiJwZXJzb25ob2cvc2VydmljZS92MS9zZXJ2aWNlLnByb3RvEhRwZXJzb25ob2cuc2VydmljZS52MTK3MwoQUGVyc29uSG9nU2VydmljZRJYCglHZXRQZXJzb24SJC5wZXJzb25ob2cudHlwZXMudjEuR2V0UGVyc29uUmVxdWVzdBolLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25SZXNwb25zZRJYCgpHZXRQZXJzb25zEiUucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvbnNSZXF1ZXN0GiMucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbnNSZXNwb25zZRJkCg9HZXRQZXJzb25CeVV1aWQSKi5wZXJzb25ob2cudHlwZXMudjEuR2V0UGVyc29uQnlVdWlkUmVxdWVzdBolLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25SZXNwb25zZRJmChFHZXRQZXJzb25zQnlVdWlkcxIsLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlVdWlkc1JlcXVlc3QaIy5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc1Jlc3BvbnNlEnAKFUdldFBlcnNvbkJ5RGlzdGluY3RJZBIwLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25CeURpc3RpbmN0SWRSZXF1ZXN0GiUucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblJlc3BvbnNlEpEBCh1HZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbRI4LnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbVJlcXVlc3QaNi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc0J5RGlzdGluY3RJZHNJblRlYW1SZXNwb25zZRJ/ChdHZXRQZXJzb25zQnlEaXN0aW5jdElkcxIyLnBlcnNvbmhvZy50eXBlcy52MS5HZXRQZXJzb25zQnlEaXN0aW5jdElkc1JlcXVlc3QaMC5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uc0J5RGlzdGluY3RJZHNSZXNwb25zZRKCAQoXR2V0RGlzdGluY3RJZHNGb3JQZXJzb24SMi5wZXJzb25ob2cudHlwZXMudjEuR2V0RGlzdGluY3RJZHNGb3JQZXJzb25SZXF1ZXN0GjMucGVyc29uaG9nLnR5cGVzLnYxLkdldERpc3RpbmN0SWRzRm9yUGVyc29uUmVzcG9uc2UShQEKGEdldERpc3RpbmN0SWRzRm9yUGVyc29ucxIzLnBlcnNvbmhvZy50eXBlcy52MS5HZXREaXN0aW5jdElkc0ZvclBlcnNvbnNSZXF1ZXN0GjQucGVyc29uaG9nLnR5cGVzLnYxLkdldERpc3RpbmN0SWRzRm9yUGVyc29uc1Jlc3BvbnNlEogBChlHZXRIYXNoS2V5T3ZlcnJpZGVDb250ZXh0EjQucGVyc29uaG9nLnR5cGVzLnYxLkdldEhhc2hLZXlPdmVycmlkZUNvbnRleHRSZXF1ZXN0GjUucGVyc29uaG9nLnR5cGVzLnYxLkdldEhhc2hLZXlPdmVycmlkZUNvbnRleHRSZXNwb25zZRJ/ChZVcHNlcnRIYXNoS2V5T3ZlcnJpZGVzEjEucGVyc29uaG9nLnR5cGVzLnYxLlVwc2VydEhhc2hLZXlPdmVycmlkZXNSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLlVwc2VydEhhc2hLZXlPdmVycmlkZXNSZXNwb25zZRKUAQodRGVsZXRlSGFzaEtleU92ZXJyaWRlc0J5VGVhbXMSOC5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlSGFzaEtleU92ZXJyaWRlc0J5VGVhbXNSZXF1ZXN0GjkucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUhhc2hLZXlPdmVycmlkZXNCeVRlYW1zUmVzcG9uc2USdwoVQ2hlY2tDb2hvcnRNZW1iZXJzaGlwEjAucGVyc29uaG9nLnR5cGVzLnYxLkNoZWNrQ29ob3J0TWVtYmVyc2hpcFJlcXVlc3QaLC5wZXJzb25ob2cudHlwZXMudjEuQ29ob3J0TWVtYmVyc2hpcFJlc3BvbnNlEnMKEkNvdW50Q29ob3J0TWVtYmVycxItLnBlcnNvbmhvZy50eXBlcy52MS5Db3VudENvaG9ydE1lbWJlcnNSZXF1ZXN0Gi4ucGVyc29uaG9nLnR5cGVzLnYxLkNvdW50Q29ob3J0TWVtYmVyc1Jlc3BvbnNlEnMKEkRlbGV0ZUNvaG9ydE1lbWJlchItLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVDb2hvcnRNZW1iZXJSZXF1ZXN0Gi4ucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUNvaG9ydE1lbWJlclJlc3BvbnNlEoIBChdEZWxldGVDb2hvcnRNZW1iZXJzQnVsaxIyLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVDb2hvcnRNZW1iZXJzQnVsa1JlcXVlc3QaMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlQ29ob3J0TWVtYmVyc0J1bGtSZXNwb25zZRJ2ChNJbnNlcnRDb2hvcnRNZW1iZXJzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkluc2VydENvaG9ydE1lbWJlcnNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkluc2VydENvaG9ydE1lbWJlcnNSZXNwb25zZRJ2ChNMaXN0Q29ob3J0TWVtYmVySWRzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RDb2hvcnRNZW1iZXJJZHNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RDb2hvcnRNZW1iZXJJZHNSZXNwb25zZRJVCghHZXRHcm91cBIjLnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFJlcXVlc3QaJC5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBSZXNwb25zZRJVCglHZXRHcm91cHMSJC5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBzUmVxdWVzdBoiLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cHNSZXNwb25zZRJnCg5HZXRHcm91cHNCYXRjaBIpLnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cHNCYXRjaFJlcXVlc3QaKi5wZXJzb25ob2cudHlwZXMudjEuR2V0R3JvdXBzQmF0Y2hSZXNwb25zZRJbCgpMaXN0R3JvdXBzEiUucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RHcm91cHNSZXF1ZXN0GiYucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RHcm91cHNSZXNwb25zZRKGAQocR2V0R3JvdXBUeXBlTWFwcGluZ3NCeVRlYW1JZBI3LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkUmVxdWVzdBotLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cFR5cGVNYXBwaW5nc1Jlc3BvbnNlEo0BCh1HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkcxI4LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nc0J5VGVhbUlkc1JlcXVlc3QaMi5wZXJzb25ob2cudHlwZXMudjEuR3JvdXBUeXBlTWFwcGluZ3NCYXRjaFJlc3BvbnNlEowBCh9HZXRHcm91cFR5cGVNYXBwaW5nc0J5UHJvamVjdElkEjoucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRSZXF1ZXN0Gi0ucGVyc29uaG9nLnR5cGVzLnYxLkdyb3VwVHlwZU1hcHBpbmdzUmVzcG9uc2USkwEKIEdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRzEjsucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdzQnlQcm9qZWN0SWRzUmVxdWVzdBoyLnBlcnNvbmhvZy50eXBlcy52MS5Hcm91cFR5cGVNYXBwaW5nc0JhdGNoUmVzcG9uc2USnQEKIEdldEdyb3VwVHlwZU1hcHBpbmdCeURhc2hib2FyZElkEjsucGVyc29uaG9nLnR5cGVzLnYxLkdldEdyb3VwVHlwZU1hcHBpbmdCeURhc2hib2FyZElkUmVxdWVzdBo8LnBlcnNvbmhvZy50eXBlcy52MS5HZXRHcm91cFR5cGVNYXBwaW5nQnlEYXNoYm9hcmRJZFJlc3BvbnNlEn8KFkNvdW50R3JvdXBUeXBlTWFwcGluZ3MSMS5wZXJzb25ob2cudHlwZXMudjEuQ291bnRHcm91cFR5cGVNYXBwaW5nc1JlcXVlc3QaMi5wZXJzb25ob2cudHlwZXMudjEuQ291bnRHcm91cFR5cGVNYXBwaW5nc1Jlc3BvbnNlEl4KC0NyZWF0ZUdyb3VwEiYucGVyc29uaG9nLnR5cGVzLnYxLkNyZWF0ZUdyb3VwUmVxdWVzdBonLnBlcnNvbmhvZy50eXBlcy52MS5DcmVhdGVHcm91cFJlc3BvbnNlEl4KC1VwZGF0ZUdyb3VwEiYucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwUmVxdWVzdBonLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVHcm91cFJlc3BvbnNlEoUBChhEZWxldGVHcm91cHNCYXRjaEZvclRlYW0SMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlR3JvdXBzQmF0Y2hGb3JUZWFtUmVxdWVzdBo0LnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVHcm91cHNCYXRjaEZvclRlYW1SZXNwb25zZRJ/ChZVcGRhdGVHcm91cFR5cGVNYXBwaW5nEjEucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwVHlwZU1hcHBpbmdSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLlVwZGF0ZUdyb3VwVHlwZU1hcHBpbmdSZXNwb25zZRJ/ChZEZWxldGVHcm91cFR5cGVNYXBwaW5nEjEucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdSZXF1ZXN0GjIucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdSZXNwb25zZRKmAQojRGVsZXRlR3JvdXBUeXBlTWFwcGluZ3NCYXRjaEZvclRlYW0SPi5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlR3JvdXBUeXBlTWFwcGluZ3NCYXRjaEZvclRlYW1SZXF1ZXN0Gj8ucGVyc29uaG9nLnR5cGVzLnYxLkRlbGV0ZUdyb3VwVHlwZU1hcHBpbmdzQmF0Y2hGb3JUZWFtUmVzcG9uc2USfwoWVXBkYXRlUGVyc29uUHJvcGVydGllcxIxLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVQZXJzb25Qcm9wZXJ0aWVzUmVxdWVzdBoyLnBlcnNvbmhvZy50eXBlcy52MS5VcGRhdGVQZXJzb25Qcm9wZXJ0aWVzUmVzcG9uc2USXgoLRmVuY2VQZXJzb24SJi5wZXJzb25ob2cudHlwZXMudjEuRmVuY2VQZXJzb25SZXF1ZXN0GicucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlUGVyc29uUmVzcG9uc2USYQoMRmVuY2VQZXJzb25zEicucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlUGVyc29uc1JlcXVlc3QaKC5wZXJzb25ob2cudHlwZXMudjEuRmVuY2VQZXJzb25zUmVzcG9uc2USYQoMUmVsZWFzZUZlbmNlEicucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VGZW5jZVJlcXVlc3QaKC5wZXJzb25ob2cudHlwZXMudjEuUmVsZWFzZUZlbmNlUmVzcG9uc2USZAoNUmVsZWFzZUZlbmNlcxIoLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlRmVuY2VzUmVxdWVzdBopLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlRmVuY2VzUmVzcG9uc2UScwoSRm9sZFBlcnNvbkRvY3VtZW50Ei0ucGVyc29uaG9nLnR5cGVzLnYxLkZvbGRQZXJzb25Eb2N1bWVudFJlcXVlc3QaLi5wZXJzb25ob2cudHlwZXMudjEuRm9sZFBlcnNvbkRvY3VtZW50UmVzcG9uc2USZAoNRGVsZXRlUGVyc29ucxIoLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVQZXJzb25zUmVxdWVzdBopLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVQZXJzb25zUmVzcG9uc2USiAEKGURlbGV0ZVBlcnNvbnNCYXRjaEZvclRlYW0SNC5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc0JhdGNoRm9yVGVhbVJlcXVlc3QaNS5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc0JhdGNoRm9yVGVhbVJlc3BvbnNlEoIBChdEZWxldGVUb21ic3RvbmVkUGVyc29ucxIyLnBlcnNvbmhvZy50eXBlcy52MS5EZWxldGVUb21ic3RvbmVkUGVyc29uc1JlcXVlc3QaMy5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXNwb25zZRJ2ChNHZXRQZXJzb25Ub21ic3RvbmVzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkdldFBlcnNvblRvbWJzdG9uZXNSZXNwb25zZRJ2ChNBY2tQZXJzb25Ub21ic3RvbmVzEi4ucGVyc29uaG9nLnR5cGVzLnYxLkFja1BlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Gi8ucGVyc29uaG9nLnR5cGVzLnYxLkFja1BlcnNvblRvbWJzdG9uZXNSZXNwb25zZRKFAQoYTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlEjMucGVyc29uaG9nLnR5cGVzLnYxLkxpc3RQZXJzb25Ub21ic3RvbmVRdWV1ZVJlcXVlc3QaNC5wZXJzb25ob2cudHlwZXMudjEuTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlUmVzcG9uc2USXgoLU3BsaXRQZXJzb24SJi5wZXJzb25ob2cudHlwZXMudjEuU3BsaXRQZXJzb25SZXF1ZXN0GicucGVyc29uaG9nLnR5cGVzLnYxLlNwbGl0UGVyc29uUmVzcG9uc2USmgEKH1NldFBlcnNvbkRpc3RpbmN0SWRWZXJzaW9uRmxvb3ISOi5wZXJzb25ob2cudHlwZXMudjEuU2V0UGVyc29uRGlzdGluY3RJZFZlcnNpb25GbG9vclJlcXVlc3QaOy5wZXJzb25ob2cudHlwZXMudjEuU2V0UGVyc29uRGlzdGluY3RJZFZlcnNpb25GbG9vclJlc3BvbnNlEnwKFVNldFBlcnNvblZlcnNpb25GbG9vchIwLnBlcnNvbmhvZy50eXBlcy52MS5TZXRQZXJzb25WZXJzaW9uRmxvb3JSZXF1ZXN0GjEucGVyc29uaG9nLnR5cGVzLnYxLlNldFBlcnNvblZlcnNpb25GbG9vclJlc3BvbnNlEogBChlFbnN1cmVQZXJzb25WZXJzaW9uRmxvb3JzEjQucGVyc29uaG9nLnR5cGVzLnYxLkVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXF1ZXN0GjUucGVyc29uaG9nLnR5cGVzLnYxLkVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXNwb25zZRJwChFHZXREaXN0aW5jdElkUm93cxIsLnBlcnNvbmhvZy50eXBlcy52MS5HZXREaXN0aW5jdElkUm93c1JlcXVlc3QaLS5wZXJzb25ob2cudHlwZXMudjEuR2V0RGlzdGluY3RJZFJvd3NSZXNwb25zZRJzChJMaXN0UGVyc29uc0ZvclRlYW0SLS5wZXJzb25ob2cudHlwZXMudjEuTGlzdFBlcnNvbnNGb3JUZWFtUmVxdWVzdBouLnBlcnNvbmhvZy50eXBlcy52MS5MaXN0UGVyc29uc0ZvclRlYW1SZXNwb25zZRKFAQoYUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzEjMucGVyc29uaG9nLnR5cGVzLnYxLlJhaXNlUGVyc29uVmVyc2lvbkZsb29yc1JlcXVlc3QaNC5wZXJzb25ob2cudHlwZXMudjEuUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzUmVzcG9uc2USZwoOUmVzdG9yZVBlcnNvbnMSKS5wZXJzb25ob2cudHlwZXMudjEuUmVzdG9yZVBlcnNvbnNSZXF1ZXN0GioucGVyc29uaG9nLnR5cGVzLnYxLlJlc3RvcmVQZXJzb25zUmVzcG9uc2ViBnByb3RvMw',
[
file_personhog_types_v1_person,
file_personhog_types_v1_group,
@@ -608,7 +610,8 @@ export const PersonHogService: GenService<{
}
/**
* Writes for the person consistency repair. Raises claim lifecycle marks on the persons they
- * raise. Versions only go up. Same routing caveat as DeletePersons above.
+ * raise; restores only insert absent persons. Versions only go up. Same routing caveat as
+ * DeletePersons above.
*
* @generated from rpc personhog.service.v1.PersonHogService.RaisePersonVersionFloors
*/
@@ -617,4 +620,12 @@ export const PersonHogService: GenService<{
input: typeof RaisePersonVersionFloorsRequestSchema
output: typeof RaisePersonVersionFloorsResponseSchema
}
+ /**
+ * @generated from rpc personhog.service.v1.PersonHogService.RestorePersons
+ */
+ restorePersons: {
+ methodKind: 'unary'
+ input: typeof RestorePersonsRequestSchema
+ output: typeof RestorePersonsResponseSchema
+ }
}> = /*@__PURE__*/ serviceDesc(file_personhog_service_v1_service, 0)
diff --git a/nodejs/src/common/generated/personhog/personhog/types/v1/person_pb.ts b/nodejs/src/common/generated/personhog/personhog/types/v1/person_pb.ts
index 779dfa65678e..9461311f5fe7 100644
--- a/nodejs/src/common/generated/personhog/personhog/types/v1/person_pb.ts
+++ b/nodejs/src/common/generated/personhog/personhog/types/v1/person_pb.ts
@@ -13,7 +13,7 @@ import { file_personhog_types_v1_common } from './common_pb'
export const file_personhog_types_v1_person: GenFile =
/*@__PURE__*/
fileDesc(
- 'Ch9wZXJzb25ob2cvdHlwZXMvdjEvcGVyc29uLnByb3RvEhJwZXJzb25ob2cudHlwZXMudjEisgIKBlBlcnNvbhIKCgJpZBgBIAEoAxIMCgR1dWlkGAIgASgJEg8KB3RlYW1faWQYAyABKAMSEgoKcHJvcGVydGllcxgEIAEoDBIiChpwcm9wZXJ0aWVzX2xhc3RfdXBkYXRlZF9hdBgFIAEoDBIhChlwcm9wZXJ0aWVzX2xhc3Rfb3BlcmF0aW9uGAYgASgMEhIKCmNyZWF0ZWRfYXQYByABKAMSDwoHdmVyc2lvbhgIIAEoAxIVCg1pc19pZGVudGlmaWVkGAkgASgIEhcKCmlzX3VzZXJfaWQYCiABKAhIAIgBARIZCgxsYXN0X3NlZW5fYXQYCyABKANIAYgBARISCgppc19kZWxldGVkGAwgASgIQg0KC19pc191c2VyX2lkQg8KDV9sYXN0X3NlZW5fYXQiZgoVRGlzdGluY3RJZFdpdGhWZXJzaW9uEhMKC2Rpc3RpbmN0X2lkGAEgASgJEhQKB3ZlcnNpb24YAiABKANIAIgBARIPCgJpZBgDIAEoA0gBiAEBQgoKCF92ZXJzaW9uQgUKA19pZCJoChVQZXJzb25XaXRoRGlzdGluY3RJZHMSEwoLZGlzdGluY3RfaWQYASABKAkSLwoGcGVyc29uGAIgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24iZwoRUGVyc29uRGlzdGluY3RJZHMSEQoJcGVyc29uX2lkGAEgASgDEj8KDGRpc3RpbmN0X2lkcxgCIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkV2l0aFZlcnNpb24ihwEKGFBlcnNvbldpdGhUZWFtRGlzdGluY3RJZBIvCgNrZXkYASABKAsyIi5wZXJzb25ob2cudHlwZXMudjEuVGVhbURpc3RpbmN0SWQSLwoGcGVyc29uGAIgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24ibQoQR2V0UGVyc29uUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxI1CgxyZWFkX29wdGlvbnMYAyABKAsyHy5wZXJzb25ob2cudHlwZXMudjEuUmVhZE9wdGlvbnMiTwoRR2V0UGVyc29uUmVzcG9uc2USLwoGcGVyc29uGAEgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24ibwoRR2V0UGVyc29uc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxISCgpwZXJzb25faWRzGAIgAygDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucyJTCg9QZXJzb25zUmVzcG9uc2USKwoHcGVyc29ucxgBIAMoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24SEwoLbWlzc2luZ19pZHMYAiADKAMibgoWR2V0UGVyc29uQnlVdWlkUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEgwKBHV1aWQYAiABKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zInEKGEdldFBlcnNvbnNCeVV1aWRzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEg0KBXV1aWRzGAIgAygJEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucyJ7ChxHZXRQZXJzb25CeURpc3RpbmN0SWRSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEwoLZGlzdGluY3RfaWQYAiABKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zIoQBCiRHZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbVJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIUCgxkaXN0aW5jdF9pZHMYAiADKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zImAKIlBlcnNvbnNCeURpc3RpbmN0SWRzSW5UZWFtUmVzcG9uc2USOgoHcmVzdWx0cxgBIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25XaXRoRGlzdGluY3RJZHMilgEKHkdldFBlcnNvbnNCeURpc3RpbmN0SWRzUmVxdWVzdBI9ChF0ZWFtX2Rpc3RpbmN0X2lkcxgBIAMoCzIiLnBlcnNvbmhvZy50eXBlcy52MS5UZWFtRGlzdGluY3RJZBI1CgxyZWFkX29wdGlvbnMYAiABKAsyHy5wZXJzb25ob2cudHlwZXMudjEuUmVhZE9wdGlvbnMiXQocUGVyc29uc0J5RGlzdGluY3RJZHNSZXNwb25zZRI9CgdyZXN1bHRzGAEgAygLMiwucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbldpdGhUZWFtRGlzdGluY3RJZCK/AQoeR2V0RGlzdGluY3RJZHNGb3JQZXJzb25SZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucxISCgVsaW1pdBgEIAEoA0gAiAEBEhYKCWN1cnNvcl9pZBgFIAEoA0gBiAEBQggKBl9saW1pdEIMCgpfY3Vyc29yX2lkIpIBCh9HZXREaXN0aW5jdElkc0ZvclBlcnNvblJlc3BvbnNlEj8KDGRpc3RpbmN0X2lkcxgBIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkV2l0aFZlcnNpb24SGwoObmV4dF9jdXJzb3JfaWQYAiABKANIAIgBAUIRCg9fbmV4dF9jdXJzb3JfaWQisQEKH0dldERpc3RpbmN0SWRzRm9yUGVyc29uc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxISCgpwZXJzb25faWRzGAIgAygDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucxIdChBsaW1pdF9wZXJfcGVyc29uGAQgASgDSACIAQFCEwoRX2xpbWl0X3Blcl9wZXJzb24iZgogR2V0RGlzdGluY3RJZHNGb3JQZXJzb25zUmVzcG9uc2USQgoTcGVyc29uX2Rpc3RpbmN0X2lkcxgBIAMoCzIlLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25EaXN0aW5jdElkcyKWAgodVXBkYXRlUGVyc29uUHJvcGVydGllc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIRCglwZXJzb25faWQYAiABKAMSEgoKZXZlbnRfbmFtZRgDIAEoCRIWCg5zZXRfcHJvcGVydGllcxgEIAEoDBIbChNzZXRfb25jZV9wcm9wZXJ0aWVzGAUgASgMEhgKEHVuc2V0X3Byb3BlcnRpZXMYBiADKAkSGgoNaXNfaWRlbnRpZmllZBgHIAEoCEgAiAEBEhkKDGxhc3Rfc2Vlbl9hdBgIIAEoA0gBiAEBEhQKDGZvcmNlX3VwZGF0ZRgJIAEoCEIQCg5faXNfaWRlbnRpZmllZEIPCg1fbGFzdF9zZWVuX2F0Im0KHlVwZGF0ZVBlcnNvblByb3BlcnRpZXNSZXNwb25zZRIvCgZwZXJzb24YASABKAsyGi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uSACIAQESDwoHdXBkYXRlZBgCIAEoCEIJCgdfcGVyc29uInIKFERlbGV0ZVBlcnNvbnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJEjMKBG1vZGUYAyABKA4yJS5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc01vZGUiPAoUVG9tYnN0b25lZERpc3RpbmN0SWQSEwoLZGlzdGluY3RfaWQYASABKAkSDwoHdmVyc2lvbhgCIAEoAyJ4ChBUb21ic3RvbmVkUGVyc29uEhMKC3BlcnNvbl91dWlkGAEgASgJEg8KB3ZlcnNpb24YAiABKAMSPgoMZGlzdGluY3RfaWRzGAMgAygLMigucGVyc29uaG9nLnR5cGVzLnYxLlRvbWJzdG9uZWREaXN0aW5jdElkInwKFURlbGV0ZVBlcnNvbnNSZXNwb25zZRIVCg1kZWxldGVkX2NvdW50GAEgASgDEhIKCnRvbWJzdG9uZWQYAiABKAgSOAoKdG9tYnN0b25lcxgDIAMoCzIkLnBlcnNvbmhvZy50eXBlcy52MS5Ub21ic3RvbmVkUGVyc29uIkMKGkdldFBlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJIlcKG0dldFBlcnNvblRvbWJzdG9uZXNSZXNwb25zZRI4Cgp0b21ic3RvbmVzGAEgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLlRvbWJzdG9uZWRQZXJzb24iPAoUQWNrZWRQZXJzb25Ub21ic3RvbmUSEwoLcGVyc29uX3V1aWQYASABKAkSDwoHdmVyc2lvbhgCIAEoAyJrChpBY2tQZXJzb25Ub21ic3RvbmVzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEjwKCnRvbWJzdG9uZXMYAiADKAsyKC5wZXJzb25ob2cudHlwZXMudjEuQWNrZWRQZXJzb25Ub21ic3RvbmUiNAobQWNrUGVyc29uVG9tYnN0b25lc1Jlc3BvbnNlEhUKDWNsZWFyZWRfY291bnQYASABKAMihAEKH0xpc3RQZXJzb25Ub21ic3RvbmVRdWV1ZVJlcXVlc3QSFQoNYWZ0ZXJfdGVhbV9pZBgBIAEoAxIZChFhZnRlcl9wZXJzb25fdXVpZBgCIAEoCRINCgVsaW1pdBgDIAEoAxIUCgd0ZWFtX2lkGAQgASgDSACIAQFCCgoIX3RlYW1faWQicAoZUGVyc29uVG9tYnN0b25lUXVldWVFbnRyeRIPCgd0ZWFtX2lkGAEgASgDEhMKC3BlcnNvbl91dWlkGAIgASgJEhYKDnBlcnNvbl92ZXJzaW9uGAMgASgDEhUKDXRvbWJzdG9uZWRfYXQYBCABKAMiYgogTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlUmVzcG9uc2USPgoHZW50cmllcxgBIAMoCzItLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25Ub21ic3RvbmVRdWV1ZUVudHJ5IkcKIERlbGV0ZVBlcnNvbnNCYXRjaEZvclRlYW1SZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEgoKYmF0Y2hfc2l6ZRgCIAEoAyI6CiFEZWxldGVQZXJzb25zQmF0Y2hGb3JUZWFtUmVzcG9uc2USFQoNZGVsZXRlZF9jb3VudBgBIAEoAyKcAQoeRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJEhAKCG1heF9yb3dzGAMgASgDEkEKD2JvdW5kZWRfcGVyc29ucxgEIAMoCzIoLnBlcnNvbmhvZy50eXBlcy52MS5WZXJzaW9uQm91bmRlZFBlcnNvbiJAChRWZXJzaW9uQm91bmRlZFBlcnNvbhITCgtwZXJzb25fdXVpZBgBIAEoCRITCgttYXhfdmVyc2lvbhgCIAEoAyLkAQofRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXNwb25zZRIVCg1kZWxldGVkX2NvdW50GAEgASgDEhoKEnNraXBwZWRfbGl2ZV9jb3VudBgCIAEoAxIcChRibG9ja2VkX3BlcnNvbl91dWlkcxgDIAMoCRIcChRwZW5kaW5nX3BlcnNvbl91dWlkcxgEIAMoCRIUCgxyb3dzX2RlbGV0ZWQYBSABKAMSHQoVdmVyc2lvbl9ndWFyZF9hcHBsaWVkGAYgASgIEh0KFXNraXBwZWRfdmVyc2lvbl9jb3VudBgHIAEoAyJXChJTcGxpdFBlcnNvblJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIRCglwZXJzb25faWQYAiABKAMSHQoVZGlzdGluY3RfaWRzX3RvX3NwbGl0GAMgAygJIo4BCgtTcGxpdFJlc3VsdBITCgtkaXN0aW5jdF9pZBgBIAEoCRIXCg9uZXdfcGVyc29uX3V1aWQYAiABKAkSGgoSbmV3X3BlcnNvbl92ZXJzaW9uGAMgASgDEhMKC3BkaV92ZXJzaW9uGAQgASgDEiAKGG5ld19wZXJzb25fY3JlYXRlZF9hdF9tcxgFIAEoAyJGChNTcGxpdFBlcnNvblJlc3BvbnNlEi8KBnNwbGl0cxgBIAMoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5TcGxpdFJlc3VsdCJjCiZTZXRQZXJzb25EaXN0aW5jdElkVmVyc2lvbkZsb29yUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhMKC2Rpc3RpbmN0X2lkGAIgASgJEhMKC21pbl92ZXJzaW9uGAMgASgDImUKJ1NldFBlcnNvbkRpc3RpbmN0SWRWZXJzaW9uRmxvb3JSZXNwb25zZRIvCgZwZXJzb24YASABKAsyGi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uSACIAQFCCQoHX3BlcnNvbiJXChxTZXRQZXJzb25WZXJzaW9uRmxvb3JSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEhMKC21pbl92ZXJzaW9uGAMgASgDIjAKHVNldFBlcnNvblZlcnNpb25GbG9vclJlc3BvbnNlEg8KB3VwZGF0ZWQYASABKAgiPgoSUGVyc29uVmVyc2lvbkZsb29yEhMKC3BlcnNvbl91dWlkGAEgASgJEhMKC21pbl92ZXJzaW9uGAIgASgDImsKIEVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSNgoGZmxvb3JzGAIgAygLMiYucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvblZlcnNpb25GbG9vciJ6ChhQZXJzb25WZXJzaW9uRmxvb3JSZXN1bHQSEwoLcGVyc29uX3V1aWQYASABKAkSOAoHb3V0Y29tZRgCIAEoDjInLnBlcnNvbmhvZy50eXBlcy52MS5WZXJzaW9uRmxvb3JPdXRjb21lEg8KB3ZlcnNpb24YAyABKAMiYgohRW5zdXJlUGVyc29uVmVyc2lvbkZsb29yc1Jlc3BvbnNlEj0KB3Jlc3VsdHMYASADKAsyLC5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uVmVyc2lvbkZsb29yUmVzdWx0In0KEkZlbmNlUGVyc29uUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxINCgVvcF9pZBgDIAEoCRI0CgdvcF90eXBlGAQgASgOMiMucGVyc29uaG9nLnR5cGVzLnYxLkxpZmVjeWNsZU9wVHlwZSJBChNGZW5jZVBlcnNvblJlc3BvbnNlEioKBnNlYWxlZBgBIAEoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24ifwoTRmVuY2VQZXJzb25zUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEg0KBW9wX2lkGAIgASgJEjQKB29wX3R5cGUYAyABKA4yIy5wZXJzb25ob2cudHlwZXMudjEuTGlmZWN5Y2xlT3BUeXBlEhIKCnBlcnNvbl9pZHMYBCADKAMiXwoURmVuY2VQZXJzb25zUmVzcG9uc2USNAoGc2VhbGVkGAEgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlZFBlcnNvblNlYWwSEQoJbm90X2ZvdW5kGAIgAygDIkoKEEZlbmNlZFBlcnNvblNlYWwSEQoJcGVyc29uX2lkGAEgASgDEg8KB3ZlcnNpb24YAiABKAMSEgoKY3JlYXRlZF9hdBgDIAEoAyLWAQoTUmVsZWFzZUZlbmNlUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxITCgtwZXJzb25fdXVpZBgDIAEoCRINCgVvcF9pZBgEIAEoCRIzCgdvdXRjb21lGAUgASgOMiIucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VPdXRjb21lEhsKDnNlYWxlZF92ZXJzaW9uGAYgASgDSACIAQESEgoKY3JlYXRlZF9hdBgHIAEoA0IRCg9fc2VhbGVkX3ZlcnNpb24iFgoUUmVsZWFzZUZlbmNlUmVzcG9uc2UiogEKFFJlbGVhc2VGZW5jZXNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSDQoFb3BfaWQYAiABKAkSMwoHb3V0Y29tZRgDIAEoDjIiLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlT3V0Y29tZRI1CgdwZXJzb25zGAQgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VGZW5jZUl0ZW0ifgoQUmVsZWFzZUZlbmNlSXRlbRIRCglwZXJzb25faWQYASABKAMSEwoLcGVyc29uX3V1aWQYAiABKAkSGwoOc2VhbGVkX3ZlcnNpb24YAyABKANIAIgBARISCgpjcmVhdGVkX2F0GAQgASgDQhEKD19zZWFsZWRfdmVyc2lvbiIXChVSZWxlYXNlRmVuY2VzUmVzcG9uc2UiUwoUU2VhbGVkU291cmNlU25hcHNob3QSKgoGcGVyc29uGAEgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbhIPCgdvcmRpbmFsGAIgASgFIr0BChlGb2xkUGVyc29uRG9jdW1lbnRSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEkIKEHNlYWxlZF9zbmFwc2hvdHMYAyADKAsyKC5wZXJzb25ob2cudHlwZXMudjEuU2VhbGVkU291cmNlU25hcHNob3QSEQoJZXZlbnRfc2V0GAQgASgMEhYKDmV2ZW50X3NldF9vbmNlGAUgASgMEg0KBW9wX2lkGAYgASgJIkgKGkZvbGRQZXJzb25Eb2N1bWVudFJlc3BvbnNlEioKBnBlcnNvbhgBIAEoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24ivAEKDURpc3RpbmN0SWRSb3cSEwoLZGlzdGluY3RfaWQYASABKAkSEQoJcGVyc29uX2lkGAIgASgDEhgKC3BlcnNvbl91dWlkGAMgASgJSACIAQESDwoHdmVyc2lvbhgEIAEoAxISCgppc19kZWxldGVkGAUgASgIEh4KEXBlcnNvbl9pc19kZWxldGVkGAYgASgISAGIAQFCDgoMX3BlcnNvbl91dWlkQhQKEl9wZXJzb25faXNfZGVsZXRlZCJ4ChhHZXREaXN0aW5jdElkUm93c1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIUCgxkaXN0aW5jdF9pZHMYAiADKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zIkwKGUdldERpc3RpbmN0SWRSb3dzUmVzcG9uc2USLwoEcm93cxgBIAMoCzIhLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkUm93IoYBCg9QZXJzb25MaXN0RW50cnkSCgoCaWQYASABKAMSDAoEdXVpZBgCIAEoCRIPCgd2ZXJzaW9uGAMgASgDEhIKCmlzX2RlbGV0ZWQYBCABKAgSHQoVaGFzX2xpdmVfZGlzdGluY3RfaWRzGAUgASgIEhUKDWNyZWF0ZWRfYXRfbXMYBiABKAMivwEKGUxpc3RQZXJzb25zRm9yVGVhbVJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIXCg9hZnRlcl9wZXJzb25faWQYAiABKAMSDQoFbGltaXQYAyABKAMSNQoMcmVhZF9vcHRpb25zGAQgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zEh0KEGJlZm9yZV9wZXJzb25faWQYBSABKANIAIgBAUITChFfYmVmb3JlX3BlcnNvbl9pZCKOAQoaTGlzdFBlcnNvbnNGb3JUZWFtUmVzcG9uc2USNAoHcGVyc29ucxgBIAMoCzIjLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25MaXN0RW50cnkSIQoUbmV4dF9hZnRlcl9wZXJzb25faWQYAiABKANIAIgBAUIXChVfbmV4dF9hZnRlcl9wZXJzb25faWQiagofUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEjYKBmZsb29ycxgCIAMoCzImLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25WZXJzaW9uRmxvb3IieAodUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JSZXN1bHQSEwoLcGVyc29uX3V1aWQYASABKAkSMQoHb3V0Y29tZRgCIAEoDjIgLnBlcnNvbmhvZy50eXBlcy52MS5SYWlzZU91dGNvbWUSDwoHdmVyc2lvbhgDIAEoAyJmCiBSYWlzZVBlcnNvblZlcnNpb25GbG9vcnNSZXNwb25zZRJCCgdyZXN1bHRzGAEgAygLMjEucGVyc29uaG9nLnR5cGVzLnYxLlJhaXNlUGVyc29uVmVyc2lvbkZsb29yUmVzdWx0KnkKEURlbGV0ZVBlcnNvbnNNb2RlEiMKH0RFTEVURV9QRVJTT05TX01PREVfVU5TUEVDSUZJRUQQABIcChhERUxFVEVfUEVSU09OU19NT0RFX0hBUkQQARIhCh1ERUxFVEVfUEVSU09OU19NT0RFX1RPTUJTVE9ORRACKuQBChNWZXJzaW9uRmxvb3JPdXRjb21lEiUKIVZFUlNJT05fRkxPT1JfT1VUQ09NRV9VTlNQRUNJRklFRBAAEiwKKFZFUlNJT05fRkxPT1JfT1VUQ09NRV9UT01CU1RPTkVfSU5TRVJURUQQARIqCiZWRVJTSU9OX0ZMT09SX09VVENPTUVfVE9NQlNUT05FX1JBSVNFRBACEiwKKFZFUlNJT05fRkxPT1JfT1VUQ09NRV9UT01CU1RPTkVfQVRfRkxPT1IQAxIeChpWRVJTSU9OX0ZMT09SX09VVENPTUVfTElWRRAEKm8KD0xpZmVjeWNsZU9wVHlwZRIhCh1MSUZFQ1lDTEVfT1BfVFlQRV9VTlNQRUNJRklFRBAAEhwKGExJRkVDWUNMRV9PUF9UWVBFX0RFTEVURRABEhsKF0xJRkVDWUNMRV9PUF9UWVBFX01FUkdFEAIqbQoOUmVsZWFzZU91dGNvbWUSHwobUkVMRUFTRV9PVVRDT01FX1VOU1BFQ0lGSUVEEAASHQoZUkVMRUFTRV9PVVRDT01FX0NPTU1JVFRFRBABEhsKF1JFTEVBU0VfT1VUQ09NRV9BQk9SVEVEEAIqnQEKDFJhaXNlT3V0Y29tZRIdChlSQUlTRV9PVVRDT01FX1VOU1BFQ0lGSUVEEAASGAoUUkFJU0VfT1VUQ09NRV9SQUlTRUQQARIdChlSQUlTRV9PVVRDT01FX0FUX09SX0FCT1ZFEAISGgoWUkFJU0VfT1VUQ09NRV9OT1RfTElWRRADEhkKFVJBSVNFX09VVENPTUVfTUlTU0lORxAEYgZwcm90bzM',
+ 'Ch9wZXJzb25ob2cvdHlwZXMvdjEvcGVyc29uLnByb3RvEhJwZXJzb25ob2cudHlwZXMudjEisgIKBlBlcnNvbhIKCgJpZBgBIAEoAxIMCgR1dWlkGAIgASgJEg8KB3RlYW1faWQYAyABKAMSEgoKcHJvcGVydGllcxgEIAEoDBIiChpwcm9wZXJ0aWVzX2xhc3RfdXBkYXRlZF9hdBgFIAEoDBIhChlwcm9wZXJ0aWVzX2xhc3Rfb3BlcmF0aW9uGAYgASgMEhIKCmNyZWF0ZWRfYXQYByABKAMSDwoHdmVyc2lvbhgIIAEoAxIVCg1pc19pZGVudGlmaWVkGAkgASgIEhcKCmlzX3VzZXJfaWQYCiABKAhIAIgBARIZCgxsYXN0X3NlZW5fYXQYCyABKANIAYgBARISCgppc19kZWxldGVkGAwgASgIQg0KC19pc191c2VyX2lkQg8KDV9sYXN0X3NlZW5fYXQiZgoVRGlzdGluY3RJZFdpdGhWZXJzaW9uEhMKC2Rpc3RpbmN0X2lkGAEgASgJEhQKB3ZlcnNpb24YAiABKANIAIgBARIPCgJpZBgDIAEoA0gBiAEBQgoKCF92ZXJzaW9uQgUKA19pZCJoChVQZXJzb25XaXRoRGlzdGluY3RJZHMSEwoLZGlzdGluY3RfaWQYASABKAkSLwoGcGVyc29uGAIgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24iZwoRUGVyc29uRGlzdGluY3RJZHMSEQoJcGVyc29uX2lkGAEgASgDEj8KDGRpc3RpbmN0X2lkcxgCIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkV2l0aFZlcnNpb24ihwEKGFBlcnNvbldpdGhUZWFtRGlzdGluY3RJZBIvCgNrZXkYASABKAsyIi5wZXJzb25ob2cudHlwZXMudjEuVGVhbURpc3RpbmN0SWQSLwoGcGVyc29uGAIgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24ibQoQR2V0UGVyc29uUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxI1CgxyZWFkX29wdGlvbnMYAyABKAsyHy5wZXJzb25ob2cudHlwZXMudjEuUmVhZE9wdGlvbnMiTwoRR2V0UGVyc29uUmVzcG9uc2USLwoGcGVyc29uGAEgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbkgAiAEBQgkKB19wZXJzb24ibwoRR2V0UGVyc29uc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxISCgpwZXJzb25faWRzGAIgAygDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucyJTCg9QZXJzb25zUmVzcG9uc2USKwoHcGVyc29ucxgBIAMoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24SEwoLbWlzc2luZ19pZHMYAiADKAMibgoWR2V0UGVyc29uQnlVdWlkUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEgwKBHV1aWQYAiABKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zInEKGEdldFBlcnNvbnNCeVV1aWRzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEg0KBXV1aWRzGAIgAygJEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucyJ7ChxHZXRQZXJzb25CeURpc3RpbmN0SWRSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEwoLZGlzdGluY3RfaWQYAiABKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zIoQBCiRHZXRQZXJzb25zQnlEaXN0aW5jdElkc0luVGVhbVJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIUCgxkaXN0aW5jdF9pZHMYAiADKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zImAKIlBlcnNvbnNCeURpc3RpbmN0SWRzSW5UZWFtUmVzcG9uc2USOgoHcmVzdWx0cxgBIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25XaXRoRGlzdGluY3RJZHMilgEKHkdldFBlcnNvbnNCeURpc3RpbmN0SWRzUmVxdWVzdBI9ChF0ZWFtX2Rpc3RpbmN0X2lkcxgBIAMoCzIiLnBlcnNvbmhvZy50eXBlcy52MS5UZWFtRGlzdGluY3RJZBI1CgxyZWFkX29wdGlvbnMYAiABKAsyHy5wZXJzb25ob2cudHlwZXMudjEuUmVhZE9wdGlvbnMiXQocUGVyc29uc0J5RGlzdGluY3RJZHNSZXNwb25zZRI9CgdyZXN1bHRzGAEgAygLMiwucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbldpdGhUZWFtRGlzdGluY3RJZCK/AQoeR2V0RGlzdGluY3RJZHNGb3JQZXJzb25SZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucxISCgVsaW1pdBgEIAEoA0gAiAEBEhYKCWN1cnNvcl9pZBgFIAEoA0gBiAEBQggKBl9saW1pdEIMCgpfY3Vyc29yX2lkIpIBCh9HZXREaXN0aW5jdElkc0ZvclBlcnNvblJlc3BvbnNlEj8KDGRpc3RpbmN0X2lkcxgBIAMoCzIpLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkV2l0aFZlcnNpb24SGwoObmV4dF9jdXJzb3JfaWQYAiABKANIAIgBAUIRCg9fbmV4dF9jdXJzb3JfaWQisQEKH0dldERpc3RpbmN0SWRzRm9yUGVyc29uc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxISCgpwZXJzb25faWRzGAIgAygDEjUKDHJlYWRfb3B0aW9ucxgDIAEoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5SZWFkT3B0aW9ucxIdChBsaW1pdF9wZXJfcGVyc29uGAQgASgDSACIAQFCEwoRX2xpbWl0X3Blcl9wZXJzb24iZgogR2V0RGlzdGluY3RJZHNGb3JQZXJzb25zUmVzcG9uc2USQgoTcGVyc29uX2Rpc3RpbmN0X2lkcxgBIAMoCzIlLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25EaXN0aW5jdElkcyKWAgodVXBkYXRlUGVyc29uUHJvcGVydGllc1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIRCglwZXJzb25faWQYAiABKAMSEgoKZXZlbnRfbmFtZRgDIAEoCRIWCg5zZXRfcHJvcGVydGllcxgEIAEoDBIbChNzZXRfb25jZV9wcm9wZXJ0aWVzGAUgASgMEhgKEHVuc2V0X3Byb3BlcnRpZXMYBiADKAkSGgoNaXNfaWRlbnRpZmllZBgHIAEoCEgAiAEBEhkKDGxhc3Rfc2Vlbl9hdBgIIAEoA0gBiAEBEhQKDGZvcmNlX3VwZGF0ZRgJIAEoCEIQCg5faXNfaWRlbnRpZmllZEIPCg1fbGFzdF9zZWVuX2F0Im0KHlVwZGF0ZVBlcnNvblByb3BlcnRpZXNSZXNwb25zZRIvCgZwZXJzb24YASABKAsyGi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uSACIAQESDwoHdXBkYXRlZBgCIAEoCEIJCgdfcGVyc29uInIKFERlbGV0ZVBlcnNvbnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJEjMKBG1vZGUYAyABKA4yJS5wZXJzb25ob2cudHlwZXMudjEuRGVsZXRlUGVyc29uc01vZGUiPAoUVG9tYnN0b25lZERpc3RpbmN0SWQSEwoLZGlzdGluY3RfaWQYASABKAkSDwoHdmVyc2lvbhgCIAEoAyJ4ChBUb21ic3RvbmVkUGVyc29uEhMKC3BlcnNvbl91dWlkGAEgASgJEg8KB3ZlcnNpb24YAiABKAMSPgoMZGlzdGluY3RfaWRzGAMgAygLMigucGVyc29uaG9nLnR5cGVzLnYxLlRvbWJzdG9uZWREaXN0aW5jdElkInwKFURlbGV0ZVBlcnNvbnNSZXNwb25zZRIVCg1kZWxldGVkX2NvdW50GAEgASgDEhIKCnRvbWJzdG9uZWQYAiABKAgSOAoKdG9tYnN0b25lcxgDIAMoCzIkLnBlcnNvbmhvZy50eXBlcy52MS5Ub21ic3RvbmVkUGVyc29uIkMKGkdldFBlcnNvblRvbWJzdG9uZXNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJIlcKG0dldFBlcnNvblRvbWJzdG9uZXNSZXNwb25zZRI4Cgp0b21ic3RvbmVzGAEgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLlRvbWJzdG9uZWRQZXJzb24iPAoUQWNrZWRQZXJzb25Ub21ic3RvbmUSEwoLcGVyc29uX3V1aWQYASABKAkSDwoHdmVyc2lvbhgCIAEoAyJrChpBY2tQZXJzb25Ub21ic3RvbmVzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEjwKCnRvbWJzdG9uZXMYAiADKAsyKC5wZXJzb25ob2cudHlwZXMudjEuQWNrZWRQZXJzb25Ub21ic3RvbmUiNAobQWNrUGVyc29uVG9tYnN0b25lc1Jlc3BvbnNlEhUKDWNsZWFyZWRfY291bnQYASABKAMihAEKH0xpc3RQZXJzb25Ub21ic3RvbmVRdWV1ZVJlcXVlc3QSFQoNYWZ0ZXJfdGVhbV9pZBgBIAEoAxIZChFhZnRlcl9wZXJzb25fdXVpZBgCIAEoCRINCgVsaW1pdBgDIAEoAxIUCgd0ZWFtX2lkGAQgASgDSACIAQFCCgoIX3RlYW1faWQicAoZUGVyc29uVG9tYnN0b25lUXVldWVFbnRyeRIPCgd0ZWFtX2lkGAEgASgDEhMKC3BlcnNvbl91dWlkGAIgASgJEhYKDnBlcnNvbl92ZXJzaW9uGAMgASgDEhUKDXRvbWJzdG9uZWRfYXQYBCABKAMiYgogTGlzdFBlcnNvblRvbWJzdG9uZVF1ZXVlUmVzcG9uc2USPgoHZW50cmllcxgBIAMoCzItLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25Ub21ic3RvbmVRdWV1ZUVudHJ5IkcKIERlbGV0ZVBlcnNvbnNCYXRjaEZvclRlYW1SZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEgoKYmF0Y2hfc2l6ZRgCIAEoAyI6CiFEZWxldGVQZXJzb25zQmF0Y2hGb3JUZWFtUmVzcG9uc2USFQoNZGVsZXRlZF9jb3VudBgBIAEoAyKcAQoeRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSFAoMcGVyc29uX3V1aWRzGAIgAygJEhAKCG1heF9yb3dzGAMgASgDEkEKD2JvdW5kZWRfcGVyc29ucxgEIAMoCzIoLnBlcnNvbmhvZy50eXBlcy52MS5WZXJzaW9uQm91bmRlZFBlcnNvbiJAChRWZXJzaW9uQm91bmRlZFBlcnNvbhITCgtwZXJzb25fdXVpZBgBIAEoCRITCgttYXhfdmVyc2lvbhgCIAEoAyLkAQofRGVsZXRlVG9tYnN0b25lZFBlcnNvbnNSZXNwb25zZRIVCg1kZWxldGVkX2NvdW50GAEgASgDEhoKEnNraXBwZWRfbGl2ZV9jb3VudBgCIAEoAxIcChRibG9ja2VkX3BlcnNvbl91dWlkcxgDIAMoCRIcChRwZW5kaW5nX3BlcnNvbl91dWlkcxgEIAMoCRIUCgxyb3dzX2RlbGV0ZWQYBSABKAMSHQoVdmVyc2lvbl9ndWFyZF9hcHBsaWVkGAYgASgIEh0KFXNraXBwZWRfdmVyc2lvbl9jb3VudBgHIAEoAyJXChJTcGxpdFBlcnNvblJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIRCglwZXJzb25faWQYAiABKAMSHQoVZGlzdGluY3RfaWRzX3RvX3NwbGl0GAMgAygJIo4BCgtTcGxpdFJlc3VsdBITCgtkaXN0aW5jdF9pZBgBIAEoCRIXCg9uZXdfcGVyc29uX3V1aWQYAiABKAkSGgoSbmV3X3BlcnNvbl92ZXJzaW9uGAMgASgDEhMKC3BkaV92ZXJzaW9uGAQgASgDEiAKGG5ld19wZXJzb25fY3JlYXRlZF9hdF9tcxgFIAEoAyJGChNTcGxpdFBlcnNvblJlc3BvbnNlEi8KBnNwbGl0cxgBIAMoCzIfLnBlcnNvbmhvZy50eXBlcy52MS5TcGxpdFJlc3VsdCJjCiZTZXRQZXJzb25EaXN0aW5jdElkVmVyc2lvbkZsb29yUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhMKC2Rpc3RpbmN0X2lkGAIgASgJEhMKC21pbl92ZXJzaW9uGAMgASgDImUKJ1NldFBlcnNvbkRpc3RpbmN0SWRWZXJzaW9uRmxvb3JSZXNwb25zZRIvCgZwZXJzb24YASABKAsyGi5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uSACIAQFCCQoHX3BlcnNvbiJXChxTZXRQZXJzb25WZXJzaW9uRmxvb3JSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEhMKC21pbl92ZXJzaW9uGAMgASgDIjAKHVNldFBlcnNvblZlcnNpb25GbG9vclJlc3BvbnNlEg8KB3VwZGF0ZWQYASABKAgiPgoSUGVyc29uVmVyc2lvbkZsb29yEhMKC3BlcnNvbl91dWlkGAEgASgJEhMKC21pbl92ZXJzaW9uGAIgASgDImsKIEVuc3VyZVBlcnNvblZlcnNpb25GbG9vcnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSNgoGZmxvb3JzGAIgAygLMiYucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvblZlcnNpb25GbG9vciJ6ChhQZXJzb25WZXJzaW9uRmxvb3JSZXN1bHQSEwoLcGVyc29uX3V1aWQYASABKAkSOAoHb3V0Y29tZRgCIAEoDjInLnBlcnNvbmhvZy50eXBlcy52MS5WZXJzaW9uRmxvb3JPdXRjb21lEg8KB3ZlcnNpb24YAyABKAMiYgohRW5zdXJlUGVyc29uVmVyc2lvbkZsb29yc1Jlc3BvbnNlEj0KB3Jlc3VsdHMYASADKAsyLC5wZXJzb25ob2cudHlwZXMudjEuUGVyc29uVmVyc2lvbkZsb29yUmVzdWx0In0KEkZlbmNlUGVyc29uUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxINCgVvcF9pZBgDIAEoCRI0CgdvcF90eXBlGAQgASgOMiMucGVyc29uaG9nLnR5cGVzLnYxLkxpZmVjeWNsZU9wVHlwZSJBChNGZW5jZVBlcnNvblJlc3BvbnNlEioKBnNlYWxlZBgBIAEoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24ifwoTRmVuY2VQZXJzb25zUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEg0KBW9wX2lkGAIgASgJEjQKB29wX3R5cGUYAyABKA4yIy5wZXJzb25ob2cudHlwZXMudjEuTGlmZWN5Y2xlT3BUeXBlEhIKCnBlcnNvbl9pZHMYBCADKAMiXwoURmVuY2VQZXJzb25zUmVzcG9uc2USNAoGc2VhbGVkGAEgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLkZlbmNlZFBlcnNvblNlYWwSEQoJbm90X2ZvdW5kGAIgAygDIkoKEEZlbmNlZFBlcnNvblNlYWwSEQoJcGVyc29uX2lkGAEgASgDEg8KB3ZlcnNpb24YAiABKAMSEgoKY3JlYXRlZF9hdBgDIAEoAyLWAQoTUmVsZWFzZUZlbmNlUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEhEKCXBlcnNvbl9pZBgCIAEoAxITCgtwZXJzb25fdXVpZBgDIAEoCRINCgVvcF9pZBgEIAEoCRIzCgdvdXRjb21lGAUgASgOMiIucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VPdXRjb21lEhsKDnNlYWxlZF92ZXJzaW9uGAYgASgDSACIAQESEgoKY3JlYXRlZF9hdBgHIAEoA0IRCg9fc2VhbGVkX3ZlcnNpb24iFgoUUmVsZWFzZUZlbmNlUmVzcG9uc2UiogEKFFJlbGVhc2VGZW5jZXNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSDQoFb3BfaWQYAiABKAkSMwoHb3V0Y29tZRgDIAEoDjIiLnBlcnNvbmhvZy50eXBlcy52MS5SZWxlYXNlT3V0Y29tZRI1CgdwZXJzb25zGAQgAygLMiQucGVyc29uaG9nLnR5cGVzLnYxLlJlbGVhc2VGZW5jZUl0ZW0ifgoQUmVsZWFzZUZlbmNlSXRlbRIRCglwZXJzb25faWQYASABKAMSEwoLcGVyc29uX3V1aWQYAiABKAkSGwoOc2VhbGVkX3ZlcnNpb24YAyABKANIAIgBARISCgpjcmVhdGVkX2F0GAQgASgDQhEKD19zZWFsZWRfdmVyc2lvbiIXChVSZWxlYXNlRmVuY2VzUmVzcG9uc2UiUwoUU2VhbGVkU291cmNlU25hcHNob3QSKgoGcGVyc29uGAEgASgLMhoucGVyc29uaG9nLnR5cGVzLnYxLlBlcnNvbhIPCgdvcmRpbmFsGAIgASgFIr0BChlGb2xkUGVyc29uRG9jdW1lbnRSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSEQoJcGVyc29uX2lkGAIgASgDEkIKEHNlYWxlZF9zbmFwc2hvdHMYAyADKAsyKC5wZXJzb25ob2cudHlwZXMudjEuU2VhbGVkU291cmNlU25hcHNob3QSEQoJZXZlbnRfc2V0GAQgASgMEhYKDmV2ZW50X3NldF9vbmNlGAUgASgMEg0KBW9wX2lkGAYgASgJIkgKGkZvbGRQZXJzb25Eb2N1bWVudFJlc3BvbnNlEioKBnBlcnNvbhgBIAEoCzIaLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb24ivAEKDURpc3RpbmN0SWRSb3cSEwoLZGlzdGluY3RfaWQYASABKAkSEQoJcGVyc29uX2lkGAIgASgDEhgKC3BlcnNvbl91dWlkGAMgASgJSACIAQESDwoHdmVyc2lvbhgEIAEoAxISCgppc19kZWxldGVkGAUgASgIEh4KEXBlcnNvbl9pc19kZWxldGVkGAYgASgISAGIAQFCDgoMX3BlcnNvbl91dWlkQhQKEl9wZXJzb25faXNfZGVsZXRlZCJ4ChhHZXREaXN0aW5jdElkUm93c1JlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIUCgxkaXN0aW5jdF9pZHMYAiADKAkSNQoMcmVhZF9vcHRpb25zGAMgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zIkwKGUdldERpc3RpbmN0SWRSb3dzUmVzcG9uc2USLwoEcm93cxgBIAMoCzIhLnBlcnNvbmhvZy50eXBlcy52MS5EaXN0aW5jdElkUm93IoYBCg9QZXJzb25MaXN0RW50cnkSCgoCaWQYASABKAMSDAoEdXVpZBgCIAEoCRIPCgd2ZXJzaW9uGAMgASgDEhIKCmlzX2RlbGV0ZWQYBCABKAgSHQoVaGFzX2xpdmVfZGlzdGluY3RfaWRzGAUgASgIEhUKDWNyZWF0ZWRfYXRfbXMYBiABKAMivwEKGUxpc3RQZXJzb25zRm9yVGVhbVJlcXVlc3QSDwoHdGVhbV9pZBgBIAEoAxIXCg9hZnRlcl9wZXJzb25faWQYAiABKAMSDQoFbGltaXQYAyABKAMSNQoMcmVhZF9vcHRpb25zGAQgASgLMh8ucGVyc29uaG9nLnR5cGVzLnYxLlJlYWRPcHRpb25zEh0KEGJlZm9yZV9wZXJzb25faWQYBSABKANIAIgBAUITChFfYmVmb3JlX3BlcnNvbl9pZCKOAQoaTGlzdFBlcnNvbnNGb3JUZWFtUmVzcG9uc2USNAoHcGVyc29ucxgBIAMoCzIjLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25MaXN0RW50cnkSIQoUbmV4dF9hZnRlcl9wZXJzb25faWQYAiABKANIAIgBAUIXChVfbmV4dF9hZnRlcl9wZXJzb25faWQiagofUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JzUmVxdWVzdBIPCgd0ZWFtX2lkGAEgASgDEjYKBmZsb29ycxgCIAMoCzImLnBlcnNvbmhvZy50eXBlcy52MS5QZXJzb25WZXJzaW9uRmxvb3IieAodUmFpc2VQZXJzb25WZXJzaW9uRmxvb3JSZXN1bHQSEwoLcGVyc29uX3V1aWQYASABKAkSMQoHb3V0Y29tZRgCIAEoDjIgLnBlcnNvbmhvZy50eXBlcy52MS5SYWlzZU91dGNvbWUSDwoHdmVyc2lvbhgDIAEoAyJmCiBSYWlzZVBlcnNvblZlcnNpb25GbG9vcnNSZXNwb25zZRJCCgdyZXN1bHRzGAEgAygLMjEucGVyc29uaG9nLnR5cGVzLnYxLlJhaXNlUGVyc29uVmVyc2lvbkZsb29yUmVzdWx0IrYBCg5SZXN0b3JlZFBlcnNvbhITCgtwZXJzb25fdXVpZBgBIAEoCRISCgpwcm9wZXJ0aWVzGAIgASgMEhUKDWNyZWF0ZWRfYXRfbXMYAyABKAMSFQoNaXNfaWRlbnRpZmllZBgEIAEoCBIPCgd2ZXJzaW9uGAUgASgDEjwKDGRpc3RpbmN0X2lkcxgGIAMoCzImLnBlcnNvbmhvZy50eXBlcy52MS5SZXN0b3JlZERpc3RpbmN0SWQiOgoSUmVzdG9yZWREaXN0aW5jdElkEhMKC2Rpc3RpbmN0X2lkGAEgASgJEg8KB3ZlcnNpb24YAiABKAMiXQoVUmVzdG9yZVBlcnNvbnNSZXF1ZXN0Eg8KB3RlYW1faWQYASABKAMSMwoHcGVyc29ucxgCIAMoCzIiLnBlcnNvbmhvZy50eXBlcy52MS5SZXN0b3JlZFBlcnNvbiKiAQoTUmVzdG9yZVBlcnNvblJlc3VsdBITCgtwZXJzb25fdXVpZBgBIAEoCRIzCgdvdXRjb21lGAIgASgOMiIucGVyc29uaG9nLnR5cGVzLnYxLlJlc3RvcmVPdXRjb21lEhEKCXBlcnNvbl9pZBgDIAEoAxIPCgd2ZXJzaW9uGAQgASgDEh0KFXJlc3RvcmVkX2Rpc3RpbmN0X2lkcxgFIAMoCSJSChZSZXN0b3JlUGVyc29uc1Jlc3BvbnNlEjgKB3Jlc3VsdHMYASADKAsyJy5wZXJzb25ob2cudHlwZXMudjEuUmVzdG9yZVBlcnNvblJlc3VsdCp5ChFEZWxldGVQZXJzb25zTW9kZRIjCh9ERUxFVEVfUEVSU09OU19NT0RFX1VOU1BFQ0lGSUVEEAASHAoYREVMRVRFX1BFUlNPTlNfTU9ERV9IQVJEEAESIQodREVMRVRFX1BFUlNPTlNfTU9ERV9UT01CU1RPTkUQAirkAQoTVmVyc2lvbkZsb29yT3V0Y29tZRIlCiFWRVJTSU9OX0ZMT09SX09VVENPTUVfVU5TUEVDSUZJRUQQABIsCihWRVJTSU9OX0ZMT09SX09VVENPTUVfVE9NQlNUT05FX0lOU0VSVEVEEAESKgomVkVSU0lPTl9GTE9PUl9PVVRDT01FX1RPTUJTVE9ORV9SQUlTRUQQAhIsCihWRVJTSU9OX0ZMT09SX09VVENPTUVfVE9NQlNUT05FX0FUX0ZMT09SEAMSHgoaVkVSU0lPTl9GTE9PUl9PVVRDT01FX0xJVkUQBCpvCg9MaWZlY3ljbGVPcFR5cGUSIQodTElGRUNZQ0xFX09QX1RZUEVfVU5TUEVDSUZJRUQQABIcChhMSUZFQ1lDTEVfT1BfVFlQRV9ERUxFVEUQARIbChdMSUZFQ1lDTEVfT1BfVFlQRV9NRVJHRRACKm0KDlJlbGVhc2VPdXRjb21lEh8KG1JFTEVBU0VfT1VUQ09NRV9VTlNQRUNJRklFRBAAEh0KGVJFTEVBU0VfT1VUQ09NRV9DT01NSVRURUQQARIbChdSRUxFQVNFX09VVENPTUVfQUJPUlRFRBACKp0BCgxSYWlzZU91dGNvbWUSHQoZUkFJU0VfT1VUQ09NRV9VTlNQRUNJRklFRBAAEhgKFFJBSVNFX09VVENPTUVfUkFJU0VEEAESHQoZUkFJU0VfT1VUQ09NRV9BVF9PUl9BQk9WRRACEhoKFlJBSVNFX09VVENPTUVfTk9UX0xJVkUQAxIZChVSQUlTRV9PVVRDT01FX01JU1NJTkcQBCq7AQoOUmVzdG9yZU91dGNvbWUSHwobUkVTVE9SRV9PVVRDT01FX1VOU1BFQ0lGSUVEEAASHAoYUkVTVE9SRV9PVVRDT01FX0lOU0VSVEVEEAESHwobUkVTVE9SRV9PVVRDT01FX0VYSVNUU19MSVZFEAISJQohUkVTVE9SRV9PVVRDT01FX0VYSVNUU19UT01CU1RPTkVEEAMSIgoeUkVTVE9SRV9PVVRDT01FX05PX0RJU1RJTkNUX0lEEARiBnByb3RvMw',
[file_personhog_types_v1_common]
)
@@ -2307,6 +2307,163 @@ export const RaisePersonVersionFloorsResponseSchema: GenMessage<RaisePersonVersi
/*@__PURE__*/
messageDesc(file_personhog_types_v1_person, 71)
+/**
+ * A person to insert from its ClickHouse copy.
+ *
+ * @generated from message personhog.types.v1.RestoredPerson
+ */
+export type RestoredPerson = Message<'personhog.types.v1.RestoredPerson'> & {
+ /**
+ * @generated from field: string person_uuid = 1;
+ */
+ personUuid: string
+
+ /**
+ * JSON object.
+ *
+ * @generated from field: bytes properties = 2;
+ */
+ properties: Uint8Array
+
+ /**
+ * @generated from field: int64 created_at_ms = 3;
+ */
+ createdAtMs: bigint
+
+ /**
+ * @generated from field: bool is_identified = 4;
+ */
+ isIdentified: boolean
+
+ /**
+ * @generated from field: int64 version = 5;
+ */
+ version: bigint
+
+ /**
+ * Distinct ids to insert on the person in the same transaction, where no row exists for them.
+ * When the person is inserted but none of these can be, the person is not inserted either
+ * (RESTORE_OUTCOME_NO_DISTINCT_ID), so a restore never leaves a person nothing points to.
+ *
+ * @generated from field: repeated personhog.types.v1.RestoredDistinctId distinct_ids = 6;
+ */
+ distinctIds: RestoredDistinctId[]
+}
+
+/**
+ * Describes the message personhog.types.v1.RestoredPerson.
+ * Use `create(RestoredPersonSchema)` to create a new message.
+ */
+export const RestoredPersonSchema: GenMessage<RestoredPerson> =
+ /*@__PURE__*/
+ messageDesc(file_personhog_types_v1_person, 72)
+
+/**
+ * @generated from message personhog.types.v1.RestoredDistinctId
+ */
+export type RestoredDistinctId = Message<'personhog.types.v1.RestoredDistinctId'> & {
+ /**
+ * @generated from field: string distinct_id = 1;
+ */
+ distinctId: string
+
+ /**
+ * @generated from field: int64 version = 2;
+ */
+ version: bigint
+}
+
+/**
+ * Describes the message personhog.types.v1.RestoredDistinctId.
+ * Use `create(RestoredDistinctIdSchema)` to create a new message.
+ */
+export const RestoredDistinctIdSchema: GenMessage<RestoredDistinctId> =
+ /*@__PURE__*/
+ messageDesc(file_personhog_types_v1_person, 73)
+
+/**
+ * @generated from message personhog.types.v1.RestorePersonsRequest
+ */
+export type RestorePersonsRequest = Message<'personhog.types.v1.RestorePersonsRequest'> & {
+ /**
+ * @generated from field: int64 team_id = 1;
+ */
+ teamId: bigint
+
+ /**
+ * At most 250, no repeated uuid.
+ *
+ * @generated from field: repeated personhog.types.v1.RestoredPerson persons = 2;
+ */
+ persons: RestoredPerson[]
+}
+
+/**
+ * Describes the message personhog.types.v1.RestorePersonsRequest.
+ * Use `create(RestorePersonsRequestSchema)` to create a new message.
+ */
+export const RestorePersonsRequestSchema: GenMessage<RestorePersonsRequest> =
+ /*@__PURE__*/
+ messageDesc(file_personhog_types_v1_person, 74)
+
+/**
+ * @generated from message personhog.types.v1.RestorePersonResult
+ */
+export type RestorePersonResult = Message<'personhog.types.v1.RestorePersonResult'> & {
+ /**
+ * @generated from field: string person_uuid = 1;
+ */
+ personUuid: string
+
+ /**
+ * @generated from field: personhog.types.v1.RestoreOutcome outcome = 2;
+ */
+ outcome: RestoreOutcome
+
+ /**
+ * @generated from field: int64 person_id = 3;
+ */
+ personId: bigint
+
+ /**
+ * @generated from field: int64 version = 4;
+ */
+ version: bigint
+
+ /**
+ * For INSERTED: the requested distinct ids inserted on the person, at their requested versions.
+ *
+ * @generated from field: repeated string restored_distinct_ids = 5;
+ */
+ restoredDistinctIds: string[]
+}
+
+/**
+ * Describes the message personhog.types.v1.RestorePersonResult.
+ * Use `create(RestorePersonResultSchema)` to create a new message.
+ */
+export const RestorePersonResultSchema: GenMessage<RestorePersonResult> =
+ /*@__PURE__*/
+ messageDesc(file_personhog_types_v1_person, 75)
+
+/**
+ * @generated from message personhog.types.v1.RestorePersonsResponse
+ */
+export type RestorePersonsResponse = Message<'personhog.types.v1.RestorePersonsResponse'> & {
+ /**
+ * @generated from field: repeated personhog.types.v1.RestorePersonResult results = 1;
+ */
+ results: RestorePersonResult[]
+}
+
+/**
+ * Describes the message personhog.types.v1.RestorePersonsResponse.
+ * Use `create(RestorePersonsResponseSchema)` to create a new message.
+ */
+export const RestorePersonsResponseSchema: GenMessage<RestorePersonsResponse> =
+ /*@__PURE__*/
+ messageDesc(file_personhog_types_v1_person, 76)
+
/**
* How DeletePersons removes the rows.
*
@@ -2483,3 +2640,42 @@ export enum RaiseOutcome {
* Describes the enum personhog.types.v1.RaiseOutcome.
*/
export const RaiseOutcomeSchema: GenEnum<RaiseOutcome> = /*@__PURE__*/ enumDesc(file_personhog_types_v1_person, 4)
+
+/**
+ * @generated from enum personhog.types.v1.RestoreOutcome
+ */
+export enum RestoreOutcome {
+ /**
+ * @generated from enum value: RESTORE_OUTCOME_UNSPECIFIED = 0;
+ */
+ UNSPECIFIED = 0,
+
+ /**
+ * @generated from enum value: RESTORE_OUTCOME_INSERTED = 1;
+ */
+ INSERTED = 1,
+
+ /**
+ * A row with the uuid exists, live or tombstoned; it is left unchanged.
+ *
+ * @generated from enum value: RESTORE_OUTCOME_EXISTS_LIVE = 2;
+ */
+ EXISTS_LIVE = 2,
+
+ /**
+ * @generated from enum value: RESTORE_OUTCOME_EXISTS_TOMBSTONED = 3;
+ */
+ EXISTS_TOMBSTONED = 3,
+
+ /**
+ * The request listed distinct ids, and every one of them already had a row; nothing was inserted.
+ *
+ * @generated from enum value: RESTORE_OUTCOME_NO_DISTINCT_ID = 4;
+ */
+ NO_DISTINCT_ID = 4,
+}
+
+/**
+ * Describes the enum personhog.types.v1.RestoreOutcome.
+ */
+export const RestoreOutcomeSchema: GenEnum<RestoreOutcome> = /*@__PURE__*/ enumDesc(file_personhog_types_v1_person, 5)
diff --git a/nodejs/src/common/personhog/client.test.ts b/nodejs/src/common/personhog/client.test.ts
index 1ecac85f7b05..6059921af995 100644
--- a/nodejs/src/common/personhog/client.test.ts
+++ b/nodejs/src/common/personhog/client.test.ts
@@ -153,6 +153,7 @@ const SERVICE_DEFAULTS: ServiceImpl<typeof PersonHogService> = {
getDistinctIdRows: () => ({ rows: [] }),
listPersonsForTeam: () => ({ persons: [] }),
raisePersonVersionFloors: () => ({ results: [] }),
+ restorePersons: () => ({ results: [] }),
fencePerson: () => ({}),
fencePersons: () => ({}),
releaseFence: () => ({}),
diff --git a/nodejs/src/common/personhog/persons.test.ts b/nodejs/src/common/personhog/persons.test.ts
index bef154a25de4..9979d891de7b 100644
--- a/nodejs/src/common/personhog/persons.test.ts
+++ b/nodejs/src/common/personhog/persons.test.ts
@@ -88,6 +88,7 @@ const SERVICE_DEFAULTS: ServiceImpl<typeof PersonHogService> = {
getDistinctIdRows: () => ({ rows: [] }),
listPersonsForTeam: () => ({ persons: [] }),
raisePersonVersionFloors: () => ({ results: [] }),
+ restorePersons: () => ({ results: [] }),
fencePerson: () => ({}),
fencePersons: () => ({}),
releaseFence: () => ({}),
diff --git a/packages/personhog-proto/personhog/service/v1/service_pb2.py b/packages/personhog-proto/personhog/service/v1/service_pb2.py
index dec94b1feabe..761d1ce5a14b 100644
--- a/packages/personhog-proto/personhog/service/v1/service_pb2.py
+++ b/packages/personhog-proto/personhog/service/v1/service_pb2.py
@@ -28,7 +28,7 @@ from personhog.types.v1 import (
)
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
- b"\n\"personhog/service/v1/service.proto\x12\x14personhog.service.v1\x1a\x1fpersonhog/types/v1/person.proto\x1a\x1epersonhog/types/v1/group.proto\x1a\x1fpersonhog/types/v1/cohort.proto\x1a%personhog/types/v1/feature_flag.proto2\xce\x32\n\x10PersonHogService\x12X\n\tGetPerson\x12$.personhog.types.v1.GetPersonRequest\x1a%.personhog.types.v1.GetPersonResponse\x12X\n\nGetPersons\x12%.personhog.types.v1.GetPersonsRequest\x1a#.personhog.types.v1.PersonsResponse\x12\x64\n\x0fGetPersonByUuid\x12*.personhog.types.v1.GetPersonByUuidRequest\x1a%.personhog.types.v1.GetPersonResponse\x12\x66\n\x11GetPersonsByUuids\x12,.personhog.types.v1.GetPersonsByUuidsRequest\x1a#.personhog.types.v1.PersonsResponse\x12p\n\x15GetPersonByDistinctId\x12\x30.personhog.types.v1.GetPersonByDistinctIdRequest\x1a%.personhog.types.v1.GetPersonResponse\x12\x91\x01\n\x1dGetPersonsByDistinctIdsInTeam\x12\x38.personhog.types.v1.GetPersonsByDistinctIdsInTeamRequest\x1a\x36.personhog.types.v1.PersonsByDistinctIdsInTeamResponse\x12\x7f\n\x17GetPersonsByDistinctIds\x12\x32.personhog.types.v1.GetPersonsByDistinctIdsRequest\x1a\x30.personhog.types.v1.PersonsByDistinctIdsResponse\x12\x82\x01\n\x17GetDistinctIdsForPerson\x12\x32.personhog.types.v1.GetDistinctIdsForPersonRequest\x1a\x33.personhog.types.v1.GetDistinctIdsForPersonResponse\x12\x85\x01\n\x18GetDistinctIdsForPersons\x12\x33.personhog.types.v1.GetDistinctIdsForPersonsRequest\x1a\x34.personhog.types.v1.GetDistinctIdsForPersonsResponse\x12\x88\x01\n\x19GetHashKeyOverrideContext\x12\x34.personhog.types.v1.GetHashKeyOverrideContextRequest\x1a\x35.personhog.types.v1.GetHashKeyOverrideContextResponse\x12\x7f\n\x16UpsertHashKeyOverrides\x12\x31.personhog.types.v1.UpsertHashKeyOverridesRequest\x1a\x32.personhog.types.v1.UpsertHashKeyOverridesResponse\x12\x94\x01\n\x1d\x44\x65leteHashKeyOverridesByTeams\x12\x38.personhog.types.v1.DeleteHashKeyOverridesByTeamsRequest\x1a\x39.personhog.types.v1.DeleteHashKeyOverridesByTeamsResponse\x12w\n\x15\x43heckCohortMembership\x12\x30.personhog.types.v1.CheckCohortMembershipRequest\x1a,.personhog.types.v1.CohortMembershipResponse\x12s\n\x12\x43ountCohortMembers\x12-.personhog.types.v1.CountCohortMembersRequest\x1a..personhog.types.v1.CountCohortMembersResponse\x12s\n\x12\x44\x65leteCohortMember\x12-.personhog.types.v1.DeleteCohortMemberRequest\x1a..personhog.types.v1.DeleteCohortMemberResponse\x12\x82\x01\n\x17\x44\x65leteCohortMembersBulk\x12\x32.personhog.types.v1.DeleteCohortMembersBulkRequest\x1a\x33.personhog.types.v1.DeleteCohortMembersBulkResponse\x12v\n\x13InsertCohortMembers\x12..personhog.types.v1.InsertCohortMembersRequest\x1a/.personhog.types.v1.InsertCohortMembersResponse\x12v\n\x13ListCohortMemberIds\x12..personhog.types.v1.ListCohortMemberIdsRequest\x1a/.personhog.types.v1.ListCohortMemberIdsResponse\x12U\n\x08GetGroup\x12#.personhog.types.v1.GetGroupRequest\x1a$.personhog.types.v1.GetGroupResponse\x12U\n\tGetGroups\x12$.personhog.types.v1.GetGroupsRequest\x1a\".personhog.types.v1.GroupsResponse\x12g\n\x0eGetGroupsBatch\x12).personhog.types.v1.GetGroupsBatchRequest\x1a*.personhog.types.v1.GetGroupsBatchResponse\x12[\n\nListGroups\x12%.personhog.types.v1.ListGroupsRequest\x1a&.personhog.types.v1.ListGroupsResponse\x12\x86\x01\n\x1cGetGroupTypeMappingsByTeamId\x12\x37.personhog.types.v1.GetGroupTypeMappingsByTeamIdRequest\x1a-.personhog.types.v1.GroupTypeMappingsResponse\x12\x8d\x01\n\x1dGetGroupTypeMappingsByTeamIds\x12\x38.personhog.types.v1.GetGroupTypeMappingsByTeamIdsRequest\x1a\x32.personhog.types.v1.GroupTypeMappingsBatchResponse\x12\x8c\x01\n\x1fGetGroupTypeMappingsByProjectId\x12:.personhog.types.v1.GetGroupTypeMappingsByProjectIdRequest\x1a-.personhog.types.v1.GroupTypeMappingsResponse\x12\x93\x01\n GetGroupTypeMappingsByProjectIds\x12;.personhog.types.v1.GetGroupTypeMappingsByProjectIdsRequest\x1a\x32.personhog.types.v1.GroupTypeMappingsBatchResponse\x12\x9d\x01\n GetGroupTypeMappingByDashboardId\x12;.personhog.types.v1.GetGroupTypeMappingByDashboardIdRequest\x1a<.personhog.types.v1.GetGroupTypeMappingByDashboardIdResponse\x12\x7f\n\x16\x43ountGroupTypeMappings\x12\x31.personhog.types.v1.CountGroupTypeMappingsRequest\x1a\x32.personhog.types.v1.CountGroupTypeMappingsResponse\x12^\n\x0b\x43reateGroup\x12&.personhog.types.v1.CreateGroupRequest\x1a'.personhog.types.v1.CreateGroupResponse\x12^\n\x0bUpdateGroup\x12&.personhog.types.v1.UpdateGroupRequest\x1a'.personhog.types.v1.UpdateGroupResponse\x12\x85\x01\n\x18\x44\x65leteGroupsBatchForTeam\x12\x33.personhog.types.v1.DeleteGroupsBatchForTeamRequest\x1a\x34.personhog.types.v1.DeleteGroupsBatchForTeamResponse\x12\x7f\n\x16UpdateGroupTypeMapping\x12\x31.personhog.types.v1.UpdateGroupTypeMappingRequest\x1a\x32.personhog.types.v1.UpdateGroupTypeMappingResponse\x12\x7f\n\x16\x44\x65leteGroupTypeMapping\x12\x31.personhog.types.v1.DeleteGroupTypeMappingRequest\x1a\x32.personhog.types.v1.DeleteGroupTypeMappingResponse\x12\xa6\x01\n#DeleteGroupTypeMappingsBatchForTeam\x12>.personhog.types.v1.DeleteGroupTypeMappingsBatchForTeamRequest\x1a?.personhog.types.v1.DeleteGroupTypeMappingsBatchForTeamResponse\x12\x7f\n\x16UpdatePersonProperties\x12\x31.personhog.types.v1.UpdatePersonPropertiesRequest\x1a\x32.personhog.types.v1.UpdatePersonPropertiesResponse\x12^\n\x0b\x46\x65ncePerson\x12&.personhog.types.v1.FencePersonRequest\x1a'.personhog.types.v1.FencePersonResponse\x12\x61\n\x0c\x46\x65ncePersons\x12'.personhog.types.v1.FencePersonsRequest\x1a(.personhog.types.v1.FencePersonsResponse\x12\x61\n\x0cReleaseFence\x12'.personhog.types.v1.ReleaseFenceRequest\x1a(.personhog.types.v1.ReleaseFenceResponse\x12\x64\n\rReleaseFences\x12(.personhog.types.v1.ReleaseFencesRequest\x1a).personhog.types.v1.ReleaseFencesResponse\x12s\n\x12\x46oldPersonDocument\x12-.personhog.types.v1.FoldPersonDocumentRequest\x1a..personhog.types.v1.FoldPersonDocumentResponse\x12\x64\n\rDeletePersons\x12(.personhog.types.v1.DeletePersonsRequest\x1a).personhog.types.v1.DeletePersonsResponse\x12\x88\x01\n\x19\x44\x65letePersonsBatchForTeam\x12\x34.personhog.types.v1.DeletePersonsBatchForTeamRequest\x1a\x35.personhog.types.v1.DeletePersonsBatchForTeamResponse\x12\x82\x01\n\x17\x44\x65leteTombstonedPersons\x12\x32.personhog.types.v1.DeleteTombstonedPersonsRequest\x1a\x33.personhog.types.v1.DeleteTombstonedPersonsResponse\x12v\n\x13GetPersonTombstones\x12..personhog.types.v1.GetPersonTombstonesRequest\x1a/.personhog.types.v1.GetPersonTombstonesResponse\x12v\n\x13\x41\x63kPersonTombstones\x12..personhog.types.v1.AckPersonTombstonesRequest\x1a/.personhog.types.v1.AckPersonTombstonesResponse\x12\x85\x01\n\x18ListPersonTombstoneQueue\x12\x33.personhog.types.v1.ListPersonTombstoneQueueRequest\x1a\x34.personhog.types.v1.ListPersonTombstoneQueueResponse\x12^\n\x0bSplitPerson\x12&.personhog.types.v1.SplitPersonRequest\x1a'.personhog.types.v1.SplitPersonResponse\x12\x9a\x01\n\x1fSetPersonDistinctIdVersionFloor\x12:.personhog.types.v1.SetPersonDistinctIdVersionFloorRequest\x1a;.personhog.types.v1.SetPersonDistinctIdVersionFloorResponse\x12|\n\x15SetPersonVersionFloor\x12\x30.personhog.types.v1.SetPersonVersionFloorRequest\x1a\x31.personhog.types.v1.SetPersonVersionFloorResponse\x12\x88\x01\n\x19\x45nsurePersonVersionFloors\x12\x34.personhog.types.v1.EnsurePersonVersionFloorsRequest\x1a\x35.personhog.types.v1.EnsurePersonVersionFloorsResponse\x12p\n\x11GetDistinctIdRows\x12,.personhog.types.v1.GetDistinctIdRowsRequest\x1a-.personhog.types.v1.GetDistinctIdRowsResponse\x12s\n\x12ListPersonsForTeam\x12-.personhog.types.v1.ListPersonsForTeamRequest\x1a..personhog.types.v1.ListPersonsForTeamResponse\x12\x85\x01\n\x18RaisePersonVersionFloors\x12\x33.personhog.types.v1.RaisePersonVersionFloorsRequest\x1a\x34.personhog.types.v1.RaisePersonVersionFloorsResponseb\x06proto3"
+ b"\n\"personhog/service/v1/service.proto\x12\x14personhog.service.v1\x1a\x1fpersonhog/types/v1/person.proto\x1a\x1epersonhog/types/v1/group.proto\x1a\x1fpersonhog/types/v1/cohort.proto\x1a%personhog/types/v1/feature_flag.proto2\xb7\x33\n\x10PersonHogService\x12X\n\tGetPerson\x12$.personhog.types.v1.GetPersonRequest\x1a%.personhog.types.v1.GetPersonResponse\x12X\n\nGetPersons\x12%.personhog.types.v1.GetPersonsRequest\x1a#.personhog.types.v1.PersonsResponse\x12\x64\n\x0fGetPersonByUuid\x12*.personhog.types.v1.GetPersonByUuidRequest\x1a%.personhog.types.v1.GetPersonResponse\x12\x66\n\x11GetPersonsByUuids\x12,.personhog.types.v1.GetPersonsByUuidsRequest\x1a#.personhog.types.v1.PersonsResponse\x12p\n\x15GetPersonByDistinctId\x12\x30.personhog.types.v1.GetPersonByDistinctIdRequest\x1a%.personhog.types.v1.GetPersonResponse\x12\x91\x01\n\x1dGetPersonsByDistinctIdsInTeam\x12\x38.personhog.types.v1.GetPersonsByDistinctIdsInTeamRequest\x1a\x36.personhog.types.v1.PersonsByDistinctIdsInTeamResponse\x12\x7f\n\x17GetPersonsByDistinctIds\x12\x32.personhog.types.v1.GetPersonsByDistinctIdsRequest\x1a\x30.personhog.types.v1.PersonsByDistinctIdsResponse\x12\x82\x01\n\x17GetDistinctIdsForPerson\x12\x32.personhog.types.v1.GetDistinctIdsForPersonRequest\x1a\x33.personhog.types.v1.GetDistinctIdsForPersonResponse\x12\x85\x01\n\x18GetDistinctIdsForPersons\x12\x33.personhog.types.v1.GetDistinctIdsForPersonsRequest\x1a\x34.personhog.types.v1.GetDistinctIdsForPersonsResponse\x12\x88\x01\n\x19GetHashKeyOverrideContext\x12\x34.personhog.types.v1.GetHashKeyOverrideContextRequest\x1a\x35.personhog.types.v1.GetHashKeyOverrideContextResponse\x12\x7f\n\x16UpsertHashKeyOverrides\x12\x31.personhog.types.v1.UpsertHashKeyOverridesRequest\x1a\x32.personhog.types.v1.UpsertHashKeyOverridesResponse\x12\x94\x01\n\x1d\x44\x65leteHashKeyOverridesByTeams\x12\x38.personhog.types.v1.DeleteHashKeyOverridesByTeamsRequest\x1a\x39.personhog.types.v1.DeleteHashKeyOverridesByTeamsResponse\x12w\n\x15\x43heckCohortMembership\x12\x30.personhog.types.v1.CheckCohortMembershipRequest\x1a,.personhog.types.v1.CohortMembershipResponse\x12s\n\x12\x43ountCohortMembers\x12-.personhog.types.v1.CountCohortMembersRequest\x1a..personhog.types.v1.CountCohortMembersResponse\x12s\n\x12\x44\x65leteCohortMember\x12-.personhog.types.v1.DeleteCohortMemberRequest\x1a..personhog.types.v1.DeleteCohortMemberResponse\x12\x82\x01\n\x17\x44\x65leteCohortMembersBulk\x12\x32.personhog.types.v1.DeleteCohortMembersBulkRequest\x1a\x33.personhog.types.v1.DeleteCohortMembersBulkResponse\x12v\n\x13InsertCohortMembers\x12..personhog.types.v1.InsertCohortMembersRequest\x1a/.personhog.types.v1.InsertCohortMembersResponse\x12v\n\x13ListCohortMemberIds\x12..personhog.types.v1.ListCohortMemberIdsRequest\x1a/.personhog.types.v1.ListCohortMemberIdsResponse\x12U\n\x08GetGroup\x12#.personhog.types.v1.GetGroupRequest\x1a$.personhog.types.v1.GetGroupResponse\x12U\n\tGetGroups\x12$.personhog.types.v1.GetGroupsRequest\x1a\".personhog.types.v1.GroupsResponse\x12g\n\x0eGetGroupsBatch\x12).personhog.types.v1.GetGroupsBatchRequest\x1a*.personhog.types.v1.GetGroupsBatchResponse\x12[\n\nListGroups\x12%.personhog.types.v1.ListGroupsRequest\x1a&.personhog.types.v1.ListGroupsResponse\x12\x86\x01\n\x1cGetGroupTypeMappingsByTeamId\x12\x37.personhog.types.v1.GetGroupTypeMappingsByTeamIdRequest\x1a-.personhog.types.v1.GroupTypeMappingsResponse\x12\x8d\x01\n\x1dGetGroupTypeMappingsByTeamIds\x12\x38.personhog.types.v1.GetGroupTypeMappingsByTeamIdsRequest\x1a\x32.personhog.types.v1.GroupTypeMappingsBatchResponse\x12\x8c\x01\n\x1fGetGroupTypeMappingsByProjectId\x12:.personhog.types.v1.GetGroupTypeMappingsByProjectIdRequest\x1a-.personhog.types.v1.GroupTypeMappingsResponse\x12\x93\x01\n GetGroupTypeMappingsByProjectIds\x12;.personhog.types.v1.GetGroupTypeMappingsByProjectIdsRequest\x1a\x32.personhog.types.v1.GroupTypeMappingsBatchResponse\x12\x9d\x01\n GetGroupTypeMappingByDashboardId\x12;.personhog.types.v1.GetGroupTypeMappingByDashboardIdRequest\x1a<.personhog.types.v1.GetGroupTypeMappingByDashboardIdResponse\x12\x7f\n\x16\x43ountGroupTypeMappings\x12\x31.personhog.types.v1.CountGroupTypeMappingsRequest\x1a\x32.personhog.types.v1.CountGroupTypeMappingsResponse\x12^\n\x0b\x43reateGroup\x12&.personhog.types.v1.CreateGroupRequest\x1a'.personhog.types.v1.CreateGroupResponse\x12^\n\x0bUpdateGroup\x12&.personhog.types.v1.UpdateGroupRequest\x1a'.personhog.types.v1.UpdateGroupResponse\x12\x85\x01\n\x18\x44\x65leteGroupsBatchForTeam\x12\x33.personhog.types.v1.DeleteGroupsBatchForTeamRequest\x1a\x34.personhog.types.v1.DeleteGroupsBatchForTeamResponse\x12\x7f\n\x16UpdateGroupTypeMapping\x12\x31.personhog.types.v1.UpdateGroupTypeMappingRequest\x1a\x32.personhog.types.v1.UpdateGroupTypeMappingResponse\x12\x7f\n\x16\x44\x65leteGroupTypeMapping\x12\x31.personhog.types.v1.DeleteGroupTypeMappingRequest\x1a\x32.personhog.types.v1.DeleteGroupTypeMappingResponse\x12\xa6\x01\n#DeleteGroupTypeMappingsBatchForTeam\x12>.personhog.types.v1.DeleteGroupTypeMappingsBatchForTeamRequest\x1a?.personhog.types.v1.DeleteGroupTypeMappingsBatchForTeamResponse\x12\x7f\n\x16UpdatePersonProperties\x12\x31.personhog.types.v1.UpdatePersonPropertiesRequest\x1a\x32.personhog.types.v1.UpdatePersonPropertiesResponse\x12^\n\x0b\x46\x65ncePerson\x12&.personhog.types.v1.FencePersonRequest\x1a'.personhog.types.v1.FencePersonResponse\x12\x61\n\x0c\x46\x65ncePersons\x12'.personhog.types.v1.FencePersonsRequest\x1a(.personhog.types.v1.FencePersonsResponse\x12\x61\n\x0cReleaseFence\x12'.personhog.types.v1.ReleaseFenceRequest\x1a(.personhog.types.v1.ReleaseFenceResponse\x12\x64\n\rReleaseFences\x12(.personhog.types.v1.ReleaseFencesRequest\x1a).personhog.types.v1.ReleaseFencesResponse\x12s\n\x12\x46oldPersonDocument\x12-.personhog.types.v1.FoldPersonDocumentRequest\x1a..personhog.types.v1.FoldPersonDocumentResponse\x12\x64\n\rDeletePersons\x12(.personhog.types.v1.DeletePersonsRequest\x1a).personhog.types.v1.DeletePersonsResponse\x12\x88\x01\n\x19\x44\x65letePersonsBatchForTeam\x12\x34.personhog.types.v1.DeletePersonsBatchForTeamRequest\x1a\x35.personhog.types.v1.DeletePersonsBatchForTeamResponse\x12\x82\x01\n\x17\x44\x65leteTombstonedPersons\x12\x32.personhog.types.v1.DeleteTombstonedPersonsRequest\x1a\x33.personhog.types.v1.DeleteTombstonedPersonsResponse\x12v\n\x13GetPersonTombstones\x12..personhog.types.v1.GetPersonTombstonesRequest\x1a/.personhog.types.v1.GetPersonTombstonesResponse\x12v\n\x13\x41\x63kPersonTombstones\x12..personhog.types.v1.AckPersonTombstonesRequest\x1a/.personhog.types.v1.AckPersonTombstonesResponse\x12\x85\x01\n\x18ListPersonTombstoneQueue\x12\x33.personhog.types.v1.ListPersonTombstoneQueueRequest\x1a\x34.personhog.types.v1.ListPersonTombstoneQueueResponse\x12^\n\x0bSplitPerson\x12&.personhog.types.v1.SplitPersonRequest\x1a'.personhog.types.v1.SplitPersonResponse\x12\x9a\x01\n\x1fSetPersonDistinctIdVersionFloor\x12:.personhog.types.v1.SetPersonDistinctIdVersionFloorRequest\x1a;.personhog.types.v1.SetPersonDistinctIdVersionFloorResponse\x12|\n\x15SetPersonVersionFloor\x12\x30.personhog.types.v1.SetPersonVersionFloorRequest\x1a\x31.personhog.types.v1.SetPersonVersionFloorResponse\x12\x88\x01\n\x19\x45nsurePersonVersionFloors\x12\x34.personhog.types.v1.EnsurePersonVersionFloorsRequest\x1a\x35.personhog.types.v1.EnsurePersonVersionFloorsResponse\x12p\n\x11GetDistinctIdRows\x12,.personhog.types.v1.GetDistinctIdRowsRequest\x1a-.personhog.types.v1.GetDistinctIdRowsResponse\x12s\n\x12ListPersonsForTeam\x12-.personhog.types.v1.ListPersonsForTeamRequest\x1a..personhog.types.v1.ListPersonsForTeamResponse\x12\x85\x01\n\x18RaisePersonVersionFloors\x12\x33.personhog.types.v1.RaisePersonVersionFloorsRequest\x1a\x34.personhog.types.v1.RaisePersonVersionFloorsResponse\x12g\n\x0eRestorePersons\x12).personhog.types.v1.RestorePersonsRequest\x1a*.personhog.types.v1.RestorePersonsResponseb\x06proto3"
)
_globals = globals()
@@ -37,5 +37,5 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "personhog.service.v1.servic
if not _descriptor._USE_C_DESCRIPTORS:
DESCRIPTOR._loaded_options = None
_globals["_PERSONHOGSERVICE"]._serialized_start = 198
- _globals["_PERSONHOGSERVICE"]._serialized_end = 6676
+ _globals["_PERSONHOGSERVICE"]._serialized_end = 6781
# @@protoc_insertion_point(module_scope)
diff --git a/packages/personhog-proto/personhog/service/v1/service_pb2_grpc.py b/packages/personhog-proto/personhog/service/v1/service_pb2_grpc.py
index cd5237762632..833cad1c210c 100644
--- a/packages/personhog-proto/personhog/service/v1/service_pb2_grpc.py
+++ b/packages/personhog-proto/personhog/service/v1/service_pb2_grpc.py
@@ -360,6 +360,12 @@ class PersonHogServiceStub:
response_deserializer=personhog_dot_types_dot_v1_dot_person__pb2.RaisePersonVersionFloorsResponse.FromString,
_registered_method=True,
)
+ self.RestorePersons = channel.unary_unary(
+ "/personhog.service.v1.PersonHogService/RestorePersons",
+ request_serializer=personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsRequest.SerializeToString,
+ response_deserializer=personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsResponse.FromString,
+ _registered_method=True,
+ )
class PersonHogServiceServicer:
@@ -701,12 +707,19 @@ class PersonHogServiceServicer:
def RaisePersonVersionFloors(self, request, context):
"""Writes for the person consistency repair. Raises claim lifecycle marks on the persons they
- raise. Versions only go up. Same routing caveat as DeletePersons above.
+ raise; restores only insert absent persons. Versions only go up. Same routing caveat as
+ DeletePersons above.
"""
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
context.set_details("Method not implemented!")
raise NotImplementedError("Method not implemented!")
+ def RestorePersons(self, request, context):
+ """Missing associated documentation comment in .proto file."""
+ context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+ context.set_details("Method not implemented!")
+ raise NotImplementedError("Method not implemented!")
+
def add_PersonHogServiceServicer_to_server(servicer, server):
rpc_method_handlers = {
@@ -975,6 +988,11 @@ def add_PersonHogServiceServicer_to_server(servicer, server):
request_deserializer=personhog_dot_types_dot_v1_dot_person__pb2.RaisePersonVersionFloorsRequest.FromString,
response_serializer=personhog_dot_types_dot_v1_dot_person__pb2.RaisePersonVersionFloorsResponse.SerializeToString,
),
+ "RestorePersons": grpc.unary_unary_rpc_method_handler(
+ servicer.RestorePersons,
+ request_deserializer=personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsRequest.FromString,
+ response_serializer=personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsResponse.SerializeToString,
+ ),
}
generic_handler = grpc.method_handlers_generic_handler("personhog.service.v1.PersonHogService", rpc_method_handlers)
server.add_generic_rpc_handlers((generic_handler,))
@@ -2576,3 +2594,33 @@ class PersonHogService:
metadata,
_registered_method=True,
)
+
+ @staticmethod
+ def RestorePersons(
+ request,
+ target,
+ options=(),
+ channel_credentials=None,
+ call_credentials=None,
+ insecure=False,
+ compression=None,
+ wait_for_ready=None,
+ timeout=None,
+ metadata=None,
+ ):
+ return grpc.experimental.unary_unary(
+ request,
+ target,
+ "/personhog.service.v1.PersonHogService/RestorePersons",
+ personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsRequest.SerializeToString,
+ personhog_dot_types_dot_v1_dot_person__pb2.RestorePersonsResponse.FromString,
+ options,
+ channel_credentials,
+ insecure,
+ call_credentials,
+ compression,
+ wait_for_ready,
+ timeout,
+ metadata,
+ _registered_method=True,
+ )
diff --git a/packages/personhog-proto/personhog/types/v1/person_pb2.py b/packages/personhog-proto/personhog/types/v1/person_pb2.py
index 47b8e5de5714..23850a727204 100644
--- a/packages/personhog-proto/personhog/types/v1/person_pb2.py
+++ b/packages/personhog-proto/personhog/types/v1/person_pb2.py
@@ -23,7 +23,7 @@ _sym_db = _symbol_database.Default()
from personhog.types.v1 import common_pb2 as personhog_dot_types_dot_v1_dot_common__pb2
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
- b'\n\x1fpersonhog/types/v1/person.proto\x12\x12personhog.types.v1\x1a\x1fpersonhog/types/v1/common.proto"\xb2\x02\n\x06Person\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x0f\n\x07team_id\x18\x03 \x01(\x03\x12\x12\n\nproperties\x18\x04 \x01(\x0c\x12"\n\x1aproperties_last_updated_at\x18\x05 \x01(\x0c\x12!\n\x19properties_last_operation\x18\x06 \x01(\x0c\x12\x12\n\ncreated_at\x18\x07 \x01(\x03\x12\x0f\n\x07version\x18\x08 \x01(\x03\x12\x15\n\ris_identified\x18\t \x01(\x08\x12\x17\n\nis_user_id\x18\n \x01(\x08H\x00\x88\x01\x01\x12\x19\n\x0clast_seen_at\x18\x0b \x01(\x03H\x01\x88\x01\x01\x12\x12\n\nis_deleted\x18\x0c \x01(\x08\x42\r\n\x0b_is_user_idB\x0f\n\r_last_seen_at"f\n\x15\x44istinctIdWithVersion\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x14\n\x07version\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x0f\n\x02id\x18\x03 \x01(\x03H\x01\x88\x01\x01\x42\n\n\x08_versionB\x05\n\x03_id"h\n\x15PersonWithDistinctIds\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12/\n\x06person\x18\x02 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"g\n\x11PersonDistinctIds\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12?\n\x0c\x64istinct_ids\x18\x02 \x03(\x0b\x32).personhog.types.v1.DistinctIdWithVersion"\x87\x01\n\x18PersonWithTeamDistinctId\x12/\n\x03key\x18\x01 \x01(\x0b\x32".personhog.types.v1.TeamDistinctId\x12/\n\x06person\x18\x02 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"m\n\x10GetPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"O\n\x11GetPersonResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"o\n\x11GetPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nperson_ids\x18\x02 \x03(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"S\n\x0fPersonsResponse\x12+\n\x07persons\x18\x01 \x03(\x0b\x32\x1a.personhog.types.v1.Person\x12\x13\n\x0bmissing_ids\x18\x02 \x03(\x03"n\n\x16GetPersonByUuidRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"q\n\x18GetPersonsByUuidsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05uuids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"{\n\x1cGetPersonByDistinctIdRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0b\x64istinct_id\x18\x02 \x01(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"\x84\x01\n$GetPersonsByDistinctIdsInTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0c\x64istinct_ids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"`\n"PersonsByDistinctIdsInTeamResponse\x12:\n\x07results\x18\x01 \x03(\x0b\x32).personhog.types.v1.PersonWithDistinctIds"\x96\x01\n\x1eGetPersonsByDistinctIdsRequest\x12=\n\x11team_distinct_ids\x18\x01 \x03(\x0b\x32".personhog.types.v1.TeamDistinctId\x12\x35\n\x0cread_options\x18\x02 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"]\n\x1cPersonsByDistinctIdsResponse\x12=\n\x07results\x18\x01 \x03(\x0b\x32,.personhog.types.v1.PersonWithTeamDistinctId"\xbf\x01\n\x1eGetDistinctIdsForPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x12\n\x05limit\x18\x04 \x01(\x03H\x00\x88\x01\x01\x12\x16\n\tcursor_id\x18\x05 \x01(\x03H\x01\x88\x01\x01\x42\x08\n\x06_limitB\x0c\n\n_cursor_id"\x92\x01\n\x1fGetDistinctIdsForPersonResponse\x12?\n\x0c\x64istinct_ids\x18\x01 \x03(\x0b\x32).personhog.types.v1.DistinctIdWithVersion\x12\x1b\n\x0enext_cursor_id\x18\x02 \x01(\x03H\x00\x88\x01\x01\x42\x11\n\x0f_next_cursor_id"\xb1\x01\n\x1fGetDistinctIdsForPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nperson_ids\x18\x02 \x03(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x1d\n\x10limit_per_person\x18\x04 \x01(\x03H\x00\x88\x01\x01\x42\x13\n\x11_limit_per_person"f\n GetDistinctIdsForPersonsResponse\x12\x42\n\x13person_distinct_ids\x18\x01 \x03(\x0b\x32%.personhog.types.v1.PersonDistinctIds"\x96\x02\n\x1dUpdatePersonPropertiesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x12\n\nevent_name\x18\x03 \x01(\t\x12\x16\n\x0eset_properties\x18\x04 \x01(\x0c\x12\x1b\n\x13set_once_properties\x18\x05 \x01(\x0c\x12\x18\n\x10unset_properties\x18\x06 \x03(\t\x12\x1a\n\ris_identified\x18\x07 \x01(\x08H\x00\x88\x01\x01\x12\x19\n\x0clast_seen_at\x18\x08 \x01(\x03H\x01\x88\x01\x01\x12\x14\n\x0c\x66orce_update\x18\t \x01(\x08\x42\x10\n\x0e_is_identifiedB\x0f\n\r_last_seen_at"m\n\x1eUpdatePersonPropertiesResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x12\x0f\n\x07updated\x18\x02 \x01(\x08\x42\t\n\x07_person"r\n\x14\x44\x65letePersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t\x12\x33\n\x04mode\x18\x03 \x01(\x0e\x32%.personhog.types.v1.DeletePersonsMode"<\n\x14TombstonedDistinctId\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03"x\n\x10TombstonedPerson\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12>\n\x0c\x64istinct_ids\x18\x03 \x03(\x0b\x32(.personhog.types.v1.TombstonedDistinctId"|\n\x15\x44\x65letePersonsResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03\x12\x12\n\ntombstoned\x18\x02 \x01(\x08\x12\x38\n\ntombstones\x18\x03 \x03(\x0b\x32$.personhog.types.v1.TombstonedPerson"C\n\x1aGetPersonTombstonesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t"W\n\x1bGetPersonTombstonesResponse\x12\x38\n\ntombstones\x18\x01 \x03(\x0b\x32$.personhog.types.v1.TombstonedPerson"<\n\x14\x41\x63kedPersonTombstone\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03"k\n\x1a\x41\x63kPersonTombstonesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12<\n\ntombstones\x18\x02 \x03(\x0b\x32(.personhog.types.v1.AckedPersonTombstone"4\n\x1b\x41\x63kPersonTombstonesResponse\x12\x15\n\rcleared_count\x18\x01 \x01(\x03"\x84\x01\n\x1fListPersonTombstoneQueueRequest\x12\x15\n\rafter_team_id\x18\x01 \x01(\x03\x12\x19\n\x11\x61\x66ter_person_uuid\x18\x02 \x01(\t\x12\r\n\x05limit\x18\x03 \x01(\x03\x12\x14\n\x07team_id\x18\x04 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_team_id"p\n\x19PersonTombstoneQueueEntry\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x02 \x01(\t\x12\x16\n\x0eperson_version\x18\x03 \x01(\x03\x12\x15\n\rtombstoned_at\x18\x04 \x01(\x03"b\n ListPersonTombstoneQueueResponse\x12>\n\x07\x65ntries\x18\x01 \x03(\x0b\x32-.personhog.types.v1.PersonTombstoneQueueEntry"G\n DeletePersonsBatchForTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nbatch_size\x18\x02 \x01(\x03":\n!DeletePersonsBatchForTeamResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03"\x9c\x01\n\x1e\x44\x65leteTombstonedPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t\x12\x10\n\x08max_rows\x18\x03 \x01(\x03\x12\x41\n\x0f\x62ounded_persons\x18\x04 \x03(\x0b\x32(.personhog.types.v1.VersionBoundedPerson"@\n\x14VersionBoundedPerson\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x13\n\x0bmax_version\x18\x02 \x01(\x03"\xe4\x01\n\x1f\x44\x65leteTombstonedPersonsResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03\x12\x1a\n\x12skipped_live_count\x18\x02 \x01(\x03\x12\x1c\n\x14\x62locked_person_uuids\x18\x03 \x03(\t\x12\x1c\n\x14pending_person_uuids\x18\x04 \x03(\t\x12\x14\n\x0crows_deleted\x18\x05 \x01(\x03\x12\x1d\n\x15version_guard_applied\x18\x06 \x01(\x08\x12\x1d\n\x15skipped_version_count\x18\x07 \x01(\x03"W\n\x12SplitPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x1d\n\x15\x64istinct_ids_to_split\x18\x03 \x03(\t"\x8e\x01\n\x0bSplitResult\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x17\n\x0fnew_person_uuid\x18\x02 \x01(\t\x12\x1a\n\x12new_person_version\x18\x03 \x01(\x03\x12\x13\n\x0bpdi_version\x18\x04 \x01(\x03\x12 \n\x18new_person_created_at_ms\x18\x05 \x01(\x03"F\n\x13SplitPersonResponse\x12/\n\x06splits\x18\x01 \x03(\x0b\x32\x1f.personhog.types.v1.SplitResult"c\n&SetPersonDistinctIdVersionFloorRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0b\x64istinct_id\x18\x02 \x01(\t\x12\x13\n\x0bmin_version\x18\x03 \x01(\x03"e\n\'SetPersonDistinctIdVersionFloorResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"W\n\x1cSetPersonVersionFloorRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x13\n\x0bmin_version\x18\x03 \x01(\x03"0\n\x1dSetPersonVersionFloorResponse\x12\x0f\n\x07updated\x18\x01 \x01(\x08">\n\x12PersonVersionFloor\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x13\n\x0bmin_version\x18\x02 \x01(\x03"k\n EnsurePersonVersionFloorsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x36\n\x06\x66loors\x18\x02 \x03(\x0b\x32&.personhog.types.v1.PersonVersionFloor"z\n\x18PersonVersionFloorResult\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x38\n\x07outcome\x18\x02 \x01(\x0e\x32\'.personhog.types.v1.VersionFloorOutcome\x12\x0f\n\x07version\x18\x03 \x01(\x03"b\n!EnsurePersonVersionFloorsResponse\x12=\n\x07results\x18\x01 \x03(\x0b\x32,.personhog.types.v1.PersonVersionFloorResult"}\n\x12\x46\x65ncePersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\r\n\x05op_id\x18\x03 \x01(\t\x12\x34\n\x07op_type\x18\x04 \x01(\x0e\x32#.personhog.types.v1.LifecycleOpType"A\n\x13\x46\x65ncePersonResponse\x12*\n\x06sealed\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person"\x7f\n\x13\x46\x65ncePersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05op_id\x18\x02 \x01(\t\x12\x34\n\x07op_type\x18\x03 \x01(\x0e\x32#.personhog.types.v1.LifecycleOpType\x12\x12\n\nperson_ids\x18\x04 \x03(\x03"_\n\x14\x46\x65ncePersonsResponse\x12\x34\n\x06sealed\x18\x01 \x03(\x0b\x32$.personhog.types.v1.FencedPersonSeal\x12\x11\n\tnot_found\x18\x02 \x03(\x03"J\n\x10\x46\x65ncedPersonSeal\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12\x12\n\ncreated_at\x18\x03 \x01(\x03"\xd6\x01\n\x13ReleaseFenceRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x03 \x01(\t\x12\r\n\x05op_id\x18\x04 \x01(\t\x12\x33\n\x07outcome\x18\x05 \x01(\x0e\x32".personhog.types.v1.ReleaseOutcome\x12\x1b\n\x0esealed_version\x18\x06 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\ncreated_at\x18\x07 \x01(\x03\x42\x11\n\x0f_sealed_version"\x16\n\x14ReleaseFenceResponse"\xa2\x01\n\x14ReleaseFencesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05op_id\x18\x02 \x01(\t\x12\x33\n\x07outcome\x18\x03 \x01(\x0e\x32".personhog.types.v1.ReleaseOutcome\x12\x35\n\x07persons\x18\x04 \x03(\x0b\x32$.personhog.types.v1.ReleaseFenceItem"~\n\x10ReleaseFenceItem\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x02 \x01(\t\x12\x1b\n\x0esealed_version\x18\x03 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\ncreated_at\x18\x04 \x01(\x03\x42\x11\n\x0f_sealed_version"\x17\n\x15ReleaseFencesResponse"S\n\x14SealedSourceSnapshot\x12*\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person\x12\x0f\n\x07ordinal\x18\x02 \x01(\x05"\xbd\x01\n\x19\x46oldPersonDocumentRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x42\n\x10sealed_snapshots\x18\x03 \x03(\x0b\x32(.personhog.types.v1.SealedSourceSnapshot\x12\x11\n\tevent_set\x18\x04 \x01(\x0c\x12\x16\n\x0e\x65vent_set_once\x18\x05 \x01(\x0c\x12\r\n\x05op_id\x18\x06 \x01(\t"H\n\x1a\x46oldPersonDocumentResponse\x12*\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person"\xbc\x01\n\rDistinctIdRow\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x18\n\x0bperson_uuid\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12\x12\n\nis_deleted\x18\x05 \x01(\x08\x12\x1e\n\x11person_is_deleted\x18\x06 \x01(\x08H\x01\x88\x01\x01\x42\x0e\n\x0c_person_uuidB\x14\n\x12_person_is_deleted"x\n\x18GetDistinctIdRowsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0c\x64istinct_ids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"L\n\x19GetDistinctIdRowsResponse\x12/\n\x04rows\x18\x01 \x03(\x0b\x32!.personhog.types.v1.DistinctIdRow"\x86\x01\n\x0fPersonListEntry\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\x03\x12\x12\n\nis_deleted\x18\x04 \x01(\x08\x12\x1d\n\x15has_live_distinct_ids\x18\x05 \x01(\x08\x12\x15\n\rcreated_at_ms\x18\x06 \x01(\x03"\xbf\x01\n\x19ListPersonsForTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x17\n\x0f\x61\x66ter_person_id\x18\x02 \x01(\x03\x12\r\n\x05limit\x18\x03 \x01(\x03\x12\x35\n\x0cread_options\x18\x04 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x1d\n\x10\x62\x65\x66ore_person_id\x18\x05 \x01(\x03H\x00\x88\x01\x01\x42\x13\n\x11_before_person_id"\x8e\x01\n\x1aListPersonsForTeamResponse\x12\x34\n\x07persons\x18\x01 \x03(\x0b\x32#.personhog.types.v1.PersonListEntry\x12!\n\x14next_after_person_id\x18\x02 \x01(\x03H\x00\x88\x01\x01\x42\x17\n\x15_next_after_person_id"j\n\x1fRaisePersonVersionFloorsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x36\n\x06\x66loors\x18\x02 \x03(\x0b\x32&.personhog.types.v1.PersonVersionFloor"x\n\x1dRaisePersonVersionFloorResult\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x31\n\x07outcome\x18\x02 \x01(\x0e\x32 .personhog.types.v1.RaiseOutcome\x12\x0f\n\x07version\x18\x03 \x01(\x03"f\n RaisePersonVersionFloorsResponse\x12\x42\n\x07results\x18\x01 \x03(\x0b\x32\x31.personhog.types.v1.RaisePersonVersionFloorResult*y\n\x11\x44\x65letePersonsMode\x12#\n\x1f\x44\x45LETE_PERSONS_MODE_UNSPECIFIED\x10\x00\x12\x1c\n\x18\x44\x45LETE_PERSONS_MODE_HARD\x10\x01\x12!\n\x1d\x44\x45LETE_PERSONS_MODE_TOMBSTONE\x10\x02*\xe4\x01\n\x13VersionFloorOutcome\x12%\n!VERSION_FLOOR_OUTCOME_UNSPECIFIED\x10\x00\x12,\n(VERSION_FLOOR_OUTCOME_TOMBSTONE_INSERTED\x10\x01\x12*\n&VERSION_FLOOR_OUTCOME_TOMBSTONE_RAISED\x10\x02\x12,\n(VERSION_FLOOR_OUTCOME_TOMBSTONE_AT_FLOOR\x10\x03\x12\x1e\n\x1aVERSION_FLOOR_OUTCOME_LIVE\x10\x04*o\n\x0fLifecycleOpType\x12!\n\x1dLIFECYCLE_OP_TYPE_UNSPECIFIED\x10\x00\x12\x1c\n\x18LIFECYCLE_OP_TYPE_DELETE\x10\x01\x12\x1b\n\x17LIFECYCLE_OP_TYPE_MERGE\x10\x02*m\n\x0eReleaseOutcome\x12\x1f\n\x1bRELEASE_OUTCOME_UNSPECIFIED\x10\x00\x12\x1d\n\x19RELEASE_OUTCOME_COMMITTED\x10\x01\x12\x1b\n\x17RELEASE_OUTCOME_ABORTED\x10\x02*\x9d\x01\n\x0cRaiseOutcome\x12\x1d\n\x19RAISE_OUTCOME_UNSPECIFIED\x10\x00\x12\x18\n\x14RAISE_OUTCOME_RAISED\x10\x01\x12\x1d\n\x19RAISE_OUTCOME_AT_OR_ABOVE\x10\x02\x12\x1a\n\x16RAISE_OUTCOME_NOT_LIVE\x10\x03\x12\x19\n\x15RAISE_OUTCOME_MISSING\x10\x04\x62\x06proto3'
+ b'\n\x1fpersonhog/types/v1/person.proto\x12\x12personhog.types.v1\x1a\x1fpersonhog/types/v1/common.proto"\xb2\x02\n\x06Person\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x0f\n\x07team_id\x18\x03 \x01(\x03\x12\x12\n\nproperties\x18\x04 \x01(\x0c\x12"\n\x1aproperties_last_updated_at\x18\x05 \x01(\x0c\x12!\n\x19properties_last_operation\x18\x06 \x01(\x0c\x12\x12\n\ncreated_at\x18\x07 \x01(\x03\x12\x0f\n\x07version\x18\x08 \x01(\x03\x12\x15\n\ris_identified\x18\t \x01(\x08\x12\x17\n\nis_user_id\x18\n \x01(\x08H\x00\x88\x01\x01\x12\x19\n\x0clast_seen_at\x18\x0b \x01(\x03H\x01\x88\x01\x01\x12\x12\n\nis_deleted\x18\x0c \x01(\x08\x42\r\n\x0b_is_user_idB\x0f\n\r_last_seen_at"f\n\x15\x44istinctIdWithVersion\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x14\n\x07version\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x0f\n\x02id\x18\x03 \x01(\x03H\x01\x88\x01\x01\x42\n\n\x08_versionB\x05\n\x03_id"h\n\x15PersonWithDistinctIds\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12/\n\x06person\x18\x02 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"g\n\x11PersonDistinctIds\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12?\n\x0c\x64istinct_ids\x18\x02 \x03(\x0b\x32).personhog.types.v1.DistinctIdWithVersion"\x87\x01\n\x18PersonWithTeamDistinctId\x12/\n\x03key\x18\x01 \x01(\x0b\x32".personhog.types.v1.TeamDistinctId\x12/\n\x06person\x18\x02 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"m\n\x10GetPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"O\n\x11GetPersonResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"o\n\x11GetPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nperson_ids\x18\x02 \x03(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"S\n\x0fPersonsResponse\x12+\n\x07persons\x18\x01 \x03(\x0b\x32\x1a.personhog.types.v1.Person\x12\x13\n\x0bmissing_ids\x18\x02 \x03(\x03"n\n\x16GetPersonByUuidRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"q\n\x18GetPersonsByUuidsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05uuids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"{\n\x1cGetPersonByDistinctIdRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0b\x64istinct_id\x18\x02 \x01(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"\x84\x01\n$GetPersonsByDistinctIdsInTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0c\x64istinct_ids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"`\n"PersonsByDistinctIdsInTeamResponse\x12:\n\x07results\x18\x01 \x03(\x0b\x32).personhog.types.v1.PersonWithDistinctIds"\x96\x01\n\x1eGetPersonsByDistinctIdsRequest\x12=\n\x11team_distinct_ids\x18\x01 \x03(\x0b\x32".personhog.types.v1.TeamDistinctId\x12\x35\n\x0cread_options\x18\x02 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"]\n\x1cPersonsByDistinctIdsResponse\x12=\n\x07results\x18\x01 \x03(\x0b\x32,.personhog.types.v1.PersonWithTeamDistinctId"\xbf\x01\n\x1eGetDistinctIdsForPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x12\n\x05limit\x18\x04 \x01(\x03H\x00\x88\x01\x01\x12\x16\n\tcursor_id\x18\x05 \x01(\x03H\x01\x88\x01\x01\x42\x08\n\x06_limitB\x0c\n\n_cursor_id"\x92\x01\n\x1fGetDistinctIdsForPersonResponse\x12?\n\x0c\x64istinct_ids\x18\x01 \x03(\x0b\x32).personhog.types.v1.DistinctIdWithVersion\x12\x1b\n\x0enext_cursor_id\x18\x02 \x01(\x03H\x00\x88\x01\x01\x42\x11\n\x0f_next_cursor_id"\xb1\x01\n\x1fGetDistinctIdsForPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nperson_ids\x18\x02 \x03(\x03\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x1d\n\x10limit_per_person\x18\x04 \x01(\x03H\x00\x88\x01\x01\x42\x13\n\x11_limit_per_person"f\n GetDistinctIdsForPersonsResponse\x12\x42\n\x13person_distinct_ids\x18\x01 \x03(\x0b\x32%.personhog.types.v1.PersonDistinctIds"\x96\x02\n\x1dUpdatePersonPropertiesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x12\n\nevent_name\x18\x03 \x01(\t\x12\x16\n\x0eset_properties\x18\x04 \x01(\x0c\x12\x1b\n\x13set_once_properties\x18\x05 \x01(\x0c\x12\x18\n\x10unset_properties\x18\x06 \x03(\t\x12\x1a\n\ris_identified\x18\x07 \x01(\x08H\x00\x88\x01\x01\x12\x19\n\x0clast_seen_at\x18\x08 \x01(\x03H\x01\x88\x01\x01\x12\x14\n\x0c\x66orce_update\x18\t \x01(\x08\x42\x10\n\x0e_is_identifiedB\x0f\n\r_last_seen_at"m\n\x1eUpdatePersonPropertiesResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x12\x0f\n\x07updated\x18\x02 \x01(\x08\x42\t\n\x07_person"r\n\x14\x44\x65letePersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t\x12\x33\n\x04mode\x18\x03 \x01(\x0e\x32%.personhog.types.v1.DeletePersonsMode"<\n\x14TombstonedDistinctId\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03"x\n\x10TombstonedPerson\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12>\n\x0c\x64istinct_ids\x18\x03 \x03(\x0b\x32(.personhog.types.v1.TombstonedDistinctId"|\n\x15\x44\x65letePersonsResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03\x12\x12\n\ntombstoned\x18\x02 \x01(\x08\x12\x38\n\ntombstones\x18\x03 \x03(\x0b\x32$.personhog.types.v1.TombstonedPerson"C\n\x1aGetPersonTombstonesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t"W\n\x1bGetPersonTombstonesResponse\x12\x38\n\ntombstones\x18\x01 \x03(\x0b\x32$.personhog.types.v1.TombstonedPerson"<\n\x14\x41\x63kedPersonTombstone\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03"k\n\x1a\x41\x63kPersonTombstonesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12<\n\ntombstones\x18\x02 \x03(\x0b\x32(.personhog.types.v1.AckedPersonTombstone"4\n\x1b\x41\x63kPersonTombstonesResponse\x12\x15\n\rcleared_count\x18\x01 \x01(\x03"\x84\x01\n\x1fListPersonTombstoneQueueRequest\x12\x15\n\rafter_team_id\x18\x01 \x01(\x03\x12\x19\n\x11\x61\x66ter_person_uuid\x18\x02 \x01(\t\x12\r\n\x05limit\x18\x03 \x01(\x03\x12\x14\n\x07team_id\x18\x04 \x01(\x03H\x00\x88\x01\x01\x42\n\n\x08_team_id"p\n\x19PersonTombstoneQueueEntry\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x02 \x01(\t\x12\x16\n\x0eperson_version\x18\x03 \x01(\x03\x12\x15\n\rtombstoned_at\x18\x04 \x01(\x03"b\n ListPersonTombstoneQueueResponse\x12>\n\x07\x65ntries\x18\x01 \x03(\x0b\x32-.personhog.types.v1.PersonTombstoneQueueEntry"G\n DeletePersonsBatchForTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x12\n\nbatch_size\x18\x02 \x01(\x03":\n!DeletePersonsBatchForTeamResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03"\x9c\x01\n\x1e\x44\x65leteTombstonedPersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0cperson_uuids\x18\x02 \x03(\t\x12\x10\n\x08max_rows\x18\x03 \x01(\x03\x12\x41\n\x0f\x62ounded_persons\x18\x04 \x03(\x0b\x32(.personhog.types.v1.VersionBoundedPerson"@\n\x14VersionBoundedPerson\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x13\n\x0bmax_version\x18\x02 \x01(\x03"\xe4\x01\n\x1f\x44\x65leteTombstonedPersonsResponse\x12\x15\n\rdeleted_count\x18\x01 \x01(\x03\x12\x1a\n\x12skipped_live_count\x18\x02 \x01(\x03\x12\x1c\n\x14\x62locked_person_uuids\x18\x03 \x03(\t\x12\x1c\n\x14pending_person_uuids\x18\x04 \x03(\t\x12\x14\n\x0crows_deleted\x18\x05 \x01(\x03\x12\x1d\n\x15version_guard_applied\x18\x06 \x01(\x08\x12\x1d\n\x15skipped_version_count\x18\x07 \x01(\x03"W\n\x12SplitPersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x1d\n\x15\x64istinct_ids_to_split\x18\x03 \x03(\t"\x8e\x01\n\x0bSplitResult\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x17\n\x0fnew_person_uuid\x18\x02 \x01(\t\x12\x1a\n\x12new_person_version\x18\x03 \x01(\x03\x12\x13\n\x0bpdi_version\x18\x04 \x01(\x03\x12 \n\x18new_person_created_at_ms\x18\x05 \x01(\x03"F\n\x13SplitPersonResponse\x12/\n\x06splits\x18\x01 \x03(\x0b\x32\x1f.personhog.types.v1.SplitResult"c\n&SetPersonDistinctIdVersionFloorRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x13\n\x0b\x64istinct_id\x18\x02 \x01(\t\x12\x13\n\x0bmin_version\x18\x03 \x01(\x03"e\n\'SetPersonDistinctIdVersionFloorResponse\x12/\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.PersonH\x00\x88\x01\x01\x42\t\n\x07_person"W\n\x1cSetPersonVersionFloorRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x13\n\x0bmin_version\x18\x03 \x01(\x03"0\n\x1dSetPersonVersionFloorResponse\x12\x0f\n\x07updated\x18\x01 \x01(\x08">\n\x12PersonVersionFloor\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x13\n\x0bmin_version\x18\x02 \x01(\x03"k\n EnsurePersonVersionFloorsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x36\n\x06\x66loors\x18\x02 \x03(\x0b\x32&.personhog.types.v1.PersonVersionFloor"z\n\x18PersonVersionFloorResult\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x38\n\x07outcome\x18\x02 \x01(\x0e\x32\'.personhog.types.v1.VersionFloorOutcome\x12\x0f\n\x07version\x18\x03 \x01(\x03"b\n!EnsurePersonVersionFloorsResponse\x12=\n\x07results\x18\x01 \x03(\x0b\x32,.personhog.types.v1.PersonVersionFloorResult"}\n\x12\x46\x65ncePersonRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\r\n\x05op_id\x18\x03 \x01(\t\x12\x34\n\x07op_type\x18\x04 \x01(\x0e\x32#.personhog.types.v1.LifecycleOpType"A\n\x13\x46\x65ncePersonResponse\x12*\n\x06sealed\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person"\x7f\n\x13\x46\x65ncePersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05op_id\x18\x02 \x01(\t\x12\x34\n\x07op_type\x18\x03 \x01(\x0e\x32#.personhog.types.v1.LifecycleOpType\x12\x12\n\nperson_ids\x18\x04 \x03(\x03"_\n\x14\x46\x65ncePersonsResponse\x12\x34\n\x06sealed\x18\x01 \x03(\x0b\x32$.personhog.types.v1.FencedPersonSeal\x12\x11\n\tnot_found\x18\x02 \x03(\x03"J\n\x10\x46\x65ncedPersonSeal\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12\x12\n\ncreated_at\x18\x03 \x01(\x03"\xd6\x01\n\x13ReleaseFenceRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x03 \x01(\t\x12\r\n\x05op_id\x18\x04 \x01(\t\x12\x33\n\x07outcome\x18\x05 \x01(\x0e\x32".personhog.types.v1.ReleaseOutcome\x12\x1b\n\x0esealed_version\x18\x06 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\ncreated_at\x18\x07 \x01(\x03\x42\x11\n\x0f_sealed_version"\x16\n\x14ReleaseFenceResponse"\xa2\x01\n\x14ReleaseFencesRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\r\n\x05op_id\x18\x02 \x01(\t\x12\x33\n\x07outcome\x18\x03 \x01(\x0e\x32".personhog.types.v1.ReleaseOutcome\x12\x35\n\x07persons\x18\x04 \x03(\x0b\x32$.personhog.types.v1.ReleaseFenceItem"~\n\x10ReleaseFenceItem\x12\x11\n\tperson_id\x18\x01 \x01(\x03\x12\x13\n\x0bperson_uuid\x18\x02 \x01(\t\x12\x1b\n\x0esealed_version\x18\x03 \x01(\x03H\x00\x88\x01\x01\x12\x12\n\ncreated_at\x18\x04 \x01(\x03\x42\x11\n\x0f_sealed_version"\x17\n\x15ReleaseFencesResponse"S\n\x14SealedSourceSnapshot\x12*\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person\x12\x0f\n\x07ordinal\x18\x02 \x01(\x05"\xbd\x01\n\x19\x46oldPersonDocumentRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x42\n\x10sealed_snapshots\x18\x03 \x03(\x0b\x32(.personhog.types.v1.SealedSourceSnapshot\x12\x11\n\tevent_set\x18\x04 \x01(\x0c\x12\x16\n\x0e\x65vent_set_once\x18\x05 \x01(\x0c\x12\r\n\x05op_id\x18\x06 \x01(\t"H\n\x1a\x46oldPersonDocumentResponse\x12*\n\x06person\x18\x01 \x01(\x0b\x32\x1a.personhog.types.v1.Person"\xbc\x01\n\rDistinctIdRow\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x11\n\tperson_id\x18\x02 \x01(\x03\x12\x18\n\x0bperson_uuid\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12\x12\n\nis_deleted\x18\x05 \x01(\x08\x12\x1e\n\x11person_is_deleted\x18\x06 \x01(\x08H\x01\x88\x01\x01\x42\x0e\n\x0c_person_uuidB\x14\n\x12_person_is_deleted"x\n\x18GetDistinctIdRowsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x14\n\x0c\x64istinct_ids\x18\x02 \x03(\t\x12\x35\n\x0cread_options\x18\x03 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions"L\n\x19GetDistinctIdRowsResponse\x12/\n\x04rows\x18\x01 \x03(\x0b\x32!.personhog.types.v1.DistinctIdRow"\x86\x01\n\x0fPersonListEntry\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0c\n\x04uuid\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\x03\x12\x12\n\nis_deleted\x18\x04 \x01(\x08\x12\x1d\n\x15has_live_distinct_ids\x18\x05 \x01(\x08\x12\x15\n\rcreated_at_ms\x18\x06 \x01(\x03"\xbf\x01\n\x19ListPersonsForTeamRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x17\n\x0f\x61\x66ter_person_id\x18\x02 \x01(\x03\x12\r\n\x05limit\x18\x03 \x01(\x03\x12\x35\n\x0cread_options\x18\x04 \x01(\x0b\x32\x1f.personhog.types.v1.ReadOptions\x12\x1d\n\x10\x62\x65\x66ore_person_id\x18\x05 \x01(\x03H\x00\x88\x01\x01\x42\x13\n\x11_before_person_id"\x8e\x01\n\x1aListPersonsForTeamResponse\x12\x34\n\x07persons\x18\x01 \x03(\x0b\x32#.personhog.types.v1.PersonListEntry\x12!\n\x14next_after_person_id\x18\x02 \x01(\x03H\x00\x88\x01\x01\x42\x17\n\x15_next_after_person_id"j\n\x1fRaisePersonVersionFloorsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x36\n\x06\x66loors\x18\x02 \x03(\x0b\x32&.personhog.types.v1.PersonVersionFloor"x\n\x1dRaisePersonVersionFloorResult\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x31\n\x07outcome\x18\x02 \x01(\x0e\x32 .personhog.types.v1.RaiseOutcome\x12\x0f\n\x07version\x18\x03 \x01(\x03"f\n RaisePersonVersionFloorsResponse\x12\x42\n\x07results\x18\x01 \x03(\x0b\x32\x31.personhog.types.v1.RaisePersonVersionFloorResult"\xb6\x01\n\x0eRestoredPerson\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x12\n\nproperties\x18\x02 \x01(\x0c\x12\x15\n\rcreated_at_ms\x18\x03 \x01(\x03\x12\x15\n\ris_identified\x18\x04 \x01(\x08\x12\x0f\n\x07version\x18\x05 \x01(\x03\x12<\n\x0c\x64istinct_ids\x18\x06 \x03(\x0b\x32&.personhog.types.v1.RestoredDistinctId":\n\x12RestoredDistinctId\x12\x13\n\x0b\x64istinct_id\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x03"]\n\x15RestorePersonsRequest\x12\x0f\n\x07team_id\x18\x01 \x01(\x03\x12\x33\n\x07persons\x18\x02 \x03(\x0b\x32".personhog.types.v1.RestoredPerson"\xa2\x01\n\x13RestorePersonResult\x12\x13\n\x0bperson_uuid\x18\x01 \x01(\t\x12\x33\n\x07outcome\x18\x02 \x01(\x0e\x32".personhog.types.v1.RestoreOutcome\x12\x11\n\tperson_id\x18\x03 \x01(\x03\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12\x1d\n\x15restored_distinct_ids\x18\x05 \x03(\t"R\n\x16RestorePersonsResponse\x12\x38\n\x07results\x18\x01 \x03(\x0b\x32\'.personhog.types.v1.RestorePersonResult*y\n\x11\x44\x65letePersonsMode\x12#\n\x1f\x44\x45LETE_PERSONS_MODE_UNSPECIFIED\x10\x00\x12\x1c\n\x18\x44\x45LETE_PERSONS_MODE_HARD\x10\x01\x12!\n\x1d\x44\x45LETE_PERSONS_MODE_TOMBSTONE\x10\x02*\xe4\x01\n\x13VersionFloorOutcome\x12%\n!VERSION_FLOOR_OUTCOME_UNSPECIFIED\x10\x00\x12,\n(VERSION_FLOOR_OUTCOME_TOMBSTONE_INSERTED\x10\x01\x12*\n&VERSION_FLOOR_OUTCOME_TOMBSTONE_RAISED\x10\x02\x12,\n(VERSION_FLOOR_OUTCOME_TOMBSTONE_AT_FLOOR\x10\x03\x12\x1e\n\x1aVERSION_FLOOR_OUTCOME_LIVE\x10\x04*o\n\x0fLifecycleOpType\x12!\n\x1dLIFECYCLE_OP_TYPE_UNSPECIFIED\x10\x00\x12\x1c\n\x18LIFECYCLE_OP_TYPE_DELETE\x10\x01\x12\x1b\n\x17LIFECYCLE_OP_TYPE_MERGE\x10\x02*m\n\x0eReleaseOutcome\x12\x1f\n\x1bRELEASE_OUTCOME_UNSPECIFIED\x10\x00\x12\x1d\n\x19RELEASE_OUTCOME_COMMITTED\x10\x01\x12\x1b\n\x17RELEASE_OUTCOME_ABORTED\x10\x02*\x9d\x01\n\x0cRaiseOutcome\x12\x1d\n\x19RAISE_OUTCOME_UNSPECIFIED\x10\x00\x12\x18\n\x14RAISE_OUTCOME_RAISED\x10\x01\x12\x1d\n\x19RAISE_OUTCOME_AT_OR_ABOVE\x10\x02\x12\x1a\n\x16RAISE_OUTCOME_NOT_LIVE\x10\x03\x12\x19\n\x15RAISE_OUTCOME_MISSING\x10\x04*\xbb\x01\n\x0eRestoreOutcome\x12\x1f\n\x1bRESTORE_OUTCOME_UNSPECIFIED\x10\x00\x12\x1c\n\x18RESTORE_OUTCOME_INSERTED\x10\x01\x12\x1f\n\x1bRESTORE_OUTCOME_EXISTS_LIVE\x10\x02\x12%\n!RESTORE_OUTCOME_EXISTS_TOMBSTONED\x10\x03\x12"\n\x1eRESTORE_OUTCOME_NO_DISTINCT_ID\x10\x04\x62\x06proto3'
)
_globals = globals()
@@ -31,16 +31,18 @@ _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "personhog.types.v1.person_pb2", _globals)
if not _descriptor._USE_C_DESCRIPTORS:
DESCRIPTOR._loaded_options = None
- _globals["_DELETEPERSONSMODE"]._serialized_start = 8492
- _globals["_DELETEPERSONSMODE"]._serialized_end = 8613
- _globals["_VERSIONFLOOROUTCOME"]._serialized_start = 8616
- _globals["_VERSIONFLOOROUTCOME"]._serialized_end = 8844
- _globals["_LIFECYCLEOPTYPE"]._serialized_start = 8846
- _globals["_LIFECYCLEOPTYPE"]._serialized_end = 8957
- _globals["_RELEASEOUTCOME"]._serialized_start = 8959
- _globals["_RELEASEOUTCOME"]._serialized_end = 9068
- _globals["_RAISEOUTCOME"]._serialized_start = 9071
- _globals["_RAISEOUTCOME"]._serialized_end = 9228
+ _globals["_DELETEPERSONSMODE"]._serialized_start = 9081
+ _globals["_DELETEPERSONSMODE"]._serialized_end = 9202
+ _globals["_VERSIONFLOOROUTCOME"]._serialized_start = 9205
+ _globals["_VERSIONFLOOROUTCOME"]._serialized_end = 9433
+ _globals["_LIFECYCLEOPTYPE"]._serialized_start = 9435
+ _globals["_LIFECYCLEOPTYPE"]._serialized_end = 9546
+ _globals["_RELEASEOUTCOME"]._serialized_start = 9548
+ _globals["_RELEASEOUTCOME"]._serialized_end = 9657
+ _globals["_RAISEOUTCOME"]._serialized_start = 9660
+ _globals["_RAISEOUTCOME"]._serialized_end = 9817
+ _globals["_RESTOREOUTCOME"]._serialized_start = 9820
+ _globals["_RESTOREOUTCOME"]._serialized_end = 10007
_globals["_PERSON"]._serialized_start = 89
_globals["_PERSON"]._serialized_end = 395
_globals["_DISTINCTIDWITHVERSION"]._serialized_start = 397
@@ -185,4 +187,14 @@ if not _descriptor._USE_C_DESCRIPTORS:
_globals["_RAISEPERSONVERSIONFLOORRESULT"]._serialized_end = 8386
_globals["_RAISEPERSONVERSIONFLOORSRESPONSE"]._serialized_start = 8388
_globals["_RAISEPERSONVERSIONFLOORSRESPONSE"]._serialized_end = 8490
+ _globals["_RESTOREDPERSON"]._serialized_start = 8493
+ _globals["_RESTOREDPERSON"]._serialized_end = 8675
+ _globals["_RESTOREDDISTINCTID"]._serialized_start = 8677
+ _globals["_RESTOREDDISTINCTID"]._serialized_end = 8735
+ _globals["_RESTOREPERSONSREQUEST"]._serialized_start = 8737
+ _globals["_RESTOREPERSONSREQUEST"]._serialized_end = 8830
+ _globals["_RESTOREPERSONRESULT"]._serialized_start = 8833
+ _globals["_RESTOREPERSONRESULT"]._serialized_end = 8995
+ _globals["_RESTOREPERSONSRESPONSE"]._serialized_start = 8997
+ _globals["_RESTOREPERSONSRESPONSE"]._serialized_end = 9079
# @@protoc_insertion_point(module_scope)
diff --git a/packages/personhog-proto/personhog/types/v1/person_pb2.pyi b/packages/personhog-proto/personhog/types/v1/person_pb2.pyi
index 09b68b229844..add94d4ca5ef 100644
--- a/packages/personhog-proto/personhog/types/v1/person_pb2.pyi
+++ b/packages/personhog-proto/personhog/types/v1/person_pb2.pyi
@@ -55,6 +55,14 @@ class RaiseOutcome(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
RAISE_OUTCOME_NOT_LIVE: _ClassVar[RaiseOutcome]
RAISE_OUTCOME_MISSING: _ClassVar[RaiseOutcome]
+class RestoreOutcome(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+ __slots__ = ()
+ RESTORE_OUTCOME_UNSPECIFIED: _ClassVar[RestoreOutcome]
+ RESTORE_OUTCOME_INSERTED: _ClassVar[RestoreOutcome]
+ RESTORE_OUTCOME_EXISTS_LIVE: _ClassVar[RestoreOutcome]
+ RESTORE_OUTCOME_EXISTS_TOMBSTONED: _ClassVar[RestoreOutcome]
+ RESTORE_OUTCOME_NO_DISTINCT_ID: _ClassVar[RestoreOutcome]
+
DELETE_PERSONS_MODE_UNSPECIFIED: DeletePersonsMode
DELETE_PERSONS_MODE_HARD: DeletePersonsMode
DELETE_PERSONS_MODE_TOMBSTONE: DeletePersonsMode
@@ -74,6 +82,11 @@ RAISE_OUTCOME_RAISED: RaiseOutcome
RAISE_OUTCOME_AT_OR_ABOVE: RaiseOutcome
RAISE_OUTCOME_NOT_LIVE: RaiseOutcome
RAISE_OUTCOME_MISSING: RaiseOutcome
+RESTORE_OUTCOME_UNSPECIFIED: RestoreOutcome
+RESTORE_OUTCOME_INSERTED: RestoreOutcome
+RESTORE_OUTCOME_EXISTS_LIVE: RestoreOutcome
+RESTORE_OUTCOME_EXISTS_TOMBSTONED: RestoreOutcome
+RESTORE_OUTCOME_NO_DISTINCT_ID: RestoreOutcome
class Person(_message.Message):
__slots__ = (
@@ -1054,3 +1067,72 @@ class RaisePersonVersionFloorsResponse(_message.Message):
def __init__(
self, results: _Optional[_Iterable[_Union[RaisePersonVersionFloorResult, _Mapping]]] = ...
) -> None: ...
+
+class RestoredPerson(_message.Message):
+ __slots__ = ("person_uuid", "properties", "created_at_ms", "is_identified", "version", "distinct_ids")
+ PERSON_UUID_FIELD_NUMBER: _ClassVar[int]
+ PROPERTIES_FIELD_NUMBER: _ClassVar[int]
+ CREATED_AT_MS_FIELD_NUMBER: _ClassVar[int]
+ IS_IDENTIFIED_FIELD_NUMBER: _ClassVar[int]
+ VERSION_FIELD_NUMBER: _ClassVar[int]
+ DISTINCT_IDS_FIELD_NUMBER: _ClassVar[int]
+ person_uuid: str
+ properties: bytes
+ created_at_ms: int
+ is_identified: bool
+ version: int
+ distinct_ids: _containers.RepeatedCompositeFieldContainer[RestoredDistinctId]
+ def __init__(
+ self,
+ person_uuid: _Optional[str] = ...,
+ properties: _Optional[bytes] = ...,
+ created_at_ms: _Optional[int] = ...,
+ is_identified: bool = ...,
+ version: _Optional[int] = ...,
+ distinct_ids: _Optional[_Iterable[_Union[RestoredDistinctId, _Mapping]]] = ...,
+ ) -> None: ...
+
+class RestoredDistinctId(_message.Message):
+ __slots__ = ("distinct_id", "version")
+ DISTINCT_ID_FIELD_NUMBER: _ClassVar[int]
+ VERSION_FIELD_NUMBER: _ClassVar[int]
+ distinct_id: str
+ version: int
+ def __init__(self, distinct_id: _Optional[str] = ..., version: _Optional[int] = ...) -> None: ...
+
+class RestorePersonsRequest(_message.Message):
+ __slots__ = ("team_id", "persons")
+ TEAM_ID_FIELD_NUMBER: _ClassVar[int]
+ PERSONS_FIELD_NUMBER: _ClassVar[int]
+ team_id: int
+ persons: _containers.RepeatedCompositeFieldContainer[RestoredPerson]
+ def __init__(
+ self, team_id: _Optional[int] = ..., persons: _Optional[_Iterable[_Union[RestoredPerson, _Mapping]]] = ...
+ ) -> None: ...
+
+class RestorePersonResult(_message.Message):
+ __slots__ = ("person_uuid", "outcome", "person_id", "version", "restored_distinct_ids")
+ PERSON_UUID_FIELD_NUMBER: _ClassVar[int]
+ OUTCOME_FIELD_NUMBER: _ClassVar[int]
+ PERSON_ID_FIELD_NUMBER: _ClassVar[int]
+ VERSION_FIELD_NUMBER: _ClassVar[int]
+ RESTORED_DISTINCT_IDS_FIELD_NUMBER: _ClassVar[int]
+ person_uuid: str
+ outcome: RestoreOutcome
+ person_id: int
+ version: int
+ restored_distinct_ids: _containers.RepeatedScalarFieldContainer[str]
+ def __init__(
+ self,
+ person_uuid: _Optional[str] = ...,
+ outcome: _Optional[_Union[RestoreOutcome, str]] = ...,
+ person_id: _Optional[int] = ...,
+ version: _Optional[int] = ...,
+ restored_distinct_ids: _Optional[_Iterable[str]] = ...,
+ ) -> None: ...
+
+class RestorePersonsResponse(_message.Message):
+ __slots__ = ("results",)
+ RESULTS_FIELD_NUMBER: _ClassVar[int]
+ results: _containers.RepeatedCompositeFieldContainer[RestorePersonResult]
+ def __init__(self, results: _Optional[_Iterable[_Union[RestorePersonResult, _Mapping]]] = ...) -> None: ...
diff --git a/posthog/personhog_client/client.py b/posthog/personhog_client/client.py
index 4e87f8272ded..24ab245dc8e2 100644
--- a/posthog/personhog_client/client.py
+++ b/posthog/personhog_client/client.py
@@ -92,6 +92,8 @@ from posthog.personhog_client.proto import (
PersonsResponse,
RaisePersonVersionFloorsRequest,
RaisePersonVersionFloorsResponse,
+ RestorePersonsRequest,
+ RestorePersonsResponse,
SetPersonDistinctIdVersionFloorRequest,
SetPersonDistinctIdVersionFloorResponse,
SetPersonVersionFloorRequest,
@@ -291,6 +293,9 @@ class PersonHogClient:
) -> RaisePersonVersionFloorsResponse:
return self._stub.RaisePersonVersionFloors(request, timeout=timeout or self._timeout)
+ def restore_persons(self, request: RestorePersonsRequest, timeout: float | None = None) -> RestorePersonsResponse:
+ return self._stub.RestorePersons(request, timeout=timeout or self._timeout)
+
# -- Person lookups --
def get_person(self, request: GetPersonRequest) -> GetPersonResponse:
diff --git a/posthog/personhog_client/fake_client.py b/posthog/personhog_client/fake_client.py
index 6021c17d429b..b4ac2fb7c38d 100644
--- a/posthog/personhog_client/fake_client.py
+++ b/posthog/personhog_client/fake_client.py
@@ -1073,6 +1073,66 @@ class FakePersonHogClient:
response.results.add(person_uuid=floor.person_uuid, outcome=outcome, version=version)
return response
+ def restore_persons(
+ self, request: person_pb2.RestorePersonsRequest, timeout: float | None = None
+ ) -> person_pb2.RestorePersonsResponse:
+ self.calls.append(_Call("restore_persons", request))
+ self._check_repair_batch(
+ [p.person_uuid for p in request.persons], [p.version for p in request.persons], uuid_keys=True
+ )
+ parsed_properties = [json.loads(p.properties) for p in request.persons]
+ if not all(isinstance(props, dict) for props in parsed_properties):
+ raise ValueError("properties must be a JSON object")
+ listed = [d for p in request.persons for d in p.distinct_ids]
+ if len({d.distinct_id for d in listed}) != len(listed) or any(
+ not d.distinct_id or d.version < 0 for d in listed
+ ):
+ raise ValueError("distinct_ids must be unique, non-empty and at non-negative versions")
+ response = person_pb2.RestorePersonsResponse()
+ for restored, properties in zip(request.persons, parsed_properties):
+ existing = self._persons_by_uuid.get((request.team_id, restored.person_uuid))
+ if existing is not None:
+ outcome = (
+ person_pb2.RESTORE_OUTCOME_EXISTS_TOMBSTONED
+ if existing.is_deleted
+ else person_pb2.RESTORE_OUTCOME_EXISTS_LIVE
+ )
+ response.results.add(
+ person_uuid=restored.person_uuid, outcome=outcome, person_id=existing.id, version=existing.version
+ )
+ continue
+ free = [
+ d
+ for d in restored.distinct_ids
+ if (request.team_id, d.distinct_id) not in self._persons_by_distinct_id
+ and (request.team_id, d.distinct_id) not in self._tombstoned_distinct_ids
+ ]
+ if restored.distinct_ids and not free:
+ response.results.add(
+ person_uuid=restored.person_uuid, outcome=person_pb2.RESTORE_OUTCOME_NO_DISTINCT_ID
+ )
+ continue
+ self._next_split_person_id += 1
+ person = self.add_person(
+ team_id=request.team_id,
+ person_id=self._next_split_person_id,
+ uuid=restored.person_uuid,
+ properties=properties,
+ created_at=restored.created_at_ms,
+ version=restored.version,
+ is_identified=restored.is_identified,
+ distinct_ids=[d.distinct_id for d in free],
+ distinct_id_versions={d.distinct_id: d.version for d in free},
+ )
+ response.results.add(
+ person_uuid=restored.person_uuid,
+ outcome=person_pb2.RESTORE_OUTCOME_INSERTED,
+ person_id=person.id,
+ version=person.version,
+ restored_distinct_ids=[d.distinct_id for d in free],
+ )
+ return response
+
# ── Assertion helpers ────────────────────────────────────────────
def assert_called(self, method: str, *, times: int | None = None) -> list[_Call]:
diff --git a/posthog/personhog_client/proto/__init__.py b/posthog/personhog_client/proto/__init__.py
index f53802b8fa79..35b7d1ca8c8e 100644
--- a/posthog/personhog_client/proto/__init__.py
+++ b/posthog/personhog_client/proto/__init__.py
@@ -115,5 +115,9 @@ from personhog.types.v1.person_pb2 import (
ListPersonsForTeamResponse,
RaisePersonVersionFloorsRequest,
RaisePersonVersionFloorsResponse,
+ RestorePersonsRequest,
+ RestorePersonsResponse,
+ RestoredDistinctId,
+ RESTORE_OUTCOME_NO_DISTINCT_ID,
PersonVersionFloorResult,
)
diff --git a/posthog/personhog_client/test_fake_client.py b/posthog/personhog_client/test_fake_client.py
index 93f77cd886a4..21ea45591992 100644
--- a/posthog/personhog_client/test_fake_client.py
+++ b/posthog/personhog_client/test_fake_client.py
@@ -838,6 +838,55 @@ class TestFakePersonHogClientRepairWrites:
(person_pb2.RAISE_OUTCOME_MISSING, 0),
]
+ def test_restore_inserts_only_absent_uuids(self):
+ response = self.client.restore_persons(
+ person_pb2.RestorePersonsRequest(
+ team_id=self.TEAM_ID,
+ persons=[
+ person_pb2.RestoredPerson(person_uuid=u, properties=b'{"plan": "free"}', version=6)
+ for u in (self.MISSING, self.LIVE, self.TOMB)
+ ],
+ )
+ )
+ assert [r.outcome for r in response.results] == [
+ person_pb2.RESTORE_OUTCOME_INSERTED,
+ person_pb2.RESTORE_OUTCOME_EXISTS_LIVE,
+ person_pb2.RESTORE_OUTCOME_EXISTS_TOMBSTONED,
+ ]
+ restored = self.client.stored_person(self.TEAM_ID, self.MISSING)
+ assert restored is not None and json.loads(restored.properties) == {"plan": "free"} and restored.version == 6
+
+ def test_restore_inserts_listed_distinct_ids_and_skips_a_person_none_of_them_could_reach(self):
+ holder = "00000000-0000-0000-0000-000000000009"
+ self.client.add_person(team_id=self.TEAM_ID, person_id=9, uuid=holder, distinct_ids=["taken", "taken-2"])
+ reachable, unreachable = "00000000-0000-0000-0000-000000000005", "00000000-0000-0000-0000-000000000006"
+
+ def ids(*dids: str) -> list[person_pb2.RestoredDistinctId]:
+ return [person_pb2.RestoredDistinctId(distinct_id=d, version=4) for d in dids]
+
+ response = self.client.restore_persons(
+ person_pb2.RestorePersonsRequest(
+ team_id=self.TEAM_ID,
+ persons=[
+ person_pb2.RestoredPerson(
+ person_uuid=reachable, properties=b"{}", distinct_ids=ids("new", "taken")
+ ),
+ person_pb2.RestoredPerson(person_uuid=unreachable, properties=b"{}", distinct_ids=ids("taken-2")),
+ ],
+ )
+ )
+
+ assert [(r.outcome, list(r.restored_distinct_ids)) for r in response.results] == [
+ (person_pb2.RESTORE_OUTCOME_INSERTED, ["new"]),
+ (person_pb2.RESTORE_OUTCOME_NO_DISTINCT_ID, []),
+ ]
+ assert self.client.stored_person(self.TEAM_ID, unreachable) is None
+ stored = self.client.get_distinct_id_rows(
+ person_pb2.GetDistinctIdRowsRequest(team_id=self.TEAM_ID, distinct_ids=["new", "taken"])
+ )
+ rows = {r.distinct_id: (r.person_uuid, r.version) for r in stored.rows}
+ assert rows == {"new": (reachable, 4), "taken": (holder, 0)}
+
def test_rejects_a_repeated_uuid_before_any_write(self):
with pytest.raises(ValueError, match="Duplicate key"):
self.client.raise_person_version_floors(
diff --git a/proto/personhog/replica/v1/replica.proto b/proto/personhog/replica/v1/replica.proto
index 93a792630242..74db1ecec5e0 100644
--- a/proto/personhog/replica/v1/replica.proto
+++ b/proto/personhog/replica/v1/replica.proto
@@ -84,6 +84,8 @@ service PersonHogReplica {
rpc ListPersonsForTeam(personhog.types.v1.ListPersonsForTeamRequest) returns (personhog.types.v1.ListPersonsForTeamResponse);
// Writes for the person consistency repair. Raises claim lifecycle marks on the persons they
- // raise. Versions only go up. Same routing caveat as DeletePersons above.
+ // raise; restores only insert absent persons. Versions only go up. Same routing caveat as
+ // DeletePersons above.
rpc RaisePersonVersionFloors(personhog.types.v1.RaisePersonVersionFloorsRequest) returns (personhog.types.v1.RaisePersonVersionFloorsResponse);
+ rpc RestorePersons(personhog.types.v1.RestorePersonsRequest) returns (personhog.types.v1.RestorePersonsResponse);
}
diff --git a/proto/personhog/service/v1/service.proto b/proto/personhog/service/v1/service.proto
index 42d8e682bd50..f68addf226d1 100644
--- a/proto/personhog/service/v1/service.proto
+++ b/proto/personhog/service/v1/service.proto
@@ -111,6 +111,8 @@ service PersonHogService {
rpc ListPersonsForTeam(personhog.types.v1.ListPersonsForTeamRequest) returns (personhog.types.v1.ListPersonsForTeamResponse);
// Writes for the person consistency repair. Raises claim lifecycle marks on the persons they
- // raise. Versions only go up. Same routing caveat as DeletePersons above.
+ // raise; restores only insert absent persons. Versions only go up. Same routing caveat as
+ // DeletePersons above.
rpc RaisePersonVersionFloors(personhog.types.v1.RaisePersonVersionFloorsRequest) returns (personhog.types.v1.RaisePersonVersionFloorsResponse);
+ rpc RestorePersons(personhog.types.v1.RestorePersonsRequest) returns (personhog.types.v1.RestorePersonsResponse);
}
diff --git a/proto/personhog/types/v1/person.proto b/proto/personhog/types/v1/person.proto
index 13061303ba76..2e37bf42ec22 100644
--- a/proto/personhog/types/v1/person.proto
+++ b/proto/personhog/types/v1/person.proto
@@ -701,3 +701,51 @@ message RaisePersonVersionFloorResult {
message RaisePersonVersionFloorsResponse {
repeated RaisePersonVersionFloorResult results = 1;
}
+
+// A person to insert from its ClickHouse copy.
+message RestoredPerson {
+ string person_uuid = 1;
+ // JSON object.
+ bytes properties = 2;
+ int64 created_at_ms = 3;
+ bool is_identified = 4;
+ int64 version = 5;
+ // Distinct ids to insert on the person in the same transaction, where no row exists for them.
+ // When the person is inserted but none of these can be, the person is not inserted either
+ // (RESTORE_OUTCOME_NO_DISTINCT_ID), so a restore never leaves a person nothing points to.
+ repeated RestoredDistinctId distinct_ids = 6;
+}
+
+message RestoredDistinctId {
+ string distinct_id = 1;
+ int64 version = 2;
+}
+
+message RestorePersonsRequest {
+ int64 team_id = 1;
+ // At most 250, no repeated uuid.
+ repeated RestoredPerson persons = 2;
+}
+
+enum RestoreOutcome {
+ RESTORE_OUTCOME_UNSPECIFIED = 0;
+ RESTORE_OUTCOME_INSERTED = 1;
+ // A row with the uuid exists, live or tombstoned; it is left unchanged.
+ RESTORE_OUTCOME_EXISTS_LIVE = 2;
+ RESTORE_OUTCOME_EXISTS_TOMBSTONED = 3;
+ // The request listed distinct ids, and every one of them already had a row; nothing was inserted.
+ RESTORE_OUTCOME_NO_DISTINCT_ID = 4;
+}
+
+message RestorePersonResult {
+ string person_uuid = 1;
+ RestoreOutcome outcome = 2;
+ int64 person_id = 3;
+ int64 version = 4;
+ // For INSERTED: the requested distinct ids inserted on the person, at their requested versions.
+ repeated string restored_distinct_ids = 5;
+}
+
+message RestorePersonsResponse {
+ repeated RestorePersonResult results = 1;
+}
diff --git a/rust/personhog-replica/.sqlx/query-2f67167b4924d44675702680df8fbadb22f9ec20a9158a707c42a0d405aa62e6.json b/rust/personhog-replica/.sqlx/query-2f67167b4924d44675702680df8fbadb22f9ec20a9158a707c42a0d405aa62e6.json
new file mode 100644
index 000000000000..cff43d420f78
--- /dev/null
+++ b/rust/personhog-replica/.sqlx/query-2f67167b4924d44675702680df8fbadb22f9ec20a9158a707c42a0d405aa62e6.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "DELETE FROM posthog_person WHERE team_id = $1 AND id = ANY($2::bigint[])",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int4",
+ "Int8Array"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "2f67167b4924d44675702680df8fbadb22f9ec20a9158a707c42a0d405aa62e6"
+}
diff --git a/rust/personhog-replica/.sqlx/query-55e497dd547da53e785acdf1cb17c17c09aed3eb406ab417b69a014c2fd58063.json b/rust/personhog-replica/.sqlx/query-55e497dd547da53e785acdf1cb17c17c09aed3eb406ab417b69a014c2fd58063.json
new file mode 100644
index 000000000000..c7615bbaccac
--- /dev/null
+++ b/rust/personhog-replica/.sqlx/query-55e497dd547da53e785acdf1cb17c17c09aed3eb406ab417b69a014c2fd58063.json
@@ -0,0 +1,25 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO posthog_persondistinctid (distinct_id, person_id, team_id, version, is_deleted)\n SELECT f.distinct_id, f.person_id, $1, f.version, false\n FROM UNNEST($2::text[], $3::bigint[], $4::bigint[]) AS f(distinct_id, person_id, version)\n ON CONFLICT (team_id, distinct_id) DO NOTHING\n RETURNING distinct_id as \"distinct_id!\"\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "distinct_id!",
+ "type_info": "Varchar"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int4",
+ "TextArray",
+ "Int8Array",
+ "Int8Array"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "55e497dd547da53e785acdf1cb17c17c09aed3eb406ab417b69a014c2fd58063"
+}
diff --git a/rust/personhog-replica/.sqlx/query-fca7ae2012495fc8d8652f922e80b8e37c9f6aee29ce08122be847fa44e23079.json b/rust/personhog-replica/.sqlx/query-fca7ae2012495fc8d8652f922e80b8e37c9f6aee29ce08122be847fa44e23079.json
new file mode 100644
index 000000000000..d1e6317dbc1e
--- /dev/null
+++ b/rust/personhog-replica/.sqlx/query-fca7ae2012495fc8d8652f922e80b8e37c9f6aee29ce08122be847fa44e23079.json
@@ -0,0 +1,33 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO posthog_person (uuid, team_id, properties, properties_last_updated_at,\n properties_last_operation, created_at, version,\n is_identified, is_deleted)\n SELECT f.uuid, $1, f.properties::jsonb, '{}'::jsonb, '{}'::jsonb, f.created_at,\n f.version, f.is_identified, false\n FROM UNNEST($2::uuid[], $3::text[], $4::timestamptz[], $5::bigint[], $6::bool[])\n AS f(uuid, properties, created_at, version, is_identified)\n ON CONFLICT (team_id, uuid) DO NOTHING\n RETURNING id::bigint as \"id!\", uuid as \"uuid!\"\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id!",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 1,
+ "name": "uuid!",
+ "type_info": "Uuid"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int4",
+ "UuidArray",
+ "TextArray",
+ "TimestamptzArray",
+ "Int8Array",
+ "BoolArray"
+ ]
+ },
+ "nullable": [
+ false,
+ false
+ ]
+ },
+ "hash": "fca7ae2012495fc8d8652f922e80b8e37c9f6aee29ce08122be847fa44e23079"
+}
diff --git a/rust/personhog-replica/src/service/mod.rs b/rust/personhog-replica/src/service/mod.rs
index e230ffba1fe8..8306bc6cdb7f 100644
--- a/rust/personhog-replica/src/service/mod.rs
+++ b/rust/personhog-replica/src/service/mod.rs
@@ -46,10 +46,12 @@ use personhog_proto::personhog::types::v1::{
PersonWithTeamDistinctId, PersonsByDistinctIdsInTeamResponse, PersonsByDistinctIdsResponse,
PersonsResponse, RaiseOutcome as ProtoRaiseOutcome, RaisePersonVersionFloorResult,
RaisePersonVersionFloorsRequest, RaisePersonVersionFloorsResponse,
- SetPersonDistinctIdVersionFloorRequest, SetPersonDistinctIdVersionFloorResponse,
- SetPersonVersionFloorRequest, SetPersonVersionFloorResponse, SplitPersonRequest,
- SplitPersonResponse, SplitResult as ProtoSplitResult, TeamDistinctId, TombstonedDistinctId,
- TombstonedPerson, UpdateGroupRequest, UpdateGroupResponse, UpdateGroupTypeMappingRequest,
+ RestoreOutcome as ProtoRestoreOutcome, RestorePersonResult, RestorePersonsRequest,
+ RestorePersonsResponse, SetPersonDistinctIdVersionFloorRequest,
+ SetPersonDistinctIdVersionFloorResponse, SetPersonVersionFloorRequest,
+ SetPersonVersionFloorResponse, SplitPersonRequest, SplitPersonResponse,
+ SplitResult as ProtoSplitResult, TeamDistinctId, TombstonedDistinctId, TombstonedPerson,
+ UpdateGroupRequest, UpdateGroupResponse, UpdateGroupTypeMappingRequest,
UpdateGroupTypeMappingResponse, UpsertHashKeyOverridesRequest, UpsertHashKeyOverridesResponse,
VersionFloorOutcome as ProtoVersionFloorOutcome,
};
@@ -1709,6 +1711,65 @@ impl PersonHogReplica for PersonHogReplicaService {
.collect(),
}))
}
+
+ async fn restore_persons(
+ &self,
+ request: Request<RestorePersonsRequest>,
+ ) -> Result<Response<RestorePersonsResponse>, Status> {
+ let req = request.into_inner();
+ check_floor_batch(
+ req.persons
+ .iter()
+ .map(|p| (p.person_uuid.as_str(), p.version)),
+ )?;
+ let persons: Vec<storage::types::RestoredPerson> = req
+ .persons
+ .iter()
+ .map(|p| {
+ let properties: serde_json::Value =
+ serde_json::from_slice(&p.properties).map_err(|e| {
+ Status::invalid_argument(format!("Invalid properties JSON: {e}"))
+ })?;
+ if !properties.is_object() {
+ return Err(Status::invalid_argument("properties must be a JSON object"));
+ }
+ Ok(storage::types::RestoredPerson {
+ uuid: parse_uuid(&p.person_uuid)?,
+ properties,
+ created_at: chrono::DateTime::from_timestamp_millis(p.created_at_ms)
+ .ok_or_else(|| Status::invalid_argument("created_at_ms out of range"))?,
+ is_identified: p.is_identified,
+ version: p.version,
+ distinct_ids: p
+ .distinct_ids
+ .iter()
+ .map(|d| (d.distinct_id.clone(), d.version))
+ .collect(),
+ })
+ })
+ .collect::<Result<_, _>>()?;
+ reject_duplicate_uuids(persons.iter().map(|p| p.uuid))?;
+ check_restored_distinct_ids(&persons)?;
+
+ let results = self
+ .storage
+ .restore_persons(req.team_id, &persons)
+ .await
+ .map_err(|e| log_and_convert_error(e, "restore_persons"))?;
+
+ Ok(Response::new(RestorePersonsResponse {
+ results: results
+ .into_iter()
+ .map(|r| RestorePersonResult {
+ person_uuid: r.uuid.to_string(),
+ outcome: restore_outcome_to_proto(r.outcome) as i32,
+ person_id: r.person_id,
+ version: r.version,
+ restored_distinct_ids: r.restored_distinct_ids,
+ })
+ .collect(),
+ }))
+ }
}
#[allow(clippy::result_large_err)]
@@ -1777,6 +1838,34 @@ fn tombstone_to_proto(person: storage::types::TombstonedPerson) -> TombstonedPer
}
}
+#[allow(clippy::result_large_err)]
+fn check_restored_distinct_ids(persons: &[storage::types::RestoredPerson]) -> Result<(), Status> {
+ let ids: Vec<&(String, i64)> = persons.iter().flat_map(|p| &p.distinct_ids).collect();
+ if ids.len() > MAX_DISTINCT_ID_ROWS_SIZE {
+ return Err(Status::invalid_argument(format!(
+ "At most {MAX_DISTINCT_ID_ROWS_SIZE} distinct ids per restore, got {}",
+ ids.len()
+ )));
+ }
+ let mut seen = HashSet::with_capacity(ids.len());
+ for (distinct_id, version) in ids {
+ if distinct_id.is_empty() {
+ return Err(Status::invalid_argument("distinct_id must not be empty"));
+ }
+ if *version < 0 {
+ return Err(Status::invalid_argument(format!(
+ "version must not be negative, got {version} for {distinct_id}"
+ )));
+ }
+ if !seen.insert(distinct_id.as_str()) {
+ return Err(Status::invalid_argument(format!(
+ "Duplicate distinct_id in request: {distinct_id}"
+ )));
+ }
+ }
+ Ok(())
+}
+
#[allow(clippy::result_large_err)]
fn reject_duplicate_uuids(uuids: impl Iterator<Item = Uuid>) -> Result<(), Status> {
// Two spellings of one UUID pass the string check but lock the same row.
@@ -1799,3 +1888,12 @@ fn raise_outcome_to_proto(outcome: storage::types::RaiseOutcome) -> ProtoRaiseOu
storage::types::RaiseOutcome::Missing => ProtoRaiseOutcome::Missing,
}
}
+
+fn restore_outcome_to_proto(outcome: storage::types::RestoreOutcome) -> ProtoRestoreOutcome {
+ match outcome {
+ storage::types::RestoreOutcome::Inserted => ProtoRestoreOutcome::Inserted,
+ storage::types::RestoreOutcome::ExistsLive => ProtoRestoreOutcome::ExistsLive,
+ storage::types::RestoreOutcome::ExistsTombstoned => ProtoRestoreOutcome::ExistsTombstoned,
+ storage::types::RestoreOutcome::NoDistinctId => ProtoRestoreOutcome::NoDistinctId,
+ }
+}
diff --git a/rust/personhog-replica/src/service/tests/mocks.rs b/rust/personhog-replica/src/service/tests/mocks.rs
index 569b7829041a..9e9f6ea4c760 100644
--- a/rust/personhog-replica/src/service/tests/mocks.rs
+++ b/rust/personhog-replica/src/service/tests/mocks.rs
@@ -1918,6 +1918,14 @@ impl storage::PersonRepair for FailingStorage {
) -> storage::StorageResult<Vec<storage::types::RaiseResult>> {
Err(self.error.clone())
}
+
+ async fn restore_persons(
+ &self,
+ _team_id: i64,
+ _persons: &[storage::types::RestoredPerson],
+ ) -> storage::StorageResult<Vec<storage::types::RestoreResult>> {
+ Err(self.error.clone())
+ }
}
#[async_trait]
@@ -1929,6 +1937,14 @@ impl storage::PersonRepair for SuccessStorage {
) -> storage::StorageResult<Vec<storage::types::RaiseResult>> {
Ok(Vec::new())
}
+
+ async fn restore_persons(
+ &self,
+ _team_id: i64,
+ _persons: &[storage::types::RestoredPerson],
+ ) -> storage::StorageResult<Vec<storage::types::RestoreResult>> {
+ Ok(Vec::new())
+ }
}
#[async_trait]
@@ -1940,6 +1956,14 @@ impl storage::PersonRepair for PopulatedStorage {
) -> storage::StorageResult<Vec<storage::types::RaiseResult>> {
Ok(Vec::new())
}
+
+ async fn restore_persons(
+ &self,
+ _team_id: i64,
+ _persons: &[storage::types::RestoredPerson],
+ ) -> storage::StorageResult<Vec<storage::types::RestoreResult>> {
+ Ok(Vec::new())
+ }
}
#[async_trait]
@@ -1951,4 +1975,12 @@ impl storage::PersonRepair for ConsistencyTrackingStorage {
) -> storage::StorageResult<Vec<storage::types::RaiseResult>> {
Ok(Vec::new())
}
+
+ async fn restore_persons(
+ &self,
+ _team_id: i64,
+ _persons: &[storage::types::RestoredPerson],
+ ) -> storage::StorageResult<Vec<storage::types::RestoreResult>> {
+ Ok(Vec::new())
+ }
}
diff --git a/rust/personhog-replica/src/storage/postgres/person.rs b/rust/personhog-replica/src/storage/postgres/person.rs
index 3f635b73d11e..761434d0b686 100644
--- a/rust/personhog-replica/src/storage/postgres/person.rs
+++ b/rust/personhog-replica/src/storage/postgres/person.rs
@@ -1541,7 +1541,7 @@ pub(super) struct LockedPerson {
/// Lock the existing persons among `uuids` in id order, the order the ingestion
/// writer and the tombstone paths take person locks in.
-async fn lock_persons_by_uuids(
+pub(super) async fn lock_persons_by_uuids(
tx: &mut Transaction<'_, Postgres>,
team_id: i64,
uuids: &[Uuid],
diff --git a/rust/personhog-replica/src/storage/postgres/repair.rs b/rust/personhog-replica/src/storage/postgres/repair.rs
index 30a93db848e9..e34ce652a7c4 100644
--- a/rust/personhog-replica/src/storage/postgres/repair.rs
+++ b/rust/personhog-replica/src/storage/postgres/repair.rs
@@ -1,16 +1,19 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
use async_trait::async_trait;
use sqlx::{Postgres, Transaction};
use uuid::Uuid;
use super::person::{
- bulk_primary_labels, claim_lifecycle_marks, release_lifecycle_marks, LockedPerson, MarkKind,
+ bulk_primary_labels, claim_lifecycle_marks, lock_persons_by_uuids, release_lifecycle_marks,
+ LockedPerson, MarkKind,
};
use super::{PostgresStorage, DB_QUERY_DURATION};
-use crate::storage::error::StorageResult;
+use crate::storage::error::{StorageError, StorageResult};
use crate::storage::traits::PersonRepair;
-use crate::storage::types::{RaiseOutcome, RaiseResult};
+use crate::storage::types::{
+ RaiseOutcome, RaiseResult, RestoreOutcome, RestoreResult, RestoredPerson,
+};
#[async_trait]
impl PersonRepair for PostgresStorage {
@@ -89,6 +92,190 @@ impl PersonRepair for PostgresStorage {
})
.collect())
}
+
+ async fn restore_persons(
+ &self,
+ team_id: i64,
+ persons: &[RestoredPerson],
+ ) -> StorageResult<Vec<RestoreResult>> {
+ if persons.is_empty() {
+ return Ok(Vec::new());
+ }
+ let labels = bulk_primary_labels("restore_persons");
+ let _timer = common_metrics::timing_guard(DB_QUERY_DURATION, &labels);
+
+ let mut tx = begin_with_lock_timeout(self).await?;
+ let uuids: Vec<Uuid> = persons.iter().map(|p| p.uuid).collect();
+ let mut existing = lock_persons_by_uuids(&mut tx, team_id, &uuids).await?;
+
+ // Insert in uuid order, so two calls racing on the same uuids cannot deadlock.
+ let mut absent: Vec<&RestoredPerson> = persons
+ .iter()
+ .filter(|p| !existing.contains_key(&p.uuid))
+ .collect();
+ absent.sort_unstable_by_key(|p| p.uuid);
+ let inserted: HashMap<Uuid, i64> = if absent.is_empty() {
+ HashMap::new()
+ } else {
+ sqlx::query!(
+ r#"
+ INSERT INTO posthog_person (uuid, team_id, properties, properties_last_updated_at,
+ properties_last_operation, created_at, version,
+ is_identified, is_deleted)
+ SELECT f.uuid, $1, f.properties::jsonb, '{}'::jsonb, '{}'::jsonb, f.created_at,
+ f.version, f.is_identified, false
+ FROM UNNEST($2::uuid[], $3::text[], $4::timestamptz[], $5::bigint[], $6::bool[])
+ AS f(uuid, properties, created_at, version, is_identified)
+ ON CONFLICT (team_id, uuid) DO NOTHING
+ RETURNING id::bigint as "id!", uuid as "uuid!"
+ "#,
+ team_id as i32,
+ &absent.iter().map(|p| p.uuid).collect::<Vec<_>>(),
+ &absent
+ .iter()
+ .map(|p| p.properties.to_string())
+ .collect::<Vec<_>>(),
+ &absent.iter().map(|p| p.created_at).collect::<Vec<_>>(),
+ &absent.iter().map(|p| p.version).collect::<Vec<_>>(),
+ &absent.iter().map(|p| p.is_identified).collect::<Vec<_>>()
+ )
+ .fetch_all(&mut *tx)
+ .await?
+ .into_iter()
+ .map(|row| (row.uuid, row.id))
+ .collect()
+ };
+
+ let restored_ids =
+ insert_restored_distinct_ids(&mut tx, team_id, &absent, &inserted).await?;
+ // A person listed with distinct ids, none of which could be inserted, would be live with nothing
+ // pointing at it; it was inserted in this transaction, so removing it undoes the insert.
+ let unreachable: Vec<i64> = absent
+ .iter()
+ .filter(|p| !p.distinct_ids.is_empty() && !restored_ids.contains_key(&p.uuid))
+ .filter_map(|p| inserted.get(&p.uuid).copied())
+ .collect();
+ if !unreachable.is_empty() {
+ sqlx::query!(
+ "DELETE FROM posthog_person WHERE team_id = $1 AND id = ANY($2::bigint[])",
+ team_id as i32,
+ &unreachable
+ )
+ .execute(&mut *tx)
+ .await?;
+ }
+
+ // ON CONFLICT DO NOTHING waited for a concurrent insert of the same uuid and skipped it.
+ let raced: Vec<Uuid> = absent
+ .iter()
+ .map(|p| p.uuid)
+ .filter(|uuid| !inserted.contains_key(uuid))
+ .collect();
+ if !raced.is_empty() {
+ let late = lock_persons_by_uuids(&mut tx, team_id, &raced).await?;
+ if late.len() != raced.len() {
+ return Err(StorageError::FailedPrecondition(format!(
+ "person rows changed during restore_persons (team_id={team_id}); retry"
+ )));
+ }
+ existing.extend(late);
+ }
+ tx.commit().await?;
+
+ persons
+ .iter()
+ .map(|p| {
+ if let Some(id) = inserted.get(&p.uuid) {
+ let ids = restored_ids.get(&p.uuid).cloned().unwrap_or_default();
+ let outcome = if p.distinct_ids.is_empty() || !ids.is_empty() {
+ RestoreOutcome::Inserted
+ } else {
+ RestoreOutcome::NoDistinctId
+ };
+ return Ok(RestoreResult {
+ uuid: p.uuid,
+ outcome,
+ person_id: if outcome == RestoreOutcome::Inserted {
+ *id
+ } else {
+ 0
+ },
+ version: if outcome == RestoreOutcome::Inserted {
+ p.version
+ } else {
+ 0
+ },
+ restored_distinct_ids: ids,
+ });
+ }
+ let row = existing.get(&p.uuid).ok_or_else(|| {
+ StorageError::Query(format!("restore_persons did not classify uuid {}", p.uuid))
+ })?;
+ Ok(RestoreResult {
+ uuid: p.uuid,
+ outcome: if row.is_deleted {
+ RestoreOutcome::ExistsTombstoned
+ } else {
+ RestoreOutcome::ExistsLive
+ },
+ person_id: row.id,
+ version: row.version,
+ restored_distinct_ids: Vec::new(),
+ })
+ })
+ .collect()
+ }
+}
+
+/// Insert the requested distinct ids of each person this call inserted, where no row exists for them.
+/// Returns the inserted ids by person uuid.
+async fn insert_restored_distinct_ids(
+ tx: &mut Transaction<'static, Postgres>,
+ team_id: i64,
+ persons: &[&RestoredPerson],
+ inserted: &HashMap<Uuid, i64>,
+) -> StorageResult<HashMap<Uuid, Vec<String>>> {
+ let mut rows: Vec<(&str, i64, i64, Uuid)> = persons
+ .iter()
+ .filter_map(|p| inserted.get(&p.uuid).map(|id| (p, *id)))
+ .flat_map(|(p, id)| {
+ p.distinct_ids
+ .iter()
+ .map(move |(distinct_id, version)| (distinct_id.as_str(), id, *version, p.uuid))
+ })
+ .collect();
+ if rows.is_empty() {
+ return Ok(HashMap::new());
+ }
+ // Insert in distinct id order, so two calls racing on the same ids cannot deadlock.
+ rows.sort_unstable_by(|a, b| a.0.cmp(b.0));
+ let done: HashSet<String> = sqlx::query_scalar!(
+ r#"
+ INSERT INTO posthog_persondistinctid (distinct_id, person_id, team_id, version, is_deleted)
+ SELECT f.distinct_id, f.person_id, $1, f.version, false
+ FROM UNNEST($2::text[], $3::bigint[], $4::bigint[]) AS f(distinct_id, person_id, version)
+ ON CONFLICT (team_id, distinct_id) DO NOTHING
+ RETURNING distinct_id as "distinct_id!"
+ "#,
+ team_id as i32,
+ &rows.iter().map(|r| r.0.to_string()).collect::<Vec<_>>(),
+ &rows.iter().map(|r| r.1).collect::<Vec<_>>(),
+ &rows.iter().map(|r| r.2).collect::<Vec<_>>()
+ )
+ .fetch_all(&mut **tx)
+ .await?
+ .into_iter()
+ .collect();
+ let mut by_person: HashMap<Uuid, Vec<String>> = HashMap::new();
+ for (distinct_id, _, _, uuid) in rows {
+ if done.contains(distinct_id) {
+ by_person
+ .entry(uuid)
+ .or_default()
+ .push(distinct_id.to_string());
+ }
+ }
+ Ok(by_person)
}
/// Lock the claimed persons in id order, keyed by uuid. Locking by id, not uuid, leaves out a person
diff --git a/rust/personhog-replica/src/storage/traits/repair.rs b/rust/personhog-replica/src/storage/traits/repair.rs
index 36949d52da96..5bac03579282 100644
--- a/rust/personhog-replica/src/storage/traits/repair.rs
+++ b/rust/personhog-replica/src/storage/traits/repair.rs
@@ -2,7 +2,7 @@ use async_trait::async_trait;
use uuid::Uuid;
use crate::storage::error::StorageResult;
-use crate::storage::types::RaiseResult;
+use crate::storage::types::{RaiseResult, RestoreResult, RestoredPerson};
/// Writes for the person consistency repair. Each runs in one primary transaction, fails fast on a
/// held row lock, and only raises versions, so a retry after an unknown commit is a no-op.
@@ -16,4 +16,11 @@ pub trait PersonRepair: Send + Sync {
team_id: i64,
floors: &[(Uuid, i64)],
) -> StorageResult<Vec<RaiseResult>>;
+
+ /// Insert each person whose uuid has no row, live or tombstoned. Results keep request order.
+ async fn restore_persons(
+ &self,
+ team_id: i64,
+ persons: &[RestoredPerson],
+ ) -> StorageResult<Vec<RestoreResult>>;
}
diff --git a/rust/personhog-replica/src/storage/types/repair.rs b/rust/personhog-replica/src/storage/types/repair.rs
index d99e47a850f3..64a83a8cc0ea 100644
--- a/rust/personhog-replica/src/storage/types/repair.rs
+++ b/rust/personhog-replica/src/storage/types/repair.rs
@@ -15,3 +15,32 @@ pub struct RaiseResult {
/// The version the row holds after the call; 0 when missing.
pub version: i64,
}
+
+/// A person to insert from its ClickHouse copy.
+#[derive(Debug, Clone, PartialEq)]
+pub struct RestoredPerson {
+ pub uuid: Uuid,
+ pub properties: serde_json::Value,
+ pub created_at: chrono::DateTime<chrono::Utc>,
+ pub is_identified: bool,
+ pub version: i64,
+ /// Distinct ids and versions to insert on the person in the same transaction.
+ pub distinct_ids: Vec<(String, i64)>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum RestoreOutcome {
+ Inserted,
+ ExistsLive,
+ ExistsTombstoned,
+ NoDistinctId,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct RestoreResult {
+ pub uuid: Uuid,
+ pub outcome: RestoreOutcome,
+ pub person_id: i64,
+ pub version: i64,
+ pub restored_distinct_ids: Vec<String>,
+}
diff --git a/rust/personhog-replica/tests/service_tests.rs b/rust/personhog-replica/tests/service_tests.rs
index 682e5919da45..bf205c4997bf 100644
--- a/rust/personhog-replica/tests/service_tests.rs
+++ b/rust/personhog-replica/tests/service_tests.rs
@@ -14,7 +14,8 @@ use personhog_proto::personhog::types::v1::{
GetPersonRequest, GetPersonsByDistinctIdsInTeamRequest, GetPersonsByDistinctIdsRequest,
GetPersonsByUuidsRequest, GetPersonsRequest, GroupIdentifier, GroupKey,
ListPersonsForTeamRequest, PersonVersionFloor, PersonVersionFloorResult, RaiseOutcome,
- RaisePersonVersionFloorsRequest, ReadOptions, SetPersonDistinctIdVersionFloorRequest,
+ RaisePersonVersionFloorsRequest, ReadOptions, RestoreOutcome, RestorePersonsRequest,
+ RestoredDistinctId, RestoredPerson, SetPersonDistinctIdVersionFloorRequest,
SetPersonVersionFloorRequest, SplitPersonRequest, TeamDistinctId,
UpsertHashKeyOverridesRequest, VersionBoundedPerson, VersionFloorOutcome,
};
@@ -2001,6 +2002,34 @@ async fn test_repair_writes_round_trip_through_the_service() {
(RaiseOutcome::Raised as i32, 5)
);
+ let absent = Uuid::new_v4();
+ let restored = ctx
+ .service
+ .restore_persons(Request::new(RestorePersonsRequest {
+ team_id: ctx.team_id,
+ persons: vec![RestoredPerson {
+ person_uuid: absent.to_string(),
+ properties: br#"{"plan": "free"}"#.to_vec(),
+ created_at_ms: 1_600_000_000_000,
+ is_identified: false,
+ version: 4,
+ distinct_ids: vec![RestoredDistinctId {
+ distinct_id: "svc_repair_restored".to_string(),
+ version: 3,
+ }],
+ }],
+ }))
+ .await
+ .expect("restore")
+ .into_inner()
+ .results;
+ assert_eq!(restored[0].outcome, RestoreOutcome::Inserted as i32);
+ assert_eq!(restored[0].version, 4);
+ assert_eq!(
+ restored[0].restored_distinct_ids,
+ vec!["svc_repair_restored"]
+ );
+
ctx.cleanup().await.ok();
}
@@ -2008,11 +2037,17 @@ async fn test_repair_writes_round_trip_through_the_service() {
enum BadRepairRequest {
TooManyFloors,
DuplicateFloorUuid,
+ PropertiesNotJson,
+ PropertiesNotAnObject,
+ DuplicateRestoredDistinctId,
}
#[rstest]
#[case::too_many_floors(BadRepairRequest::TooManyFloors)]
#[case::duplicate_floor_uuid(BadRepairRequest::DuplicateFloorUuid)]
+#[case::properties_not_json(BadRepairRequest::PropertiesNotJson)]
+#[case::properties_not_an_object(BadRepairRequest::PropertiesNotAnObject)]
+#[case::duplicate_restored_distinct_id(BadRepairRequest::DuplicateRestoredDistinctId)]
#[tokio::test]
async fn test_repair_writes_reject_bad_requests(#[case] bad: BadRepairRequest) {
let ctx = ServiceTestContext::new().await;
@@ -2021,6 +2056,17 @@ async fn test_repair_writes_reject_bad_requests(#[case] bad: BadRepairRequest) {
person_uuid: u,
min_version: 1,
};
+ let restore = |properties: &[u8]| RestorePersonsRequest {
+ team_id: ctx.team_id,
+ persons: vec![RestoredPerson {
+ person_uuid: uuid.clone(),
+ properties: properties.to_vec(),
+ created_at_ms: 0,
+ is_identified: false,
+ version: 1,
+ distinct_ids: vec![],
+ }],
+ };
let status = match bad {
BadRepairRequest::TooManyFloors => ctx
.service
@@ -2040,6 +2086,28 @@ async fn test_repair_writes_reject_bad_requests(#[case] bad: BadRepairRequest) {
}))
.await
.map(|_| ()),
+ BadRepairRequest::PropertiesNotJson => ctx
+ .service
+ .restore_persons(Request::new(restore(b"not json")))
+ .await
+ .map(|_| ()),
+ BadRepairRequest::PropertiesNotAnObject => ctx
+ .service
+ .restore_persons(Request::new(restore(b"[1, 2]")))
+ .await
+ .map(|_| ()),
+ BadRepairRequest::DuplicateRestoredDistinctId => {
+ let mut request = restore(b"{}");
+ let id = || RestoredDistinctId {
+ distinct_id: "svc_dup".to_string(),
+ version: 0,
+ };
+ request.persons[0].distinct_ids = vec![id(), id()];
+ ctx.service
+ .restore_persons(Request::new(request))
+ .await
+ .map(|_| ())
+ }
}
.expect_err("rejected");
assert_eq!(status.code(), tonic::Code::InvalidArgument, "{status:?}");
diff --git a/rust/personhog-replica/tests/storage_tests.rs b/rust/personhog-replica/tests/storage_tests.rs
index 5257871a7bf7..e548bce29a8b 100644
--- a/rust/personhog-replica/tests/storage_tests.rs
+++ b/rust/personhog-replica/tests/storage_tests.rs
@@ -3,7 +3,7 @@ mod common;
use common::TestContext;
use metrics_util::debugging::{DebugValue, DebuggingRecorder, Snapshotter};
use personhog_replica::storage::postgres::ConsistencyLevel;
-use personhog_replica::storage::types::RaiseOutcome;
+use personhog_replica::storage::types::{RaiseOutcome, RestoreOutcome, RestoredPerson};
use personhog_replica::storage::{
GroupKey, PersonVersionFloorResult, StorageError, TimeoutKind, TombstoneTarget,
TombstonedDeleteOutcome, TombstonedDistinctId, TombstonedPerson, VersionFloorOutcome,
@@ -5040,6 +5040,174 @@ async fn test_raise_person_version_floors_raises_only_live_persons() {
ctx.cleanup().await.ok();
}
+#[tokio::test]
+async fn test_restore_persons_inserts_only_absent_uuids() {
+ let ctx = TestContext::new().await;
+ let live = ctx
+ .insert_person("restore_live", Some(serde_json::json!({"kept": true})))
+ .await
+ .unwrap();
+ let tombstoned = ctx.insert_person("restore_tombstoned", None).await.unwrap();
+ ctx.tombstone_person(tombstoned.id, None).await.unwrap();
+ let created_at = chrono::DateTime::parse_from_rfc3339("2021-02-03T04:05:06Z")
+ .unwrap()
+ .with_timezone(&chrono::Utc);
+ let restored = |uuid: Uuid| RestoredPerson {
+ uuid,
+ properties: serde_json::json!({"email": "[email protected]"}),
+ created_at,
+ is_identified: true,
+ version: 7,
+ distinct_ids: Vec::new(),
+ };
+ let absent = Uuid::new_v4();
+
+ let results = ctx
+ .storage
+ .restore_persons(
+ ctx.team_id,
+ &[
+ restored(absent),
+ restored(live.uuid),
+ restored(tombstoned.uuid),
+ ],
+ )
+ .await
+ .expect("restore");
+
+ let outcomes: Vec<(Uuid, RestoreOutcome)> =
+ results.iter().map(|r| (r.uuid, r.outcome)).collect();
+ assert_eq!(
+ outcomes,
+ vec![
+ (absent, RestoreOutcome::Inserted),
+ (live.uuid, RestoreOutcome::ExistsLive),
+ (tombstoned.uuid, RestoreOutcome::ExistsTombstoned),
+ ]
+ );
+ assert_eq!((results[1].person_id, results[1].version), (live.id, 0));
+ assert_eq!(
+ (results[2].person_id, results[2].version),
+ (tombstoned.id, 1)
+ );
+
+ let inserted = ctx
+ .storage
+ .get_person_by_uuid(ctx.team_id, absent)
+ .await
+ .unwrap()
+ .expect("restored person reads as live");
+ assert_eq!(inserted.id, results[0].person_id);
+ assert_eq!(inserted.version, Some(7));
+ assert!(inserted.is_identified);
+ assert_eq!(inserted.created_at, created_at);
+ assert_eq!(
+ serde_json::from_str::<serde_json::Value>(inserted.properties.as_deref().unwrap()).unwrap(),
+ serde_json::json!({"email": "[email protected]"})
+ );
+ let untouched = ctx
+ .storage
+ .get_person_by_uuid(ctx.team_id, live.uuid)
+ .await
+ .unwrap()
+ .expect("live");
+ assert_eq!(
+ serde_json::from_str::<serde_json::Value>(untouched.properties.as_deref().unwrap())
+ .unwrap(),
+ serde_json::json!({"kept": true})
+ );
+ let (still_deleted, _, _, _) = tombstone_state(&ctx.pool, ctx.team_id, tombstoned.id).await;
+ assert!(still_deleted);
+
+ ctx.cleanup().await.ok();
+}
+
+#[tokio::test]
+async fn test_restore_persons_inserts_the_listed_distinct_ids_or_not_the_person() {
+ let ctx = TestContext::new().await;
+ let holder = ctx.insert_person("rd_holder", None).await.unwrap();
+ for distinct_id in ["rdx_taken", "rdx_only_taken"] {
+ ctx.add_distinct_id_to_person(holder.id, distinct_id)
+ .await
+ .unwrap();
+ }
+ let live = ctx.insert_person("rd_live", None).await.unwrap();
+ let restored = |uuid: Uuid, ids: &[&str]| RestoredPerson {
+ uuid,
+ properties: serde_json::json!({}),
+ created_at: chrono::Utc::now(),
+ is_identified: false,
+ version: 4,
+ distinct_ids: ids.iter().map(|d| (d.to_string(), 6)).collect(),
+ };
+ let (partly, unreachable, without_ids) = (Uuid::new_v4(), Uuid::new_v4(), Uuid::new_v4());
+
+ let results = ctx
+ .storage
+ .restore_persons(
+ ctx.team_id,
+ &[
+ restored(partly, &["rdx_new", "rdx_taken"]),
+ restored(unreachable, &["rdx_only_taken"]),
+ restored(without_ids, &[]),
+ restored(live.uuid, &["rdx_for_live"]),
+ ],
+ )
+ .await
+ .expect("restore");
+
+ let summary: Vec<(Uuid, RestoreOutcome, Vec<String>)> = results
+ .iter()
+ .map(|r| (r.uuid, r.outcome, r.restored_distinct_ids.clone()))
+ .collect();
+ assert_eq!(
+ summary,
+ vec![
+ (
+ partly,
+ RestoreOutcome::Inserted,
+ vec!["rdx_new".to_string()]
+ ),
+ (unreachable, RestoreOutcome::NoDistinctId, vec![]),
+ (without_ids, RestoreOutcome::Inserted, vec![]),
+ (live.uuid, RestoreOutcome::ExistsLive, vec![]),
+ ]
+ );
+ let owners: Vec<(String, Uuid, i64)> = sqlx::query_as(
+ "SELECT d.distinct_id, p.uuid, d.version FROM posthog_persondistinctid d
+ JOIN posthog_person p ON p.id = d.person_id
+ WHERE d.team_id = $1 AND d.distinct_id LIKE 'rdx\\_%' ORDER BY d.distinct_id",
+ )
+ .bind(ctx.team_id)
+ .fetch_all(&ctx.pool)
+ .await
+ .unwrap();
+ assert_eq!(
+ owners,
+ vec![
+ ("rdx_new".to_string(), partly, 6),
+ ("rdx_only_taken".to_string(), holder.uuid, 0),
+ ("rdx_taken".to_string(), holder.uuid, 0),
+ ]
+ );
+ assert!(ctx
+ .storage
+ .get_person_by_uuid(ctx.team_id, unreachable)
+ .await
+ .unwrap()
+ .is_none());
+ let absent_rows: i64 =
+ sqlx::query_scalar("SELECT count(*) FROM posthog_person WHERE team_id = $1 AND uuid = $2")
+ .bind(ctx.team_id)
+ .bind(unreachable)
+ .fetch_one(&ctx.pool)
+ .await
+ .unwrap();
+ assert_eq!(absent_rows, 0);
+
+ ctx.cleanup().await.ok();
+}
+
#[tokio::test]
async fn test_raise_person_version_floors_fails_when_another_operation_holds_the_person() {
let ctx = TestContext::new().await;
diff --git a/rust/personhog-router/src/proxy.rs b/rust/personhog-router/src/proxy.rs
index 14344e0fd6d8..c486f461baba 100644
--- a/rust/personhog-router/src/proxy.rs
+++ b/rust/personhog-router/src/proxy.rs
@@ -75,6 +75,7 @@ pub const KNOWN_METHODS: &[&str] = &[
"RaisePersonVersionFloors",
"ReleaseFence",
"ReleaseFences",
+ "RestorePersons",
"SetPersonDistinctIdVersionFloor",
"SetPersonVersionFloor",
"SplitPerson",
diff --git a/rust/personhog-router/tests/common/mod.rs b/rust/personhog-router/tests/common/mod.rs
index 570f83f9214c..0cbe19a3d9fa 100644
--- a/rust/personhog-router/tests/common/mod.rs
+++ b/rust/personhog-router/tests/common/mod.rs
@@ -55,12 +55,12 @@ use personhog_proto::personhog::types::v1::{
ListPersonTombstoneQueueRequest, ListPersonTombstoneQueueResponse, ListPersonsForTeamRequest,
ListPersonsForTeamResponse, Person, PersonsByDistinctIdsInTeamResponse,
PersonsByDistinctIdsResponse, PersonsResponse, RaisePersonVersionFloorsRequest,
- RaisePersonVersionFloorsResponse, SetPersonDistinctIdVersionFloorRequest,
- SetPersonDistinctIdVersionFloorResponse, SetPersonVersionFloorRequest,
- SetPersonVersionFloorResponse, SplitPersonRequest, SplitPersonResponse, UpdateGroupRequest,
- UpdateGroupResponse, UpdateGroupTypeMappingRequest, UpdateGroupTypeMappingResponse,
- UpdatePersonPropertiesRequest, UpdatePersonPropertiesResponse, UpsertHashKeyOverridesRequest,
- UpsertHashKeyOverridesResponse,
+ RaisePersonVersionFloorsResponse, RestorePersonsRequest, RestorePersonsResponse,
+ SetPersonDistinctIdVersionFloorRequest, SetPersonDistinctIdVersionFloorResponse,
+ SetPersonVersionFloorRequest, SetPersonVersionFloorResponse, SplitPersonRequest,
+ SplitPersonResponse, UpdateGroupRequest, UpdateGroupResponse, UpdateGroupTypeMappingRequest,
+ UpdateGroupTypeMappingResponse, UpdatePersonPropertiesRequest, UpdatePersonPropertiesResponse,
+ UpsertHashKeyOverridesRequest, UpsertHashKeyOverridesResponse,
};
use personhog_router::backend::{
ChannelBackend, DnsBackendConfig, LeaderBackend, LeaderBackendConfig, StashTable,
@@ -571,6 +571,13 @@ impl PersonHogReplica for TestReplicaService {
) -> Result<Response<RaisePersonVersionFloorsResponse>, Status> {
Ok(Response::new(RaisePersonVersionFloorsResponse::default()))
}
+
+ async fn restore_persons(
+ &self,
+ _request: Request<RestorePersonsRequest>,
+ ) -> Result<Response<RestorePersonsResponse>, Status> {
+ Ok(Response::new(RestorePersonsResponse::default()))
+ }
}
/// Start a test replica server on a random port and return its address
diff --git a/rust/property-defs-rs/tests/group_type_resolver.rs b/rust/property-defs-rs/tests/group_type_resolver.rs
index 9f7cee318e99..8feeea0888a2 100644
--- a/rust/property-defs-rs/tests/group_type_resolver.rs
+++ b/rust/property-defs-rs/tests/group_type_resolver.rs
@@ -471,6 +471,13 @@ impl PersonHogService for MockPersonHogService {
) -> Result<Response<RaisePersonVersionFloorsResponse>, Status> {
Err(Status::unimplemented(""))
}
+
+ async fn restore_persons(
+ &self,
+ _: Request<RestorePersonsRequest>,
+ ) -> Result<Response<RestorePersonsResponse>, Status> {
+ Err(Status::unimplemented(""))
+ }
}
// -- helpers ------------------------------------------------------------