Couple of fixes

This commit is contained in:
Miroslav Štampar 2026-08-17 22:20:42 +02:00
parent 77ee160875
commit 848ba68ccf
11 changed files with 53 additions and 11 deletions

View file

@ -84,8 +84,8 @@ from lib.utils.safe2bin import safecharencode
from lib.utils.xrange import xrange
from thirdparty import six
# Sentinel returned by the opt-in Huffman retrieval (--huffman) meaning "this character is
# outside the ASCII model (e.g. multi-byte/Unicode) - defer to the classic bisection".
# Sentinel returned by the (default-on, '--no-huffman') Huffman retrieval meaning "this character
# is outside the ASCII model (e.g. multi-byte/Unicode) - defer to the classic bisection".
_HUFFMAN_FALLBACK = object()
# Cache of character-level Markov priors keyed by (order, scale, dbms); built once per process

View file

@ -591,6 +591,13 @@ def _confirm(profile, expression, value, length):
# whose low byte still looks like ASCII), and that must not count against a working channel.
if length is None:
if _ask(profile, "%s=%d" % (queries[dbms].length.query % ("(%s)" % expression), len(value))) is not True:
# a NULL value has no length, so the comparison above is NULL (i.e. not selected) no matter
# what was read - exactly how a channel that drops rows fails it. One extra probe tells the
# two apart, so a column with NULLs in it does not retire an otherwise working channel
if _ask(profile, "(%s) IS NULL" % expression) is True:
_debug("value is NULL, so its length cannot be confirmed")
return None
_debug("length of the extracted value did not confirm")
return False
elif length != len(value):

View file

@ -257,7 +257,8 @@ def _chunkedJsonAggUse(expression, expressionFields, expressionFieldsList, count
caps. K is halved adaptively if a chunk response still gets truncated. Returns a BigArray of
rows, or None to let the caller fall back to the regular per-row UNION path.
Same DBMS coverage as the single-shot JSON-agg (per-DBMS aggregate + windowing); others -> None.
Covers the single-shot JSON-agg back-ends that also have a windowing form here (i.e. all of them
except Oracle and MSSQL, whose aggregates are built differently); others -> None.
"""
dbms = Backend.getIdentifiedDbms()