Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
acquamarin committed Feb 13, 2025
1 parent 241d8d0 commit e56af01
Show file tree
Hide file tree
Showing 63 changed files with 15 additions and 36 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ allconfig:
$(call config-cmake-release, \
-DBUILD_BENCHMARK=TRUE \
-DBUILD_EXAMPLES=TRUE \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity-catalog" \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity_catalog" \
-DBUILD_JAVA=TRUE \
-DBUILD_NODEJS=TRUE \
-DBUILD_PYTHON=TRUE \
Expand All @@ -106,7 +106,7 @@ alldebug:
$(call run-cmake-debug, \
-DBUILD_BENCHMARK=TRUE \
-DBUILD_EXAMPLES=TRUE \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity-catalog" \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity_catalog" \
-DBUILD_JAVA=TRUE \
-DBUILD_NODEJS=TRUE \
-DBUILD_PYTHON=TRUE \
Expand Down Expand Up @@ -195,7 +195,7 @@ example:

extension-test-build:
$(call run-cmake-relwithdebinfo, \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity-catalog" \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity_catalog" \
-DBUILD_EXTENSION_TESTS=TRUE \
-DBUILD_TESTS=TRUE \
)
Expand All @@ -221,13 +221,13 @@ extension-json-test: extension-json-test-build

extension-debug:
$(call run-cmake-debug, \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity-catalog" \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity_catalog" \
-DBUILD_KUZU=FALSE \
)

extension-release:
$(call run-cmake-release, \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity-catalog" \
-DBUILD_EXTENSIONS="httpfs;duckdb;json;postgres;sqlite;fts;delta;iceberg;unity_catalog" \
-DBUILD_KUZU=FALSE \
)

Expand Down Expand Up @@ -270,7 +270,7 @@ clean-extension:
cmake -E rm -rf extension/fts/build
cmake -E rm -rf extension/delta/build
cmake -E rm -rf extension/iceberg/build
cmake -E rm -rf extension/unity-catalog/build
cmake -E rm -rf extension/unity_catalog/build

clean-python-api:
cmake -E rm -rf tools/python_api/build
Expand Down
4 changes: 2 additions & 2 deletions extension/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ if ("iceberg" IN_LIST BUILD_EXTENSIONS)
add_subdirectory(iceberg)
endif ()

if ("unity-catalog" IN_LIST BUILD_EXTENSIONS)
add_subdirectory(unity-catalog)
if ("unity_catalog" IN_LIST BUILD_EXTENSIONS)
add_subdirectory(unity_catalog)
endif ()
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ add_library(unity_catalog_extension
SHARED
${UNITY_CATALOG_EXTENSION_OBJECT_FILES})

set_extension_properties(unity_catalog_extension unity_catalog unity-catalog)
set_extension_properties(unity_catalog_extension unity_catalog unity_catalog)

target_link_libraries(unity_catalog_extension
PRIVATE
Expand All @@ -31,7 +31,7 @@ if (NOT WIN32)
add_library(unity_catalog_loader
SHARED
${PROJECT_SOURCE_DIR}/extension/duckdb/src/loader/duckdb_loader.cpp)
set_extension_properties(unity_catalog_loader unity_catalog_loader unity-catalog)
set_extension_properties(unity_catalog_loader unity_catalog_loader unity_catalog)
endif ()

if (WIN32)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if (NOT WIN32)
SHARED
unity_catalog_install_func.cpp
${PROJECT_SOURCE_DIR}/extension/duckdb/src/installer/duckdb_installer.cpp)
set_extension_properties(unity_catalog_installer unity_catalog_installer unity-catalog)
set_extension_properties(unity_catalog_installer unity_catalog_installer unity_catalog)
endif ()

if (APPLE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ ${1}/bin/uc table delete --full_name university.default.grades
${1}/bin/uc table delete --full_name university.default.person
${1}/bin/uc catalog create --name university
${1}/bin/uc schema create --catalog university --name default
${1}/bin/uc table create --full_name university.default.grades --columns "name string, pass boolean, math short, chinese int, english long, physics float, chemistry double" --format DELTA --storage_location "${2}/extension/unity-catalog/test/setup/tables/grades"
${1}/bin/uc table create --full_name university.default.person --columns "name string, class byte, birthtime timestamp, info binary" --format DELTA --storage_location "${2}/extension/unity-catalog/test/setup/tables/person"
${1}/bin/uc table create --full_name university.default.grades --columns "name string, pass boolean, math short, chinese int, english long, physics float, chemistry double" --format DELTA --storage_location "${2}/extension/unity_catalog/test/setup/tables/grades"
${1}/bin/uc table create --full_name university.default.person --columns "name string, class byte, birthtime timestamp, info binary" --format DELTA --storage_location "${2}/extension/unity_catalog/test/setup/tables/person"
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,11 @@
--

-CASE ScanUnityCatalog
-STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/unity-catalog/build/libunity_catalog.kuzu_extension"
-STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/unity_catalog/build/libunity_catalog.kuzu_extension"
---- ok
-STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/unity-catalog/build/libunity_catalog.kuzu_extension"
-STATEMENT load extension "${KUZU_ROOT_DIRECTORY}/extension/unity_catalog/build/libunity_catalog.kuzu_extension"
---- ok

-LOG DefaultCatalogScan
-STATEMENT ATTACH 'unity' AS unity (DBTYPE UC_CATALOG);
---- ok
-STATEMENT LOAD FROM unity.numbers RETURN *;
---- 15
131|35.443732
150|329.197303
247|477.742227
294|209.322436
42|403.857969
477|380.678561
484|344.003740
539|425.661029
564|188.755356
644|203.439559
680|797.691220
755|883.610563
75|277.880219
821|767.799854
958|509.371273

-LOG UniversityCatalogScan
-STATEMENT ATTACH 'university' AS university (DBTYPE UC_CATALOG);
---- ok
Expand Down

0 comments on commit e56af01

Please sign in to comment.