aboutsummaryrefslogtreecommitdiffstats
path: root/util/generic
diff options
context:
space:
mode:
authordanila-eremin <danila-eremin@yandex-team.ru>2022-02-10 16:46:21 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:21 +0300
commit358e631d1a69242d3ae4d6e6b1e4f7581d03133b (patch)
treedb997f29fd5f1b32ede8ce681a7c73ec0a0714d0 /util/generic
parentbf23f1e45d4627b54a70900ef362c1be748cc787 (diff)
downloadydb-358e631d1a69242d3ae4d6e6b1e4f7581d03133b.tar.gz
Restoring authorship annotation for <danila-eremin@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'util/generic')
-rw-r--r--util/generic/deque.pxd18
-rw-r--r--util/generic/deque_ut.pyx132
-rw-r--r--util/generic/hash.pxd40
-rw-r--r--util/generic/hash_set_ut.pyx2
-rw-r--r--util/generic/hash_ut.pyx4
-rw-r--r--util/generic/ptr.pxd24
-rw-r--r--util/generic/string.pxd4
-rw-r--r--util/generic/string_ut.pyx74
-rw-r--r--util/generic/vector_ut.pyx16
9 files changed, 157 insertions, 157 deletions
diff --git a/util/generic/deque.pxd b/util/generic/deque.pxd
index 62834ac2ad..ae3b31fb5f 100644
--- a/util/generic/deque.pxd
+++ b/util/generic/deque.pxd
@@ -1,9 +1,9 @@
-from libcpp.deque cimport deque
-
-
-cdef extern from "<util/generic/deque.h>" nogil:
- cdef cppclass TDeque[T](deque):
- TDeque() except +
- TDeque(size_t) except +
- TDeque(size_t, const T&) except +
- TDeque(const TDeque&) except +
+from libcpp.deque cimport deque
+
+
+cdef extern from "<util/generic/deque.h>" nogil:
+ cdef cppclass TDeque[T](deque):
+ TDeque() except +
+ TDeque(size_t) except +
+ TDeque(size_t, const T&) except +
+ TDeque(const TDeque&) except +
diff --git a/util/generic/deque_ut.pyx b/util/generic/deque_ut.pyx
index 42cec42647..5c8e985d8b 100644
--- a/util/generic/deque_ut.pyx
+++ b/util/generic/deque_ut.pyx
@@ -1,66 +1,66 @@
-from libcpp.deque cimport deque
-from util.generic.deque cimport TDeque
-
-import pytest
-import unittest
-
-
-class TestDeque(unittest.TestCase):
- def test_ctor1(self):
- cdef TDeque[int] tmp = TDeque[int]()
- self.assertEqual(tmp.size(), 0)
-
- def test_ctor2(self):
- cdef TDeque[int] tmp = TDeque[int](10)
- self.assertEqual(tmp.size(), 10)
- self.assertEqual(tmp[0], 0)
-
- def test_ctor3(self):
- cdef TDeque[int] tmp = TDeque[int](10, 42)
- self.assertEqual(tmp.size(), 10)
- self.assertEqual(tmp[0], 42)
-
- def test_ctor4(self):
- cdef TDeque[int] tmp = TDeque[int](10, 42)
- cdef TDeque[int] tmp2 = TDeque[int](tmp)
- self.assertEqual(tmp2.size(), 10)
- self.assertEqual(tmp2[0], 42)
-
- def test_operator_assign(self):
- cdef TDeque[int] tmp2
- tmp2.push_back(1)
- tmp2.push_back(2)
-
- cdef TDeque[int] tmp3
- tmp3.push_back(1)
- tmp3.push_back(3)
-
- self.assertEqual(tmp2[1], 2)
- self.assertEqual(tmp3[1], 3)
-
- tmp3 = tmp2
-
- self.assertEqual(tmp2[1], 2)
- self.assertEqual(tmp3[1], 2)
-
- def test_compare(self):
- cdef TDeque[int] tmp1
- tmp1.push_back(1)
- tmp1.push_back(2)
-
- cdef TDeque[int] tmp2
- tmp2.push_back(1)
- tmp2.push_back(2)
-
- cdef TDeque[int] tmp3
- tmp3.push_back(1)
- tmp3.push_back(3)
-
- self.assertTrue(tmp1 == tmp2)
- self.assertTrue(tmp1 != tmp3)
-
- self.assertTrue(tmp1 < tmp3)
- self.assertTrue(tmp1 <= tmp3)
-
- self.assertTrue(tmp3 > tmp1)
- self.assertTrue(tmp3 >= tmp1) \ No newline at end of file
+from libcpp.deque cimport deque
+from util.generic.deque cimport TDeque
+
+import pytest
+import unittest
+
+
+class TestDeque(unittest.TestCase):
+ def test_ctor1(self):
+ cdef TDeque[int] tmp = TDeque[int]()
+ self.assertEqual(tmp.size(), 0)
+
+ def test_ctor2(self):
+ cdef TDeque[int] tmp = TDeque[int](10)
+ self.assertEqual(tmp.size(), 10)
+ self.assertEqual(tmp[0], 0)
+
+ def test_ctor3(self):
+ cdef TDeque[int] tmp = TDeque[int](10, 42)
+ self.assertEqual(tmp.size(), 10)
+ self.assertEqual(tmp[0], 42)
+
+ def test_ctor4(self):
+ cdef TDeque[int] tmp = TDeque[int](10, 42)
+ cdef TDeque[int] tmp2 = TDeque[int](tmp)
+ self.assertEqual(tmp2.size(), 10)
+ self.assertEqual(tmp2[0], 42)
+
+ def test_operator_assign(self):
+ cdef TDeque[int] tmp2
+ tmp2.push_back(1)
+ tmp2.push_back(2)
+
+ cdef TDeque[int] tmp3
+ tmp3.push_back(1)
+ tmp3.push_back(3)
+
+ self.assertEqual(tmp2[1], 2)
+ self.assertEqual(tmp3[1], 3)
+
+ tmp3 = tmp2
+
+ self.assertEqual(tmp2[1], 2)
+ self.assertEqual(tmp3[1], 2)
+
+ def test_compare(self):
+ cdef TDeque[int] tmp1
+ tmp1.push_back(1)
+ tmp1.push_back(2)
+
+ cdef TDeque[int] tmp2
+ tmp2.push_back(1)
+ tmp2.push_back(2)
+
+ cdef TDeque[int] tmp3
+ tmp3.push_back(1)
+ tmp3.push_back(3)
+
+ self.assertTrue(tmp1 == tmp2)
+ self.assertTrue(tmp1 != tmp3)
+
+ self.assertTrue(tmp1 < tmp3)
+ self.assertTrue(tmp1 <= tmp3)
+
+ self.assertTrue(tmp3 > tmp1)
+ self.assertTrue(tmp3 >= tmp1) \ No newline at end of file
diff --git a/util/generic/hash.pxd b/util/generic/hash.pxd
index 385c10d805..1eabe0e380 100644
--- a/util/generic/hash.pxd
+++ b/util/generic/hash.pxd
@@ -12,16 +12,16 @@ cdef extern from "util/generic/hash.h" nogil:
cppclass const_iterator(iterator):
pass
- cppclass reverse_iterator:
- pair[T, U]& operator*()
- iterator operator++()
- iterator operator--()
- bint operator==(reverse_iterator)
- bint operator!=(reverse_iterator)
-
- cppclass const_reverse_iterator(reverse_iterator):
- pass
-
+ cppclass reverse_iterator:
+ pair[T, U]& operator*()
+ iterator operator++()
+ iterator operator--()
+ bint operator==(reverse_iterator)
+ bint operator!=(reverse_iterator)
+
+ cppclass const_reverse_iterator(reverse_iterator):
+ pass
+
THashMap() except +
THashMap(THashMap&) except +
U& operator[](T&)
@@ -54,13 +54,13 @@ cdef extern from "util/generic/hash.h" nogil:
size_t max_size()
size_t size()
void swap(THashMap&)
- iterator lower_bound(T&)
- const_iterator const_lower_bound "lower_bound"(T&)
- reverse_iterator rbegin()
- const_reverse_iterator const_rbegin "rbegin"()
- reverse_iterator rend()
- const_reverse_iterator const_rend "rend"()
- iterator upper_bound(T&)
- const_iterator const_upper_bound "upper_bound"(T&)
- void max_load_factor(float)
- float max_load_factor()
+ iterator lower_bound(T&)
+ const_iterator const_lower_bound "lower_bound"(T&)
+ reverse_iterator rbegin()
+ const_reverse_iterator const_rbegin "rbegin"()
+ reverse_iterator rend()
+ const_reverse_iterator const_rend "rend"()
+ iterator upper_bound(T&)
+ const_iterator const_upper_bound "upper_bound"(T&)
+ void max_load_factor(float)
+ float max_load_factor()
diff --git a/util/generic/hash_set_ut.pyx b/util/generic/hash_set_ut.pyx
index bdcf6284af..275ffddd3f 100644
--- a/util/generic/hash_set_ut.pyx
+++ b/util/generic/hash_set_ut.pyx
@@ -9,7 +9,7 @@ import unittest
from cython.operator cimport dereference as deref
-class TestHashSet(unittest.TestCase):
+class TestHashSet(unittest.TestCase):
def test_simple_constructor_equality_operator(self):
cdef THashSet[int] c1
diff --git a/util/generic/hash_ut.pyx b/util/generic/hash_ut.pyx
index ecf6dac2e6..d714288da1 100644
--- a/util/generic/hash_ut.pyx
+++ b/util/generic/hash_ut.pyx
@@ -1,5 +1,5 @@
-# cython: c_string_type=str, c_string_encoding=utf8
-
+# cython: c_string_type=str, c_string_encoding=utf8
+
from util.generic.hash cimport THashMap
from util.generic.string cimport TString
diff --git a/util/generic/ptr.pxd b/util/generic/ptr.pxd
index 16e8d19144..7eb3171aab 100644
--- a/util/generic/ptr.pxd
+++ b/util/generic/ptr.pxd
@@ -8,10 +8,10 @@ cdef extern from "<util/generic/ptr.h>" nogil:
void Reset(T*)
void Swap(THolder[T])
-
+
cdef THolder[T] MakeHolder[T](...)
-
+
cdef cppclass TIntrusivePtr[T]:
TIntrusivePtr()
TIntrusivePtr(T*)
@@ -21,16 +21,16 @@ cdef extern from "<util/generic/ptr.h>" nogil:
T* Release()
void Drop()
-
- cdef cppclass TIntrusiveConstPtr[T]:
- TIntrusiveConstPtr()
- TIntrusiveConstPtr(T*)
- TIntrusiveConstPtr& operator=(...)
- void Reset(T*)
- const T* Get()
- void Drop()
-
-
+
+ cdef cppclass TIntrusiveConstPtr[T]:
+ TIntrusiveConstPtr()
+ TIntrusiveConstPtr(T*)
+ TIntrusiveConstPtr& operator=(...)
+ void Reset(T*)
+ const T* Get()
+ void Drop()
+
+
cdef cppclass TAtomicSharedPtr[T]:
TAtomicSharedPtr()
TAtomicSharedPtr(T*)
diff --git a/util/generic/string.pxd b/util/generic/string.pxd
index c25f7392a1..2ae1555c21 100644
--- a/util/generic/string.pxd
+++ b/util/generic/string.pxd
@@ -6,9 +6,9 @@ cdef extern from "<util/generic/strbuf.h>" nogil:
TStringBuf() except +
TStringBuf(const char*) except +
TStringBuf(const char*, size_t) except +
- const char* data()
+ const char* data()
char* Data()
- size_t size()
+ size_t size()
size_t Size()
diff --git a/util/generic/string_ut.pyx b/util/generic/string_ut.pyx
index 5407f5b4c1..c7428f857a 100644
--- a/util/generic/string_ut.pyx
+++ b/util/generic/string_ut.pyx
@@ -1,14 +1,14 @@
-# cython: c_string_type=str, c_string_encoding=utf8
-
+# cython: c_string_type=str, c_string_encoding=utf8
+
from libcpp.string cimport string as std_string
from util.generic.string cimport TString, npos
import pytest
import unittest
-import sys
-
+import sys
+
class TestStroka(unittest.TestCase):
def test_unicode(self):
cdef TString x = "привет"
@@ -18,38 +18,38 @@ class TestStroka(unittest.TestCase):
def test_ctor1(self):
cdef TString tmp = TString()
cdef TString tmp2 = TString(tmp)
- self.assertEquals(tmp2, "")
+ self.assertEquals(tmp2, "")
def test_ctor2(self):
cdef std_string tmp = b"hello"
cdef TString tmp2 = TString(tmp)
- self.assertEquals(tmp2, "hello")
+ self.assertEquals(tmp2, "hello")
def test_ctor3(self):
cdef TString tmp = b"hello"
cdef TString tmp2 = TString(tmp, 0, 4)
- self.assertEquals(tmp2, "hell")
+ self.assertEquals(tmp2, "hell")
def test_ctor4(self):
cdef TString tmp = TString(<char*>b"hello")
- self.assertEquals(tmp, "hello")
+ self.assertEquals(tmp, "hello")
def test_ctor5(self):
cdef TString tmp = TString(<char*>b"hello", 4)
- self.assertEquals(tmp, "hell")
+ self.assertEquals(tmp, "hell")
def test_ctor6(self):
cdef TString tmp = TString(<char*>b"hello", 1, 3)
- self.assertEquals(tmp, "ell")
+ self.assertEquals(tmp, "ell")
def test_ctor7(self):
cdef TString tmp = TString(3, <char>'x')
- self.assertEquals(tmp, "xxx")
+ self.assertEquals(tmp, "xxx")
def test_ctor8(self):
cdef bytes tmp = b"hello"
cdef TString tmp2 = TString(<char*>tmp, <char*>tmp + 4)
- self.assertEquals(tmp2, "hell")
+ self.assertEquals(tmp2, "hell")
def test_compare(self):
cdef TString tmp1 = b"abacab"
@@ -72,18 +72,18 @@ class TestStroka(unittest.TestCase):
def test_operator_assign(self):
cdef TString tmp = b"hello"
cdef TString tmp2 = tmp
- self.assertEquals(tmp2, "hello")
+ self.assertEquals(tmp2, "hello")
def test_operator_plus(self):
cdef TString tmp = TString(b"hello ") + TString(b"world")
- self.assertEquals(tmp, "hello world")
+ self.assertEquals(tmp, "hello world")
def test_c_str(self):
cdef TString tmp = b"hello"
- if sys.version_info.major == 2:
- self.assertEquals(bytes(tmp.c_str()), b"hello")
- else:
- self.assertEquals(bytes(tmp.c_str(), 'utf8'), b"hello")
+ if sys.version_info.major == 2:
+ self.assertEquals(bytes(tmp.c_str()), b"hello")
+ else:
+ self.assertEquals(bytes(tmp.c_str(), 'utf8'), b"hello")
def test_length(self):
cdef TString tmp = b"hello"
@@ -107,70 +107,70 @@ class TestStroka(unittest.TestCase):
cdef TString tmp2 = b"fuu"
tmp.append(tmp2)
- self.assertEquals(tmp, "fuu")
+ self.assertEquals(tmp, "fuu")
tmp.append(tmp2, 1, 2)
- self.assertEquals(tmp, "fuuuu")
+ self.assertEquals(tmp, "fuuuu")
tmp.append(<char*>"ll ")
- self.assertEquals(tmp, "fuuuull ")
+ self.assertEquals(tmp, "fuuuull ")
tmp.append(<char*>"of greatness", 4)
- self.assertEquals(tmp, "fuuuull of g")
+ self.assertEquals(tmp, "fuuuull of g")
tmp.append(2, <char>b'o')
- self.assertEquals(tmp, "fuuuull of goo")
+ self.assertEquals(tmp, "fuuuull of goo")
tmp.push_back(b'z')
- self.assertEquals(tmp, "fuuuull of gooz")
+ self.assertEquals(tmp, "fuuuull of gooz")
def test_assign(self):
cdef TString tmp
tmp.assign(b"one")
- self.assertEquals(tmp, "one")
+ self.assertEquals(tmp, "one")
tmp.assign(b"two hundred", 0, 3)
- self.assertEquals(tmp, "two")
+ self.assertEquals(tmp, "two")
tmp.assign(<char*>b"three")
- self.assertEquals(tmp, "three")
+ self.assertEquals(tmp, "three")
tmp.assign(<char*>b"three fiddy", 5)
- self.assertEquals(tmp, "three")
+ self.assertEquals(tmp, "three")
def test_insert(self):
cdef TString tmp
tmp = b"xx"
tmp.insert(1, b"foo")
- self.assertEquals(tmp, "xfoox")
+ self.assertEquals(tmp, "xfoox")
tmp = b"xx"
tmp.insert(1, b"haxor", 1, 3)
- self.assertEquals(tmp, "xaxox")
+ self.assertEquals(tmp, "xaxox")
tmp = b"xx"
tmp.insert(1, <char*>b"foo")
- self.assertEquals(tmp, "xfoox")
+ self.assertEquals(tmp, "xfoox")
tmp = b"xx"
tmp.insert(1, <char*>b"foozzy", 3)
- self.assertEquals(tmp, "xfoox")
+ self.assertEquals(tmp, "xfoox")
tmp = b"xx"
tmp.insert(1, 2, <char>b'u')
- self.assertEquals(tmp, "xuux")
+ self.assertEquals(tmp, "xuux")
def test_copy(self):
cdef char buf[16]
cdef TString tmp = b"hello"
tmp.copy(buf, 5, 0)
- self.assertEquals(buf[:5], "hello")
+ self.assertEquals(buf[:5], "hello")
def test_find(self):
cdef TString haystack = b"whole lotta bytes"
- cdef TString needle = "hole"
+ cdef TString needle = "hole"
self.assertEquals(haystack.find(needle), 1)
self.assertEquals(haystack.find(needle, 3), npos)
@@ -221,5 +221,5 @@ class TestStroka(unittest.TestCase):
def test_substr(self):
cdef TString tmp = b"foobar"
- self.assertEquals(tmp.substr(1), "oobar")
- self.assertEquals(tmp.substr(1, 4), "ooba")
+ self.assertEquals(tmp.substr(1), "oobar")
+ self.assertEquals(tmp.substr(1, 4), "ooba")
diff --git a/util/generic/vector_ut.pyx b/util/generic/vector_ut.pyx
index 904e67733b..8bdcf7d16e 100644
--- a/util/generic/vector_ut.pyx
+++ b/util/generic/vector_ut.pyx
@@ -1,5 +1,5 @@
-# cython: c_string_type=str, c_string_encoding=utf8
-
+# cython: c_string_type=str, c_string_encoding=utf8
+
from util.generic.vector cimport TVector
from util.generic.string cimport TString
@@ -42,14 +42,14 @@ class TestVector(unittest.TestCase):
tmp3.push_back(1)
tmp3.push_back(3)
- self.assertEqual(tmp2[1], 2)
- self.assertEqual(tmp3[1], 3)
-
+ self.assertEqual(tmp2[1], 2)
+ self.assertEqual(tmp3[1], 3)
+
tmp3 = tmp2
- self.assertEqual(tmp2[1], 2)
- self.assertEqual(tmp3[1], 2)
-
+ self.assertEqual(tmp2[1], 2)
+ self.assertEqual(tmp3[1], 2)
+
def test_compare(self):
cdef TVector[int] tmp1
tmp1.push_back(1)