Skip to content

add unknown item type to scheme ls #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Support `TYPE_UNSPECIFIED` item type to scheme ls

## 2.12.0 ##
* Fixed error message while get token from metadata with asyncio iam
* Add `SnapshotReadOnly` transaction mode support to `session.transaction`
Expand Down
15 changes: 9 additions & 6 deletions ydb/scheme.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class SchemeEntryType(enum.IntEnum):
Enumerates all available entry types.
"""

TYPE_UNSPECIFIED = 0
DIRECTORY = 1
TABLE = 2
PERS_QUEUE_GROUP = 3
Expand All @@ -24,6 +25,10 @@ class SchemeEntryType(enum.IntEnum):
REPLICATION = 16
TOPIC = 17

@classmethod
def _missing_(cls, value):
return cls.TYPE_UNSPECIFIED

@staticmethod
def is_table(entry):
"""
Expand Down Expand Up @@ -299,7 +304,7 @@ def _wrap_scheme_entry(entry_pb, scheme_entry_cls=None, *args, **kwargs):
return scheme_entry_cls(
entry_pb.name,
entry_pb.owner,
getattr(SchemeEntryType, _apis.ydb_scheme.Entry.Type.Name(entry_pb.type)),
SchemeEntryType(entry_pb.type),
_wrap_permissions(entry_pb.effective_permissions),
_wrap_permissions(entry_pb.permissions),
entry_pb.size_bytes,
Expand All @@ -318,7 +323,7 @@ def _wrap_list_directory_response(rpc_state, response):
message = _apis.ydb_scheme.ListDirectoryResult()
response.operation.result.Unpack(message)
children = []
supported_items = set([i.value for i in SchemeEntryType])
supported_items = set(i.value for i in SchemeEntryType)
for children_item in message.children:
if children_item.type not in supported_items:
continue
Expand All @@ -328,12 +333,10 @@ def _wrap_list_directory_response(rpc_state, response):
return Directory(
message.self.name,
message.self.owner,
getattr(SchemeEntryType, _apis.ydb_scheme.Entry.Type.Name(message.self.type)),
SchemeEntryType(message.self.type),
_wrap_permissions(message.self.effective_permissions),
_wrap_permissions(message.self.permissions),
tuple(
children,
),
tuple(children),
)


Expand Down
30 changes: 30 additions & 0 deletions ydb/scheme_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from ydb.scheme import (
SchemeEntryType,
_wrap_scheme_entry,
_wrap_list_directory_response,
)
from ydb._apis import ydb_scheme


def test_wrap_scheme_entry():
assert (
_wrap_scheme_entry(ydb_scheme.Entry(type=1)).type is SchemeEntryType.DIRECTORY
)
assert _wrap_scheme_entry(ydb_scheme.Entry(type=17)).type is SchemeEntryType.TOPIC

assert (
_wrap_scheme_entry(ydb_scheme.Entry()).type is SchemeEntryType.TYPE_UNSPECIFIED
)
assert (
_wrap_scheme_entry(ydb_scheme.Entry(type=10)).type
is SchemeEntryType.TYPE_UNSPECIFIED
)
assert (
_wrap_scheme_entry(ydb_scheme.Entry(type=1001)).type
is SchemeEntryType.TYPE_UNSPECIFIED
)


def test_wrap_list_directory_response():
d = _wrap_list_directory_response(None, ydb_scheme.ListDirectoryResponse())
assert d.type is SchemeEntryType.TYPE_UNSPECIFIED