From 9018f98d3d3b5fbf2e982353b5bf8ccdb63ccb1a Mon Sep 17 00:00:00 2001 From: Nico Kemnitz Date: Thu, 21 Jul 2022 10:17:07 +0200 Subject: [PATCH] fix: resolve column filter ambiguity --- pychunkedgraph/graph/chunkedgraph.py | 2 +- pychunkedgraph/graph/client/bigtable/utils.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pychunkedgraph/graph/chunkedgraph.py b/pychunkedgraph/graph/chunkedgraph.py index d562d9d15..a5b08ff03 100644 --- a/pychunkedgraph/graph/chunkedgraph.py +++ b/pychunkedgraph/graph/chunkedgraph.py @@ -299,7 +299,7 @@ def get_atomic_cross_edges( node_ids=l2_ids, properties=[ attributes.Connectivity.CrossChunkEdge[l] - for l in range(2, self.meta.layer_count) + for l in range(2, max(3, self.meta.layer_count)) ], ) result = {} diff --git a/pychunkedgraph/graph/client/bigtable/utils.py b/pychunkedgraph/graph/client/bigtable/utils.py index a940789f9..2d30eeb32 100644 --- a/pychunkedgraph/graph/client/bigtable/utils.py +++ b/pychunkedgraph/graph/client/bigtable/utils.py @@ -129,6 +129,10 @@ def get_time_range_and_column_filter( ) filters = [time_filter] if columns is not None: + if len(columns) == 0: + raise ValueError( + f"Empty column filter {columns} is ambiguous. Pass `None` if no column filter should be applied." + ) column_filter = _get_column_filter(columns) filters = [column_filter, time_filter] if user_id is not None: