database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

One more try to fix autobake build

Browse Source
This commit is contained in:
Leonid Fedorov
2025-07-15 22:15:27 +00:00
committed by Leonid Fedorov
parent 902805d5a3
commit 05bbfcae57
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage-manager/CMakeLists.txt
View File

@ -82,7 +82,6 @@ target_include_directories(storagemanager PRIVATE ${Boost_INCLUDE_DIRS})
columnstore_executable(StorageManager src/main.cpp) columnstore_executable(StorageManager src/main.cpp)
columnstore_link(StorageManager storagemanager) columnstore_link(StorageManager storagemanager)
set_property(TARGET StorageManager PROPERTY CXX_STANDARD 20)
set(TMPDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) set(TMPDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

4
storage-manager/src/S3Storage.h
View File

@ -19,12 +19,12 @@
#include <deque> #include <deque>
#include <string> #include <string>
#include <map>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <unordered_map>
#include "CloudStorage.h" #include "CloudStorage.h"
#include "libmarias3/marias3.h" #include "libmarias3/marias3.h"
#include "Config.h"
#include <curl/curl.h> #include <curl/curl.h>
namespace storagemanager namespace storagemanager

7
utils/regr/modamysql.cpp
View File

@ -1,14 +1,7 @@
#include <my_config.h> #include <my_config.h>
#include <cmath> #include <cmath>
#include <iostream>
#include <sstream>
#include <string.h> #include <string.h>
#include <unordered_map> #include <unordered_map>
#include <algorithm>
#include <sstream>
#include <iostream>
#include <charconv>
#include "boost/lexical_cast.hpp"
#include "idb_mysql.h" #include "idb_mysql.h"
namespace namespace

2
writeengine/bulk/we_cmdargs.cpp
View File

@ -303,7 +303,7 @@ void WECmdArgs::parseCmdLineArgs(int argc, char** argv)
fAllowMissingColumn = true; fAllowMissingColumn = true;
} }
} }
if (vm.contains("max-errors")) if (vm.count("max-errors"))
{ {
auto optarg= vm["max-errors"].as<string>(); auto optarg= vm["max-errors"].as<string>();
if (optarg == "all") if (optarg == "all")

2
writeengine/splitter/we_cmdargs.cpp
View File

@ -736,7 +736,7 @@ void WECmdArgs::parseCmdLineArgs(int argc, char** argv)
fBatchQty = 10000; fBatchQty = 10000;
} }
} }
if (vm.contains("max-errors")) if (vm.count("max-errors"))
{ {
auto optarg = vm["max-errors"].as<string>(); auto optarg = vm["max-errors"].as<string>();
if (optarg == "all") if (optarg == "all")