Skip to content

Commit aed8c63

Browse files
hemidactylushemidactylus
authored
Lift a couple of suppressed features now that the Data API has implemented them (#329)
* lifted temporary test workarouns for pending issues * bring the py3.8+3.9 fix and update changesfile
1 parent af491fc commit aed8c63

File tree

4 files changed

+25
-61
lines changed

4 files changed

+25
-61
lines changed

‎CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
main
2+
====
3+
restore support for Python 3.8, 3.9
4+
(reinstated some Data API functionalities being tested after the API got patched re: sorting on PK and pagination with that sorting)
5+
16
v 2.0.0-preview
27
===============
38
Introduction of full Tables support.

‎tests/tables/conftest.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@
134134
dimension=3,
135135
service=None,
136136
),
137-
"p_int_regular": TableScalarColumnTypeDescriptor(
138-
column_type="int"
139-
), # TODO: remove->p_int after #1718
140137
},
141138
primary_key=TablePrimaryKeyDescriptor(
142139
partition_by=["p_text"],

‎tests/tables/integration/test_table_dml_async.py

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from astrapy.results import TableInsertManyResult
2626

2727
from ..conftest import (
28-
IS_ASTRA_DB,
2928
DefaultAsyncTable,
3029
_repaint_NaNs,
3130
_typify_tuple,
@@ -98,7 +97,6 @@ async def test_table_insert_one_find_one_async(
9897
{
9998
"p_text": "pA",
10099
"p_int": i,
101-
"p_int_regular": i,
102100
"p_vector": DataAPIVector([i, 1, 0]),
103101
}
104102
for i in range(3)
@@ -109,7 +107,6 @@ async def test_table_insert_one_find_one_async(
109107
{
110108
"p_text": "pB",
111109
"p_int": 100 - i,
112-
"p_int_regular": 100 - i,
113110
"p_vector": DataAPIVector([i + 0.1, 1, 0]),
114111
}
115112
for i in range(3)
@@ -129,18 +126,14 @@ async def test_table_insert_one_find_one_async(
129126
assert (fo_fil_ann_row["p_text"], fo_fil_ann_row["p_int"]) == ("pB", 100)
130127
# just regular sort
131128
fo_unf_srt_row = await async_empty_table_composite.find_one(
132-
sort={
133-
"p_int_regular": SortMode.DESCENDING
134-
} # TODO: replace with p_int when ok
129+
sort={"p_int": SortMode.DESCENDING}
135130
)
136131
assert fo_unf_srt_row is not None
137132
assert (fo_unf_srt_row["p_text"], fo_unf_srt_row["p_int"]) == ("pB", 100)
138133
# regular sort, filtered
139134
fo_fil_srt_row = await async_empty_table_composite.find_one(
140135
filter={"p_text": "pA"},
141-
sort={
142-
"p_int_regular": SortMode.DESCENDING
143-
}, # TODO: replace with p_int when ok
136+
sort={"p_int": SortMode.DESCENDING},
144137
)
145138
assert fo_fil_srt_row is not None
146139
assert (fo_fil_srt_row["p_text"], fo_fil_srt_row["p_int"]) == ("pA", 2)
@@ -636,26 +629,14 @@ async def test_table_find_async(
636629
# (nonvector) sorting
637630
await async_empty_table_all_returns.insert_many(INSMANY_AR_ROWS)
638631
# sorting as per clustering column
639-
if IS_ASTRA_DB: # TODO, reinstate full find once fix deployed
640-
# (i.e. remove this branching point in favour of local)
641-
srows_in_part = await async_empty_table_all_returns.find(
642-
filter={"p_ascii": "A", "p_bigint": 100},
643-
sort={"p_int": SortMode.DESCENDING},
644-
limit=20,
645-
).to_list()
646-
assert len(srows_in_part) == 20
647-
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
648-
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
649-
else:
650-
# Latest Data API:
651-
srows_in_part = await async_empty_table_all_returns.find(
652-
filter={"p_ascii": "A", "p_bigint": 100},
653-
sort={"p_int": SortMode.DESCENDING},
654-
limit=INSMANY_AR_ROW_HALFN + 1,
655-
).to_list()
656-
assert len(srows_in_part) == INSMANY_AR_ROW_HALFN
657-
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
658-
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
632+
srows_in_part = await async_empty_table_all_returns.find(
633+
filter={"p_ascii": "A", "p_bigint": 100},
634+
sort={"p_int": SortMode.DESCENDING},
635+
limit=INSMANY_AR_ROW_HALFN + 1,
636+
).to_list()
637+
assert len(srows_in_part) == INSMANY_AR_ROW_HALFN
638+
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
639+
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
659640
# sorting by any regular column
660641
srows_anycol = await async_empty_table_all_returns.find(
661642
filter={"p_ascii": "A", "p_bigint": 100},

‎tests/tables/integration/test_table_dml_sync.py

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
from astrapy.results import TableInsertManyResult
2626

2727
from ..conftest import (
28-
IS_ASTRA_DB,
2928
DefaultTable,
3029
_repaint_NaNs,
3130
_typify_tuple,
@@ -98,7 +97,6 @@ def test_table_insert_one_find_one_sync(
9897
{
9998
"p_text": "pA",
10099
"p_int": i,
101-
"p_int_regular": i,
102100
"p_vector": DataAPIVector([i, 1, 0]),
103101
}
104102
for i in range(3)
@@ -109,7 +107,6 @@ def test_table_insert_one_find_one_sync(
109107
{
110108
"p_text": "pB",
111109
"p_int": 100 - i,
112-
"p_int_regular": 100 - i,
113110
"p_vector": DataAPIVector([i + 0.1, 1, 0]),
114111
}
115112
for i in range(3)
@@ -129,18 +126,14 @@ def test_table_insert_one_find_one_sync(
129126
assert (fo_fil_ann_row["p_text"], fo_fil_ann_row["p_int"]) == ("pB", 100)
130127
# just regular sort
131128
fo_unf_srt_row = sync_empty_table_composite.find_one(
132-
sort={
133-
"p_int_regular": SortMode.DESCENDING
134-
} # TODO: replace with p_int when ok
129+
sort={"p_int": SortMode.DESCENDING}
135130
)
136131
assert fo_unf_srt_row is not None
137132
assert (fo_unf_srt_row["p_text"], fo_unf_srt_row["p_int"]) == ("pB", 100)
138133
# regular sort, filtered
139134
fo_fil_srt_row = sync_empty_table_composite.find_one(
140135
filter={"p_text": "pA"},
141-
sort={
142-
"p_int_regular": SortMode.DESCENDING
143-
}, # TODO: replace with p_int when ok
136+
sort={"p_int": SortMode.DESCENDING},
144137
)
145138
assert fo_fil_srt_row is not None
146139
assert (fo_fil_srt_row["p_text"], fo_fil_srt_row["p_int"]) == ("pA", 2)
@@ -622,26 +615,14 @@ def test_table_find_sync(
622615
# (nonvector) sorting
623616
sync_empty_table_all_returns.insert_many(INSMANY_AR_ROWS)
624617
# sorting as per clustering column
625-
if IS_ASTRA_DB: # TODO, reinstate full find once fix deployed
626-
# (i.e. remove this branching point in favour of local)
627-
srows_in_part = sync_empty_table_all_returns.find(
628-
filter={"p_ascii": "A", "p_bigint": 100},
629-
sort={"p_int": SortMode.DESCENDING},
630-
limit=20,
631-
).to_list()
632-
assert len(srows_in_part) == 20
633-
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
634-
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
635-
else:
636-
# Latest Data API:
637-
srows_in_part = sync_empty_table_all_returns.find(
638-
filter={"p_ascii": "A", "p_bigint": 100},
639-
sort={"p_int": SortMode.DESCENDING},
640-
limit=INSMANY_AR_ROW_HALFN + 1,
641-
).to_list()
642-
assert len(srows_in_part) == INSMANY_AR_ROW_HALFN
643-
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
644-
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
618+
srows_in_part = sync_empty_table_all_returns.find(
619+
filter={"p_ascii": "A", "p_bigint": 100},
620+
sort={"p_int": SortMode.DESCENDING},
621+
limit=INSMANY_AR_ROW_HALFN + 1,
622+
).to_list()
623+
assert len(srows_in_part) == INSMANY_AR_ROW_HALFN
624+
srows_in_part_pints = [row["p_int"] for row in srows_in_part]
625+
assert sorted(srows_in_part_pints) == srows_in_part_pints[::-1]
645626
# sorting by any regular column
646627
srows_anycol = sync_empty_table_all_returns.find(
647628
filter={"p_ascii": "A", "p_bigint": 100},

0 commit comments

Comments
 (0)