Skip to content

Commit 5ac9295

Browse files
hiltontjalambcannonpalmsjdockertyjeffreyssmith2nd
authored
chore(sync): influxdb_pro 2026-05-01 (#27399)
Source: ad8686d895cadac4972a612dd2b5e4d0e0adfabf Commits: - `4bf54d028e` chore(ci): cargo audit ignore for 'RUSTSEC-2026-0114' (influxdata/influxdb_pro#3365) - `dca0fabb21` feat: add plugin trigger type restrictions (influxdata/influxdb_pro#3293) - `0ecab6db06` feat(grpc): emit query-stats gRPC trailers on Enterprise Flight do_get (influxdata/influxdb_pro#3295) - `b681835416` fix(WriteLineError): slice string at utf-8 boundary (influxdata/influxdb_pro#3292) - `545100cfba` fix(sll): include database_id on v1 /query entries (influxdata/influxdb_pro#3284) - `694b428ba3` feat: add import command to CLI to exercise the Bulk Import API (influxdata/influxdb_pro#3162) - `c1c0d3373d` chore: Remove iox-sync from justfiles and readme (influxdata/influxdb_pro#3256) - `2a03788008` docs: fix rustdoc (influxdata/influxdb_pro#3222) - `5d80136a7e` feat(pacha_tree): wire V2 compactor into Combined mode HTTP test endpoints (influxdata/influxdb_pro#3216) - `ce9a862a4a` feat(server): add /ready endpoint with object store health check (influxdata/influxdb_pro#3185) - `85e125f679` fix(tokio): update to 1.52.1 for spawn_blocking fix (influxdata/influxdb_pro#3200) Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org> Co-authored-by: Cannon Palms <cpalms@influxdata.com> Co-authored-by: Jack <56563911+jdockerty@users.noreply.github.com> Co-authored-by: Jeffrey Smith II <jsmith@influxdata.com> Co-authored-by: Lili Cosic <cosiclili@gmail.com> Co-authored-by: Phil Bracikowski <13472206+philjb@users.noreply.github.com> Co-authored-by: Reid Kaufmann <73494261+reidkaufmann@users.noreply.github.com>
1 parent b66fe85 commit 5ac9295

34 files changed

Lines changed: 1508 additions & 75 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,8 @@ jobs:
271271
command: cargo install cargo-deny --locked
272272
- run:
273273
name: cargo-deny Checks
274-
# `--warn unsound` downgrades RustSec `informational = "unsound"`
275-
# advisories to warnings, they flag API soundness concerns, not
276-
# exploitable vulnerabilities, so we don't want them to fail CI.
277274
command: cargo deny check -s --warn unsound
275+
278276
doc:
279277
docker:
280278
- image: quay.io/influxdb/rust:ci

.circleci/packages/influxdb3/fs/usr/share/influxdb3/influxdb3-core.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@
228228
# URL of plugin repository (env: INFLUXDB3_PLUGIN_REPO)
229229
#plugin-repo="<URL>"
230230

231+
# Restrict plugin triggers to the provided trigger type(s). Comma-separated
232+
# list of: wal, schedule, request (env: INFLUXDB3_RESTRICT_PLUGIN_TRIGGERS_TO)
233+
#restrict-plugin-triggers-to="<TYPES>"
234+
231235
# =============================================================================
232236
# Data Lifecycle & Retention
233237
# =============================================================================

Cargo.lock

Lines changed: 20 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ regex = "1.11.1"
212212
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream", "json"] }
213213
rstest = "0.26"
214214
rustls = { version = "0.23", default-features = false, features = ["logging", "ring", "std", "tls12"] }
215-
rustls-webpki = { version = "0.103.12", default-features = false, features = ["ring", "std"] }
215+
rustls-webpki = { version = "0.103.13", default-features = false, features = ["ring", "std"] }
216216
secrecy = "0.8.0"
217217
serde = { version = "1.0", features = ["derive"] }
218218
# serde_json is set to 1.0.127 to prevent a conflict with core, if that gets updated upstream, this

core/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# `oss/core`
2+
3+
`oss/core` contains the lower-level shared crates shared across:
4+
5+
- InfluxDB 3 Core
6+
- InfluxDB 3 Enterprise
7+
- InfluxDB 3 IOx
8+
9+
These crates provide common building blocks such as query execution, schema and data
10+
types, HTTP and gRPC utilities, observability helpers, and supporting Arrow and Parquet
11+
infrastructure.
12+
13+
14+
Examples of crates in this directory include:
15+
16+
- query and planner crates such as `iox_query`, `iox_query_influxql`, and `query_functions`
17+
- shared data model crates such as `data_types`, `schema`, and `mutable_batch`
18+
- service and protocol crates such as `generated_types`, `service_grpc_flight`, and `iox_http`
19+
- common runtime and observability crates such as `executor`, `metric`, `trace`, and `trogging`
20+
21+
As a rule of thumb, code belongs in `core` when it is product-agnostic infrastructure.

core/data_types/src/columns.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,25 @@ impl std::fmt::Display for ColumnType {
411411
}
412412
}
413413

414+
impl std::str::FromStr for ColumnType {
415+
type Err = String;
416+
417+
fn from_str(s: &str) -> Result<Self, Self::Err> {
418+
match s {
419+
"i64" => Ok(Self::I64),
420+
"u64" => Ok(Self::U64),
421+
"f64" => Ok(Self::F64),
422+
"bool" => Ok(Self::Bool),
423+
"string" => Ok(Self::String),
424+
"time" => Ok(Self::Time),
425+
"tag" => Ok(Self::Tag),
426+
_ => Err(format!(
427+
"invalid column type '{s}': valid types are i64, u64, f64, bool, string, time, tag"
428+
)),
429+
}
430+
}
431+
}
432+
414433
impl TryFrom<&ArrowDataType> for ColumnType {
415434
type Error = &'static str;
416435

0 commit comments

Comments
 (0)