Skip to content

Commit 5e41765

Browse files
committed
fix integration tests
1 parent 8518c67 commit 5e41765

File tree

7 files changed

+33
-137
lines changed

7 files changed

+33
-137
lines changed

Cargo.lock

+21-128
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ lazy_static = "1.4.0"
8989
log = "0.4"
9090
logger = { path = "components/logger" }
9191
lru = "0.7.6"
92+
influxql-logical-planner = { git = "https://github.com/CeresDB/influxql", package = "iox_query_influxql" }
93+
influxql-parser = { git = "https://github.com/CeresDB/influxql", package = "influxdb_influxql_parser" }
94+
influxql-query = { git = "https://github.com/CeresDB/influxql", package = "iox_query" }
95+
influxql-schema = { git = "https://github.com/CeresDB/influxql", package = "schema" }
9296
interpreters = { path = "interpreters" }
9397
itertools = "0.10.5"
9498
meta_client = { path = "meta_client" }

analytic_engine/src/sst/parquet/hybrid.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@ impl ArrayHandle {
7474
}
7575

7676
// Note: this require primitive array
77-
78-
fn data_slice(&self) -> &[u8] {
79-
unimplemented!()
77+
fn data_slice(&self) -> Vec<u8> {
78+
self.array.to_data().buffers()[0].as_slice().to_vec()
8079
}
8180

8281
fn nulls(&self) -> Option<&NullBuffer> {

query_engine/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ common_util = { workspace = true }
2020
datafusion = { workspace = true }
2121
df_operator = { workspace = true }
2222
futures = { workspace = true }
23-
iox_query = { git = "https://github.com/CeresDB/influxql" }
23+
influxql-query = { workspace = true }
2424
log = { workspace = true }
2525
query_frontend = { workspace = true }
2626
serde = { workspace = true }

query_engine/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl Context {
6969
.with_query_planner(Arc::new(QueryPlannerAdapter))
7070
.with_analyzer_rules(Self::analyzer_rules())
7171
.with_optimizer_rules(logical_optimize_rules);
72-
let state = iox_query::logical_optimizer::register_iox_logical_optimizers(state);
72+
let state = influxql_query::logical_optimizer::register_iox_logical_optimizers(state);
7373
let physical_optimizer =
7474
Self::apply_adapters_for_physical_optimize_rules(state.physical_optimizers());
7575
SessionContext::with_state(state.with_physical_optimizer_rules(physical_optimizer))

query_engine/src/df_planner_extension/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl QueryPlanner for QueryPlannerAdapter {
3030
let extension_planners: Vec<Arc<dyn ExtensionPlanner + Send + Sync>> = vec![
3131
Arc::new(table_scan_by_primary_key::Planner),
3232
Arc::new(prom_align::PromAlignPlanner),
33-
Arc::new(iox_query::exec::context::IOxExtensionPlanner {}),
33+
Arc::new(influxql_query::exec::context::IOxExtensionPlanner {}),
3434
];
3535

3636
let physical_planner = DefaultPhysicalPlanner::with_extension_planners(extension_planners);

query_frontend/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ datafusion = { workspace = true }
2626
datafusion-proto = { workspace = true }
2727
df_operator = { workspace = true }
2828
hashbrown = { version = "0.12", features = ["raw"] }
29-
influxql-logical-planner = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "iox_query_influxql" }
30-
influxql-parser = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "influxdb_influxql_parser" }
31-
influxql-schema = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "schema" }
29+
influxql-logical-planner = { workspace = true }
30+
influxql-parser = { workspace = true }
31+
influxql-schema = { workspace = true }
3232
itertools = { workspace = true }
3333
lazy_static = { workspace = true }
3434
log = { workspace = true }

0 commit comments

Comments
 (0)