Skip to content

Commit ce37029

Browse files
JodeZerntkathole
authored andcommitted
fix: Preserve entity row order in precomputed reads
Signed-off-by: JodeZer <[email protected]>
1 parent e2e28c7 commit ce37029

2 files changed

Lines changed: 153 additions & 9 deletions

File tree

‎sdk/python/feast/infra/online_stores/online_store.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ def get_online_features(
237237
online_features_response,
238238
full_feature_names,
239239
output_len,
240+
first_idxs,
240241
grouped_refs,
241242
registry,
242243
project,
@@ -522,6 +523,7 @@ async def get_online_features_async(
522523
online_features_response,
523524
full_feature_names,
524525
output_len,
526+
first_idxs,
525527
grouped_refs,
526528
registry,
527529
project,
@@ -606,12 +608,16 @@ def _try_precomputed_fast_path(
606608
online_features_response: Any,
607609
full_feature_names: bool,
608610
num_rows: int,
611+
entity_row_indices: Sequence[Sequence[int]],
609612
grouped_refs: List,
610613
registry: BaseRegistry,
611614
project: str,
612615
) -> bool:
613616
"""Build the response from pre-computed vectors.
614617
618+
``entity_row_indices`` maps each deduplicated entity vector to its original
619+
request rows, preserving input order and repeated entities in the response.
620+
615621
Returns True if the fast path succeeded for ALL entities, False otherwise
616622
(caller should fall back to per-FV reads).
617623
"""
@@ -695,8 +701,10 @@ def _try_precomputed_fast_path(
695701

696702
now_secs = _time_mod.time() if any_ttl else 0.0
697703

698-
for row_idx, vec in enumerate(vectors):
699-
ts_list[row_idx] = vec.precomputed_at
704+
for entity_idx, vec in enumerate(vectors):
705+
destination_row_indices = entity_row_indices[entity_idx]
706+
for row_idx in destination_row_indices:
707+
ts_list[row_idx] = vec.precomputed_at
700708

701709
# Build per-FV expiry flags once per entity (not per feature).
702710
fv_expired: Optional[Dict[str, bool]] = None
@@ -720,14 +728,16 @@ def _try_precomputed_fast_path(
720728
stored_values = vec.values
721729
for out_idx in range(n_features):
722730
src_idx = reorder_map[out_idx] if reorder_map else out_idx
723-
feat_values[out_idx][row_idx] = stored_values[src_idx]
731+
status = PRESENT
724732

725733
if fv_expired:
726734
feat_fv = feat_fv_names[out_idx]
727735
if feat_fv and fv_expired.get(feat_fv, False):
728-
feat_statuses[out_idx][row_idx] = OUTSIDE_MAX_AGE
729-
continue
730-
feat_statuses[out_idx][row_idx] = PRESENT
736+
status = OUTSIDE_MAX_AGE
737+
738+
for row_idx in destination_row_indices:
739+
feat_values[out_idx][row_idx] = stored_values[src_idx]
740+
feat_statuses[out_idx][row_idx] = status
731741

732742
online_features_response.metadata.feature_names.val.extend(
733743
expected_feature_names

‎sdk/python/tests/unit/test_precomputed_feature_vectors.py‎

Lines changed: 137 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Tests for pre-computed feature vectors (issue #6185)."""
22

3+
import asyncio
34
from datetime import datetime, timedelta, timezone
45
from unittest.mock import MagicMock
56

@@ -272,13 +273,15 @@ class TestSchemaMismatchFallback:
272273
def _fast_path(self, blobs, expected_names, grouped_refs=None, num_rows=None):
273274
from feast.infra.online_stores.online_store import OnlineStore
274275

276+
resolved_num_rows = num_rows or len(blobs)
275277
response = GetOnlineFeaturesResponse(results=[])
276278
result = OnlineStore._try_precomputed_fast_path(
277279
blobs=blobs,
278280
expected_feature_names=expected_names,
279281
online_features_response=response,
280282
full_feature_names=True,
281-
num_rows=num_rows or len(blobs),
283+
num_rows=resolved_num_rows,
284+
entity_row_indices=tuple([i] for i in range(len(blobs))),
282285
grouped_refs=grouped_refs or [],
283286
registry=MagicMock(),
284287
project="test",
@@ -370,16 +373,28 @@ def test_schema_mismatch_in_second_entity_returns_false(self):
370373

371374

372375
class TestFastPathMultiEntity:
373-
def _fast_path(self, blobs, expected_names, grouped_refs=None, num_rows=None):
376+
def _fast_path(
377+
self,
378+
blobs,
379+
expected_names,
380+
grouped_refs=None,
381+
num_rows=None,
382+
entity_row_indices=None,
383+
):
374384
from feast.infra.online_stores.online_store import OnlineStore
375385

386+
resolved_num_rows = num_rows or len(blobs)
387+
if entity_row_indices is None:
388+
entity_row_indices = tuple([i] for i in range(len(blobs)))
389+
376390
response = GetOnlineFeaturesResponse(results=[])
377391
result = OnlineStore._try_precomputed_fast_path(
378392
blobs=blobs,
379393
expected_feature_names=expected_names,
380394
online_features_response=response,
381395
full_feature_names=True,
382-
num_rows=num_rows or len(blobs),
396+
num_rows=resolved_num_rows,
397+
entity_row_indices=entity_row_indices,
383398
grouped_refs=grouped_refs or [],
384399
registry=MagicMock(),
385400
project="test",
@@ -418,6 +433,39 @@ def test_multiple_entities_all_present(self):
418433
assert a_values == pytest.approx([1.0, 2.0, 3.0])
419434
assert b_values == pytest.approx([10.0, 20.0, 30.0])
420435

436+
def test_restores_original_order_and_duplicate_entities(self):
437+
timestamps = [
438+
_make_timestamp(datetime(2025, 1, day, tzinfo=timezone.utc))
439+
for day in (1, 2, 3)
440+
]
441+
vectors = [
442+
_make_vector(
443+
feature_names=["fv1__a"],
444+
values=[ValueProto(float_val=float(entity_id))],
445+
precomputed_at=timestamps[entity_id - 1],
446+
)
447+
for entity_id in (1, 2, 3)
448+
]
449+
450+
ok, response = self._fast_path(
451+
[vector.SerializeToString() for vector in vectors],
452+
["fv1__a"],
453+
num_rows=4,
454+
entity_row_indices=([1], [3], [0, 2]),
455+
)
456+
457+
assert ok is True
458+
assert [value.float_val for value in response.results[0].values] == [
459+
3.0,
460+
1.0,
461+
3.0,
462+
2.0,
463+
]
464+
assert list(response.results[0].statuses) == [FieldStatus.PRESENT] * 4
465+
assert [
466+
timestamp.seconds for timestamp in response.results[0].event_timestamps
467+
] == [timestamps[index].seconds for index in (2, 0, 2, 1)]
468+
421469
def test_statuses_are_present(self):
422470
vec = _make_vector(
423471
feature_names=["fv1__a"],
@@ -439,6 +487,89 @@ def test_feature_names_in_metadata(self):
439487
assert list(response.metadata.feature_names.val) == ["fv1__x", "fv2__y"]
440488

441489

490+
# ═══════════════════════════════════════════════════════════════════════════════
491+
# Public online retrieval: entity row ordering
492+
# ═══════════════════════════════════════════════════════════════════════════════
493+
494+
495+
@pytest.mark.parametrize("use_async", [False, True], ids=["sync", "async"])
496+
def test_precomputed_retrieval_preserves_entity_order_and_duplicates(use_async):
497+
from feast import Entity
498+
from feast.infra.online_stores.online_store import OnlineStore
499+
from feast.value_type import ValueType
500+
501+
entity = Entity(
502+
name="driver",
503+
join_keys=["driver_id"],
504+
value_type=ValueType.INT64,
505+
)
506+
feature_view = FeatureView(
507+
name="driver_stats",
508+
entities=[entity],
509+
schema=[
510+
Field(name="driver_id", dtype=Int64),
511+
Field(name="score", dtype=Float32),
512+
],
513+
source=_make_file_source("driver_stats_src"),
514+
)
515+
feature_service = FeatureService(
516+
name="driver_service",
517+
features=[feature_view],
518+
precompute_online=True,
519+
)
520+
521+
class PrecomputedStore(OnlineStore):
522+
def online_write_batch(self, config, table, data, progress):
523+
pass
524+
525+
def online_read(self, config, table, entity_keys, requested_features=None):
526+
raise AssertionError("regular online reads should not be used")
527+
528+
def update(self, *args, **kwargs):
529+
pass
530+
531+
def teardown(self, *args, **kwargs):
532+
pass
533+
534+
def read_precomputed_vectors(
535+
self, config, feature_service_name, project, entity_keys
536+
):
537+
blobs = []
538+
for entity_key in entity_keys:
539+
entity_id = entity_key.entity_values[0].int64_val
540+
vector = _make_vector(
541+
feature_names=["driver_stats__score"],
542+
values=[ValueProto(float_val=float(entity_id * 10))],
543+
)
544+
blobs.append(vector.SerializeToString())
545+
return blobs
546+
547+
registry = MagicMock()
548+
registry.cached_registry_proto_created = None
549+
registry.enable_online_versioning = False
550+
registry.get_feature_service.return_value = feature_service
551+
registry.get_any_feature_view.return_value = feature_view
552+
registry.list_entities.return_value = [entity]
553+
554+
request_kwargs = {
555+
"config": MagicMock(),
556+
"features": feature_service,
557+
"entity_rows": {"driver_id": [3, 1, 3, 2]},
558+
"registry": registry,
559+
"project": "test",
560+
"full_feature_names": True,
561+
}
562+
store = PrecomputedStore()
563+
if use_async:
564+
response = asyncio.run(store.get_online_features_async(**request_kwargs))
565+
else:
566+
response = store.get_online_features(**request_kwargs)
567+
568+
result = response.to_dict()
569+
assert result["driver_id"] == [3, 1, 3, 2]
570+
assert result["driver_stats__score"] == [30.0, 10.0, 30.0, 20.0]
571+
572+
442573
# ═══════════════════════════════════════════════════════════════════════════════
443574
# TTL enforcement in fast path
444575
# ═══════════════════════════════════════════════════════════════════════════════
@@ -472,6 +603,7 @@ def _fast_path_with_ttl(self, fv_event_dt, fv_ttl_seconds, fv_name="fv1"):
472603
online_features_response=response,
473604
full_feature_names=True,
474605
num_rows=1,
606+
entity_row_indices=([0],),
475607
grouped_refs=grouped_refs,
476608
registry=MagicMock(),
477609
project="test",
@@ -515,6 +647,7 @@ def test_zero_ttl_means_no_expiry(self):
515647
online_features_response=response,
516648
full_feature_names=True,
517649
num_rows=1,
650+
entity_row_indices=([0],),
518651
grouped_refs=[(fv, ["f1"])],
519652
registry=MagicMock(),
520653
project="test",
@@ -548,6 +681,7 @@ def test_mixed_ttl_some_expired_some_fresh(self):
548681
online_features_response=response,
549682
full_feature_names=True,
550683
num_rows=1,
684+
entity_row_indices=([0],),
551685
grouped_refs=[(fv1, ["f1"]), (fv2, ["f2"])],
552686
registry=MagicMock(),
553687
project="test",

0 commit comments

Comments
 (0)