Skip to content

Commit

Permalink
Rebase on dev
Browse files Browse the repository at this point in the history
  • Loading branch information
bekadavis9 committed Aug 12, 2022
1 parent 8bbe168 commit 6c1f9af
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
6 changes: 3 additions & 3 deletions tiledb/sm/array/array.cc
Expand Up @@ -229,19 +229,19 @@ Status Array::delete_fragments(
// Check that query type is WRITE_EXCLUSIVE
if (query_type_ != QueryType::WRITE_EXCLUSIVE) {
return LOG_STATUS(Status_ArrayError(
"Cannot delete fragments; Query type must be WRITE_EXCLUSIVE"));
"[Array::delete_fragments] Query type must be WRITE_EXCLUSIVE"));
}

// Check that array is open
if (!is_open() && !controller().is_open(uri)) {
return LOG_STATUS(
Status_ArrayError("Cannot delete fragments; Array is closed"));
Status_ArrayError("[Array::delete_fragments] Array is closed"));
}

// Check that array is not in the process of opening or closing
if (is_opening_or_closing_) {
return LOG_STATUS(Status_ArrayError(
"Cannot delete fragments; "
"[Array::delete_fragments] "
"May not perform simultaneous open or close operations."));
}

Expand Down
8 changes: 0 additions & 8 deletions tiledb/sm/consolidator/fragment_consolidator.cc
Expand Up @@ -317,14 +317,6 @@ Status FragmentConsolidator::vacuum(
return LOG_STATUS(Status_ArrayDirectoryError(le.what()));
}

auto array_dir = ArrayDirectory(
vfs,
compute_tp,
URI(array_name),
0,
std::numeric_limits<uint64_t>::max(),
ArrayDirectoryMode::VACUUM_FRAGMENTS);

auto filtered_fragment_uris = array_dir.filtered_fragment_uris(true);
const auto& fragment_uris_to_vacuum =
filtered_fragment_uris.fragment_uris_to_vacuum();
Expand Down
6 changes: 3 additions & 3 deletions tiledb/sm/query/query.cc
Expand Up @@ -1121,7 +1121,7 @@ Status Query::disable_checks_consolidation() {
"Cannot disable checks for consolidation after initialization"));
}

if (type_ != QueryType::WRITE) {
if (type_ != QueryType::WRITE && type_ != QueryType::WRITE_EXCLUSIVE) {
return logger_->status(Status_QueryError(
"Cannot disable checks for consolidation; Applicable only to writes"));
}
Expand Down Expand Up @@ -1152,7 +1152,7 @@ void Query::set_processed_conditions(
}

Status Query::check_buffer_names() {
if (type_ == QueryType::WRITE) {
if (type_ == QueryType::WRITE || type_ == QueryType::WRITE_EXCLUSIVE) {
// If the array is sparse, the coordinates must be provided
if (!array_schema_->dense() && !coords_info_.has_coords_)
return logger_->status(Status_WriterError(
Expand Down Expand Up @@ -1187,7 +1187,7 @@ Status Query::check_buffer_names() {
}

Status Query::create_strategy(bool skip_checks_serialization) {
if (type_ == QueryType::WRITE) {
if (type_ == QueryType::WRITE || type_ == QueryType::WRITE_EXCLUSIVE) {
if (layout_ == Layout::COL_MAJOR || layout_ == Layout::ROW_MAJOR) {
strategy_ = tdb_unique_ptr<IQueryStrategy>(tdb_new(
OrderedWriter,
Expand Down

0 comments on commit 6c1f9af

Please sign in to comment.