Skip to content

Commit ba1b03d

Browse files
shaunrd0shaunrd0
authored
Update to TileDB 2.10.2 (#68)
1 parent 255198c commit ba1b03d

File tree

10 files changed

+42
-22
lines changed

10 files changed

+42
-22
lines changed

‎.github/scripts/download_tiledb.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
set -e -x
2-
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-windows-x86_64-2.10.1-6535d4c.zip
3-
unzip tiledb-windows-x86_64-2.10.1-6535d4c.zip -d tiledb-windows
2+
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip
3+
unzip tiledb-windows-x86_64-2.10.2-9ab84f9.zip -d tiledb-windows
44
cp ./tiledb-windows/bin/tiledb.dll ./sources/TileDB.CSharp/runtimes/win-x64/native/
5-
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-linux-x86_64-2.10.1-6535d4c.tar.gz
5+
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz
66
mkdir tiledb-linux
7-
tar xvfz tiledb-linux-x86_64-2.10.1-6535d4c.tar.gz --directory tiledb-linux
7+
tar xvfz tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz --directory tiledb-linux
88
cp ./tiledb-linux/lib/libtiledb.so.2.10 ./sources/TileDB.CSharp/runtimes/linux-x64/native/
9-
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-macos-x86_64-2.10.1-6535d4c.tar.gz
9+
wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz
1010
mkdir tiledb-macos
11-
tar xvfz tiledb-macos-x86_64-2.10.1-6535d4c.tar.gz --directory tiledb-macos
11+
tar xvfz tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz --directory tiledb-macos
1212
cp ./tiledb-macos/lib/libtiledb.dylib ./sources/TileDB.CSharp/runtimes/osx-x64/native/

‎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.1" CACHE STRING "TileDB version")
8+
set(TILEDB_VERSION "2.10.2" 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: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ 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.1")
12+
if(${TILEDB_VERSION} STREQUAL "2.10.2")
13+
if (WIN32) # Windows
14+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip")
15+
SET(TILEDB_DOWNLOAD_SHA1 "fe6dac320afb08dd3f2f40f2705306f6eb245f8b")
16+
elseif(APPLE) # OSX
17+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz")
18+
SET(TILEDB_DOWNLOAD_SHA1 "2be62a6c48c0bd7aeea786414aa32aef26fe6a64")
19+
else() # Linux
20+
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")
21+
SET(TILEDB_DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f")
22+
endif()
23+
elseif(${TILEDB_VERSION} STREQUAL "2.10.1")
1324
if (WIN32) # Windows
1425
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-windows-x86_64-2.10.1-6535d4c.zip")
1526
SET(TILEDB_DOWNLOAD_SHA1 "d0c5ed50f3c5215cae8a4dd82f756624e43252aa")
@@ -341,14 +352,14 @@ elseif(${TILEDB_VERSION} STREQUAL "2.0.7")
341352
endif()
342353
else()
343354
if (WIN32) # Windows
344-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-windows-x86_64-2.10.1-6535d4c.zip")
345-
SET(TILEDB_DOWNLOAD_SHA1 "d0c5ed50f3c5215cae8a4dd82f756624e43252aa")
355+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip")
356+
SET(TILEDB_DOWNLOAD_SHA1 "fe6dac320afb08dd3f2f40f2705306f6eb245f8b")
346357
elseif(APPLE) # OSX
347-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-macos-x86_64-2.10.1-6535d4c.tar.gz")
348-
SET(TILEDB_DOWNLOAD_SHA1 "68a43a62544ac849e1ca1b7c724f129dd7c8e50d")
358+
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz")
359+
SET(TILEDB_DOWNLOAD_SHA1 "2be62a6c48c0bd7aeea786414aa32aef26fe6a64")
349360
else() # Linux
350-
SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-linux-x86_64-2.10.1-6535d4c.tar.gz")
351-
SET(TILEDB_DOWNLOAD_SHA1 "8c48232cd52934724b2b7a254ebad6c27e5a7683")
361+
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")
362+
SET(TILEDB_DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f")
352363
endif()
353364
endif()
354365

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<RootNamespace>TileDB.CSharp.Examples</RootNamespace>
5-
<Version>5.1.0</Version>
5+
<Version>5.1.1</Version>
66
<TargetFrameworks>net5.0</TargetFrameworks>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎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.1
85-
mv TileDB TileDB_2.10.1
86-
cd TileDB_2.10.1
84+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.10.2
85+
mv TileDB TileDB_2.10.2
86+
cd TileDB_2.10.2
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
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>TileDB.CSharp</RootNamespace>
5-
<Version>5.1.0</Version>
5+
<Version>5.1.1</Version>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<TargetFrameworks>net5.0</TargetFrameworks>

‎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.0</version>
5+
<version>5.1.1</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.1.</releaseNotes>
12+
<releaseNotes>This package is the csharp wrapper of TileDB 2.10.2.</releaseNotes>
1313
<copyright>$copyright$</copyright>
1414
<tags>tiledb</tags>
1515
<dependencies>

‎sources/TileDB.Interop/Methods.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,6 +1458,14 @@ public static unsafe partial class Methods
14581458
[return: NativeTypeName("int32_t")]
14591459
public static extern int tiledb_group_dump_str(tiledb_ctx_t* ctx, tiledb_group_t* group, [NativeTypeName("char **")] sbyte** dump_ascii, [NativeTypeName("const uint8_t")] byte recursive);
14601460

1461+
[DllImport(LibDllImport.Path, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1462+
[return: NativeTypeName("int32_t")]
1463+
public static extern int tiledb_group_consolidate_metadata(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* group_uri, tiledb_config_t* config);
1464+
1465+
[DllImport(LibDllImport.Path, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
1466+
[return: NativeTypeName("int32_t")]
1467+
public static extern int tiledb_group_vacuum_metadata(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* group_uri, tiledb_config_t* config);
1468+
14611469
[DllImport(LibDllImport.Path, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
14621470
[return: NativeTypeName("int32_t")]
14631471
public static extern int tiledb_filestore_schema_create(tiledb_ctx_t* ctx, [NativeTypeName("const char *")] sbyte* uri, tiledb_array_schema_t** array_schema);

‎sources/TileDB.Interop/TileDB.Interop.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
</PropertyGroup>
66
<PropertyGroup>
7-
<Version>5.1.0</Version>
7+
<Version>5.1.1</Version>
88
<TargetFrameworks>net5.0</TargetFrameworks>
99
</PropertyGroup>
1010
</Project>

‎sources/TileDB.Interop/tiledb_datatype_t.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ public enum tiledb_datatype_t : uint
4444
TILEDB_TIME_FS = 38,
4545
TILEDB_TIME_AS = 39,
4646
TILEDB_BLOB = 40,
47+
TILEDB_BOOL = 41,
4748
}
4849
}

0 commit comments

Comments
 (0)