Skip to content

Commit 1154ce9

Browse files
Remove all deprecated APIs. (#5146)
[SC-50038](https://app.shortcut.com/tiledb-inc/story/50038/remove-deprecated-apis) Consistent with [the announcement made in 2.23.0's release notes](https://github.com/TileDB-Inc/TileDB/releases/tag/2.23.0), this PR removes all deprecated C and C++ APIs. The infrastructure supporting the `TILEDB_REMOVE_DEPRECATIONS` CMake option was kept, in case we want to deprecate another API in the future. --- TYPE: BREAKING_API DESC: All deprecated C and C++ APIs were removed.
1 parent 0b9b277 commit 1154ce9

28 files changed

+119
-3741
lines changed

test/src/cpp-integration-query-condition.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,7 @@ TEST_CASE(
15661566
subarray_w.add_range("d", range[0], range[1]);
15671567
query_w.set_subarray(subarray_w);
15681568
query_w.set_layout(TILEDB_ROW_MAJOR);
1569-
query_w.set_buffer("a", vals);
1569+
query_w.set_data_buffer("a", vals);
15701570
REQUIRE(query_w.submit() == Query::Status::COMPLETE);
15711571

15721572
// Write values from 3-6 as 7 in the array.
@@ -1577,7 +1577,7 @@ TEST_CASE(
15771577
subarray_w2.add_range("d", range2[0], range2[1]);
15781578
query_w2.set_subarray(subarray_w2);
15791579
query_w2.set_layout(TILEDB_ROW_MAJOR);
1580-
query_w2.set_buffer("a", vals2);
1580+
query_w2.set_data_buffer("a", vals2);
15811581
REQUIRE(query_w2.submit() == Query::Status::COMPLETE);
15821582

15831583
array.close();
@@ -1596,7 +1596,7 @@ TEST_CASE(
15961596
subarray_r.add_range("d", range[0], range[1]);
15971597
query_r.set_subarray(subarray_r);
15981598
query_r.set_layout(TILEDB_ROW_MAJOR);
1599-
query_r.set_buffer("a", vals_read);
1599+
query_r.set_data_buffer("a", vals_read);
16001600
query_r.set_condition(qc);
16011601
REQUIRE(query_r.submit() == Query::Status::COMPLETE);
16021602

@@ -1645,17 +1645,17 @@ TEST_CASE(
16451645
// Write all values as 3 in the array.
16461646
std::vector<int> vals = {3, 3, 3, 3, 3, 3, 3, 3, 3, 3};
16471647
Query query_w(ctx, array, TILEDB_WRITE);
1648-
query_w.set_buffer("d", dim_vals);
1649-
query_w.set_buffer("a", vals);
1650-
query_w.set_buffer("a2", vals);
1648+
query_w.set_data_buffer("d", dim_vals);
1649+
query_w.set_data_buffer("a", vals);
1650+
query_w.set_data_buffer("a2", vals);
16511651
REQUIRE(query_w.submit() == Query::Status::COMPLETE);
16521652

16531653
// Write values from 1-10 as 7 in the array.
16541654
std::vector<int> vals2 = {7, 7, 7, 7, 7, 7, 7, 7, 7, 6};
16551655
Query query_w2(ctx, array, TILEDB_WRITE);
1656-
query_w2.set_buffer("d", dim_vals);
1657-
query_w2.set_buffer("a", vals2);
1658-
query_w2.set_buffer("a2", vals);
1656+
query_w2.set_data_buffer("d", dim_vals);
1657+
query_w2.set_data_buffer("a", vals2);
1658+
query_w2.set_data_buffer("a2", vals);
16591659
REQUIRE(query_w2.submit() == Query::Status::COMPLETE);
16601660

16611661
array.close();
@@ -1673,9 +1673,9 @@ TEST_CASE(
16731673
std::vector<int> dim_vals_read(10);
16741674
Query query_r(ctx, array_r, TILEDB_READ);
16751675
query_r.set_layout(TILEDB_GLOBAL_ORDER);
1676-
query_r.set_buffer("a", vals_read);
1677-
query_r.set_buffer("a2", vals_read2);
1678-
query_r.set_buffer("d", dim_vals_read);
1676+
query_r.set_data_buffer("a", vals_read);
1677+
query_r.set_data_buffer("a2", vals_read2);
1678+
query_r.set_data_buffer("d", dim_vals_read);
16791679
query_r.set_condition(qc);
16801680
REQUIRE(query_r.submit() == Query::Status::COMPLETE);
16811681

test/src/unit-arrow.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ void allocate_query_buffers(tiledb::Query* const query) {
166166

167167
bool has_ranges = false;
168168
for (uint64_t dim_idx = 0; dim_idx < schema.domain().ndim(); dim_idx++) {
169-
if (query->range_num(dim_idx) > 0) {
169+
Subarray subarray(query->ctx(), query->array());
170+
query->update_subarray_from_query(&subarray);
171+
if (subarray.range_num(dim_idx) > 0) {
170172
has_ranges = true;
171173
break;
172174
}

test/src/unit-backwards_compat.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void set_query_coords(
8383
Subarray sub(ctx, *array);
8484
sub.set_subarray<T>(static_cast<T*>(subarray), 2 * ndim);
8585

86-
query->set_coordinates<T>(static_cast<T*>(*coordinates), ndim);
86+
query->set_data_buffer<T>("__coords", static_cast<T*>(*coordinates), ndim);
8787
query->set_subarray(sub);
8888

8989
std::free(subarray);
@@ -136,8 +136,9 @@ void set_query_var_dimension_buffer(
136136

137137
memset(*offsets, 0, sizeof(uint64_t));
138138
memset(*buffer, 0, buffer_size);
139-
query->set_buffer<T>(
140-
dimension.name(), *offsets, 1, static_cast<T*>(*buffer), buffer_size);
139+
query->set_data_buffer<T>(
140+
dimension.name(), static_cast<T*>(*buffer), buffer_size);
141+
query->set_offsets_buffer(dimension.name(), *offsets, 1);
141142
subarray->add_range(dim_idx, std::string("1"), std::string("1"));
142143
}
143144

@@ -208,7 +209,7 @@ TEST_CASE(
208209
query_r.set_subarray(sub)
209210
.set_layout(TILEDB_ROW_MAJOR)
210211
.set_data_buffer("a", a_read)
211-
.set_coordinates(coords_read);
212+
.set_data_buffer("__coords", coords_read);
212213
query_r.submit();
213214

214215
// Note: If you encounter a failure here, in particular with a_read[0] == 100
@@ -720,7 +721,7 @@ TEST_CASE(
720721
Query query_w(ctx, old_array);
721722
query_w.set_layout(TILEDB_UNORDERED)
722723
.set_data_buffer("a", a_write)
723-
.set_coordinates(coords_write);
724+
.set_data_buffer("__coords", coords_write);
724725
query_w.submit();
725726
old_array.close();
726727

@@ -736,7 +737,7 @@ TEST_CASE(
736737
query_r.set_subarray(subarray_r)
737738
.set_layout(TILEDB_ROW_MAJOR)
738739
.set_data_buffer("a", a_read)
739-
.set_coordinates(coords_read);
740+
.set_data_buffer("__coords", coords_read);
740741
query_r.submit();
741742
array.close();
742743

test/src/unit-capi-serialized_queries.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ TEST_CASE_METHOD(
704704
Subarray cppapi_subarray(ctx, array);
705705
cppapi_subarray.set_subarray(subarray);
706706
query.set_subarray(cppapi_subarray);
707-
query.set_coordinates(coords);
707+
query.set_data_buffer("__coords", coords);
708708
query.set_data_buffer("a1", a1);
709709
query.set_data_buffer("a2", a2);
710710
query.set_validity_buffer("a2", a2_nullable);

test/src/unit-cppapi-checksum.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static void run_checksum_test(tiledb_filter_type_t filter_type) {
9494
query.set_data_buffer("a1", a1_data)
9595
.set_data_buffer("a2", a2buf.second)
9696
.set_offsets_buffer("a2", a2buf.first)
97-
.set_coordinates(coords)
97+
.set_data_buffer("__coords", coords)
9898
.set_layout(TILEDB_UNORDERED);
9999
REQUIRE(query.submit() == Query::Status::COMPLETE);
100100

test/src/unit-cppapi-consolidation-with-timestamps.cc

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,11 @@ void ConsolidationWithTimestampsFx::write_sparse(
167167
std::vector<uint64_t> dim2,
168168
uint64_t timestamp) {
169169
// Open array.
170-
Array array(ctx_, SPARSE_ARRAY_NAME, TILEDB_WRITE, timestamp);
170+
Array array(
171+
ctx_,
172+
SPARSE_ARRAY_NAME,
173+
TILEDB_WRITE,
174+
tiledb::TemporalPolicy(tiledb::TimeTravel, timestamp));
171175

172176
// Create query.
173177
Query query(ctx_, array, TILEDB_WRITE);
@@ -193,7 +197,11 @@ void ConsolidationWithTimestampsFx::write_sparse_v11(uint64_t timestamp) {
193197
std::vector<uint64_t> buffer_coords_dim2{1, 2, 4, 3};
194198

195199
// Open array.
196-
Array array(ctx_, SPARSE_ARRAY_NAME, TILEDB_WRITE, timestamp);
200+
Array array(
201+
ctx_,
202+
SPARSE_ARRAY_NAME,
203+
TILEDB_WRITE,
204+
tiledb::TemporalPolicy(tiledb::TimeTravel, timestamp));
197205

198206
// Create query.
199207
Query query(ctx_, array, TILEDB_WRITE);
@@ -290,7 +298,11 @@ void ConsolidationWithTimestampsFx::read_sparse(
290298
uint64_t timestamp,
291299
std::vector<uint64_t>* timestamps_ptr) {
292300
// Open array.
293-
Array array(ctx_, SPARSE_ARRAY_NAME, TILEDB_READ, timestamp);
301+
Array array(
302+
ctx_,
303+
SPARSE_ARRAY_NAME,
304+
TILEDB_READ,
305+
tiledb::TemporalPolicy(tiledb::TimeTravel, timestamp));
294306

295307
// Create query.
296308
Query query(ctx_, array, TILEDB_READ);

test/src/unit-cppapi-datetimes.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ TEST_CASE("C++ API: Datetime attribute", "[cppapi][datetime]") {
6464
Query query_w(ctx, array_w);
6565
query_w.set_layout(TILEDB_UNORDERED)
6666
.set_data_buffer("a", data_w)
67-
.set_coordinates(coords_w)
67+
.set_data_buffer("__coords", coords_w)
6868
.submit();
6969
query_w.finalize();
7070
array_w.close();
@@ -76,7 +76,7 @@ TEST_CASE("C++ API: Datetime attribute", "[cppapi][datetime]") {
7676
Query query_r(ctx, array_r);
7777
query_r.set_layout(TILEDB_ROW_MAJOR)
7878
.set_data_buffer("a", data_r)
79-
.set_coordinates(coords_r);
79+
.set_data_buffer("__coords", coords_r);
8080
REQUIRE(query_r.submit() == Query::Status::COMPLETE);
8181

8282
auto result_num = query_r.result_buffer_elements()["a"].second;
@@ -118,7 +118,7 @@ TEST_CASE("C++ API: Datetime dimension", "[cppapi][datetime]") {
118118
Query query_w(ctx, array_w);
119119
query_w.set_layout(TILEDB_UNORDERED)
120120
.set_data_buffer("a", data_w)
121-
.set_coordinates(coords_w)
121+
.set_data_buffer("__coords", coords_w)
122122
.submit();
123123
query_w.finalize();
124124
array_w.close();

test/src/unit-cppapi-deletes.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ void DeletesFx::write_sparse_v11(uint64_t timestamp) {
271271
std::vector<uint64_t> buffer_coords_dim2{1, 2, 4, 3};
272272

273273
// Open array.
274-
Array array(ctx_, array_name_.c_str(), TILEDB_WRITE, timestamp);
274+
Array array(
275+
ctx_,
276+
array_name_.c_str(),
277+
TILEDB_WRITE,
278+
tiledb::TemporalPolicy(tiledb::TimeTravel, timestamp));
275279

276280
// Create query.
277281
Query query(ctx_, array, TILEDB_WRITE);

test/src/unit-cppapi-filter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ TEST_CASE(
195195
query.set_data_buffer("a1", a1_data)
196196
.set_data_buffer("a2", a2buf.second)
197197
.set_offsets_buffer("a2", a2buf.first)
198-
.set_coordinates(coords)
198+
.set_data_buffer("__coords", coords)
199199
.set_layout(TILEDB_UNORDERED);
200200
REQUIRE(query.submit() == Query::Status::COMPLETE);
201201
array.close();

test/src/unit-cppapi-metadata.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,11 @@ TEST_CASE_METHOD(
313313

314314
// Create and open array in write mode
315315
tiledb::Context ctx;
316-
tiledb::Array array(ctx, std::string(array_name_), TILEDB_WRITE, 1);
316+
tiledb::Array array(
317+
ctx,
318+
std::string(array_name_),
319+
TILEDB_WRITE,
320+
tiledb::TemporalPolicy(tiledb::TimeTravel, 1));
317321

318322
// Write items
319323
int32_t v = 5;

0 commit comments

Comments
 (0)