From 92c0ae484d16bf2813fe3463f751cb172b305abb Mon Sep 17 00:00:00 2001 From: Hugoberry Date: Fri, 29 Mar 2024 12:55:06 +0000 Subject: [PATCH] moving things around, stoi-> stoull --- CMakeLists.txt | 5 +---- Makefile | 3 ++- src/abf/BackupFile.cpp | 2 +- src/abf/BackupFile.h | 2 +- src/{kaitai => ksy}/column_data_dictionary.cpp | 0 src/{kaitai => ksy}/column_data_dictionary.h | 0 src/{kaitai => ksy}/column_data_hidx.cpp | 0 src/{kaitai => ksy}/column_data_hidx.h | 0 src/{kaitai => ksy}/column_data_idf.cpp | 0 src/{kaitai => ksy}/column_data_idf.h | 0 src/{kaitai => ksy}/idfmeta_parser.cpp | 0 src/{kaitai => ksy}/idfmeta_parser.h | 0 12 files changed, 5 insertions(+), 7 deletions(-) rename src/{kaitai => ksy}/column_data_dictionary.cpp (100%) rename src/{kaitai => ksy}/column_data_dictionary.h (100%) rename src/{kaitai => ksy}/column_data_hidx.cpp (100%) rename src/{kaitai => ksy}/column_data_hidx.h (100%) rename src/{kaitai => ksy}/column_data_idf.cpp (100%) rename src/{kaitai => ksy}/column_data_idf.h (100%) rename src/{kaitai => ksy}/idfmeta_parser.cpp (100%) rename src/{kaitai => ksy}/idfmeta_parser.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80f9a52..3caf796 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,12 +13,9 @@ find_package(tinyxml2 REQUIRED) find_package(unofficial-sqlite3 REQUIRED) find_package(Crc32c REQUIRED) # find_package(kaitai-struct-cpp-stl-runtime REQUIRED) -if(NOT Crc32c_FOUND) - message(FATAL_ERROR "Crc32c not found") -endif() -find_package(Threads REQUIRED) +find_package(Threads REQUIRED) set(EXTENSION_NAME ${TARGET_NAME}_extension) diff --git a/Makefile b/Makefile index 2ed39ea..fb46e3b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,8 @@ EXT_CONFIG=${PROJ_DIR}extension_config.cmake # Setting CMAKE_PREFIX_PATH environment variable # export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux:${CMAKE_PREFIX_PATH} -# export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux/share/unofficial-sqlite3:${CMAKE_PREFIX_PATH} +# export CMAKE_PREFIX_PATH := vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime:${CMAKE_PREFIX_PATH} +# export kaitai-struct-cpp-stl-runtime_DIR := /workspaces/duckdb-pbix-extension/build/release/vcpkg_installed/x64-linux/share/kaitai-struct-cpp-stl-runtime VCPKG_TOOLCHAIN_FILE=/workspaces/duckdb-pbix-extension/vcpkg/scripts/buildsystems/vcpkg.cmake diff --git a/src/abf/BackupFile.cpp b/src/abf/BackupFile.cpp index 8af816a..f2ce012 100644 --- a/src/abf/BackupFile.cpp +++ b/src/abf/BackupFile.cpp @@ -16,7 +16,7 @@ BackupFile BackupFile::from_value(tinyxml2::XMLElement& element, const std::stri } XMLElement* offsetHeaderElement = element.FirstChildElement("m_cbOffsetHeader"); if (offsetHeaderElement && offsetHeaderElement->GetText()) { - file.m_cbOffsetHeader = std::stoi(offsetHeaderElement->GetText()); + file.m_cbOffsetHeader = std::stoull(offsetHeaderElement->GetText()); } XMLElement* deleteElement = element.FirstChildElement("Delete"); if (deleteElement && deleteElement->GetText()) { diff --git a/src/abf/BackupFile.h b/src/abf/BackupFile.h index 542932d..ac81e87 100644 --- a/src/abf/BackupFile.h +++ b/src/abf/BackupFile.h @@ -11,7 +11,7 @@ class BackupFile { public: std::optional Path; int Size; - int m_cbOffsetHeader; + uint64_t m_cbOffsetHeader; bool Delete; int64_t CreatedTimestamp; int64_t Access; diff --git a/src/kaitai/column_data_dictionary.cpp b/src/ksy/column_data_dictionary.cpp similarity index 100% rename from src/kaitai/column_data_dictionary.cpp rename to src/ksy/column_data_dictionary.cpp diff --git a/src/kaitai/column_data_dictionary.h b/src/ksy/column_data_dictionary.h similarity index 100% rename from src/kaitai/column_data_dictionary.h rename to src/ksy/column_data_dictionary.h diff --git a/src/kaitai/column_data_hidx.cpp b/src/ksy/column_data_hidx.cpp similarity index 100% rename from src/kaitai/column_data_hidx.cpp rename to src/ksy/column_data_hidx.cpp diff --git a/src/kaitai/column_data_hidx.h b/src/ksy/column_data_hidx.h similarity index 100% rename from src/kaitai/column_data_hidx.h rename to src/ksy/column_data_hidx.h diff --git a/src/kaitai/column_data_idf.cpp b/src/ksy/column_data_idf.cpp similarity index 100% rename from src/kaitai/column_data_idf.cpp rename to src/ksy/column_data_idf.cpp diff --git a/src/kaitai/column_data_idf.h b/src/ksy/column_data_idf.h similarity index 100% rename from src/kaitai/column_data_idf.h rename to src/ksy/column_data_idf.h diff --git a/src/kaitai/idfmeta_parser.cpp b/src/ksy/idfmeta_parser.cpp similarity index 100% rename from src/kaitai/idfmeta_parser.cpp rename to src/ksy/idfmeta_parser.cpp diff --git a/src/kaitai/idfmeta_parser.h b/src/ksy/idfmeta_parser.h similarity index 100% rename from src/kaitai/idfmeta_parser.h rename to src/ksy/idfmeta_parser.h