Skip to content

Commit 038d8bb

Browse files
Stop recognizing sm.use_refactored_readers config option. (#5183)
[SC-50445](https://app.shortcut.com/tiledb-inc/story/50445/remove-sm-use-refactored-readers-config-option) This option has been deprecated and undocumented for a while and a warning was emitted if it is used. This PR removes all mentions of it from the codebase. --- TYPE: CONFIG DESC: The `sm.use_refactored_readers` config option is no longer recognized. Refactored readers are used by default. To use the legacy reader, set the `sm.query_(dense|sparse_global_order|sparse_unordered_with_dups)_reader` config option (depending on the reader you are using) to `legacy`.
1 parent 63d88a7 commit 038d8bb

File tree

2 files changed

+12
-48
lines changed

2 files changed

+12
-48
lines changed

tiledb/sm/query/query.cc

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,20 +1697,9 @@ bool Query::use_refactored_dense_reader(
16971697
return false;
16981698
}
16991699

1700-
// First check for legacy option
1701-
throw_if_not_ok(config_.get<bool>(
1702-
"sm.use_refactored_readers", &use_refactored_reader, &found));
1703-
// If the legacy/deprecated option is set use it over the new parameters
1704-
// This facilitates backwards compatibility
1705-
if (found) {
1706-
logger_->warn(
1707-
"sm.use_refactored_readers config option is deprecated.\nPlease use "
1708-
"'sm.query.dense.reader' with value of 'refactored' or 'legacy'");
1709-
} else {
1710-
const std::string& val = config_.get("sm.query.dense.reader", &found);
1711-
assert(found);
1712-
use_refactored_reader = val == "refactored";
1713-
}
1700+
const std::string& val = config_.get("sm.query.dense.reader", &found);
1701+
assert(found);
1702+
use_refactored_reader = val == "refactored";
17141703

17151704
return use_refactored_reader && array_schema.dense() && all_dense;
17161705
}
@@ -1725,22 +1714,10 @@ bool Query::use_refactored_sparse_global_order_reader(
17251714
return false;
17261715
}
17271716

1728-
// First check for legacy option
1729-
throw_if_not_ok(config_.get<bool>(
1730-
"sm.use_refactored_readers", &use_refactored_reader, &found));
1731-
// If the legacy/deprecated option is set use it over the new parameters
1732-
// This facilitates backwards compatibility
1733-
if (found) {
1734-
logger_->warn(
1735-
"sm.use_refactored_readers config option is deprecated.\nPlease use "
1736-
"'sm.query.sparse_global_order.reader' with value of 'refactored' or "
1737-
"'legacy'");
1738-
} else {
1739-
const std::string& val =
1740-
config_.get("sm.query.sparse_global_order.reader", &found);
1741-
assert(found);
1742-
use_refactored_reader = val == "refactored";
1743-
}
1717+
const std::string& val =
1718+
config_.get("sm.query.sparse_global_order.reader", &found);
1719+
assert(found);
1720+
use_refactored_reader = val == "refactored";
17441721
return use_refactored_reader && !array_schema.dense() &&
17451722
(layout == Layout::GLOBAL_ORDER || layout == Layout::UNORDERED);
17461723
}
@@ -1755,22 +1732,10 @@ bool Query::use_refactored_sparse_unordered_with_dups_reader(
17551732
return false;
17561733
}
17571734

1758-
// First check for legacy option
1759-
throw_if_not_ok(config_.get<bool>(
1760-
"sm.use_refactored_readers", &use_refactored_reader, &found));
1761-
// If the legacy/deprecated option is set use it over the new parameters
1762-
// This facilitates backwards compatibility
1763-
if (found) {
1764-
logger_->warn(
1765-
"sm.use_refactored_readers config option is deprecated.\nPlease use "
1766-
"'sm.query.sparse_unordered_with_dups.reader' with value of "
1767-
"'refactored' or 'legacy'");
1768-
} else {
1769-
const std::string& val =
1770-
config_.get("sm.query.sparse_unordered_with_dups.reader", &found);
1771-
assert(found);
1772-
use_refactored_reader = val == "refactored";
1773-
}
1735+
const std::string& val =
1736+
config_.get("sm.query.sparse_unordered_with_dups.reader", &found);
1737+
assert(found);
1738+
use_refactored_reader = val == "refactored";
17741739

17751740
return use_refactored_reader && !array_schema.dense() &&
17761741
layout == Layout::UNORDERED && array_schema.allows_dups();

tiledb/sm/serialization/config.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ Status config_from_capnp(
8484
auto key = std::string_view{kv.getKey().cStr(), kv.getKey().size()};
8585
auto value = std::string_view{kv.getValue().cStr(), kv.getValue().size()};
8686
RETURN_NOT_OK((*config)->set(std::string{key}, std::string{value}));
87-
if (key == "sm.use_refactored_readers" ||
88-
key == "sm.query.dense.reader" ||
87+
if (key == "sm.query.dense.reader" ||
8988
key == "sm.query.sparse_global_order.reader" ||
9089
key == "sm.query.sparse_unordered_with_dups.reader")
9190
found_refactored_reader_config = true;

0 commit comments

Comments
 (0)