nits

Signed-off-by: Baris Palaska <[email protected]>

Author: palaska

vortex-tui/src/browse/ui/query.rs

@@ -29,7 +29,7 @@ use tokio::task::block_in_place;
 
 use crate::browse::app::AppState;
 use crate::datafusion_helper::arrow_value_to_json;
-use crate::datafusion_helper::execute_vortex_query;
+use crate::datafusion_helper::execute_query;
 use crate::datafusion_helper::json_value_to_display;
 
 /// Sort direction for table columns.
@@ -251,7 +251,7 @@ impl QueryState {
         self.running = true;
         self.error = None;
 
-        match execute_query(file_path, &self.sql_input) {
+        match exec_query(file_path, &self.sql_input) {
             Ok(results) => {
                 self.results = Some(results);
                 self.table_state.select(Some(0));
@@ -383,10 +383,10 @@ pub struct QueryResults {
 }
 
 /// Execute a SQL query against the Vortex file.
-pub fn execute_query(file_path: &str, sql: &str) -> Result<QueryResults, String> {
+fn exec_query(file_path: &str, sql: &str) -> Result<QueryResults, String> {
     block_in_place(|| {
         Handle::current().block_on(async {
-            let batches = execute_vortex_query(file_path, sql).await?;
+            let batches = execute_query(file_path, sql).await?;
 
             let total_rows: usize = batches.iter().map(|b| b.num_rows()).sum();
 
@@ -412,7 +412,7 @@ pub fn get_row_count(file_path: &str, base_query: &str) -> Result<usize, String>
         Handle::current().block_on(async {
             let count_sql = format!("SELECT COUNT(*) as count FROM ({base_query}) AS subquery");
 
-            let batches = execute_vortex_query(file_path, &count_sql).await?;
+            let batches = execute_query(file_path, &count_sql).await?;
 
             // Extract count from result
             if let Some(batch) = batches.first()

vortex-tui/src/datafusion_helper.rs

@@ -20,8 +20,8 @@ use crate::SESSION;
 ///
 /// The file is registered as a table named "data".
 /// Returns the result as a vector of RecordBatches.
-pub async fn execute_vortex_query(file_path: &str, sql: &str) -> Result<Vec<RecordBatch>, String> {
-    let ctx = create_vortex_context(file_path).await?;
+pub async fn execute_query(file_path: &str, sql: &str) -> Result<Vec<RecordBatch>, String> {
+    let ctx = create_context(file_path).await?;
 
     let df = ctx.sql(sql).await.map_err(|e| format!("SQL error: {e}"))?;
 
@@ -31,7 +31,7 @@ pub async fn execute_vortex_query(file_path: &str, sql: &str) -> Result<Vec<Reco
 }
 
 /// Create a DataFusion SessionContext with a Vortex file registered as "data".
-pub async fn create_vortex_context(file_path: &str) -> Result<SessionContext, String> {
+async fn create_context(file_path: &str) -> Result<SessionContext, String> {
     let ctx = SessionContext::new();
     let format = Arc::new(VortexFormat::new(SESSION.clone()));
 

vortex-tui/src/main.rs

@@ -28,7 +28,6 @@ use crate::inspect::InspectArgs;
 use crate::segments::SegmentsArgs;
 
 #[derive(clap::Parser)]
-#[command(version)]
 struct Cli {
     #[clap(subcommand)]
     command: Commands,

vortex-tui/src/query.rs

@@ -9,7 +9,7 @@ use vortex::error::VortexResult;
 use vortex::error::vortex_err;
 
 use crate::datafusion_helper::arrow_value_to_json;
-use crate::datafusion_helper::execute_vortex_query;
+use crate::datafusion_helper::execute_query;
 
 #[derive(Debug, clap::Parser)]
 pub struct QueryArgs {
@@ -47,7 +47,7 @@ pub async fn exec_query(args: QueryArgs) -> VortexResult<()> {
         .to_str()
         .ok_or_else(|| vortex_err!("Path is not valid UTF-8"))?;
 
-    let batches: Vec<RecordBatch> = execute_vortex_query(file_path, &args.sql)
+    let batches: Vec<RecordBatch> = execute_query(file_path, &args.sql)
         .await
         .map_err(|e| vortex_err!("{e}"))?;
 

vortex-tui/src/tree.rs

@@ -82,7 +82,6 @@ async fn exec_array_tree(file: &Path, _json: bool) -> VortexResult<()> {
         .read_all()
         .await?;
 
-    // TODO: Add JSON output support for array tree
     println!("{}", full.display_tree());
 
     Ok(())