Skip to content

Commit ae5190a

Browse files
committed
feat: Implement JSON serialization for REST Catalog API types
1 parent 9fa0d15 commit ae5190a

File tree

8 files changed

+1356
-26
lines changed

8 files changed

+1356
-26
lines changed

src/iceberg/catalog/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
iceberg_install_all_headers(iceberg/catalog)
19-
2018
add_subdirectory(memory)
2119

2220
if(ICEBERG_BUILD_REST)

src/iceberg/catalog/rest/CMakeLists.txt

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,35 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
set(ICEBERG_REST_SOURCES rest_catalog.cc)
18+
set(ICEBERG_REST_SOURCES rest_catalog.cc json_internal.cc)
1919

2020
set(ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS)
2121
set(ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS)
2222
set(ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS)
2323
set(ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS)
2424

25-
list(APPEND ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
26-
"$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>" cpr::cpr)
27-
list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
28-
"$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>" cpr::cpr)
25+
list(APPEND
26+
ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
27+
"$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>"
28+
cpr::cpr
29+
nlohmann_json::nlohmann_json)
30+
list(APPEND
31+
ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
32+
"$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>"
33+
cpr::cpr
34+
nlohmann_json::nlohmann_json)
2935
list(APPEND
3036
ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS
3137
"$<IF:$<TARGET_EXISTS:iceberg::iceberg_static>,iceberg::iceberg_static,iceberg::iceberg_shared>"
32-
"$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>")
38+
"$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>"
39+
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,nlohmann_json::nlohmann_json>"
40+
)
3341
list(APPEND
3442
ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS
3543
"$<IF:$<TARGET_EXISTS:iceberg::iceberg_shared>,iceberg::iceberg_shared,iceberg::iceberg_static>"
36-
"$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>")
44+
"$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>"
45+
"$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,nlohmann_json::nlohmann_json>"
46+
)
3747

3848
add_iceberg_lib(iceberg_rest
3949
SOURCES

0 commit comments

Comments
 (0)