feast-dev · zelinewang · Jul 14, 2026 · Jul 17, 2026
diff --git a/pixi.lock b/pixi.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,8 +23,7 @@ dependencies = [
     "mmh3",
     "numpy>=2.0.0,<3",
     "pandas>=1.4.3,<3",
-    "pyarrow>=21.0.0; extra != 'flink'",
-    "pyarrow>=16.1.0,<21.0.0; extra == 'flink'",
+    "pyarrow>=16.1.0",
     "pydantic>=2.10.6",
     "pygments>=2.12.0,<3",
     "PyYAML>=5.4.0,<7",
@@ -67,7 +66,7 @@ docling = ["docling==2.27.0"]
 duckdb = ["ibis-framework[duckdb]>=10.0.0"]
 elasticsearch = ["elasticsearch>=8.13.0"]
 faiss = ["faiss-cpu>=1.7.0,<=1.10.0"]
-flink = ["apache-flink>=2.2.1,<3"]
+flink = ["apache-flink>=2.2.1,<3", "pyarrow<21.0.0"]
 gcp = [
     "google-api-core>=1.23.0,<3",
     "googleapis-common-protos>=1.52.0,<2",

@@ -11,7 +11,6 @@
 import pandas as pd
 import pyarrow as pa
 import pytest
-import toml  # type: ignore[import-untyped]
 
 from feast import BatchFeatureView, Entity, Field, FileSource
 from feast.aggregation import Aggregation
@@ -50,20 +49,6 @@
 from feast.value_type import ValueType
 
 
-def test_flink_extra_does_not_downgrade_default_pyarrow_dependency() -> None:
-    pyproject_path = Path(__file__).resolve().parents[7] / "pyproject.toml"
-    pyproject = toml.loads(pyproject_path.read_text())
-
-    dependencies = pyproject["project"]["dependencies"]
-    assert "pyarrow>=21.0.0; extra != 'flink'" in dependencies
-    assert "pyarrow>=16.1.0,<21.0.0; extra == 'flink'" in dependencies
-    assert "pyarrow>=16.1.0" not in dependencies
-    assert (
-        "apache-flink>=2.2.1,<3"
-        in pyproject["project"]["optional-dependencies"]["flink"]
-    )
-
-
 class FakeFlinkTable:
     def __init__(self, df: pd.DataFrame, fail_on_to_pandas: bool = False) -> None:
         self._df = df.copy()

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import toml  # type: ignore[import-untyped]
+
+
+def test_flink_extra_constrains_shared_pyarrow_dependency() -> None:
+    pyproject_path = Path(__file__).resolve().parents[7] / "pyproject.toml"
+    pyproject = toml.loads(pyproject_path.read_text())
+
+    dependencies = pyproject["project"]["dependencies"]
+    flink_dependencies = pyproject["project"]["optional-dependencies"]["flink"]
+
+    assert "pyarrow>=16.1.0" in dependencies
+    assert not any(
+        dependency.startswith("pyarrow") and "extra" in dependency
+        for dependency in dependencies
+    )
+    assert "pyarrow<21.0.0" in flink_dependencies
+    assert "apache-flink>=2.2.1,<3" in flink_dependencies