mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-11-17 08:14:56 +00:00
Conflicts: - `src/common/query/Cargo.toml`: `futures-util` stays non-optional because the series-frame API exposes `futures_util::Stream`; `testing` only pulls `datafusion-datasource`. - `src/frontend/src/instance.rs`: import union (`ServerMemoryLimiter` from main, `MetricDiscoveryScope` from narthex). - `Cargo.toml` / `Cargo.lock`: follow main's newer greptime-proto rev (`c46f7ee9c`), which contains the `RawSeriesSource` this branch needs. - `tests-integration/src/standalone.rs`: keep both `query_options` and `auto_create_physical_table_timestamp_unit`. Signed-off-by: discord9 <discord9@163.com>