Page MenuHomePhabricator
Files F3539259

D12348.diff
No OneTemporary
Actions

D12348.diff
View Options

diff --git a/services/identity/src/constants.rs b/services/identity/src/constants.rs
--- a/services/identity/src/constants.rs
+++ b/services/identity/src/constants.rs
@@ -94,6 +94,7 @@
/// table name
pub const NAME: &str = "identity-devices";
pub const TIMESTAMP_INDEX_NAME: &str = "deviceList-timestamp-index";
+ pub const DEVICE_ID_INDEX_NAME: &str = "deviceID-index";
/// partition key
pub const ATTR_USER_ID: &str = "userID";
@@ -105,11 +106,11 @@
pub const DEVICE_LIST_KEY_PREFIX: &str = "devicelist-";
// device-specific attrs
- pub const OLD_ATTR_DEVICE_TYPE: &str = "deviceType";
pub const ATTR_DEVICE_KEY_INFO: &str = "deviceKeyInfo";
pub const ATTR_CONTENT_PREKEY: &str = "contentPreKey";
pub const ATTR_NOTIF_PREKEY: &str = "notifPreKey";
pub const ATTR_PLATFORM_DETAILS: &str = "platformDetails";
+ pub const ATTR_LOGIN_TIME: &str = "loginTime";
// IdentityKeyInfo constants
pub const ATTR_KEY_PAYLOAD: &str = "keyPayload";
@@ -131,13 +132,13 @@
pub const ATTR_CURRENT_SIGNATURE: &str = "curPrimarySignature";
pub const ATTR_LAST_SIGNATURE: &str = "lastPrimarySignature";
- // migration-specific attrs
- pub const OLD_ATTR_CODE_VERSION: &str = "codeVersion";
- pub const ATTR_LOGIN_TIME: &str = "loginTime";
-
// one-time key constants
pub const ATTR_CONTENT_OTK_COUNT: &str = "contentOTKCount";
pub const ATTR_NOTIF_OTK_COUNT: &str = "notifOTKCount";
+
+ // deprecated attributes
+ pub const OLD_ATTR_DEVICE_TYPE: &str = "deviceType";
+ pub const OLD_ATTR_CODE_VERSION: &str = "codeVersion";
}
// One time keys table, which need to exist in their own table to ensure
diff --git a/services/terraform/modules/shared/dynamodb.tf b/services/terraform/modules/shared/dynamodb.tf
--- a/services/terraform/modules/shared/dynamodb.tf
+++ b/services/terraform/modules/shared/dynamodb.tf
@@ -166,12 +166,26 @@
type = "N"
}
+ # used for deviceID-index
+ attribute {
+ name = "loginTime"
+ type = "S"
+ }
+
# sparse index allowing to sort device list updates by timestamp
local_secondary_index {
name = "deviceList-timestamp-index"
range_key = "timestamp"
projection_type = "ALL"
}
+
+ # sort key used for sparse indexing (present only for devices)
+ global_secondary_index {
+ name = "deviceID-index"
+ hash_key = "itemID"
+ range_key = "loginTime"
+ projection_type = "KEYS_ONLY"
+ }
}
resource "aws_dynamodb_table" "identity-tokens" {

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 12:19 AM (11 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2709948
Default Alt Text
D12348.diff (2 KB)

Event Timeline