Page MenuHomePhabricator
Files F3157215

D4378.id14387.diff
No OneTemporary
Actions

D4378.id14387.diff
View Options

diff --git a/services/tunnelbroker/src/Database/DatabaseManager.h b/services/tunnelbroker/src/Database/DatabaseManager.h
--- a/services/tunnelbroker/src/Database/DatabaseManager.h
+++ b/services/tunnelbroker/src/Database/DatabaseManager.h
@@ -24,6 +24,10 @@
namespace database {
class DatabaseManager : public DatabaseManagerBase {
+private:
+ template <class T>
+ T populatePutRequestFromMessageItem(T &putRequest, const MessageItem &item);
+
public:
static DatabaseManager &getInstance();
bool isTableAvailable(const std::string &tableName);
@@ -43,6 +47,7 @@
void removePublicKeyItem(const std::string &deviceID);
void putMessageItem(const MessageItem &item);
+ void putMessageItemsByBatch(std::vector<MessageItem> &messageItems);
std::shared_ptr<MessageItem> findMessageItem(const std::string &messageID);
std::vector<std::shared_ptr<MessageItem>>
findMessageItemsByReceiver(const std::string &toDeviceID);
diff --git a/services/tunnelbroker/src/Database/DatabaseManager.cpp b/services/tunnelbroker/src/Database/DatabaseManager.cpp
--- a/services/tunnelbroker/src/Database/DatabaseManager.cpp
+++ b/services/tunnelbroker/src/Database/DatabaseManager.cpp
@@ -135,35 +135,62 @@
this->innerRemoveItem(*item);
}
-void DatabaseManager::putMessageItem(const MessageItem &item) {
- Aws::DynamoDB::Model::PutItemRequest request;
- request.SetTableName(item.getTableName());
- request.AddItem(
+template <class T>
+T DatabaseManager::populatePutRequestFromMessageItem(
+ T &putRequest,
+ const MessageItem &item) {
+ putRequest.AddItem(
MessageItem::FIELD_MESSAGE_ID,
Aws::DynamoDB::Model::AttributeValue(item.getMessageID()));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_FROM_DEVICE_ID,
Aws::DynamoDB::Model::AttributeValue(item.getFromDeviceID()));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_TO_DEVICE_ID,
Aws::DynamoDB::Model::AttributeValue(item.getToDeviceID()));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_PAYLOAD,
Aws::DynamoDB::Model::AttributeValue(item.getPayload()));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_BLOB_HASHES,
Aws::DynamoDB::Model::AttributeValue(item.getBlobHashes()));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_EXPIRE,
Aws::DynamoDB::Model::AttributeValue(std::to_string(
static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL))));
- request.AddItem(
+ putRequest.AddItem(
MessageItem::FIELD_CREATED_AT,
Aws::DynamoDB::Model::AttributeValue(
std::to_string(tools::getCurrentTimestamp())));
+ return putRequest;
+}
+
+void DatabaseManager::putMessageItem(const MessageItem &item) {
+ Aws::DynamoDB::Model::PutItemRequest request;
+ request = this->populatePutRequestFromMessageItem(request, item);
+ request.SetTableName(item.getTableName());
this->innerPutItem(std::make_shared<MessageItem>(item), request);
}
+void DatabaseManager::putMessageItemsByBatch(
+ std::vector<MessageItem> &messageItems) {
+ std::vector<Aws::DynamoDB::Model::WriteRequest> writeRequests;
+ for (MessageItem &messageItem : messageItems) {
+ Aws::DynamoDB::Model::PutRequest putRequest;
+ putRequest =
+ this->populatePutRequestFromMessageItem(putRequest, messageItem);
+ Aws::DynamoDB::Model::WriteRequest curWriteRequest;
+ curWriteRequest.SetPutRequest(putRequest);
+ writeRequests.push_back(curWriteRequest);
+ }
+ this->innerBatchWriteItem(
+ MESSAGES_TABLE_NAME,
+ DYNAMODB_MAX_BATCH_ITEMS,
+ DYNAMODB_BACKOFF_FIRST_RETRY_DELAY,
+ DYNAMODB_MAX_BACKOFF_TIME,
+ writeRequests);
+}
+
std::shared_ptr<MessageItem>
DatabaseManager::findMessageItem(const std::string &messageID) {
Aws::DynamoDB::Model::GetItemRequest request;

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 6, 7:39 PM (22 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2431867
Default Alt Text
D4378.id14387.diff (3 KB)

Event Timeline