Skip to content

Solve the parquet conversion problem #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
metegenez wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Solve the parquet conversion problem #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5334b4e
Solve the parquet conversion problem
metegenez Jun 20, 2024
e3de7e8
Update tpch schema
metegenez Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::path::{Path, PathBuf};
use std::time::Instant;

use async_trait::async_trait;
use datafusion::arrow::datatypes::Schema;
use datafusion::arrow::datatypes::{DataType, Field, Schema, SchemaBuilder};
use datafusion::error::DataFusionError;
use datafusion::parquet::basic::Compression;
use datafusion::parquet::file::properties::WriterProperties;
Expand Down Expand Up @@ -49,11 +49,15 @@ pub async fn convert_to_parquet(
) -> datafusion::error::Result<()> {
for table in benchmark.get_table_names() {
println!("Converting table {}", table);
let schema = benchmark.get_schema(table);

let mut schema_builder = SchemaBuilder::from(benchmark.get_schema(table).fields);
schema_builder.push(Field::new("__placeholder", DataType::Utf8, true));
let schema = schema_builder.finish();

let file_ext = format!(".{}", benchmark.get_table_ext());
let options = CsvReadOptions::new()
.schema(&schema)
.has_header(false)
.delimiter(b'|')
.file_extension(&file_ext);

Expand Down Expand Up @@ -178,7 +182,19 @@ pub async fn convert_tbl(

// build plan to read the TBL file
let csv_filename = format!("{}", input_path.display());
let df = ctx.read_csv(&csv_filename, options.clone()).await?;
let mut df = ctx.read_csv(&csv_filename, options.clone()).await?;

let schema = df.schema();
// Select all apart from the padding column
let selection = df
.schema()
.fields()
.iter()
.take(schema.fields().len() - 1)
.map(|d| Expr::Column(d.qualified_column()))
.collect();

df = df.select(selection)?;

match file_format {
"csv" => df.write_csv(&output_filename).await?,
Expand Down
8 changes: 0 additions & 8 deletions src/tpch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ impl Tpc for TpcH {
Field::new("p_container", DataType::Utf8, false),
Field::new("p_retailprice", DataType::Decimal128(11, 2), false),
Field::new("p_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"supplier" => Schema::new(vec![
Expand All @@ -164,7 +163,6 @@ impl Tpc for TpcH {
Field::new("s_phone", DataType::Utf8, false),
Field::new("s_acctbal", DataType::Decimal128(11, 2), false),
Field::new("s_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"partsupp" => Schema::new(vec![
Expand All @@ -173,7 +171,6 @@ impl Tpc for TpcH {
Field::new("ps_availqty", DataType::Int32, false),
Field::new("ps_supplycost", DataType::Decimal128(11, 2), false),
Field::new("ps_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"customer" => Schema::new(vec![
Expand All @@ -185,7 +182,6 @@ impl Tpc for TpcH {
Field::new("c_acctbal", DataType::Decimal128(11, 2), false),
Field::new("c_mktsegment", DataType::Utf8, false),
Field::new("c_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"orders" => Schema::new(vec![
Expand All @@ -198,7 +194,6 @@ impl Tpc for TpcH {
Field::new("o_clerk", DataType::Utf8, false),
Field::new("o_shippriority", DataType::Int32, false),
Field::new("o_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"lineitem" => Schema::new(vec![
Expand All @@ -218,22 +213,19 @@ impl Tpc for TpcH {
Field::new("l_shipinstruct", DataType::Utf8, false),
Field::new("l_shipmode", DataType::Utf8, false),
Field::new("l_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"nation" => Schema::new(vec![
Field::new("n_nationkey", DataType::Int64, false),
Field::new("n_name", DataType::Utf8, false),
Field::new("n_regionkey", DataType::Int64, false),
Field::new("n_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

"region" => Schema::new(vec![
Field::new("r_regionkey", DataType::Int64, false),
Field::new("r_name", DataType::Utf8, false),
Field::new("r_comment", DataType::Utf8, false),
Field::new("ignore", DataType::Utf8, true),
]),

_ => unimplemented!(),
Expand Down