aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-kikimr-dev <robot-kikimr-dev@yandex-team.ru>2022-04-04 10:16:08 +0300
committerrobot-kikimr-dev <robot-kikimr-dev@yandex-team.ru>2022-04-04 10:16:08 +0300
commite2d6747a8f36c91154ad23ce60705fada6324929 (patch)
tree9a75d3510027b786cc3efb80ee3db94ebcb591a9
parente9119f45a4b7b3ed579046c25a34bd14a9ee515b (diff)
downloadydb-e2d6747a8f36c91154ad23ce60705fada6324929.tar.gz
Sync YDB SDK from github
Release YDB recipe binaries ref:61b5b21e656f820c4932aa88fb4ce07bb03d4b97
-rw-r--r--ydb/public/sdk/python/CHANGELOG.md5
-rw-r--r--ydb/public/sdk/python/examples/basic_example_v1/__main__.py2
-rw-r--r--ydb/public/sdk/python/examples/basic_example_v1/basic_example.py2
-rw-r--r--ydb/public/sdk/python/examples/pagination/__main__.py3
-rw-r--r--ydb/public/sdk/python/examples/pagination/pagination.py2
-rw-r--r--ydb/public/sdk/python/examples/secondary_indexes_builtin/__main__.py2
-rw-r--r--ydb/public/sdk/python/examples/ttl/__main__.py3
-rw-r--r--ydb/public/sdk/python/examples/ttl_readtable/__main__.py3
-rw-r--r--ydb/public/sdk/python/test-requirements.txt2
-rw-r--r--ydb/public/sdk/python/ydb/convert.py5
-rw-r--r--ydb/public/sdk/python/ydb/types.py15
-rw-r--r--ydb/public/sdk/python/ydb/ydb_version.py2
12 files changed, 34 insertions, 12 deletions
diff --git a/ydb/public/sdk/python/CHANGELOG.md b/ydb/public/sdk/python/CHANGELOG.md
index 841e4596bcb..16975ee4b01 100644
--- a/ydb/public/sdk/python/CHANGELOG.md
+++ b/ydb/public/sdk/python/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.2.0 ##
+
+* allow to refer endpoints by node id
+* support null type in queries
+
## 2.1.0 ##
* add compression support to ydb sdk
diff --git a/ydb/public/sdk/python/examples/basic_example_v1/__main__.py b/ydb/public/sdk/python/examples/basic_example_v1/__main__.py
index 233274ab077..e49a973ce0c 100644
--- a/ydb/public/sdk/python/examples/basic_example_v1/__main__.py
+++ b/ydb/public/sdk/python/examples/basic_example_v1/__main__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import argparse
-from . import basic_example
+import basic_example
import logging
diff --git a/ydb/public/sdk/python/examples/basic_example_v1/basic_example.py b/ydb/public/sdk/python/examples/basic_example_v1/basic_example.py
index 5845a18a2e0..c47e74dcaa8 100644
--- a/ydb/public/sdk/python/examples/basic_example_v1/basic_example.py
+++ b/ydb/public/sdk/python/examples/basic_example_v1/basic_example.py
@@ -2,7 +2,7 @@
import os
import ydb
-from . import basic_example_data
+import basic_example_data
FillDataQuery = """PRAGMA TablePathPrefix("{}");
diff --git a/ydb/public/sdk/python/examples/pagination/__main__.py b/ydb/public/sdk/python/examples/pagination/__main__.py
index 4ba805ddec9..117fa798938 100644
--- a/ydb/public/sdk/python/examples/pagination/__main__.py
+++ b/ydb/public/sdk/python/examples/pagination/__main__.py
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
import argparse
import os
-
-from . import pagination
+import pagination
if __name__ == "__main__":
diff --git a/ydb/public/sdk/python/examples/pagination/pagination.py b/ydb/public/sdk/python/examples/pagination/pagination.py
index e692da4f8e9..a59da090b85 100644
--- a/ydb/public/sdk/python/examples/pagination/pagination.py
+++ b/ydb/public/sdk/python/examples/pagination/pagination.py
@@ -4,7 +4,7 @@ import os
import ydb
from concurrent.futures import TimeoutError
-from . import sample_data
+import sample_data
class SchoolsPaginated(object):
diff --git a/ydb/public/sdk/python/examples/secondary_indexes_builtin/__main__.py b/ydb/public/sdk/python/examples/secondary_indexes_builtin/__main__.py
index ab3e40086f1..d982954ab42 100644
--- a/ydb/public/sdk/python/examples/secondary_indexes_builtin/__main__.py
+++ b/ydb/public/sdk/python/examples/secondary_indexes_builtin/__main__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import argparse
-from . import secondary_indexes_builtin
+import secondary_indexes_builtin
import logging
INTERESTING_TARGETS = [
diff --git a/ydb/public/sdk/python/examples/ttl/__main__.py b/ydb/public/sdk/python/examples/ttl/__main__.py
index 3d585628946..08582491973 100644
--- a/ydb/public/sdk/python/examples/ttl/__main__.py
+++ b/ydb/public/sdk/python/examples/ttl/__main__.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import argparse
-
-from . import ttl
+import ttl
if __name__ == "__main__":
diff --git a/ydb/public/sdk/python/examples/ttl_readtable/__main__.py b/ydb/public/sdk/python/examples/ttl_readtable/__main__.py
index 3d585628946..08582491973 100644
--- a/ydb/public/sdk/python/examples/ttl_readtable/__main__.py
+++ b/ydb/public/sdk/python/examples/ttl_readtable/__main__.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import argparse
-
-from . import ttl
+import ttl
if __name__ == "__main__":
diff --git a/ydb/public/sdk/python/test-requirements.txt b/ydb/public/sdk/python/test-requirements.txt
index ee7b7f8d875..1a8c3049747 100644
--- a/ydb/public/sdk/python/test-requirements.txt
+++ b/ydb/public/sdk/python/test-requirements.txt
@@ -16,7 +16,7 @@ importlib-metadata==4.6.1
iniconfig==1.1.1
jsonschema==3.2.0
packaging==21.0
-paramiko==2.7.2
+paramiko==2.10.1
pluggy==0.13.1
protobuf==3.17.3
py==1.10.0
diff --git a/ydb/public/sdk/python/ydb/convert.py b/ydb/public/sdk/python/ydb/convert.py
index 2be209bf1c6..2867f695b6d 100644
--- a/ydb/public/sdk/python/ydb/convert.py
+++ b/ydb/public/sdk/python/ydb/convert.py
@@ -256,10 +256,15 @@ def _primitive_type_to_native(type_pb):
return _primitive_type_by_id.get(type_pb.type_id)
+def _null_type_factory(type_pb):
+ return types.NullType()
+
+
_type_to_native_map = {
"optional_type": _optional_type_to_native,
"type_id": _primitive_type_to_native,
"decimal_type": _decimal_type_to_native,
+ "null_type": _null_type_factory,
}
diff --git a/ydb/public/sdk/python/ydb/types.py b/ydb/public/sdk/python/ydb/types.py
index 6ae09a5b421..1f40bb230c8 100644
--- a/ydb/public/sdk/python/ydb/types.py
+++ b/ydb/public/sdk/python/ydb/types.py
@@ -7,6 +7,7 @@ from . import _utilities, _apis
from datetime import date, datetime
import uuid
import struct
+from google.protobuf import struct_pb2
if six.PY3:
@@ -214,6 +215,20 @@ class DecimalType(AbstractTypeBuilder):
return "Decimal(%d,%d)" % (self._precision, self._scale)
+class NullType(AbstractTypeBuilder):
+ __slots__ = ("_repr", "_proto")
+
+ def __init__(self):
+ self._proto = _apis.ydb_value.Type(null_type=struct_pb2.NULL_VALUE)
+
+ @property
+ def proto(self):
+ return self._proto
+
+ def __str__(self):
+ return "NullType"
+
+
class OptionalType(AbstractTypeBuilder):
__slots__ = ("_repr", "_proto", "_item")
diff --git a/ydb/public/sdk/python/ydb/ydb_version.py b/ydb/public/sdk/python/ydb/ydb_version.py
index 5b0431ec5f5..3c00bb49aaa 100644
--- a/ydb/public/sdk/python/ydb/ydb_version.py
+++ b/ydb/public/sdk/python/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "2.1.1"
+VERSION = "2.2.0"