tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove merge-conflict related comments

Browse Source
This commit is contained in:
gvolfing
2023-10-11 13:14:29 +02:00
parent 73a554a617
commit 61d301310a
2 changed files with 2 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/storage/v2/disk/storage.cpp
View File

@@ -551,11 +551,6 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, View view) {
utils::SkipList<memgraph::storage::Vertex> *indexed_vertices{nullptr};
std::list<storage::Delta> *index_deltas{nullptr};
// transaction_.index_storage_.emplace_back(std::make_unique<utils::SkipList<storage::Vertex>>());
// auto &indexed_vertices = transaction_.index_storage_.back();
// transaction_.index_deltas_storage_.emplace_back();
// auto &index_deltas = transaction_.index_deltas_storage_.back();
auto merge_with_main_cache = [&](auto &index) -> std::unordered_set<Gid> {
index[cache_key] = utils::SkipList<Vertex>();
indexed_vertices = &index[cache_key];
@@ -583,7 +578,7 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, View view) {
}
return VerticesIterable(AllVerticesIterable(indexed_vertices->access(), storage_, &transaction_, view));
} // namespace memgraph::storage
}
VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, PropertyId property, View view) {
auto *disk_storage = static_cast<DiskStorage *>(storage_);
@@ -598,10 +593,6 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, PropertyId p
utils::SkipList<memgraph::storage::Vertex> *indexed_vertices{nullptr};
std::list<storage::Delta> *index_deltas{nullptr};
// transaction_.index_storage_.emplace_back(std::make_unique<utils::SkipList<storage::Vertex>>());
// auto &indexed_vertices = transaction_.index_storage_.back();
// transaction_.index_deltas_storage_.emplace_back();
// auto &index_deltas = transaction_.index_deltas_storage_.back();
auto merge_with_main_cache = [&](auto &index) -> std::unordered_set<Gid> {
index[cache_key] = utils::SkipList<Vertex>();
@@ -661,10 +652,6 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, PropertyId p
utils::SkipList<memgraph::storage::Vertex> *indexed_vertices{nullptr};
std::list<storage::Delta> *index_deltas{nullptr};
// transaction_.index_storage_.emplace_back(std::make_unique<utils::SkipList<storage::Vertex>>());
// auto &indexed_vertices = transaction_.index_storage_.back();
// transaction_.index_deltas_storage_.emplace_back();
// auto &index_deltas = transaction_.index_deltas_storage_.back();
auto merge_with_main_cache = [&](auto &index) -> std::unordered_set<Gid> {
index[cache_key] = utils::SkipList<Vertex>();
@@ -725,10 +712,6 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, PropertyId p
indexed_vertices = &index[cache_key];
transaction_.index_deltas_storage_.emplace_back();
index_deltas = &transaction_.index_deltas_storage_.back();
// transaction_.index_storage_.emplace_back(std::make_unique<utils::SkipList<storage::Vertex>>());
// auto &indexed_vertices = transaction_.index_storage_.back();
// transaction_.index_deltas_storage_.emplace_back();
// auto &index_deltas = transaction_.index_deltas_storage_.back();
return MergeVerticesFromMainCacheWithLabelPropertyIndexCacheForIntervalSearch(
label, property, view, lower_bound, upper_bound, *index_deltas, *indexed_vertices);
@@ -760,8 +743,6 @@ VerticesIterable DiskStorage::DiskAccessor::Vertices(LabelId label, PropertyId p
std::unordered_set<Gid> DiskStorage::DiskAccessor::MergeVerticesFromMainCacheWithLabelIndexCache(
LabelId label, View view, std::list<Delta> &index_deltas, utils::SkipList<Vertex> &indexed_vertices) {
auto main_cache_acc = transaction_.vertices_.access();
// LabelId label, View view, std::list<Delta> &index_deltas, utils::SkipList<Vertex> *indexed_vertices) {
// auto main_cache_acc = transaction_.vertices_.access();
std::unordered_set<Gid> gids;
gids.reserve(main_cache_acc.size());
@@ -814,8 +795,6 @@ std::unordered_set<Gid> DiskStorage::DiskAccessor::MergeVerticesFromMainCacheWit
LabelId label, PropertyId property, View view, std::list<Delta> &index_deltas,
utils::SkipList<Vertex> &indexed_vertices, const auto &label_property_filter) {
auto main_cache_acc = transaction_.vertices_.access();
// utils::SkipList<Vertex> *indexed_vertices, const auto &label_property_filter) {
// auto main_cache_acc = transaction_.vertices_.access();
std::unordered_set<storage::Gid> gids;
gids.reserve(main_cache_acc.size());
@@ -904,8 +883,6 @@ DiskStorage::DiskAccessor::MergeVerticesFromMainCacheWithLabelPropertyIndexCache
const std::optional<utils::Bound<PropertyValue>> &upper_bound, std::list<Delta> &index_deltas,
utils::SkipList<Vertex> &indexed_vertices) {
auto main_cache_acc = transaction_.vertices_.access();
// utils::SkipList<Vertex> *indexed_vertices) {
// auto main_cache_acc = transaction_.vertices_.access();
std::unordered_set<storage::Gid> gids;
gids.reserve(main_cache_acc.size());

35
src/storage/v2/disk/storage.hpp
View File

@@ -261,40 +261,7 @@ class DiskStorage final : public Storage {
const std::string &dst_vertex_gid);
bool DeleteEdgeFromConnectivityIndex(const std::string &vertex_gid, const std::string &edge_gid,
rocksdb::ColumnFamilyHandle *handle, std::string mode);
// bool WriteVertexToDisk(const Vertex &vertex);
// bool WriteEdgeToDisk(const std::string &serialized_edge_key, const std::string &serialized_edge_value);
// bool DeleteVertexFromDisk(const std::string &vertex);
// bool DeleteEdgeFromDisk(const std::string &edge);
/// Main storage
// utils::SkipList<Vertex> vertices_;
// using LabelIndex = LabelId;
// using LabelPropertyIndex = std::pair<LabelId, PropertyId>;
// using LabelPropertyValIndex = std::tuple<LabelId, PropertyId, PropertyValue>;
// using RangeBoundary = std::optional<utils::Bound<PropertyValue>>;
// using LabelPropertyRangeIndex = std::tuple<LabelId, PropertyId, RangeBoundary, RangeBoundary>;
// std::map<LabelId, utils::SkipList<Vertex>> label_index_cache_;
// uint64_t label_index_cache_ci_{transaction_.command_id};
// std::map<LabelPropertyIndex, utils::SkipList<Vertex>> label_property_index_cache_;
// uint64_t label_property_index_cache_ci_{transaction_.command_id};
// std::map<LabelPropertyValIndex, utils::SkipList<Vertex>> label_property_val_index_cache_;
// uint64_t label_property_val_index_cache_ci_{transaction_.command_id};
// std::map<LabelPropertyRangeIndex, utils::SkipList<Vertex>> label_property_range_index_cache_;
// uint64_t label_property_range_index_cache_ci_{transaction_.command_id};
/// We need them because query context for indexed reading is cleared after the query is done not after the
/// transaction is done
// std::vector<std::list<Delta>> index_deltas_storage_;
// utils::SkipList<Edge> edges_;
// Config::Items config_;
// std::unordered_set<std::string> edges_to_delete_;
// std::vector<std::pair<std::string, std::string>> vertices_to_delete_;
// rocksdb::Transaction *disk_transaction_;
// bool scanned_all_vertices_ = false;
}; // Accessor
};
std::unique_ptr<Storage::Accessor> Access(std::optional<IsolationLevel> override_isolation_level) override;