Skip to content

Commit c41bd56

Browse files
authored
Merge pull request #13 from Hugoberry/pbix-scalar
Adding pbix2vpax scalar function
2 parents 92c60bb + d77345b commit c41bd56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+61105
-7
lines changed

.github/workflows/MainDistributionPipeline.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525

2626
duckdb-stable-build:
2727
name: Build extension binaries
28-
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.3.1
28+
uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.0
2929
with:
30-
duckdb_version: v1.3.1
31-
ci_tools_version: main
30+
duckdb_version: v1.4.0
31+
ci_tools_version: v1.4.0
3232
extension_name: pbix
3333
exclude_archs: 'windows_amd64_mingw;linux_amd64_musl'

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ vcpkg_installed/
1111
data/DataModel_XL
1212
data/mark.pbix
1313
data/dash.pbix
14-
vcpkg/
14+
vcpkg/
15+
data/Power

.vscode/settings.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,15 @@
9797
"any": "cpp",
9898
"valarray": "cpp",
9999
"numbers": "cpp",
100-
"semaphore": "cpp"
100+
"semaphore": "cpp",
101+
"__bit_reference": "cpp",
102+
"__hash_table": "cpp",
103+
"__locale": "cpp",
104+
"__node_handle": "cpp",
105+
"__split_buffer": "cpp",
106+
"__tree": "cpp",
107+
"__verbose_abort": "cpp",
108+
"execution": "cpp",
109+
"print": "cpp"
101110
}
102111
}

CMakeLists.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ else()
3232
add_definitions(-DKS_STR_ENCODING_ICONV)
3333
endif()
3434

35+
include_directories(src/include)
36+
include_directories(src/abf/include)
37+
include_directories(src/vertipaq/include)
38+
include_directories(src/vpax/include)
39+
40+
3541
project(${TARGET_NAME})
3642
include_directories(src/include)
3743
include_directories(third_party/sqlite)
@@ -73,6 +79,13 @@ SET(VERTIPAQ_SOURCES
7379
src/vertipaq/column_data_dictionary.cpp
7480
src/vertipaq/huffman_decoder.cpp)
7581

82+
SET(VPAX_SOURCES
83+
src/vpax/vpax_schema.cpp
84+
src/vpax/vpax_value_factory.cpp
85+
src/vpax/vpax_utils.cpp
86+
src/vpax/vpax_builder.cpp
87+
src/vpax/vpax_function.cpp)
88+
7689
set(EXTENSION_SOURCES
7790
src/pbix_extension.cpp
7891
src/pbix_scanner.cpp
@@ -85,7 +98,8 @@ set(EXTENSION_SOURCES
8598
${TINYXML2_SOURCES}
8699
${XPRESS9_SOURCES}
87100
${ABF_SOURCES}
88-
${VERTIPAQ_SOURCES})
101+
${VERTIPAQ_SOURCES}
102+
${VPAX_SOURCES})
89103

90104
# find_package(Iconv REQUIRED)
91105
# if(ICONV_FOUND)

0 commit comments

Comments
 (0)