Skip to content

Commit

Permalink
bump more more
Browse files Browse the repository at this point in the history
Signed-off-by: Bugen Zhao <[email protected]>
  • Loading branch information
BugenZhao committed Aug 1, 2024
1 parent 4bf5387 commit 1eb742b
Show file tree
Hide file tree
Showing 17 changed files with 143 additions and 66 deletions.
138 changes: 106 additions & 32 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion src/batch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ parking_lot = { workspace = true }
parquet = { workspace = true }
paste = "1"
prometheus = { version = "0.13", features = ["process"] }
prost = "0.12"
rand = { workspace = true }
risingwave_common = { workspace = true }
risingwave_common_estimate_size = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/executor/hash_agg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use bytes::Bytes;
use futures_async_stream::try_stream;
use hashbrown::hash_map::Entry;
use itertools::Itertools;
use prost::Message;
use risingwave_pb::Message;
use risingwave_common::array::{DataChunk, StreamChunk};
use risingwave_common::bitmap::Bitmap;
use risingwave_common::catalog::{Field, Schema};
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/executor/join/hash_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use std::sync::Arc;
use bytes::Bytes;
use futures_async_stream::try_stream;
use itertools::Itertools;
use prost::Message;
use risingwave_pb::Message;
use risingwave_common::array::{Array, DataChunk, RowRef};
use risingwave_common::bitmap::{Bitmap, BitmapBuilder};
use risingwave_common::catalog::Schema;
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/executor/order_by.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use std::sync::Arc;
use bytes::Bytes;
use futures_async_stream::try_stream;
use itertools::Itertools;
use prost::Message;
use risingwave_common::array::DataChunk;
use risingwave_common::catalog::Schema;
use risingwave_common::memory::MemoryContext;
Expand All @@ -28,6 +27,7 @@ use risingwave_common::util::sort_util::ColumnOrder;
use risingwave_common_estimate_size::EstimateSize;
use risingwave_pb::batch_plan::plan_node::NodeBody;
use risingwave_pb::data::DataChunk as PbDataChunk;
use risingwave_pb::Message;

use super::{
BoxedDataChunkStream, BoxedExecutor, BoxedExecutorBuilder, Executor, ExecutorBuilder,
Expand Down
2 changes: 1 addition & 1 deletion src/batch/src/spill/spill_op.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use futures_util::AsyncReadExt;
use opendal::layers::RetryLayer;
use opendal::services::{Fs, Memory};
use opendal::Operator;
use prost::Message;
use risingwave_pb::Message;
use risingwave_common::array::DataChunk;
use risingwave_pb::data::DataChunk as PbDataChunk;
use thiserror_ext::AsReport;
Expand Down
2 changes: 1 addition & 1 deletion src/common/common_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ normal = ["workspace-hack"]
async-trait = "0.1"
axum = { workspace = true }
futures = { version = "0.3", default-features = false, features = ["alloc"] }
hyper = "0.14" # required by tonic
http = "1"
prometheus = { version = "0.13" }
risingwave_common = { workspace = true }
risingwave_pb = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions src/common/common_service/src/tracing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
use std::task::{Context, Poll};

use futures::Future;
use hyper::Body;
use risingwave_common::util::tracing::TracingContext;
use tonic::body::BoxBody;
use tower::{Layer, Service};
use tracing::Instrument;

Expand Down Expand Up @@ -49,9 +49,9 @@ pub struct TracingExtract<S> {
inner: S,
}

impl<S> Service<hyper::Request<Body>> for TracingExtract<S>
impl<S> Service<http::Request<BoxBody>> for TracingExtract<S>
where
S: Service<hyper::Request<Body>> + Clone + Send + 'static,
S: Service<http::Request<BoxBody>> + Clone + Send + 'static,
S::Future: Send + 'static,
{
type Error = S::Error;
Expand All @@ -63,7 +63,7 @@ where
self.inner.poll_ready(cx)
}

fn call(&mut self, req: hyper::Request<Body>) -> Self::Future {
fn call(&mut self, req: http::Request<BoxBody>) -> Self::Future {
// This is necessary because tonic internally uses `tower::buffer::Buffer`.
// See https://github.com/tower-rs/tower/issues/547#issuecomment-767629149
// for details on why this is necessary
Expand All @@ -72,7 +72,7 @@ where

async move {
let span =
if let Some(tracing_context) = TracingContext::from_http_headers(req.headers()) {
if let Some(tracing_context) = TracingContext::from_http_1_headers(req.headers()) {
let span = tracing::info_span!(
"grpc_serve",
"otel.name" = req.uri().path(),
Expand Down
Loading

0 comments on commit 1eb742b

Please sign in to comment.