Skip to content

Commit 3e63558

Browse files
HeartLinkedHeartLinked
committed
refactor: Restructure catalog module
1 parent 4c070f2 commit 3e63558

8 files changed

Lines changed: 175 additions & 29 deletions

File tree

‎example/demo_example.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "iceberg/arrow/arrow_file_io.h"
2323
#include "iceberg/avro/avro_register.h"
24-
#include "iceberg/catalog/in_memory_catalog.h"
24+
#include "iceberg/catalog/memory/in_memory_catalog.h"
2525
#include "iceberg/parquet/parquet_register.h"
2626
#include "iceberg/table.h"
2727
#include "iceberg/table_scan.h"

‎src/iceberg/CMakeLists.txt‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
set(ICEBERG_INCLUDES "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/src>"
1919
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>")
2020
set(ICEBERG_SOURCES
21-
catalog/in_memory_catalog.cc
21+
catalog/memory/in_memory_catalog.cc
2222
expression/expression.cc
2323
expression/literal.cc
2424
file_reader.cc
@@ -144,40 +144,41 @@ if(ICEBERG_BUILD_BUNDLE)
144144
"$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>"
145145
"$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>"
146146
)
147-
148147
list(APPEND
149148
ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
150149
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_static>,Iceberg::iceberg_static,Iceberg::iceberg_shared>"
151150
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_static>,Arrow::arrow_static,Arrow::arrow_shared>>"
152151
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>>"
153152
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>"
154153
)
155-
list(APPEND
156-
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
157-
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
158-
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
159-
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
160-
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
161-
)
154+
endif()
155+
list(APPEND
156+
ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
157+
"$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
158+
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
159+
"$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
160+
"$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
161+
)
162+
endif()
162163

163-
add_iceberg_lib(iceberg_bundle
164-
SOURCES
165-
${ICEBERG_BUNDLE_SOURCES}
166-
SHARED_LINK_LIBS
167-
${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
168-
STATIC_LINK_LIBS
169-
${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
170-
STATIC_INSTALL_INTERFACE_LIBS
171-
${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
172-
SHARED_INSTALL_INTERFACE_LIBS
173-
${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
164+
add_iceberg_lib(iceberg_bundle
165+
SOURCES
166+
${ICEBERG_BUNDLE_SOURCES}
167+
SHARED_LINK_LIBS
168+
${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
169+
STATIC_LINK_LIBS
170+
${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
171+
STATIC_INSTALL_INTERFACE_LIBS
172+
${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS}
173+
SHARED_INSTALL_INTERFACE_LIBS
174+
${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS})
174175

175-
add_subdirectory(arrow)
176-
add_subdirectory(avro)
177-
add_subdirectory(parquet)
176+
add_subdirectory(arrow)
177+
add_subdirectory(avro)
178+
add_subdirectory(parquet)
178179

179-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
180-
DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
180+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iceberg_bundle_export.h
181+
DESTINATION ${ICEBERG_INSTALL_INCLUDEDIR}/iceberg)
181182
endif()
182183

183184
iceberg_install_cmake_package(Iceberg iceberg_targets)

‎src/iceberg/catalog/memory/CMakeLists.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
iceberg_install_all_headers(iceberg/catalog/memory)

src/iceberg/catalog/in_memory_catalog.cc renamed to src/iceberg/catalog/memory/in_memory_catalog.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
#include "iceberg/catalog/in_memory_catalog.h"
20+
#include "iceberg/catalog/memory/in_memory_catalog.h"
2121

2222
#include <algorithm>
2323
#include <iterator> // IWYU pragma: keep

src/iceberg/catalog/in_memory_catalog.h renamed to src/iceberg/catalog/memory/in_memory_catalog.h

File renamed without changes.

‎test/CMakeLists.txt‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,23 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
fetchcontent_declare(cpp-httplib
19+
GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
20+
GIT_TAG 89c932f313c6437c38f2982869beacc89c2f2246 #release-0.26.0
21+
)
22+
1823
fetchcontent_declare(googletest
1924
GIT_REPOSITORY https://github.com/google/googletest.git
2025
GIT_TAG b514bdc898e2951020cbdca1304b75f5950d1f59 # release-1.15.2
2126
FIND_PACKAGE_ARGS
2227
NAMES
2328
GTest)
24-
fetchcontent_makeavailable(googletest)
29+
30+
if(ICEBERG_BUILD_REST_CATALOG)
31+
fetchcontent_makeavailable(cpp-httplib googletest)
32+
else()
33+
fetchcontent_makeavailable(googletest)
34+
endif()
2535

2636
set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/test/resources")
2737

@@ -131,3 +141,9 @@ if(ICEBERG_BUILD_BUNDLE)
131141
add_iceberg_test(scan_test USE_BUNDLE SOURCES file_scan_task_test.cc)
132142

133143
endif()
144+
145+
if(ICEBERG_BUILD_REST_CATALOG)
146+
add_iceberg_test(rest_catalog_test SOURCES rest_catalog_test.cc)
147+
target_link_libraries(rest_catalog_test PRIVATE iceberg_rest_catalog_static)
148+
target_include_directories(rest_catalog_test PRIVATE ${cpp-httplib_SOURCE_DIR})
149+
endif()

‎test/in_memory_catalog_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
#include "iceberg/catalog/in_memory_catalog.h"
20+
#include "iceberg/catalog/memory/in_memory_catalog.h"
2121

2222
#include <filesystem>
2323

‎test/rest_catalog_test.cc‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
#include "iceberg/catalog/rest/rest_catalog.h"
21+
22+
#include <httplib.h>
23+
24+
#include <memory>
25+
#include <thread>
26+
27+
#include <gmock/gmock.h>
28+
#include <gtest/gtest.h>
29+
#include <nlohmann/json.hpp>
30+
31+
namespace iceberg::catalog::rest {
32+
33+
class RestCatalogIntegrationTest : public ::testing::Test {
34+
protected:
35+
void SetUp() override {
36+
server_ = std::make_unique<httplib::Server>();
37+
port_ = server_->bind_to_any_port("127.0.0.1");
38+
39+
server_thread_ = std::thread([this]() { server_->listen_after_bind(); });
40+
}
41+
42+
void TearDown() override {
43+
server_->stop();
44+
if (server_thread_.joinable()) {
45+
server_thread_.join();
46+
}
47+
}
48+
49+
std::unique_ptr<httplib::Server> server_;
50+
int port_ = -1;
51+
std::thread server_thread_;
52+
};
53+
54+
TEST_F(RestCatalogIntegrationTest, GetConfigSuccessfully) {
55+
server_->Get("/v1/config", [](const httplib::Request&, httplib::Response& res) {
56+
res.status = 200;
57+
res.set_content(R"({"warehouse": "s3://test-bucket"})", "application/json");
58+
});
59+
60+
std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
61+
RestCatalog catalog(base_uri);
62+
cpr::Response response = catalog.GetConfig();
63+
64+
ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
65+
ASSERT_EQ(response.status_code, 200);
66+
67+
auto json_body = nlohmann::json::parse(response.text);
68+
EXPECT_EQ(json_body["warehouse"], "s3://test-bucket");
69+
}
70+
71+
TEST_F(RestCatalogIntegrationTest, ListNamespacesReturnsMultipleResults) {
72+
server_->Get("/v1/namespaces", [](const httplib::Request&, httplib::Response& res) {
73+
res.status = 200;
74+
res.set_content(R"({
75+
"namespaces": [
76+
["accounting", "db"],
77+
["production", "db"]
78+
]
79+
})",
80+
"application/json");
81+
});
82+
83+
std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
84+
RestCatalog catalog(base_uri);
85+
cpr::Response response = catalog.ListNamespaces();
86+
87+
ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
88+
ASSERT_EQ(response.status_code, 200);
89+
90+
auto json_body = nlohmann::json::parse(response.text);
91+
ASSERT_TRUE(json_body.contains("namespaces"));
92+
EXPECT_EQ(json_body["namespaces"].size(), 2);
93+
EXPECT_THAT(json_body["namespaces"][0][0], "accounting");
94+
}
95+
96+
TEST_F(RestCatalogIntegrationTest, HandlesServerError) {
97+
server_->Get("/v1/config", [](const httplib::Request&, httplib::Response& res) {
98+
res.status = 500;
99+
res.set_content("Internal Server Error", "text/plain");
100+
});
101+
102+
std::string base_uri = "http://127.0.0.1:" + std::to_string(port_);
103+
RestCatalog catalog(base_uri);
104+
cpr::Response response = catalog.GetConfig();
105+
106+
ASSERT_EQ(response.error.code, cpr::ErrorCode::OK);
107+
ASSERT_EQ(response.status_code, 500);
108+
ASSERT_EQ(response.text, "Internal Server Error");
109+
}
110+
111+
} // namespace iceberg::catalog::rest

0 commit comments

Comments
 (0)