Skip to content

Commit 4463c40

Browse files
committed
address feedback
1 parent c2cd487 commit 4463c40

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

pyiceberg/catalog/rest/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class IdentifierKind(Enum):
133133
AUTH = "auth"
134134
CUSTOM = "custom"
135135
REST_SCAN_PLANNING_ENABLED = "rest-scan-planning-enabled"
136+
REST_SCAN_PLANNING_ENABLED_DEFAULT = False
136137

137138
NAMESPACE_SEPARATOR = b"\x1f".decode(UTF8)
138139

@@ -272,13 +273,13 @@ def _create_session(self) -> Session:
272273

273274
return session
274275

275-
def is_scan_planning_enabled(self) -> bool:
276-
"""Check if server-side scan planning is enabled.
276+
def is_rest_scan_planning_enabled(self) -> bool:
277+
"""Check if rest server-side scan planning is enabled.
277278
278279
Returns:
279280
True if enabled, False otherwise.
280281
"""
281-
return property_as_bool(self.properties, REST_SCAN_PLANNING_ENABLED, False)
282+
return property_as_bool(self.properties, REST_SCAN_PLANNING_ENABLED, REST_SCAN_PLANNING_ENABLED_DEFAULT)
282283

283284
def _create_legacy_oauth2_auth_manager(self, session: Session) -> AuthManager:
284285
"""Create the LegacyOAuth2AuthManager by fetching required properties.

tests/catalog/test_rest.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,17 +1994,17 @@ def test_rest_catalog_context_manager_with_exception_sigv4(self, rest_mock: Mock
19941994
assert catalog is not None and hasattr(catalog, "_session")
19951995
assert len(catalog._session.adapters) == self.EXPECTED_ADAPTERS_SIGV4
19961996

1997-
def test_scan_planning_disabled_by_default(self, rest_mock: Mocker) -> None:
1997+
def test_rest_scan_planning_disabled_by_default(self, rest_mock: Mocker) -> None:
19981998
rest_mock.get(
19991999
f"{TEST_URI}v1/config",
20002000
json={"defaults": {}, "overrides": {}},
20012001
status_code=200,
20022002
)
20032003
catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN)
20042004

2005-
assert catalog.is_scan_planning_enabled() is False
2005+
assert catalog.is_rest_scan_planning_enabled() is False
20062006

2007-
def test_scan_planning_enabled_by_property(self, rest_mock: Mocker) -> None:
2007+
def test_rest_scan_planning_enabled_by_property(self, rest_mock: Mocker) -> None:
20082008
rest_mock.get(
20092009
f"{TEST_URI}v1/config",
20102010
json={"defaults": {}, "overrides": {}},
@@ -2017,9 +2017,9 @@ def test_scan_planning_enabled_by_property(self, rest_mock: Mocker) -> None:
20172017
**{"rest-scan-planning-enabled": "true"},
20182018
)
20192019

2020-
assert catalog.is_scan_planning_enabled() is True
2020+
assert catalog.is_rest_scan_planning_enabled() is True
20212021

2022-
def test_scan_planning_explicitly_disabled(self, rest_mock: Mocker) -> None:
2022+
def test_rest_scan_planning_explicitly_disabled(self, rest_mock: Mocker) -> None:
20232023
rest_mock.get(
20242024
f"{TEST_URI}v1/config",
20252025
json={"defaults": {}, "overrides": {}},
@@ -2029,17 +2029,17 @@ def test_scan_planning_explicitly_disabled(self, rest_mock: Mocker) -> None:
20292029
"rest",
20302030
uri=TEST_URI,
20312031
token=TEST_TOKEN,
2032-
**{"rest.scan-planning.enabled": "false"},
2032+
**{"rest-scan-planning-enabled": "false"},
20332033
)
20342034

2035-
assert catalog.is_scan_planning_enabled() is False
2035+
assert catalog.is_rest_scan_planning_enabled() is False
20362036

2037-
def test_scan_planning_enabled_from_server_config(self, rest_mock: Mocker) -> None:
2037+
def test_rest_scan_planning_enabled_from_server_config(self, rest_mock: Mocker) -> None:
20382038
rest_mock.get(
20392039
f"{TEST_URI}v1/config",
20402040
json={"defaults": {"rest-scan-planning-enabled": "true"}, "overrides": {}},
20412041
status_code=200,
20422042
)
20432043
catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN)
20442044

2045-
assert catalog.is_scan_planning_enabled() is True
2045+
assert catalog.is_rest_scan_planning_enabled() is True

0 commit comments

Comments
 (0)