Verified Commit 8ee2223a authored by Tunahan Kaya's avatar Tunahan Kaya Committed by Marc Vef
Browse files

solved conflicts

parent 161fe157

tests/unit/CMakeLists.txt

+3 −5
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ target_link_libraries(catch2_main 
)





# needed for filesystem header

set(CMAKE_CXX_STANDARD 17)





# define executables for tests and make them depend on the convenience 

# library (and Catch2 transitively) and fmt
@@ -43,22 +46,17 @@ set(test_src 


# needed headers

set(test_headers

        ../../src/global/rpc/rpc_utils.cpp

        ../../src/global/path_util.cpp

        ../../src/daemon/ops/metadentry.cpp

        ../../src/daemon/classes/fs_data.cpp

        ../../src/daemon/handler/h_preload.cpp

        ../../src/global/metadata.cpp

        ../../include/global/metadata.hpp

        ../../include/daemon/classes/fs_data.hpp

        ../../include/daemon/main.hpp

        ../../include/version.hpp

        ../../include/global/configure.hpp

        ../../include/global/global_defs.hpp

        ../../include/global/rpc/rpc_types.hpp

        ../../include/global/rpc/rpc_utils.hpp

        ../../include/global/path_util.hpp

        ../../include/daemon/main.hpp

        ../../include/daemon/ops/metadentry.hpp

        ../../include/daemon/classes/fs_data.hpp

        ../../include/daemon/classes/rpc_data.hpp

tests/unit/db_test.cpp

+20 −34
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#include <catch2/catch.hpp>

#include <daemon/backend/metadata/db.hpp>

#include <daemon/main.hpp>

#include <daemon/classes/fs_data.hpp>

#include <global/path_util.hpp>

#include <random>
@@ -56,7 +55,7 @@ SCENARIO( "RDB - Input single Key", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;

        WHEN("Try to input key") {

            std::string key = "/a";
@@ -69,11 +68,9 @@ SCENARIO( "RDB - Input single Key", "[RocksDB]") { 
                REQUIRE(res == val);

            }

        }



        boost::filesystem::remove_all(metadata_path);

        //system( (std::string("rm -rf ") + metadata_path).data());       // boost verwenden

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;



    }

}
@@ -82,7 +79,7 @@ SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;



        WHEN("RocksDB 1 key two values - returns first value"){
@@ -91,7 +88,6 @@ SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { 
            std::string val2 = "453|124|";



            THEN("First value returns for key") {



                db.put(key, val);

                db.put(key, val2);
@@ -101,9 +97,7 @@ SCENARIO( "RDB - Insert 1 key with two values", "[RocksDB]") { 
        }



        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;



    }

}
@@ -113,7 +107,7 @@ SCENARIO( "RDB - delete existing Key", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;



        WHEN("RocksDB delete inserted key") {
@@ -129,9 +123,7 @@ SCENARIO( "RDB - delete existing Key", "[RocksDB]") { 




        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;



    }

}
@@ -141,7 +133,7 @@ SCENARIO( "RDB - Get deleted Key", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;



        WHEN("RocksDB get deleted key") {
@@ -157,20 +149,17 @@ SCENARIO( "RDB - Get deleted Key", "[RocksDB]") { 
        }



        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;



    }

}



}



SCENARIO( "RDB - update existing Key", "[RocksDB]") {

    GIVEN("Open a db") {



        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;
@@ -192,9 +181,7 @@ SCENARIO( "RDB - update existing Key", "[RocksDB]") { 
        }



        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;





    }

}
@@ -205,7 +192,7 @@ SCENARIO( "RDB - Bulk Put/Get - single core", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;



        WHEN("Bulk Insert/Get - single core") {
@@ -238,9 +225,7 @@ SCENARIO( "RDB - Bulk Put/Get - single core", "[RocksDB]") { 
        }



        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;





    }

}
@@ -252,7 +237,7 @@ SCENARIO( "RDB - Multithreaded Bulk Insert and Get", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;



        WHEN("Multithreaded Bulk Insert and Get") {
@@ -288,9 +273,7 @@ SCENARIO( "RDB - Multithreaded Bulk Insert and Get", "[RocksDB]") { 


        }

        boost::filesystem::remove_all(metadata_path);

        metadata_path = "/tmp/db_test" + std::to_string(i);

        db = MetadataDB(metadata_path);

        i++;





    }

}
@@ -299,7 +282,7 @@ SCENARIO( "RDB - Merge Operator", "[RocksDB]") { 


        // when open db

        std::string metadata_path = "/tmp/db_test" + std::to_string(i);

        MetadataDB db = MetadataDB(metadata_path);

        gkfs::metadata::MetadataDB db = gkfs::metadata::MetadataDB(metadata_path);

        i++;

        WHEN("Merge Operation") {
@@ -311,6 +294,9 @@ SCENARIO( "RDB - Merge Operator", "[RocksDB]") { 
                db.increase_size(key, 10, true);

            }

        }

        boost::filesystem::remove_all(metadata_path);



    }



}