From f298bc7e07ce9a7b2df5f5ebe9d719a1fe577998 Mon Sep 17 00:00:00 2001 From: jianfengmao Date: Mon, 1 Jul 2024 10:34:29 -0600 Subject: [PATCH] Correct typing and an impl error --- py/server/deephaven/_table_reader.py | 1 - py/server/deephaven/table.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/py/server/deephaven/_table_reader.py b/py/server/deephaven/_table_reader.py index 1f36cefc872..b9ff7c0905c 100644 --- a/py/server/deephaven/_table_reader.py +++ b/py/server/deephaven/_table_reader.py @@ -67,7 +67,6 @@ def _table_reader_chunks(table: Table, *, cols: Optional[Union[str, Sequence[str row_sequence_iterator = row_set.getRowSequenceIterator() col_sources = [table.j_table.getColumnSource(col_def.name) for col_def in col_defs] - chunk_size = row_set.size() if not chunk_size else chunk_size j_reader_context = _JTableUpdateDataReader.makeContext(chunk_size, *col_sources) with update_graph.auto_locking_ctx(table): try: diff --git a/py/server/deephaven/table.py b/py/server/deephaven/table.py index 6df3fe575f2..dc615a53e09 100644 --- a/py/server/deephaven/table.py +++ b/py/server/deephaven/table.py @@ -527,7 +527,7 @@ def iter_dict(self, cols: Optional[Union[str, Sequence[str]]] = None) -> Generat return _table_reader_rows(self, cols) - def iter_tuple(self, cols: Optional[Union[str, Sequence[str]]] = None, name: str = 'Deephaven') -> Generator[Tuple[str, Any], None, None]: + def iter_tuple(self, cols: Optional[Union[str, Sequence[str]]] = None, name: str = 'Deephaven') -> Generator[Tuple[Any], None, None]: """ Returns a generator that reads one row at a time from the table into a named tuple. The named tuple is made up of fields with their names being the column names and their values being of the column data types. @@ -580,7 +580,7 @@ def iter_chunk_dict(self, cols: Optional[Union[str, Sequence[str]]] = None, *, c prev=False, to_numpy=True) def iter_chunk_tuple(self, cols: Optional[Union[str, Sequence[str]]] = None, *, chunk_size: Optional[int] = 4096, - name: str = 'Deephaven')-> Generator[Tuple[str, np.ndarray], None, None]: + name: str = 'Deephaven')-> Generator[Tuple[np.ndarray], None, None]: """ Returns a generator that reads one chunk of rows at a time from the table into a named tuple. The named tuple is made up of fields with their names being the column names and their values being numpy arrays of the column data types.