Add method to update app ID of BER (#349)

* batch: update app id * tests: add test to update batch app id
faasm · Aug 7, 2023 · aeb972d · aeb972d
1 parent c725c04
commit aeb972d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/include/faabric/util/batch.h b/include/faabric/util/batch.h
@@ -17,6 +17,9 @@ std::shared_ptr<faabric::BatchExecuteRequest> batchExecFactory(
 
 bool isBatchExecRequestValid(std::shared_ptr<faabric::BatchExecuteRequest> ber);
 
+void updateBatchExecAppId(std::shared_ptr<faabric::BatchExecuteRequest> ber,
+                          int newAppId);
+
 void updateBatchExecGroupId(std::shared_ptr<faabric::BatchExecuteRequest> ber,
                             int newGroupId);
 

diff --git a/src/util/batch.cpp b/src/util/batch.cpp
@@ -61,12 +61,24 @@ bool isBatchExecRequestValid(std::shared_ptr<faabric::BatchExecuteRequest> ber)
     return true;
 }
 
+void updateBatchExecAppId(std::shared_ptr<faabric::BatchExecuteRequest> ber,
+                          int newAppId)
+{
+    ber->set_appid(newAppId);
+    for (int i = 0; i < ber->messages_size(); i++) {
+        ber->mutable_messages(i)->set_appid(newAppId);
+    }
+
+    // Sanity-check in debug mode
+    assert(isBatchExecRequestValid(ber));
+}
+
 void updateBatchExecGroupId(std::shared_ptr<faabric::BatchExecuteRequest> ber,
                             int newGroupId)
 {
     ber->set_groupid(newGroupId);
-    for (auto msg : *ber->mutable_messages()) {
-        msg.set_groupid(newGroupId);
+    for (int i = 0; i < ber->messages_size(); i++) {
+        ber->mutable_messages(i)->set_groupid(newGroupId);
     }
 
     // Sanity-check in debug mode

diff --git a/tests/test/util/test_batch.cpp b/tests/test/util/test_batch.cpp
@@ -88,6 +88,21 @@ TEST_CASE("Test batch. exec request sanity checks")
     REQUIRE(isBerValid == isBatchExecRequestValid(ber));
 }
 
+TEST_CASE("Test updating the app ID of a BER")
+{
+    int nMessages = 4;
+    std::shared_ptr<faabric::BatchExecuteRequest> ber =
+      batchExecFactory("demo", "echo", nMessages);
+
+    // By default the BER is valid
+    REQUIRE(isBatchExecRequestValid(ber));
+
+    int newAppId = 1337;
+    updateBatchExecAppId(ber, newAppId);
+    REQUIRE(isBatchExecRequestValid(ber));
+    REQUIRE(ber->appid() == newAppId);
+}
+
 TEST_CASE("Test updating the group ID of a BER")
 {
     int nMessages = 4;