Skip to content

Commit

Permalink
fix a bad rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnkerl
johnkerl committed Sep 30, 2024
1 parent 7fad794 commit e55735b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 26 deletions.
10 changes: 2 additions & 8 deletions libtiledbsoma/src/soma/soma_array.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@ void SOMAArray::_set_current_domain_from_shape(
schema_evolution.array_evolve(uri_);
}

void SOMAArray::maybe_resize_soma_joinid(const std::vector<int64_t>& newshape) {
void SOMAArray::resize_soma_joinid(int64_t newshape) {
if (mq_->query_type() != TILEDB_WRITE) {
throw TileDBSOMAError(
"[SOMAArray::resize] array must be opened in write mode");
Expand All @@ -1480,12 +1480,6 @@ void SOMAArray::maybe_resize_soma_joinid(const std::vector<int64_t>& newshape) {
ArraySchema schema = arr_->schema();
Domain domain = schema.domain();
unsigned ndim = domain.ndim();
if (newshape.size() != 1) {
throw TileDBSOMAError(fmt::format(
"[SOMAArray::resize]: newshape has dimension count {}; needed 1",
newshape.size(),
ndim));
}

auto tctx = ctx_->tiledb_ctx();
CurrentDomain old_current_domain = ArraySchemaExperimental::current_domain(
Expand All @@ -1498,7 +1492,7 @@ void SOMAArray::maybe_resize_soma_joinid(const std::vector<int64_t>& newshape) {
for (unsigned i = 0; i < ndim; i++) {
if (domain.dimension(i).name() == "soma_joinid") {
ndrect.set_range<int64_t>(
domain.dimension(i).name(), 0, newshape[0] - 1);
domain.dimension(i).name(), 0, newshape - 1);
}
}

Expand Down
2 changes: 1 addition & 1 deletion libtiledbsoma/src/soma/soma_array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ class SOMAArray : public SOMAObject {
* @return Throws if the requested shape exceeds the array's create-time
* maxshape. Throws if the array does not have current-domain support.
*/
void maybe_resize_soma_joinid(const std::vector<int64_t>& newshape);
void resize_soma_joinid(int64_t newshape);

protected:
// These two are for use nominally by SOMADataFrame. This could be moved in
Expand Down
34 changes: 17 additions & 17 deletions libtiledbsoma/test/unit_soma_dataframe.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ TEST_CASE_METHOD(
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
soma_dataframe->maybe_resize_soma_joinid(std::vector<int64_t>({new_max}));
soma_dataframe->resize_soma_joinid(int64_t{new_max});
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
Expand Down Expand Up @@ -588,7 +588,7 @@ TEST_CASE_METHOD(
REQUIRE(soma_dataframe->nnz() == 4);

// Resize
auto new_shape = std::vector<int64_t>({SOMA_JOINID_RESIZE_DIM_MAX + 1});
auto new_shape = int64_t{SOMA_JOINID_RESIZE_DIM_MAX + 1};

if (!use_current_domain) {
// Domain is already set. The domain (not current domain but domain)
Expand All @@ -599,7 +599,7 @@ TEST_CASE_METHOD(

soma_dataframe = open(OpenMode::write);
// Array not resizeable if it has not already been sized
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

} else {
Expand All @@ -617,11 +617,11 @@ TEST_CASE_METHOD(
soma_dataframe->close();

soma_dataframe = open(OpenMode::read);
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
soma_dataframe->maybe_resize_soma_joinid(new_shape);
soma_dataframe->resize_soma_joinid(new_shape);
soma_dataframe->close();

// Check shape after resize
Expand Down Expand Up @@ -784,7 +784,7 @@ TEST_CASE_METHOD(
soma_dataframe->close();

// Resize
auto new_shape = std::vector<int64_t>({SOMA_JOINID_RESIZE_DIM_MAX + 1});
auto new_shape = int64_t{SOMA_JOINID_RESIZE_DIM_MAX + 1};

if (!use_current_domain) {
// Domain is already set. The domain (not current domain but domain)
Expand All @@ -795,7 +795,7 @@ TEST_CASE_METHOD(

soma_dataframe = open(OpenMode::write);
// Array not resizeable if it has not already been sized
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

} else {
Expand All @@ -812,11 +812,11 @@ TEST_CASE_METHOD(
soma_dataframe->close();

soma_dataframe = open(OpenMode::read);
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
soma_dataframe->maybe_resize_soma_joinid(new_shape);
soma_dataframe->resize_soma_joinid(new_shape);
soma_dataframe->close();

// Check shape after resize
Expand Down Expand Up @@ -1016,7 +1016,7 @@ TEST_CASE_METHOD(
soma_dataframe->close();

// Resize
auto new_shape = std::vector<int64_t>({SOMA_JOINID_RESIZE_DIM_MAX + 1});
auto new_shape = int64_t{SOMA_JOINID_RESIZE_DIM_MAX + 1};

if (!use_current_domain) {
// Domain is already set. The domain (not current domain but domain)
Expand All @@ -1027,7 +1027,7 @@ TEST_CASE_METHOD(

soma_dataframe = open(OpenMode::write);
// Array not resizeable if it has not already been sized
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

} else {
Expand All @@ -1044,11 +1044,11 @@ TEST_CASE_METHOD(
soma_dataframe->close();

soma_dataframe = open(OpenMode::read);
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
soma_dataframe->maybe_resize_soma_joinid(new_shape);
soma_dataframe->resize_soma_joinid(new_shape);
soma_dataframe->close();

// Check shape after resize
Expand Down Expand Up @@ -1229,7 +1229,7 @@ TEST_CASE_METHOD(
soma_dataframe->close();

// Resize
auto new_shape = std::vector<int64_t>({SOMA_JOINID_RESIZE_DIM_MAX + 1});
auto new_shape = int64_t{SOMA_JOINID_RESIZE_DIM_MAX + 1};

if (!use_current_domain) {
// Domain is already set. The domain (not current domain but domain)
Expand All @@ -1240,7 +1240,7 @@ TEST_CASE_METHOD(

soma_dataframe = open(OpenMode::write);
// Array not resizeable if it has not already been sized
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

} else {
Expand All @@ -1252,11 +1252,11 @@ TEST_CASE_METHOD(
soma_dataframe->close();

soma_dataframe = open(OpenMode::read);
REQUIRE_THROWS(soma_dataframe->maybe_resize_soma_joinid(new_shape));
REQUIRE_THROWS(soma_dataframe->resize_soma_joinid(new_shape));
soma_dataframe->close();

soma_dataframe = open(OpenMode::write);
soma_dataframe->maybe_resize_soma_joinid(new_shape);
soma_dataframe->resize_soma_joinid(new_shape);
soma_dataframe->close();

// Check shape after resize -- noting soma_joinid is not a dim here
Expand Down

0 comments on commit e55735b

Please sign in to comment.