[fix] removed Ballista stubs

apache · Sep 22, 2021 · 82d1763 · 82d1763
1 parent 833dafc
commit 82d1763
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/ballista/rust/core/proto/ballista.proto b/ballista/rust/core/proto/ballista.proto
@@ -943,30 +943,6 @@ message GetFileMetadataParams {
   FileType file_type = 2;
 }
 
-message ParquetFormat {
-  // fields of datasource::format::parquet::ParquetFormat
-}
-
-message ListingConfig {
-  string extension = 1;
-  oneof format {
-    ParquetFormat parquet = 2;
-    // csv, json, ...
-  }
-}
-
-message GetSchemaParams {
-  string path = 1;
-  oneof provider_config {
-    ListingConfig listing = 2;
-    // delta, iceberg... (maybe replace oneof with something more exensible)
-  }
-}
-
-message GetSchemaResult {
-  Schema schema = 1;
-}
-
 message GetFileMetadataResult {
   Schema schema = 1;
   repeated FilePartitionMetadata partitions = 2;
@@ -980,8 +956,6 @@ service SchedulerGrpc {
   // Executors must poll the scheduler for heartbeat and to receive tasks
   rpc PollWork (PollWorkParams) returns (PollWorkResult) {}
 
-  rpc GetSchema (GetSchemaParams) returns (GetSchemaResult) {}
-
   rpc GetFileMetadata (GetFileMetadataParams) returns (GetFileMetadataResult) {}
 
   rpc ExecuteQuery (ExecuteQueryParams) returns (ExecuteQueryResult) {}

diff --git a/ballista/rust/scheduler/src/lib.rs b/ballista/rust/scheduler/src/lib.rs
@@ -22,7 +22,6 @@ pub mod planner;
 #[cfg(feature = "sled")]
 mod standalone;
 pub mod state;
-use ballista_core::serde::protobuf::{GetSchemaParams, GetSchemaResult};
 #[cfg(feature = "sled")]
 pub use standalone::new_standalone_scheduler;
 
@@ -269,16 +268,6 @@ impl SchedulerGrpc for SchedulerServer {
         }
     }
 
-    /// this service would replace get_file_metadata
-    async fn get_schema(
-        &self,
-        _request: Request<GetSchemaParams>,
-    ) -> std::result::Result<Response<GetSchemaResult>, tonic::Status> {
-        // if GetSchemaParams contains a provider config of type ListingConfig
-        // use ListingOptions.infer_schema()
-        todo!()
-    }
-
     async fn get_file_metadata(
         &self,
         request: Request<GetFileMetadataParams>,

diff --git a/datafusion/src/datasource/file_format/mod.rs b/datafusion/src/datasource/file_format/mod.rs
@@ -37,7 +37,7 @@ use futures::Stream;
 /// A stream of String that can be used accross await calls
 pub type StringStream = Pin<Box<dyn Stream<Item = String> + Send + Sync>>;
 
-/// Convert a vec into a `StringStream`
+/// Convert a vector into a stream
 pub fn string_stream(strings: Vec<String>) -> StringStream {
     Box::pin(futures::stream::iter(strings))
 }