Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Core to 2.25. #450

Merged
merged 5 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- os: windows-latest
platform: windows-x86_64
- tag: dev
tag: [release-2.24, dev]
tag: [release-2.25, dev]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout TileDB
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
strategy:
fail-fast: false
matrix:
tag: [release-2.24, dev]
tag: [release-2.25, dev]
runs-on: ubuntu-latest
steps:
- name: Checkout TileDB-CSharp
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
tag: [release-2.24, dev]
tag: [release-2.25, dev]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout TileDB-CSharp
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TileDBNativePackageName>TileDB.Native</TileDBNativePackageName>
<TileDBNativeVersionMajor>2</TileDBNativeVersionMajor>
<TileDBNativeVersionMinor>24</TileDBNativeVersionMinor>
<TileDBNativeVersionMinor>25</TileDBNativeVersionMinor>
<TileDBNativePackageVersion>[$(TileDBNativeVersionMajor).$(TileDBNativeVersionMinor).0,$(TileDBNativeVersionMajor).$([MSBuild]::Add($(TileDBNativeVersionMinor), 1)).0)</TileDBNativePackageVersion>

<!-- The DevelopmentBuild property switches to the locally built native packages.
Expand Down
60 changes: 60 additions & 0 deletions sources/TileDB.CSharp/Interop/Methods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,54 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
[return: NativeTypeName("capi_return_t")]
public static extern int tiledb_attribute_get_enumeration_name(tiledb_ctx_t* ctx, tiledb_attribute_t* attr, tiledb_string_t** name);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
public static extern int tiledb_ndrectangle_alloc(tiledb_ctx_t* ctx, tiledb_domain_t* domain, [NativeTypeName("tiledb_ndrectangle_t **")] tiledb_ndrectangle_handle_t** ndr);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
public static extern int tiledb_ndrectangle_free([NativeTypeName("tiledb_ndrectangle_t **")] tiledb_ndrectangle_handle_t** ndr);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
public static extern int tiledb_current_domain_create(tiledb_ctx_t* ctx, [NativeTypeName("tiledb_current_domain_t **")] tiledb_current_domain_handle_t** current_domain);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
public static extern int tiledb_current_domain_free([NativeTypeName("tiledb_current_domain_t **")] tiledb_current_domain_handle_t** current_domain);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);
Expand Down Expand Up @@ -1568,6 +1616,10 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
[return: NativeTypeName("int32_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("capi_return_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("int32_t")]
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);
Expand All @@ -1576,6 +1628,14 @@ public static int tiledb_status([NativeTypeName("capi_return_t")] int x)
[return: NativeTypeName("int32_t")]
public static extern int tiledb_array_schema_add_enumeration(tiledb_ctx_t* ctx, tiledb_array_schema_t* array_schema, tiledb_enumeration_t* enumeration);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("int32_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("int32_t")]
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);

[DllImport("tiledb", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
[return: NativeTypeName("int32_t")]
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);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>

namespace TileDB.Interop
{
internal partial struct tiledb_current_domain_handle_t
{
}
}
9 changes: 9 additions & 0 deletions sources/TileDB.CSharp/Interop/tiledb_current_domain_type_t.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// <auto-generated/>

namespace TileDB.Interop
{
internal enum tiledb_current_domain_type_t
{
TILEDB_NDRECTANGLE = 0,
}
}
8 changes: 8 additions & 0 deletions sources/TileDB.CSharp/Interop/tiledb_ndrectangle_handle_t.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// <auto-generated/>

namespace TileDB.Interop
{
internal partial struct tiledb_ndrectangle_handle_t
{
}
}
19 changes: 19 additions & 0 deletions sources/TileDB.CSharp/Interop/tiledb_range_t.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// <auto-generated/>

namespace TileDB.Interop
{
internal unsafe partial struct tiledb_range_t
{
[NativeTypeName("const void *")]
public void* min;

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Validate-Package

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

Check warning on line 8 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.min' is never assigned to, and will always have its default value

[NativeTypeName("uint64_t")]
public ulong min_size;

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Validate-Package

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

Check warning on line 11 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.min_size' is never assigned to, and will always have its default value 0

[NativeTypeName("const void *")]
public void* max;

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Validate-Package

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

Check warning on line 14 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.max' is never assigned to, and will always have its default value

[NativeTypeName("uint64_t")]
public ulong max_size;

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (ubuntu-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Validate-Package

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (macos-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0

Check warning on line 17 in sources/TileDB.CSharp/Interop/tiledb_range_t.cs

View workflow job for this annotation

GitHub Actions / Run-Tests (windows-latest)

Field 'tiledb_range_t.max_size' is never assigned to, and will always have its default value 0
}
}
6 changes: 3 additions & 3 deletions sources/TileDB.CSharp/Subarray.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using TileDB.CSharp.Marshalling;
Expand Down Expand Up @@ -180,7 +180,8 @@ public void AddRange<T>(string dimensionName, T start, T end) where T : struct
AddRange(dimensionName, &start, &end, null);
}

// TODO: Make it public once the Core supports strides.
// The following two APIs are private until the Core supports strides.

/// <summary>
/// Adds a 1D range along a subarray dimension index, in the form (start, end, stride).
/// </summary>
Expand All @@ -196,7 +197,6 @@ private void AddRange<T>(uint dimensionIndex, T start, T end, T stride) where T
AddRange(dimensionIndex, &start, &end, &stride);
}

// TODO: Make it public once the Core supports strides.
/// <summary>
/// Adds a 1D range along a subarray dimension name, specified by its name, in the form(start, end, stride).
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions sources/TileDB.CSharp/TileDB.CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<RootNamespace>TileDB.CSharp</RootNamespace>
<Version>5.14.0</Version>
<Version>5.15.0</Version>
<Description>C# wrapper of the TileDB Embedded universal data engine.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>5.13.0</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>5.14.0</PackageValidationBaselineVersion>
<NoWarn>$(NoWarn);TILEDB0012;TILEDB0013;TILEDB0014</NoWarn>
</PropertyGroup>

Expand Down
Loading