From 87718aa0845e62e0f5223df79233672e40dd2fc8 Mon Sep 17 00:00:00 2001 From: jbajic <jure.bajic@memgraph.com> Date: Wed, 25 Jan 2023 12:14:30 +0100 Subject: [PATCH] Remove changes on license date --- src/storage/v3/delta.hpp | 2 -- src/storage/v3/indices.hpp | 4 ++-- src/storage/v3/shard_worker.hpp | 10 +--------- tests/simulation/request_router.cpp | 2 +- tests/simulation/sharded_map.cpp | 2 +- tests/simulation/test_cluster.hpp | 2 +- tests/unit/high_density_shard_create_scan.cpp | 2 +- tests/unit/machine_manager.cpp | 2 +- tests/unit/storage_v3_indices.cpp | 2 +- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/storage/v3/delta.hpp b/src/storage/v3/delta.hpp index cc8132dc3..40bbb521d 100644 --- a/src/storage/v3/delta.hpp +++ b/src/storage/v3/delta.hpp @@ -14,8 +14,6 @@ #include <cstdint> #include <memory> -#include <boost/uuid/uuid.hpp> - #include "storage/v3/edge_ref.hpp" #include "storage/v3/id_types.hpp" #include "storage/v3/property_value.hpp" diff --git a/src/storage/v3/indices.hpp b/src/storage/v3/indices.hpp index 761157040..78a3ee072 100644 --- a/src/storage/v3/indices.hpp +++ b/src/storage/v3/indices.hpp @@ -120,7 +120,7 @@ class LabelIndex { [[nodiscard]] bool Empty() const noexcept { return index_.empty(); } - std::map<LabelId, IndexContainer> &GetIndex() { return index_; } + std::map<LabelId, IndexContainer> &GetIndex() noexcept { return index_; } private: std::map<LabelId, IndexContainer> index_; @@ -239,7 +239,7 @@ class LabelPropertyIndex { [[nodiscard]] bool Empty() const noexcept { return index_.empty(); } - std::map<std::pair<LabelId, PropertyId>, IndexContainer> &GetIndex() { return index_; } + std::map<std::pair<LabelId, PropertyId>, IndexContainer> &GetIndex() noexcept { return index_; } private: std::map<std::pair<LabelId, PropertyId>, IndexContainer> index_; diff --git a/src/storage/v3/shard_worker.hpp b/src/storage/v3/shard_worker.hpp index e3d57964f..547aa0a6f 100644 --- a/src/storage/v3/shard_worker.hpp +++ b/src/storage/v3/shard_worker.hpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source @@ -173,14 +173,6 @@ class ShardWorker { auto &rsm = rsm_map_.at(uuid); Time next_for_uuid = rsm.Cron(); - // Check if shard should split - // if (const auto split_info = rsm.ShouldSplit(); split_info) { - // Request split from coordinator - // split_point => middle pk - // shard_id => uuid - // shard_version => - // } - cron_schedule_.pop(); cron_schedule_.push(std::make_pair(next_for_uuid, uuid)); } else { diff --git a/tests/simulation/request_router.cpp b/tests/simulation/request_router.cpp index 037674b66..4248e7876 100644 --- a/tests/simulation/request_router.cpp +++ b/tests/simulation/request_router.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source diff --git a/tests/simulation/sharded_map.cpp b/tests/simulation/sharded_map.cpp index 0b7d10d3d..d27858abc 100644 --- a/tests/simulation/sharded_map.cpp +++ b/tests/simulation/sharded_map.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source diff --git a/tests/simulation/test_cluster.hpp b/tests/simulation/test_cluster.hpp index 791b45faa..2e8bdf92f 100644 --- a/tests/simulation/test_cluster.hpp +++ b/tests/simulation/test_cluster.hpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source diff --git a/tests/unit/high_density_shard_create_scan.cpp b/tests/unit/high_density_shard_create_scan.cpp index 4a90b98b2..9fabf6ccc 100644 --- a/tests/unit/high_density_shard_create_scan.cpp +++ b/tests/unit/high_density_shard_create_scan.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source diff --git a/tests/unit/machine_manager.cpp b/tests/unit/machine_manager.cpp index 6cc6a3ff1..74b7d3863 100644 --- a/tests/unit/machine_manager.cpp +++ b/tests/unit/machine_manager.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source diff --git a/tests/unit/storage_v3_indices.cpp b/tests/unit/storage_v3_indices.cpp index 2f84f1558..620878fcf 100644 --- a/tests/unit/storage_v3_indices.cpp +++ b/tests/unit/storage_v3_indices.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Memgraph Ltd. +// Copyright 2022 Memgraph Ltd. // // Use of this software is governed by the Business Source License // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source