Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ project(Iceberg
DESCRIPTION "Iceberg C++ Project"
LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand Down
28 changes: 0 additions & 28 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -202,34 +202,6 @@

--------------------------------------------------------------------------------

The file src/iceberg/expected.h contains code adapted from

https://github.com/zeus-cpp/expected

with the following license (MIT)

Copyright (c) 2024 zeus-cpp

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

--------------------------------------------------------------------------------

3rdparty dependency nlohmann-json is statically linked in certain binary
distributions. nlohmann-json has the following license:

Expand Down
4 changes: 0 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ Copyright 2024-2025 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

This product includes code from zeus-cpp
* Copyright (c) 2024 zeus-cpp
* https://github.com/zeus-cpp/expected

This product includes code from smhasher
* MurmurHash3 was written by Austin Appleby, and is placed in the public
* domain. The author hereby disclaims copyright to this source code.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ C++ implementation of [Apache Iceberg™](https://iceberg.apache.org/).
## Requirements

- CMake 3.25 or higher
- C++20 compliant compiler
- C++23 compliant compiler

## Build

Expand Down
2 changes: 1 addition & 1 deletion cmake_modules/IcebergThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function(resolve_arrow_dependency)
fetchcontent_declare(VendoredArrow
${FC_DECLARE_COMMON_OPTIONS}
GIT_REPOSITORY https://github.com/apache/arrow.git
GIT_TAG 5f0aeb5de53fb25b59a52661a80071faef99a4a4
GIT_TAG f12356adaaabea86638407e995e73215dbb58bb2
#URL ${ARROW_SOURCE_URL}
#URL_HASH "SHA256=${ICEBERG_ARROW_BUILD_SHA256_CHECKSUM}"
SOURCE_SUBDIR
Expand Down
2 changes: 1 addition & 1 deletion example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.25)

project(example)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 23)

find_package(Iceberg CONFIG REQUIRED)

Expand Down
1 change: 0 additions & 1 deletion src/iceberg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ set(ICEBERG_SOURCES
type.cc
util/murmurhash3_internal.cc
util/timepoint.cc
util/unreachable.cc
util/gzip_internal.cc)

set(ICEBERG_STATIC_BUILD_INTERFACE_LIBS)
Expand Down
6 changes: 3 additions & 3 deletions src/iceberg/arrow/arrow_error_transform_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ inline ErrorKind ToErrorKind(const ::arrow::Status& status) {
#define ICEBERG_ARROW_ASSIGN_OR_RETURN_IMPL(result_name, lhs, rexpr, error_transform) \
auto&& result_name = (rexpr); \
if (!result_name.ok()) { \
return unexpected<Error>{{.kind = error_transform(result_name.status()), \
.message = result_name.status().ToString()}}; \
return std::unexpected<Error>{{.kind = error_transform(result_name.status()), \
.message = result_name.status().ToString()}}; \
} \
lhs = std::move(result_name).ValueOrDie();

Expand All @@ -51,7 +51,7 @@ inline ErrorKind ToErrorKind(const ::arrow::Status& status) {
do { \
auto&& _status = (expr); \
if (!_status.ok()) { \
return unexpected<Error>{ \
return std::unexpected<Error>{ \
{.kind = ToErrorKind(_status), .message = _status.ToString()}}; \
} \
} while (0)
Expand Down
2 changes: 2 additions & 0 deletions src/iceberg/avro/avro_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ class AvroReader::Impl {
std::unique_ptr<ReadContext> context_;
};

AvroReader::~AvroReader() = default;

Result<std::optional<ArrowArray>> AvroReader::Next() { return impl_->Next(); }

Result<ArrowSchema> AvroReader::Schema() { return impl_->Schema(); }
Expand Down
2 changes: 1 addition & 1 deletion src/iceberg/avro/avro_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ICEBERG_BUNDLE_EXPORT AvroReader : public Reader {
public:
AvroReader() = default;

~AvroReader() override = default;
~AvroReader() override;

Status Open(const ReaderOptions& options) final;

Expand Down
3 changes: 1 addition & 2 deletions src/iceberg/catalog/in_memory_catalog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <algorithm>
#include <iterator> // IWYU pragma: keep
#include <mutex>
#include <optional>
#include <unordered_map>

#include "iceberg/exception.h"
Expand Down Expand Up @@ -174,7 +173,7 @@ Result<bool> InMemoryNamespace::NamespaceExists(const Namespace& namespace_ident
if (ns.error().kind == ErrorKind::kNoSuchNamespace) {
return false;
}
return unexpected<Error>(ns.error());
return std::unexpected<Error>(ns.error());
}

Result<std::vector<Namespace>> InMemoryNamespace::ListNamespaces(
Expand Down
Loading
Loading