Skip to content

Commit

Permalink
[FEAT] connect: read/write -> csv, write -> json
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewgazelka committed Dec 11, 2024
1 parent 5238279 commit d8cc857
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 14 deletions.
11 changes: 7 additions & 4 deletions src/daft-connect/src/op/execute/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@ impl Session {
bail!("Source is required");
};

if source != "parquet" {
bail!("Unsupported source: {source}; only parquet is supported");
}
let file_format = match &*source {
"parquet" => FileFormat::Parquet,
"csv" => FileFormat::Csv,
"json" => FileFormat::Json,
_ => bail!("Unsupported source: {source}; only parquet and csv are supported"),

Check warning on line 61 in src/daft-connect/src/op/execute/write.rs

View check run for this annotation

Codecov / codecov/patch

src/daft-connect/src/op/execute/write.rs#L60-L61

Added lines #L60 - L61 were not covered by tests
};

let Ok(mode) = SaveMode::try_from(mode) else {
bail!("Invalid save mode: {mode}");
Expand Down Expand Up @@ -113,7 +116,7 @@ impl Session {

plan.builder = plan
.builder
.table_write(&path, FileFormat::Parquet, None, None, None)
.table_write(&path, file_format, None, None, None)
.wrap_err("Failed to create table write plan")?;

let optimized_plan = plan.builder.optimize()?;
Expand Down
29 changes: 19 additions & 10 deletions src/daft-connect/src/translation/logical_plan/read/data_source.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use daft_logical_plan::LogicalPlanBuilder;
use daft_scan::builder::ParquetScanBuilder;
use daft_scan::builder::{CsvScanBuilder, ParquetScanBuilder};
use eyre::{bail, ensure, WrapErr};
use tracing::warn;

Expand All @@ -18,10 +18,6 @@ pub async fn data_source(
bail!("Format is required");
};

if format != "parquet" {
bail!("Unsupported format: {format}; only parquet is supported");
}

ensure!(!paths.is_empty(), "Paths are required");

if let Some(schema) = schema {
Expand All @@ -36,10 +32,23 @@ pub async fn data_source(
warn!("Ignoring predicates: {predicates:?}; not yet implemented");
}

let builder = ParquetScanBuilder::new(paths)
.finish()
.await
.wrap_err("Failed to create parquet scan builder")?;
let plan = match &*format {
"parquet" => ParquetScanBuilder::new(paths)
.finish()
.await
.wrap_err("Failed to create parquet scan builder")?,
"csv" => CsvScanBuilder::new(paths)
.finish()
.await
.wrap_err("Failed to create csv scan builder")?,
"json" => {

Check warning on line 44 in src/daft-connect/src/translation/logical_plan/read/data_source.rs

View check run for this annotation

Codecov / codecov/patch

src/daft-connect/src/translation/logical_plan/read/data_source.rs#L44

Added line #L44 was not covered by tests
// todo(completeness): implement json reading
bail!("json reading is not yet implemented");

Check warning on line 46 in src/daft-connect/src/translation/logical_plan/read/data_source.rs

View check run for this annotation

Codecov / codecov/patch

src/daft-connect/src/translation/logical_plan/read/data_source.rs#L46

Added line #L46 was not covered by tests
}
other => {
bail!("Unsupported format: {other}; only parquet and csv are supported");

Check warning on line 49 in src/daft-connect/src/translation/logical_plan/read/data_source.rs

View check run for this annotation

Codecov / codecov/patch

src/daft-connect/src/translation/logical_plan/read/data_source.rs#L48-L49

Added lines #L48 - L49 were not covered by tests
}
};

Ok(builder)
Ok(plan)
}
36 changes: 36 additions & 0 deletions tests/connect/test_csv.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
from __future__ import annotations

import tempfile
import shutil
import os


def test_write_csv(spark_session):
# Create a temporary directory
temp_dir = tempfile.mkdtemp()
try:
# Create DataFrame from range(10)
df = spark_session.range(10)

# Write DataFrame to CSV directory
csv_dir = os.path.join(temp_dir, "test.csv")
df.write.csv(csv_dir)

# List all files in the CSV directory
csv_files = [f for f in os.listdir(csv_dir) if f.endswith('.csv')]
print(f"CSV files in directory: {csv_files}")

# Assert there is at least one CSV file
assert len(csv_files) > 0, "Expected at least one CSV file to be written"

# Read back from the CSV directory (not specific file)
df_read = spark_session.read.csv(csv_dir)

# Verify the data is unchanged
df_pandas = df.toPandas()
df_read_pandas = df_read.toPandas()
assert df_pandas["id"].equals(df_read_pandas["id"]), "Data should be unchanged after write/read"

finally:
# Clean up temp directory
shutil.rmtree(temp_dir)

0 comments on commit d8cc857

Please sign in to comment.