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

Migrate to toolchain-v2 (#33)

Browse Source 
* GCC_VERSION=10.2.0
* BINUTILS_VERSION=2.35.1
* GDB_VERSION=10.1 (except centos-7 8.3)
* CMAKE_VERSION=3.18.4
* CPPCHECK_VERSION=2.2
* LLVM_VERSION=11.0.0
* SWIG_VERSION=4.0.2
This commit is contained in:
Marko Budiselić
2020-11-12 20:18:11 +01:00
committed by GitHub
parent f0382c82cd
commit 958bc870b3
56 changed files with 1514 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mg_import_csv.cpp
View File

@@ -1,3 +1,6 @@
#include <gflags/gflags.h>
#include <glog/logging.h>
#include <algorithm>
#include <cstdio>
#include <filesystem>
@@ -6,9 +9,6 @@
#include <regex>
#include <unordered_map>
#include <gflags/gflags.h>
#include <glog/logging.h>
#include "helpers.hpp"
#include "storage/v2/storage.hpp"
#include "utils/exceptions.hpp"
@@ -326,10 +326,8 @@ std::pair<std::vector<std::string>, uint64_t> ReadRow(std::istream &stream) {
}
if (FLAGS_trim_strings) {
for (size_t i = 0; i < row.size(); ++i) {
std::string trimmed(utils::Trim(row[i]));
row[i] = std::move(trimmed);
}
std::transform(std::begin(row), std::end(row), std::begin(row),
[](const auto &item) { return utils::Trim(item); });
}
return {std::move(row), lines_count};
@@ -736,16 +734,14 @@ int main(int argc, char *argv[]) {
}
std::unordered_map<NodeId, storage::Gid> node_id_map;
storage::Storage store{
{.durability =
{.storage_directory = FLAGS_data_directory,
.recover_on_startup = false,
.snapshot_wal_mode =
storage::Config::Durability::SnapshotWalMode::DISABLED,
.snapshot_on_exit = true},
.items = {
.properties_on_edges = FLAGS_storage_properties_on_edges,
}}};
storage::Storage store{{
.items = {.properties_on_edges = FLAGS_storage_properties_on_edges},
.durability = {.storage_directory = FLAGS_data_directory,
.recover_on_startup = false,
.snapshot_wal_mode =
storage::Config::Durability::SnapshotWalMode::DISABLED,
.snapshot_on_exit = true},
}};
utils::Timer load_timer;