Skip to content

Commit b3a4705

Browse files
JohnMountJohnMount
committed
rebuild and recheck
1 parent 5b7403e commit b3a4705

File tree

12 files changed

+32
-24
lines changed

12 files changed

+32
-24
lines changed

‎build/lib/data_algebra/db_model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ def table_def_to_near_sql(
11331133
query_name=view_name,
11341134
quoted_query_name=self.quote_identifier(view_name),
11351135
sub_sql=subsql.to_bound_near_sql(columns=using),
1136-
ops_key=f"table({table_def.node_name}, {terms.keys()})",
1136+
ops_key=f"table({table_def.table_name}, {terms.keys()})",
11371137
)
11381138
return near_sql
11391139

‎build/lib/data_algebra/near_sql.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ def to_with_form_stub(
204204
assert isinstance(v[1], NearSQLContainer)
205205
if not stub.is_table:
206206
# first check cache
207-
ops_key = f"{self.near_sql.ops_key}_{self.columns}"
207+
ops_key = f"{self.near_sql.ops_key}"
208+
if self.columns is not None:
209+
ops_key = f"{ops_key}_{list(self.columns)}"
208210
if (cte_cache is not None) and (ops_key is not None):
209211
try:
210212
retrieved_cte = cte_cache[ops_key]

‎build/lib/data_algebra/sql_format_options.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SQLFormatOptions(SimpleNamespace):
1515
:param initial_commas: bool = False, if True write initial commas instead of after commas
1616
:param warn_on_method_support: bool = True, if True warn on translation to untrusted methods
1717
:param warn_on_novel_methods: bool = True, if True warn on translation to unrecognized methods
18-
:param use_cte_elim: bool = False, if True optimzie SQL by re-using common table expressions (experimental! NOT WORKING YET)
18+
:param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental)
1919
"""
2020

2121
def __init__(
@@ -37,7 +37,7 @@ def __init__(
3737
:param initial_commas: bool = False, if True write initial commas instead of after commas
3838
:param warn_on_method_support: bool = True, if True warn on translation to untrusted methods
3939
:param warn_on_novel_methods: bool = True, if True warn on translation to unrecognized methods
40-
:param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental! NOT WORKING YET)
40+
:param use_cte_elim: bool = False, if True optimize SQL by re-using common table expressions (experimental)
4141
"""
4242
assert isinstance(use_with, bool)
4343
assert isinstance(annotate, bool)

‎build/lib/data_algebra/test_util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def check_transform_on_handles(
413413
for initial_commas in [True, False]:
414414
for use_with in [True, False]:
415415
for annotate in [True, False]:
416-
for use_cte_elim in [False]: # [True, False]: # TODO: put back
416+
for use_cte_elim in [True, False]:
417417
sql_format_options = SQLFormatOptions(
418418
use_with=use_with,
419419
annotate=annotate,

‎coverage.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ data_algebra/eval_cache.py 52 0 100%
142142
data_algebra/expr_parse.py 35 0 100%
143143
data_algebra/expr_rep.py 642 88 86% 208-211, 216, 224, 240, 247, 258, 282, 291-306, 350, 356, 362, 368, 377, 383, 389, 398, 401, 404, 407, 410, 413, 464, 524, 602, 608, 643, 655, 661, 667, 679, 685, 733, 900, 915, 925, 940, 1027, 1042, 1094, 1101-1108, 1114-1115, 1140-1141, 1173, 1180-1181, 1187, 1222, 1224, 1260, 1346, 1360, 1362, 1364, 1367-1373, 1375, 1447, 1461-1463, 1479, 1518
144144
data_algebra/flow_text.py 17 0 100%
145-
data_algebra/near_sql.py 235 3 99% 41, 249-250
145+
data_algebra/near_sql.py 237 3 99% 41, 251-252
146146
data_algebra/op_catalog.py 3 0 100%
147147
data_algebra/op_container.py 124 48 61% 47-48, 65-74, 78-79, 87-88, 91-92, 95-96, 99-100, 103, 106, 110-111, 116, 121, 130-138, 149-150, 153-154, 157-165, 168-171, 174-175, 182-183, 194-195, 198-199, 202-205, 211-212, 216, 219
148148
data_algebra/pandas_base.py 501 44 91% 29, 69, 71, 84, 94, 104, 119, 122, 127, 132, 345, 411, 417-424, 457, 468, 487, 501, 510, 512, 547, 592, 633, 645, 665, 681, 691, 706, 756, 764, 779, 790, 802, 822, 850, 862, 865, 897, 914, 917, 928
@@ -154,7 +154,7 @@ data_algebra/sql_format_options.py 15 2 87% 61, 69
154154
data_algebra/test_util.py 290 40 86% 88, 110, 120, 123, 127, 150, 153, 157, 159-160, 169, 224-225, 241-246, 250, 262, 264-272, 318, 321, 329, 340, 347, 351, 362, 373, 548-553, 559-560, 563
155155
data_algebra/util.py 140 29 79% 26, 51, 56, 61, 84-85, 88-89, 92-93, 96-97, 100-101, 104-105, 108-109, 112-113, 116-117, 120-121, 192, 207, 248, 252, 254
156156
--------------------------------------------------------------------
157-
TOTAL 5760 712 88%
157+
TOTAL 5762 712 88%
158158

159159

160-
======================= 298 passed in 644.83s (0:10:44) ========================
160+
======================= 298 passed in 910.28s (0:15:10) ========================

‎dist/data_algebra-1.3.3-py3-none-any.whl‎

-31 Bytes
Binary file not shown.

‎dist/data_algebra-1.3.3.tar.gz‎

-26 Bytes
Binary file not shown.

‎docs/data_algebra/db_model.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ <h1 class="modulename">
13391339
<span class="n">query_name</span><span class="o">=</span><span class="n">view_name</span><span class="p">,</span>
13401340
<span class="n">quoted_query_name</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">quote_identifier</span><span class="p">(</span><span class="n">view_name</span><span class="p">),</span>
13411341
<span class="n">sub_sql</span><span class="o">=</span><span class="n">subsql</span><span class="o">.</span><span class="n">to_bound_near_sql</span><span class="p">(</span><span class="n">columns</span><span class="o">=</span><span class="n">using</span><span class="p">),</span>
1342-
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">node_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
1342+
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">table_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
13431343
<span class="p">)</span>
13441344
<span class="k">return</span> <span class="n">near_sql</span>
13451345

@@ -2973,7 +2973,7 @@ <h1 class="modulename">
29732973
<span class="n">query_name</span><span class="o">=</span><span class="n">view_name</span><span class="p">,</span>
29742974
<span class="n">quoted_query_name</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">quote_identifier</span><span class="p">(</span><span class="n">view_name</span><span class="p">),</span>
29752975
<span class="n">sub_sql</span><span class="o">=</span><span class="n">subsql</span><span class="o">.</span><span class="n">to_bound_near_sql</span><span class="p">(</span><span class="n">columns</span><span class="o">=</span><span class="n">using</span><span class="p">),</span>
2976-
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">node_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
2976+
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">table_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
29772977
<span class="p">)</span>
29782978
<span class="k">return</span> <span class="n">near_sql</span>
29792979

@@ -4760,7 +4760,7 @@ <h1 class="modulename">
47604760
<span class="n">query_name</span><span class="o">=</span><span class="n">view_name</span><span class="p">,</span>
47614761
<span class="n">quoted_query_name</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">quote_identifier</span><span class="p">(</span><span class="n">view_name</span><span class="p">),</span>
47624762
<span class="n">sub_sql</span><span class="o">=</span><span class="n">subsql</span><span class="o">.</span><span class="n">to_bound_near_sql</span><span class="p">(</span><span class="n">columns</span><span class="o">=</span><span class="n">using</span><span class="p">),</span>
4763-
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">node_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
4763+
<span class="n">ops_key</span><span class="o">=</span><span class="sa">f</span><span class="s2">&quot;table(</span><span class="si">{</span><span class="n">table_def</span><span class="o">.</span><span class="n">table_name</span><span class="si">}</span><span class="s2">, </span><span class="si">{</span><span class="n">terms</span><span class="o">.</span><span class="n">keys</span><span class="p">()</span><span class="si">}</span><span class="s2">)&quot;</span><span class="p">,</span>
47644764
<span class="p">)</span>
47654765
<span class="k">return</span> <span class="n">near_sql</span>
47664766
</pre></div>

‎docs/data_algebra/near_sql.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,9 @@ <h1 class="modulename">
377377
<span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">v</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">NearSQLContainer</span><span class="p">)</span>
378378
<span class="k">if</span> <span class="ow">not</span> <span class="n">stub</span><span class="o">.</span><span class="n">is_table</span><span class="p">:</span>
379379
<span class="c1"># first check cache</span>
380-
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="si">}</span><span class="s2">&quot;</span>
380+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">&quot;</span>
381+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">columns</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
382+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span>
381383
<span class="k">if</span> <span class="p">(</span><span class="n">cte_cache</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="p">(</span><span class="n">ops_key</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">):</span>
382384
<span class="k">try</span><span class="p">:</span>
383385
<span class="n">retrieved_cte</span> <span class="o">=</span> <span class="n">cte_cache</span><span class="p">[</span><span class="n">ops_key</span><span class="p">]</span>
@@ -1143,7 +1145,9 @@ <h1 class="modulename">
11431145
<span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">v</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">NearSQLContainer</span><span class="p">)</span>
11441146
<span class="k">if</span> <span class="ow">not</span> <span class="n">stub</span><span class="o">.</span><span class="n">is_table</span><span class="p">:</span>
11451147
<span class="c1"># first check cache</span>
1146-
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="si">}</span><span class="s2">&quot;</span>
1148+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">&quot;</span>
1149+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">columns</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
1150+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span>
11471151
<span class="k">if</span> <span class="p">(</span><span class="n">cte_cache</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="p">(</span><span class="n">ops_key</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">):</span>
11481152
<span class="k">try</span><span class="p">:</span>
11491153
<span class="n">retrieved_cte</span> <span class="o">=</span> <span class="n">cte_cache</span><span class="p">[</span><span class="n">ops_key</span><span class="p">]</span>
@@ -1333,7 +1337,9 @@ <h1 class="modulename">
13331337
<span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">v</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span> <span class="n">NearSQLContainer</span><span class="p">)</span>
13341338
<span class="k">if</span> <span class="ow">not</span> <span class="n">stub</span><span class="o">.</span><span class="n">is_table</span><span class="p">:</span>
13351339
<span class="c1"># first check cache</span>
1336-
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="si">}</span><span class="s2">&quot;</span>
1340+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="bp">self</span><span class="o">.</span><span class="n">near_sql</span><span class="o">.</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">&quot;</span>
1341+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">columns</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
1342+
<span class="n">ops_key</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">ops_key</span><span class="si">}</span><span class="s2">_</span><span class="si">{</span><span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">columns</span><span class="p">)</span><span class="si">}</span><span class="s2">&quot;</span>
13371343
<span class="k">if</span> <span class="p">(</span><span class="n">cte_cache</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="p">(</span><span class="n">ops_key</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">):</span>
13381344
<span class="k">try</span><span class="p">:</span>
13391345
<span class="n">retrieved_cte</span> <span class="o">=</span> <span class="n">cte_cache</span><span class="p">[</span><span class="n">ops_key</span><span class="p">]</span>

0 commit comments

Comments
 (0)