Skip to content

Commit

Permalink
fix integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jiacai2050 committed May 17, 2023
1 parent 8518c67 commit 5e41765
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 137 deletions.
149 changes: 21 additions & 128 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ lazy_static = "1.4.0"
log = "0.4"
logger = { path = "components/logger" }
lru = "0.7.6"
influxql-logical-planner = { git = "https://github.com/CeresDB/influxql", package = "iox_query_influxql" }
influxql-parser = { git = "https://github.com/CeresDB/influxql", package = "influxdb_influxql_parser" }
influxql-query = { git = "https://github.com/CeresDB/influxql", package = "iox_query" }
influxql-schema = { git = "https://github.com/CeresDB/influxql", package = "schema" }
interpreters = { path = "interpreters" }
itertools = "0.10.5"
meta_client = { path = "meta_client" }
Expand Down
5 changes: 2 additions & 3 deletions analytic_engine/src/sst/parquet/hybrid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,8 @@ impl ArrayHandle {
}

// Note: this require primitive array

fn data_slice(&self) -> &[u8] {
unimplemented!()
fn data_slice(&self) -> Vec<u8> {
self.array.to_data().buffers()[0].as_slice().to_vec()
}

fn nulls(&self) -> Option<&NullBuffer> {
Expand Down
2 changes: 1 addition & 1 deletion query_engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ common_util = { workspace = true }
datafusion = { workspace = true }
df_operator = { workspace = true }
futures = { workspace = true }
iox_query = { git = "https://github.com/CeresDB/influxql" }
influxql-query = { workspace = true }
log = { workspace = true }
query_frontend = { workspace = true }
serde = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion query_engine/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl Context {
.with_query_planner(Arc::new(QueryPlannerAdapter))
.with_analyzer_rules(Self::analyzer_rules())
.with_optimizer_rules(logical_optimize_rules);
let state = iox_query::logical_optimizer::register_iox_logical_optimizers(state);
let state = influxql_query::logical_optimizer::register_iox_logical_optimizers(state);
let physical_optimizer =
Self::apply_adapters_for_physical_optimize_rules(state.physical_optimizers());
SessionContext::with_state(state.with_physical_optimizer_rules(physical_optimizer))
Expand Down
2 changes: 1 addition & 1 deletion query_engine/src/df_planner_extension/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl QueryPlanner for QueryPlannerAdapter {
let extension_planners: Vec<Arc<dyn ExtensionPlanner + Send + Sync>> = vec![
Arc::new(table_scan_by_primary_key::Planner),
Arc::new(prom_align::PromAlignPlanner),
Arc::new(iox_query::exec::context::IOxExtensionPlanner {}),
Arc::new(influxql_query::exec::context::IOxExtensionPlanner {}),
];

let physical_planner = DefaultPhysicalPlanner::with_extension_planners(extension_planners);
Expand Down
6 changes: 3 additions & 3 deletions query_frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ datafusion = { workspace = true }
datafusion-proto = { workspace = true }
df_operator = { workspace = true }
hashbrown = { version = "0.12", features = ["raw"] }
influxql-logical-planner = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "iox_query_influxql" }
influxql-parser = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "influxdb_influxql_parser" }
influxql-schema = { git = "https://github.com/CeresDB/influxql", branch = "chore-log", package = "schema" }
influxql-logical-planner = { workspace = true }
influxql-parser = { workspace = true }
influxql-schema = { workspace = true }
itertools = { workspace = true }
lazy_static = { workspace = true }
log = { workspace = true }
Expand Down

0 comments on commit 5e41765

Please sign in to comment.