Skip to content

Commit a5d1bc5

Browse files
anastasopanastasop
authored
Merge pull request #256 from TileDB-Inc/upgrade-to-tiledb2.15
Upgrade to go 1.19 and TileDB 2.15
2 parents 768e13c + 473c5b4 commit a5d1bc5

File tree

18 files changed

+113
-56
lines changed

18 files changed

+113
-56
lines changed

‎.github/scripts/install_tiledb_linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
set -e -x
2-
curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/2.14.0/tiledb-linux-x86_64-2.14.0-27eed08.tar.gz \
2+
curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/2.15.0/tiledb-linux-x86_64-2.15.0-1fb59c4.tar.gz \
33
&& sudo tar -C /usr/local -xf tiledb.tar.gz
44
sudo ldconfig /usr/local/lib

‎.github/scripts/install_tiledb_linux_debug.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set -e -x
2-
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.14.0
2+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.15.0
33
cd TileDB
44
mkdir build && cd build
55
cmake -DSANITIZER=leak -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/local ..

‎.github/scripts/install_tiledb_macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set -e -x
2-
curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/2.14.0/tiledb-macos-x86_64-2.14.0-27eed08.tar.gz \
2+
curl --location -o tiledb.tar.gz https://github.com/TileDB-Inc/TileDB/releases/download/2.15.0/tiledb-macos-x86_64-2.15.0-1fb59c4.tar.gz \
33
&& sudo tar -C /usr/local -xf tiledb.tar.gz

‎.github/scripts/install_tiledb_source_linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set -e -x
2-
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.14.0
2+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.15.0
33
cd TileDB
44
mkdir build && cd build
55
cmake -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local ..

‎.github/scripts/install_tiledb_source_macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set -e -x
2-
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.14.0
2+
git clone https://github.com/TileDB-Inc/TileDB.git -b 2.15.0
33
cd TileDB
44
mkdir build && cd build
55
cmake -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local ..

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
# Will be checking following versions
37-
go: ["1.18"]
37+
go: ["1.19", "1.20"]
3838
steps:
3939

4040
# Checks out repository
@@ -74,7 +74,7 @@ jobs:
7474
strategy:
7575
matrix:
7676
# Will be checking following versions
77-
go: ["1.18"]
77+
go: ["1.19", "1.20"]
7878
steps:
7979
# Checks out repository
8080
- uses: actions/checkout@v2
@@ -113,7 +113,7 @@ jobs:
113113
strategy:
114114
matrix:
115115
# Will be checking following versions
116-
go: ["1.18"]
116+
go: ["1.19", "1.20"]
117117
steps:
118118

119119
# Checks out repository
@@ -153,7 +153,7 @@ jobs:
153153
strategy:
154154
matrix:
155155
# Will be checking following versions
156-
go: ["1.18"]
156+
go: ["1.19", "1.20"]
157157
steps:
158158
# Checks out repository
159159
- uses: actions/checkout@v2
@@ -192,7 +192,7 @@ jobs:
192192
strategy:
193193
matrix:
194194
# Will be checking following versions
195-
go: [1.18]
195+
go: ["1.19", "1.20"]
196196
steps:
197197
# Checks out repository
198198
- uses: actions/checkout@v2

‎README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ as such the below table reference which versions are compatible.
7676
| 0.18.0 | 2.12.X |
7777
| 0.19.0 | 2.13.X |
7878
| 0.20.0 | 2.14.X |
79+
| 0.21.0 | 2.15.X |
7980

8081

8182
## Missing Functionality
@@ -84,3 +85,12 @@ The following TileDB core library features are missing from the Go API:
8485

8586
- TileDB generic object management
8687
- TileDB group creation
88+
89+
## Deprecated Functionality
90+
91+
### 0.21.0
92+
93+
The query methods `(Set)?Buffer(Var|Nullable|Var|Unsafe)*` are deprecated because the corresponding
94+
TileDB core methods are removed. The methods will be supported for 2 releases and are expected to be
95+
removed in release 0.23. It is recommended to use the proper combination of
96+
`(Set|Get)DataBuffer`, `(Set|Get)ValidityBuffer` and `(Set|Get)OffsetBuffer`.

‎config_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ func ExampleConfig_Set() {
1515
// handle error
1616
}
1717

18-
err = config.Set("sm.tile_cache_size", "10")
18+
err = config.Set("sm.memory_budget", "4294967296")
1919
if err != nil {
2020
// handle error
2121
}
2222

23-
val, err := config.Get("sm.tile_cache_size")
23+
val, err := config.Get("sm.memory_budget")
2424
if err != nil {
2525
// handle error
2626
}
2727
fmt.Println(val)
28-
// Output: 10
28+
// Output: 4294967296
2929
}
3030

3131
func ExampleConfig_Get() {
@@ -34,12 +34,12 @@ func ExampleConfig_Get() {
3434
// handle error
3535
}
3636

37-
val, err := config.Get("sm.tile_cache_size")
37+
val, err := config.Get("sm.memory_budget")
3838
if err != nil {
3939
// handle error
4040
}
4141
fmt.Println(val)
42-
// Output: 10000000
42+
// Output: 5368709120
4343
}
4444

4545
func TestNewConfig(t *testing.T) {
@@ -54,23 +54,23 @@ func TestNewConfig(t *testing.T) {
5454
func TestSettingConfig(t *testing.T) {
5555
config, err := NewConfig()
5656
require.NoError(t, err)
57-
assert.Error(t, config.Set("sm.tile_cache_size", "fail"))
57+
assert.Error(t, config.Set("sm.memory_budget", "fail"))
5858

59-
require.NoError(t, config.Set("sm.tile_cache_size", "10"))
59+
require.NoError(t, config.Set("sm.memory_budget", "4294967296"))
6060

61-
val, err := config.Get("sm.tile_cache_size")
61+
val, err := config.Get("sm.memory_budget")
6262
require.NoError(t, err)
63-
assert.Equal(t, "10", val)
63+
assert.Equal(t, "4294967296", val)
6464
}
6565

6666
//TestGettingConfig
6767
func TestGettingConfig(t *testing.T) {
6868
config, err := NewConfig()
6969
require.NoError(t, err)
7070

71-
val, err := config.Get("sm.tile_cache_size")
71+
val, err := config.Get("sm.memory_budget")
7272
require.NoError(t, err)
73-
assert.Equal(t, "10000000", val)
73+
assert.Equal(t, "5368709120", val)
7474

7575
val, err = config.Get("sm.does_not_exists")
7676
require.NoError(t, err)
@@ -81,29 +81,29 @@ func TestGettingConfig(t *testing.T) {
8181
func TestUnSettingConfig(t *testing.T) {
8282
config, err := NewConfig()
8383
require.NoError(t, err)
84-
require.NoError(t, config.Set("sm.tile_cache_size", "10"))
84+
require.NoError(t, config.Set("sm.memory_budget", "4294967296"))
8585

86-
val, err := config.Get("sm.tile_cache_size")
86+
val, err := config.Get("sm.memory_budget")
8787
require.NoError(t, err)
88-
assert.Equal(t, "10", val)
88+
assert.Equal(t, "4294967296", val)
8989

90-
require.NoError(t, config.Unset("sm.tile_cache_size"))
90+
require.NoError(t, config.Unset("sm.memory_budget"))
9191

92-
val, err = config.Get("sm.tile_cache_size")
92+
val, err = config.Get("sm.memory_budget")
9393
require.NoError(t, err)
94-
assert.Equal(t, "10000000", val)
94+
assert.Equal(t, "5368709120", val)
9595
}
9696

9797
//TestFileConfig
9898
func TestFileConfig(t *testing.T) {
9999
config, err := NewConfig()
100100
require.NoError(t, err)
101101
assert.NotNil(t, config)
102-
require.NoError(t, config.Set("sm.tile_cache_size", "10"))
102+
require.NoError(t, config.Set("sm.memory_budget", "4294967296"))
103103

104-
val, err := config.Get("sm.tile_cache_size")
104+
val, err := config.Get("sm.memory_budget")
105105
require.NoError(t, err)
106-
assert.Equal(t, "10", val)
106+
assert.Equal(t, "4294967296", val)
107107

108108
// Create temporary path for testing configuration writing/reading
109109
tmpPath := filepath.Join(t.TempDir(), "config")
@@ -114,9 +114,9 @@ func TestFileConfig(t *testing.T) {
114114
require.NoError(t, err)
115115
assert.NotNil(t, config2)
116116

117-
val, err = config2.Get("sm.tile_cache_size")
117+
val, err = config2.Get("sm.memory_budget")
118118
require.NoError(t, err)
119-
assert.Equal(t, "10", val)
119+
assert.Equal(t, "4294967296", val)
120120
}
121121

122122
//TestConfigIter

‎context_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ func TestCancelAllTasks(t *testing.T) {
9595
func TestGetContextConfig(t *testing.T) {
9696
// Create a context with a non-default value:
9797
context, err := NewContextFromMap(map[string]string{
98-
"sm.tile_cache_size": "10",
98+
"sm.memory_budget": "4294967296",
9999
})
100100
require.NoError(t, err)
101101
config, err := context.Config()
102102
require.NoError(t, err)
103103

104104
// Validate config has setting changed
105-
val, err := config.Get("sm.tile_cache_size")
105+
val, err := config.Get("sm.memory_budget")
106106
require.NoError(t, err)
107-
assert.Equal(t, "10", val)
107+
assert.Equal(t, "4294967296", val)
108108
}
109109

110110
// TestContextLastError tests retrieving the last error

‎examples/vacuum_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func ExampleVacuumSparseArray() {
4848
// Cell (1) has data 1
4949
// Cell (2) has data 2
5050
// Cell (3) has data 3
51-
// Num of fragments after 2 writes before consolidate: 4
52-
// Num of fragments after consolidate: 4
53-
// Num of fragments after vacuum: 4
51+
// Num of fragments after 2 writes before consolidate: 5
52+
// Num of fragments after consolidate: 5
53+
// Num of fragments after vacuum: 5
5454
// Estimated query size in bytes for attribute 'a': 12
5555
// Estimated query size in bytes for dimension 'd': 12
5656
// Cell (1) has data 1

0 commit comments

Comments
 (0)