Skip to content

Commit aad0dca

Browse files
teo-tsirpanisteo-tsirpanis
authored
Update Core to 2.25. (#450)
* Regenerate bindings for 2.25. * Remove two TODOs that are not actionable from the C# API side. * Bump Core to 2.25.0. * Run nightly builds on release-2.25. * Bump version to 5.15.0.
1 parent 96436db commit aad0dca

File tree

9 files changed

+113
-9
lines changed

9 files changed

+113
-9
lines changed

‎.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- os: windows-latest
2828
platform: windows-x86_64
2929
- tag: dev
30-
tag: [release-2.24, dev]
30+
tag: [release-2.25, dev]
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- name: Checkout TileDB
@@ -71,7 +71,7 @@ jobs:
7171
strategy:
7272
fail-fast: false
7373
matrix:
74-
tag: [release-2.24, dev]
74+
tag: [release-2.25, dev]
7575
runs-on: ubuntu-latest
7676
steps:
7777
- name: Checkout TileDB-CSharp
@@ -112,7 +112,7 @@ jobs:
112112
fail-fast: false
113113
matrix:
114114
os: [ubuntu-latest, macos-latest, windows-latest]
115-
tag: [release-2.24, dev]
115+
tag: [release-2.25, dev]
116116
runs-on: ${{ matrix.os }}
117117
steps:
118118
- name: Checkout TileDB-CSharp

‎Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<TileDBNativePackageName>TileDB.Native</TileDBNativePackageName>
55
<TileDBNativeVersionMajor>2</TileDBNativeVersionMajor>
6-
<TileDBNativeVersionMinor>24</TileDBNativeVersionMinor>
6+
<TileDBNativeVersionMinor>25</TileDBNativeVersionMinor>
77
<TileDBNativePackageVersion>[$(TileDBNativeVersionMajor).$(TileDBNativeVersionMinor).0,$(TileDBNativeVersionMajor).$([MSBuild]::Add($(TileDBNativeVersionMinor), 1)).0)</TileDBNativePackageVersion>
88

99
<!-- The DevelopmentBuild property switches to the locally built native packages.

‎sources/TileDB.CSharp/Interop/Methods.cs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,54 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
13271327
[return: NativeTypeName("capi_return_t")]
13281328
public static extern int tiledb_attribute_get_enumeration_name(tiledb_ctx_t* ctx, tiledb_attribute_t* attr, tiledb_string_t** name);
13291329

1330+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1331+
[return: NativeTypeName("capi_return_t")]
1332+
public static extern int tiledb_ndrectangle_alloc(tiledb_ctx_t* ctx, tiledb_domain_t* domain, [NativeTypeName("tiledb_ndrectangle_t **")] tiledb_ndrectangle_handle_t** ndr);
1333+
1334+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1335+
[return: NativeTypeName("capi_return_t")]
1336+
public static extern int tiledb_ndrectangle_free([NativeTypeName("tiledb_ndrectangle_t **")] tiledb_ndrectangle_handle_t** ndr);
1337+
1338+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1339+
[return: NativeTypeName("capi_return_t")]
1340+
public static extern int tiledb_ndrectangle_get_range_from_name(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_ndrectangle_t *")] tiledb_ndrectangle_handle_t* ndr, [NativeTypeName("const char *")] sbyte* name, tiledb_range_t* range);
1341+
1342+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1343+
[return: NativeTypeName("capi_return_t")]
1344+
public static extern int tiledb_ndrectangle_get_range(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_ndrectangle_t *")] tiledb_ndrectangle_handle_t* ndr, [NativeTypeName("uint32_t")] uint idx, tiledb_range_t* range);
1345+
1346+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1347+
[return: NativeTypeName("capi_return_t")]
1348+
public static extern int tiledb_ndrectangle_set_range_for_name(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_ndrectangle_t *")] tiledb_ndrectangle_handle_t* ndr, [NativeTypeName("const char *")] sbyte* name, tiledb_range_t* range);
1349+
1350+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1351+
[return: NativeTypeName("capi_return_t")]
1352+
public static extern int tiledb_ndrectangle_set_range(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_ndrectangle_t *")] tiledb_ndrectangle_handle_t* ndr, [NativeTypeName("uint32_t")] uint idx, tiledb_range_t* range);
1353+
1354+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1355+
[return: NativeTypeName("capi_return_t")]
1356+
public static extern int tiledb_current_domain_create(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_current_domain_t **")] tiledb_current_domain_handle_t** current_domain);
1357+
1358+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1359+
[return: NativeTypeName("capi_return_t")]
1360+
public static extern int tiledb_current_domain_free([NativeTypeName("tiledb_current_domain_t **")] tiledb_current_domain_handle_t** current_domain);
1361+
1362+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1363+
[return: NativeTypeName("capi_return_t")]
1364+
public static extern int tiledb_current_domain_set_ndrectangle([NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* current_domain, [NativeTypeName("tiledb_ndrectangle_t *")] tiledb_ndrectangle_handle_t* ndr);
1365+
1366+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1367+
[return: NativeTypeName("capi_return_t")]
1368+
public static extern int tiledb_current_domain_get_ndrectangle([NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* current_domain, [NativeTypeName("tiledb_ndrectangle_t **")] tiledb_ndrectangle_handle_t** ndr);
1369+
1370+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1371+
[return: NativeTypeName("capi_return_t")]
1372+
public static extern int tiledb_current_domain_get_is_empty([NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* current_domain, [NativeTypeName("uint32_t *")] uint* is_empty);
1373+
1374+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1375+
[return: NativeTypeName("capi_return_t")]
1376+
public static extern int tiledb_current_domain_get_type([NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* current_domain, tiledb_current_domain_type_t* type);
1377+
13301378
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
13311379
[return: NativeTypeName("capi_return_t")]
13321380
public static extern int tiledb_enumeration_alloc(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* name, tiledb_datatype_t type, [NativeTypeName("uint32_t")] uint cell_val_num, int ordered, [NativeTypeName("const void *")] void* data, [NativeTypeName("uint64_t")] ulong data_size, [NativeTypeName("const void *")] void* offsets, [NativeTypeName("uint64_t")] ulong offsets_size, tiledb_enumeration_t** enumeration);
@@ -1568,6 +1616,10 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
15681616
[return: NativeTypeName("int32_t")]
15691617
public static extern int tiledb_array_schema_evolution_set_timestamp_range(tiledb_ctx_t* ctx, tiledb_array_schema_evolution_t* array_schema_evolution, [NativeTypeName("uint64_t")] ulong lo, [NativeTypeName("uint64_t")] ulong hi);
15701618

1619+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1620+
[return: NativeTypeName("capi_return_t")]
1621+
public static extern int tiledb_array_schema_evolution_expand_current_domain(tiledb_ctx_t* ctx, tiledb_array_schema_evolution_t* array_schema_evolution, [NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* expanded_domain);
1622+
15711623
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
15721624
[return: NativeTypeName("int32_t")]
15731625
public static extern int tiledb_array_schema_timestamp_range(tiledb_ctx_t* ctx, tiledb_array_schema_t* array_schema, [NativeTypeName("uint64_t *")] ulong* lo, [NativeTypeName("uint64_t *")] ulong* hi);
@@ -1576,6 +1628,14 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
15761628
[return: NativeTypeName("int32_t")]
15771629
public static extern int tiledb_array_schema_add_enumeration(tiledb_ctx_t* ctx, tiledb_array_schema_t* array_schema, tiledb_enumeration_t* enumeration);
15781630

1631+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1632+
[return: NativeTypeName("int32_t")]
1633+
public static extern int tiledb_array_schema_set_current_domain(tiledb_ctx_t* ctx, tiledb_array_schema_t* array_schema, [NativeTypeName("tiledb_current_domain_t *")] tiledb_current_domain_handle_t* current_domain);
1634+
1635+
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1636+
[return: NativeTypeName("int32_t")]
1637+
public static extern int tiledb_array_schema_get_current_domain(tiledb_ctx_t* ctx, tiledb_array_schema_t* array_schema, [NativeTypeName("tiledb_current_domain_t **")] tiledb_current_domain_handle_t** current_domain);
1638+
15791639
[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
15801640
[return: NativeTypeName("int32_t")]
15811641
public static extern int tiledb_array_evolve(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* array_uri, tiledb_array_schema_evolution_t* array_schema_evolution);

‎sources/TileDB.CSharp/Interop/tiledb_current_domain_handle_t.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// <auto-generated/>
2+
3+
namespace TileDB.Interop
4+
{
5+
internal partial struct tiledb_current_domain_handle_t
6+
{
7+
}
8+
}

‎sources/TileDB.CSharp/Interop/tiledb_current_domain_type_t.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// <auto-generated/>
2+
3+
namespace TileDB.Interop
4+
{
5+
internal enum tiledb_current_domain_type_t
6+
{
7+
TILEDB_NDRECTANGLE = 0,
8+
}
9+
}

‎sources/TileDB.CSharp/Interop/tiledb_ndrectangle_handle_t.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// <auto-generated/>
2+
3+
namespace TileDB.Interop
4+
{
5+
internal partial struct tiledb_ndrectangle_handle_t
6+
{
7+
}
8+
}

‎sources/TileDB.CSharp/Interop/tiledb_range_t.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// <auto-generated/>
2+
3+
namespace TileDB.Interop
4+
{
5+
internal unsafe partial struct tiledb_range_t
6+
{
7+
[NativeTypeName("const void *")]
8+
public void* min;
9+
10+
[NativeTypeName("uint64_t")]
11+
public ulong min_size;
12+
13+
[NativeTypeName("const void *")]
14+
public void* max;
15+
16+
[NativeTypeName("uint64_t")]
17+
public ulong max_size;
18+
}
19+
}

‎sources/TileDB.CSharp/Subarray.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44
using TileDB.CSharp.Marshalling;
@@ -180,7 +180,8 @@ public void AddRange<T>(string dimensionName, T start, T end) where T : struct
180180
AddRange(dimensionName, &start, &end, null);
181181
}
182182

183-
// TODO: Make it public once the Core supports strides.
183+
// The following two APIs are private until the Core supports strides.
184+
184185
/// <summary>
185186
/// Adds a 1D range along a subarray dimension index, in the form (start, end, stride).
186187
/// </summary>
@@ -196,7 +197,6 @@ private void AddRange<T>(uint dimensionIndex, T start, T end, T stride) where T
196197
AddRange(dimensionIndex, &start, &end, &stride);
197198
}
198199

199-
// TODO: Make it public once the Core supports strides.
200200
/// <summary>
201201
/// Adds a 1D range along a subarray dimension name, specified by its name, in the form(start, end, stride).
202202
/// </summary>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<Nullable>enable</Nullable>
88
<RootNamespace>TileDB.CSharp</RootNamespace>
9-
<Version>5.14.0</Version>
9+
<Version>5.15.0</Version>
1010
<Description>C# wrapper of the TileDB Embedded universal data engine.</Description>
1111
<PackageReadmeFile>README.md</PackageReadmeFile>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<EnablePackageValidation>true</EnablePackageValidation>
14-
<PackageValidationBaselineVersion>5.13.0</PackageValidationBaselineVersion>
14+
<PackageValidationBaselineVersion>5.14.0</PackageValidationBaselineVersion>
1515
<NoWarn>$(NoWarn);TILEDB0012;TILEDB0013;TILEDB0014</NoWarn>
1616
</PropertyGroup>
1717

0 commit comments

Comments
 (0)