Skip to content

Commit dd18016

Browse files
Remove extraneous StorageManager objects from serialization (#5141)
This PR removes the last occurrence of `StorageManager` from serialization code. --- TYPE: NO_HISTORY DESC: Remove extraneous StorageManager objects from serialization
1 parent e4035af commit dd18016

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

tiledb/sm/c_api/tiledb.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3777,7 +3777,7 @@ int32_t tiledb_deserialize_query_and_array(
37773777
buffer->buffer(),
37783778
(tiledb::sm::SerializationType)serialize_type,
37793779
*(*array)->array_,
3780-
ctx->storage_manager(),
3780+
ctx->resources(),
37813781
memory_tracker));
37823782

37833783
// Create query struct

tiledb/sm/serialization/query.cc

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,7 @@ Status array_from_query_deserialize(
22802280
const Buffer& serialized_buffer,
22812281
SerializationType serialize_type,
22822282
Array& array,
2283-
StorageManager* storage_manager,
2283+
ContextResources& resources,
22842284
shared_ptr<MemoryTracker> memory_tracker) {
22852285
try {
22862286
switch (serialize_type) {
@@ -2296,11 +2296,7 @@ Status array_from_query_deserialize(
22962296
capnp::Query::Reader query_reader = query_builder.asReader();
22972297
// Deserialize array instance.
22982298
array_from_capnp(
2299-
query_reader.getArray(),
2300-
storage_manager->resources(),
2301-
&array,
2302-
false,
2303-
memory_tracker);
2299+
query_reader.getArray(), resources, &array, false, memory_tracker);
23042300
break;
23052301
}
23062302
case SerializationType::CAPNP: {
@@ -2310,8 +2306,7 @@ Status array_from_query_deserialize(
23102306
"Could not deserialize query; buffer is not 8-byte aligned."));
23112307

23122308
// Set traversal limit from config
2313-
uint64_t limit = storage_manager->resources()
2314-
.config()
2309+
uint64_t limit = resources.config()
23152310
.get<uint64_t>("rest.capnp_traversal_limit")
23162311
.value();
23172312
::capnp::ReaderOptions readerOptions;
@@ -2329,11 +2324,7 @@ Status array_from_query_deserialize(
23292324
capnp::Query::Reader query_reader = reader.getRoot<capnp::Query>();
23302325
// Deserialize array instance.
23312326
array_from_capnp(
2332-
query_reader.getArray(),
2333-
storage_manager->resources(),
2334-
&array,
2335-
false,
2336-
memory_tracker);
2327+
query_reader.getArray(), resources, &array, false, memory_tracker);
23372328
break;
23382329
}
23392330
default:
@@ -3198,7 +3189,7 @@ Status array_from_query_deserialize(
31983189
const Buffer&,
31993190
SerializationType,
32003191
Array&,
3201-
StorageManager*,
3192+
ContextResources&,
32023193
shared_ptr<MemoryTracker>) {
32033194
return LOG_STATUS(Status_SerializationError(
32043195
"Cannot deserialize; serialization not enabled."));

tiledb/sm/serialization/query.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace tiledb::sm {
5252
class Array;
5353
class Buffer;
5454
class BufferList;
55+
class ContextResources;
5556
class Query;
5657
class GlobalOrderWriter;
5758
class UnorderedWriter;
@@ -142,7 +143,7 @@ Status array_from_query_deserialize(
142143
const Buffer& serialized_buffer,
143144
SerializationType serialize_type,
144145
Array& array,
145-
StorageManager* storage_manager,
146+
ContextResources& resources,
146147
shared_ptr<MemoryTracker> memory_tracker);
147148

148149
/**

0 commit comments

Comments
 (0)