Skip to content

Commit 0404724

Browse files
shaunrd0shaunrd0
authored
Update to TileDB 2.11.0 (#84)
1 parent d0cac1a commit 0404724

File tree

13 files changed

+75
-36
lines changed

13 files changed

+75
-36
lines changed

‎.github/scripts/download_tiledb.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set -e -x
2-
TAG=2.10.3
3-
ID=7a5d1cd
2+
TAG=2.11.0
3+
ID=34e5dbc
44

55
RELEASE=x86_64-$TAG-$ID
66
wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-windows-$RELEASE.zip
@@ -10,7 +10,7 @@ cp ./tiledb-windows/bin/tiledb.dll ./sources/TileDB.CSharp/runtimes/win-x64/nati
1010
wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-linux-$RELEASE.tar.gz
1111
mkdir tiledb-linux
1212
tar xvfz tiledb-linux-$RELEASE.tar.gz --directory tiledb-linux
13-
cp ./tiledb-linux/lib/libtiledb.so.${TAG%.*} ./sources/TileDB.CSharp/runtimes/linux-x64/native/
13+
cp ./tiledb-linux/lib/libtiledb.so* ./sources/TileDB.CSharp/runtimes/linux-x64/native/
1414

1515
wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-macos-$RELEASE.tar.gz
1616
mkdir tiledb-macos

‎.github/workflows/tiledb-csharp.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ jobs:
8181
- name: Download tiledb
8282
run: ./.github/scripts/download_tiledb.sh
8383

84-
- name: Copy tiledb lib
85-
run: |
86-
cp sources/TileDB.CSharp/runtimes/linux-x64/native/libtiledb.so.2.10 sources/TileDB.CSharp/runtimes/linux-x64/native/libtiledb.so
87-
8884
# DotNet build
8985
- name: Dotnet build for TileDB.CSharp
9086
run: |

‎cpp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# setup
66
cmake_minimum_required(VERSION 3.16)
77

8-
set(TILEDB_VERSION "2.10.3" CACHE STRING "TileDB version")
8+
set(TILEDB_VERSION "2.11.0" CACHE STRING "TileDB version")
99
set(TILEDB_GIT_TAG "dev" CACHE STRING "git branch")
1010

1111
project(TileDB-CSharp)

‎cpp/cmake/TileDB.cmake‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,29 @@ message(STATUS "start to set tiledb for version:${TILEDB_VERSION}")
99
if(${TILEDB_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
1010
message(STATUS "start to set TILEDB_DOWNLOAD_URL and TILEDB_DOWNLOAD_SHA1")
1111

12-
if(${TILEDB_VERSION} STREQUAL "2.10.3")
12+
if(${TILEDB_VERSION} STREQUAL "2.11.0")
13+
if (WIN32) # Windows
14+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-windows-x86_64-2.11.0-34e5dbc.zip")
15+
SET(TILEDB_DOWNLOAD_SHA1 "ae60d7bea72472716cb85631c27f8d2ddc7d7dd7")
16+
elseif(APPLE) # OSX
17+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-macos-x86_64-2.11.0-34e5dbc.tar.gz")
18+
SET(TILEDB_DOWNLOAD_SHA1 "56e865574404cb11cbd631c7c25ab0cfd413f9b3")
19+
else() # Linux
20+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-linux-x86_64-2.11.0-34e5dbc.tar.gz")
21+
SET(TILEDB_DOWNLOAD_SHA1 "c2eb91e352905728edfeb8dc0a6fbfd7bc69ef66")
22+
endif()
23+
elseif(${TILEDB_VERSION} STREQUAL "2.10.4")
24+
if (WIN32) # Windows
25+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.4/tiledb-windows-x86_64-2.10.4-f2b5d11.zip")
26+
SET(TILEDB_DOWNLOAD_SHA1 "68b4a8a22a3964efb8ef254854cf7d73f4fa2c50")
27+
elseif(APPLE) # OSX
28+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.4/tiledb-macos-x86_64-2.10.4-f2b5d11.tar.gz")
29+
SET(TILEDB_DOWNLOAD_SHA1 "7dffaf2ca3e3585641f1b6840618f3563b821041")
30+
else() # Linux
31+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.4/tiledb-linux-x86_64-2.10.4-f2b5d11.tar.gz")
32+
SET(TILEDB_DOWNLOAD_SHA1 "b765f9bd29dceaf29be9bca098c18cb74c7c1c37")
33+
endif()
34+
elseif(${TILEDB_VERSION} STREQUAL "2.10.3")
1335
if (WIN32) # Windows
1436
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-windows-x86_64-2.10.3-7a5d1cd.zip")
1537
SET(TILEDB_DOWNLOAD_SHA1 "aa4030a55339d23ef25a0d9593dbad76e9246742")
@@ -30,7 +52,7 @@ elseif(${TILEDB_VERSION} STREQUAL "2.10.2")
3052
else() # Linux
3153
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz")
3254
SET(TILEDB_DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f")
33-
endif()
55+
endif()
3456
elseif(${TILEDB_VERSION} STREQUAL "2.10.1")
3557
if (WIN32) # Windows
3658
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-windows-x86_64-2.10.1-6535d4c.zip")
@@ -363,14 +385,14 @@ elseif(${TILEDB_VERSION} STREQUAL "2.0.7")
363385
endif()
364386
else()
365387
if (WIN32) # Windows
366-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-windows-x86_64-2.10.3-7a5d1cd.zip")
367-
SET(TILEDB_DOWNLOAD_SHA1 "aa4030a55339d23ef25a0d9593dbad76e9246742")
388+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-windows-x86_64-2.11.0-34e5dbc.zip")
389+
SET(TILEDB_DOWNLOAD_SHA1 "ae60d7bea72472716cb85631c27f8d2ddc7d7dd7")
368390
elseif(APPLE) # OSX
369-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-macos-x86_64-2.10.3-7a5d1cd.tar.gz")
370-
SET(TILEDB_DOWNLOAD_SHA1 "897c17caec445f74114ac1c6e7d453d6f6d1c2e7")
391+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-macos-x86_64-2.11.0-34e5dbc.tar.gz")
392+
SET(TILEDB_DOWNLOAD_SHA1 "56e865574404cb11cbd631c7c25ab0cfd413f9b3")
371393
else() # Linux
372-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-linux-x86_64-2.10.3-7a5d1cd.tar.gz")
373-
SET(TILEDB_DOWNLOAD_SHA1 "49387ad851693a748d17d638a7d716ad62ac8706")
394+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.11.0/tiledb-linux-x86_64-2.11.0-34e5dbc.tar.gz")
395+
SET(TILEDB_DOWNLOAD_SHA1 "c2eb91e352905728edfeb8dc0a6fbfd7bc69ef66")
374396
endif()
375397
endif()
376398

‎examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<PropertyGroup>
33
<Nullable>enable</Nullable>
44
<OutputType>Exe</OutputType>
5+
<RollForward>Major</RollForward>
6+
<RollForward>Major</RollForward>
57
<RootNamespace>TileDB.CSharp.Examples</RootNamespace>
68
<TargetFramework>net5.0</TargetFramework>
7-
<RollForward>Major</RollForward>
8-
<Version>5.1.2</Version>
9+
<Version>5.2.0</Version>
910
</PropertyGroup>
1011

1112
<ItemGroup>

‎examples/bindings/quickstart_sparse_string/quickstart_sparse_string.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<OutputType>Exe</OutputType>
66
<RollForward>Major</RollForward>
77
<TargetFramework>net5.0</TargetFramework>
8-
<Version>5.1.2</Version>
8+
<Version>5.2.0</Version>
99
</PropertyGroup>
1010

1111
<ItemGroup>

‎scripts/generate/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ source ~/.zshrc
8181
Install specific version of TileDB in `/usr/local`
8282

8383
```bash
84-
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.10.3
85-
mv TileDB TileDB_2.10.3
86-
cd TileDB_2.10.3
84+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.11.0
85+
mv TileDB TileDB_2.11.0
86+
cd TileDB_2.11.0
8787
mkdir build && cd build
8888
#cmake 3.22.2
8989
cmake -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_AZURE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/local ..

‎sources/TileDB.CSharp/TileDB.CSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RollForward>Major</RollForward>
77
<RootNamespace>TileDB.CSharp</RootNamespace>
88
<TargetFramework>net5.0</TargetFramework>
9-
<Version>5.1.2</Version>
9+
<Version>5.2.0</Version>
1010
</PropertyGroup>
1111

1212
<ItemGroup>

‎sources/TileDB.CSharp/TileDB.CSharp.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<package >
33
<metadata>
44
<id>TileDB.CSharp</id>
5-
<version>5.1.2</version>
5+
<version>5.2.0</version>
66
<title>$title$</title>
77
<authors>TileDB Inc</authors>
88
<requireLicenseAcceptance>false</requireLicenseAcceptance>
99
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/TileDB-Inc/TileDB-CSharp</projectUrl>
1111
<description>CSharp wrapper of TileDB universal data engine</description>
12-
<releaseNotes>This package is the csharp wrapper of TileDB 2.10.3.</releaseNotes>
12+
<releaseNotes>This package is the csharp wrapper of TileDB 2.11.0.</releaseNotes>
1313
<copyright>$copyright$</copyright>
1414
<tags>tiledb</tags>
1515
<dependencies>

‎sources/TileDB.Interop/Methods.cs‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ namespace TileDB.Interop
44
{
55
public static unsafe partial class Methods
66
{
7+
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, EntryPoint = "_Z13tiledb_statusi", ExactSpelling = true)]
8+
[return: NativeTypeName("capi_status_t")]
9+
public static extern int tiledb_status([NativeTypeName("capi_return_t")] int x);
10+
711
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
812
[return: NativeTypeName("int32_t")]
913
public static extern int tiledb_query_type_to_str(tiledb_query_type_t query_type, [NativeTypeName("const char **")] sbyte** str);
@@ -124,6 +128,10 @@ public static unsafe partial class Methods
124128
[return: NativeTypeName("uint64_t")]
125129
public static extern ulong tiledb_timestamp_now_ms();
126130

131+
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
132+
[return: NativeTypeName("const char *")]
133+
public static extern sbyte* tiledb_timestamps();
134+
127135
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
128136
public static extern void tiledb_version([NativeTypeName("int32_t *")] int* major, [NativeTypeName("int32_t *")] int* minor, [NativeTypeName("int32_t *")] int* rev);
129137

@@ -270,49 +278,49 @@ public static unsafe partial class Methods
270278
public static extern int tiledb_group_create(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* group_uri);
271279

272280
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
273-
[return: NativeTypeName("int32_t")]
281+
[return: NativeTypeName("capi_return_t")]
274282
public static extern int tiledb_filter_alloc(tiledb_ctx_t* ctx, tiledb_filter_type_t type, tiledb_filter_t** filter);
275283

276284
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
277285
public static extern void tiledb_filter_free(tiledb_filter_t** filter);
278286

279287
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
280-
[return: NativeTypeName("int32_t")]
288+
[return: NativeTypeName("capi_return_t")]
281289
public static extern int tiledb_filter_get_type(tiledb_ctx_t* ctx, tiledb_filter_t* filter, tiledb_filter_type_t* type);
282290

283291
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
284-
[return: NativeTypeName("int32_t")]
292+
[return: NativeTypeName("capi_return_t")]
285293
public static extern int tiledb_filter_set_option(tiledb_ctx_t* ctx, tiledb_filter_t* filter, tiledb_filter_option_t option, [NativeTypeName("const void *")] void* value);
286294

287295
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
288-
[return: NativeTypeName("int32_t")]
296+
[return: NativeTypeName("capi_return_t")]
289297
public static extern int tiledb_filter_get_option(tiledb_ctx_t* ctx, tiledb_filter_t* filter, tiledb_filter_option_t option, void* value);
290298

291299
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
292-
[return: NativeTypeName("int32_t")]
300+
[return: NativeTypeName("capi_return_t")]
293301
public static extern int tiledb_filter_list_alloc(tiledb_ctx_t* ctx, tiledb_filter_list_t** filter_list);
294302

295303
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
296304
public static extern void tiledb_filter_list_free(tiledb_filter_list_t** filter_list);
297305

298306
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
299-
[return: NativeTypeName("int32_t")]
307+
[return: NativeTypeName("capi_return_t")]
300308
public static extern int tiledb_filter_list_add_filter(tiledb_ctx_t* ctx, tiledb_filter_list_t* filter_list, tiledb_filter_t* filter);
301309

302310
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
303-
[return: NativeTypeName("int32_t")]
311+
[return: NativeTypeName("capi_return_t")]
304312
public static extern int tiledb_filter_list_set_max_chunk_size(tiledb_ctx_t* ctx, [NativeTypeName("const tiledb_filter_list_t *")] tiledb_filter_list_t* filter_list, [NativeTypeName("uint32_t")] uint max_chunk_size);
305313

306314
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
307-
[return: NativeTypeName("int32_t")]
315+
[return: NativeTypeName("capi_return_t")]
308316
public static extern int tiledb_filter_list_get_nfilters(tiledb_ctx_t* ctx, [NativeTypeName("const tiledb_filter_list_t *")] tiledb_filter_list_t* filter_list, [NativeTypeName("uint32_t *")] uint* nfilters);
309317

310318
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
311-
[return: NativeTypeName("int32_t")]
319+
[return: NativeTypeName("capi_return_t")]
312320
public static extern int tiledb_filter_list_get_filter_from_index(tiledb_ctx_t* ctx, [NativeTypeName("const tiledb_filter_list_t *")] tiledb_filter_list_t* filter_list, [NativeTypeName("uint32_t")] uint index, tiledb_filter_t** filter);
313321

314322
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
315-
[return: NativeTypeName("int32_t")]
323+
[return: NativeTypeName("capi_return_t")]
316324
public static extern int tiledb_filter_list_get_max_chunk_size(tiledb_ctx_t* ctx, [NativeTypeName("const tiledb_filter_list_t *")] tiledb_filter_list_t* filter_list, [NativeTypeName("uint32_t *")] uint* max_chunk_size);
317325

318326
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
@@ -1363,6 +1371,10 @@ public static unsafe partial class Methods
13631371
[return: NativeTypeName("int32_t")]
13641372
public static extern int tiledb_query_add_point_ranges(tiledb_ctx_t* ctx, tiledb_query_t* query, [NativeTypeName("uint32_t")] uint dim_idx, [NativeTypeName("const void *")] void* start, [NativeTypeName("uint64_t")] ulong count);
13651373

1374+
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1375+
[return: NativeTypeName("int32_t")]
1376+
public static extern int tiledb_query_get_relevant_fragment_num(tiledb_ctx_t* ctx, [NativeTypeName("const tiledb_query_t *")] tiledb_query_t* query, [NativeTypeName("uint64_t *")] ulong* relevant_fragment_num);
1377+
13661378
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
13671379
[return: NativeTypeName("int32_t")]
13681380
public static extern int tiledb_query_get_status_details(tiledb_ctx_t* ctx, tiledb_query_t* query, tiledb_query_status_details_t* status);
@@ -1497,5 +1509,9 @@ public static unsafe partial class Methods
14971509
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
14981510
[return: NativeTypeName("int32_t")]
14991511
public static extern int tiledb_mime_type_from_str([NativeTypeName("const char *")] sbyte* str, tiledb_mime_type_t* mime_type);
1512+
1513+
[DllImport("libtiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1514+
[return: NativeTypeName("int32_t")]
1515+
public static extern int tiledb_fragment_info_get_total_cell_num(tiledb_ctx_t* ctx, tiledb_fragment_info_t* fragment_info, [NativeTypeName("uint64_t *")] ulong* count);
15001516
}
15011517
}

0 commit comments

Comments
 (0)