Remove batching of messages that has no effect in favor of making async operations easier to implement.

2 files changed, 0 insertions, 85 deletions

diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 4576f8a08f8..2cb390fca86 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -698,19 +698,6 @@ TEST_F(FileStorManagerTest, handler_pause) {
     ASSERT_EQ(30, filestorHandler.getNextMessage(0, stripeId).second->getPriority());
 }
 
-namespace {
-
-uint64_t getPutTime(api::StorageMessage::SP& msg)
-{
-    if (!msg.get()) {
-        return (uint64_t)-1;
-    }
-
-    return static_cast<api::PutCommand*>(msg.get())->getTimestamp();
-};
-
-}
-
 TEST_F(FileStorManagerTest, remap_split) {
     // Setup a filestorthread to test
     DummyStorageLink top;
@@ -768,63 +755,6 @@ TEST_F(FileStorManagerTest, remap_split) {
               filestorHandler.dumpQueue(0));
 }
 
-TEST_F(FileStorManagerTest, handler_multi) {
-    // Setup a filestorthread to test
-    DummyStorageLink top;
-    DummyStorageLink *dummyManager;
-    top.push_back(std::unique_ptr<StorageLink>(
-                          dummyManager = new DummyStorageLink));
-    top.open();
-    ForwardingMessageSender messageSender(*dummyManager);
-    // Since we fake time with small numbers, we need to make sure we dont
-    // compact them away, as they will seem to be from 1970
-
-    documentapi::LoadTypeSet loadTypes("raw:");
-    FileStorMetrics metrics(loadTypes.getMetricLoadTypes());
-    metrics.initDiskMetrics(_node->getPartitions().size(), loadTypes.getMetricLoadTypes(), 1, 1);
-
-    FileStorHandler filestorHandler(messageSender, metrics, _node->getPartitions(), _node->getComponentRegister());
-    filestorHandler.setGetNextMessageTimeout(50);
-    uint32_t stripeId = filestorHandler.getNextStripeId(0);
-
-    std::string content("Here is some content which is in all documents");
-
-    Document::SP doc1(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release());
-
-    Document::SP doc2(createDocument(content, "id:footype:testdoctype1:n=4567:bar").release());
-
-    document::BucketIdFactory factory;
-    document::BucketId bucket1(16, factory.getBucketId(doc1->getId()).getRawId());
-    document::BucketId bucket2(16, factory.getBucketId(doc2->getId()).getRawId());
-
-    // Populate bucket with the given data
-    for (uint32_t i = 1; i < 10; i++) {
-        filestorHandler.schedule(
-                api::StorageMessage::SP(new api::PutCommand(makeDocumentBucket(bucket1), doc1, i)), 0);
-        filestorHandler.schedule(
-                api::StorageMessage::SP(new api::PutCommand(makeDocumentBucket(bucket2), doc2, i + 10)), 0);
-    }
-
-    {
-        FileStorHandler::LockedMessage lock = filestorHandler.getNextMessage(0, stripeId);
-        ASSERT_EQ(1, getPutTime(lock.second));
-
-        lock = filestorHandler.getNextMessage(0, stripeId, lock);
-        ASSERT_EQ(2, getPutTime(lock.second));
-
-        lock = filestorHandler.getNextMessage(0, stripeId, lock);
-        ASSERT_EQ(3, getPutTime(lock.second));
-    }
-
-    {
-        FileStorHandler::LockedMessage lock = filestorHandler.getNextMessage(0, stripeId);
-        ASSERT_EQ(11, getPutTime(lock.second));
-
-        lock = filestorHandler.getNextMessage(0, stripeId, lock);
-        ASSERT_EQ(12, getPutTime(lock.second));
-    }
-}
-
 TEST_F(FileStorManagerTest, handler_timeout) {
     // Setup a filestorthread to test
     DummyStorageLink top;
diff --git a/storage/src/tests/persistence/persistencequeuetest.cpp b/storage/src/tests/persistence/persistencequeuetest.cpp
index be276dd7f9d..3754a82e7ae 100644
--- a/storage/src/tests/persistence/persistencequeuetest.cpp
+++ b/storage/src/tests/persistence/persistencequeuetest.cpp
@@ -168,19 +168,4 @@ TEST_F(PersistenceQueueTest, exclusive_locked_operation_not_started_if_exclusive
     ASSERT_FALSE(lock1.first.get());
 }
 
-TEST_F(PersistenceQueueTest, operation_batching_not_allowed_across_different_lock_modes) {
-    Fixture f(*this);
-
-    f.filestorHandler->schedule(createPut(1234, 0), _disk);
-    f.filestorHandler->schedule(createGet(1234), _disk);
-
-    auto lock0 = f.filestorHandler->getNextMessage(_disk, f.stripeId);
-    ASSERT_TRUE(lock0.first);
-    ASSERT_TRUE(lock0.second);
-    EXPECT_EQ(api::LockingRequirements::Exclusive, lock0.first->lockingRequirements());
-
-    f.filestorHandler->getNextMessage(_disk, f.stripeId, lock0);
-    ASSERT_FALSE(lock0.second);
-}
-
 } // namespace storage