From 3631c2db1460bcccf2e8e2d34f2683ef7e18b912 Mon Sep 17 00:00:00 2001
From: QP Hou <dave2008713@gmail.com>
Date: Sun, 28 Feb 2021 11:50:27 -0800
Subject: [PATCH] update arrow and datafusion to latest master (#13)

---
 Cargo.lock               | 7 ++++---
 Cargo.toml               | 6 +++---
 README.md                | 1 -
 columnq/src/table/csv.rs | 5 ++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a47a65..10be2ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -293,7 +293,7 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 [[package]]
 name = "arrow"
 version = "4.0.0-SNAPSHOT"
-source = "git+https://github.com/houqp/arrow.git?rev=555d12458a1c32301e0ce179143577f34fe78b6e#555d12458a1c32301e0ce179143577f34fe78b6e"
+source = "git+https://github.com/houqp/arrow.git?rev=f7cf15749f2df907994f48ef0bfbed3001bf145e#f7cf15749f2df907994f48ef0bfbed3001bf145e"
 dependencies = [
  "cfg_aliases",
  "chrono",
@@ -779,7 +779,7 @@ dependencies = [
 [[package]]
 name = "datafusion"
 version = "4.0.0-SNAPSHOT"
-source = "git+https://github.com/houqp/arrow.git?rev=555d12458a1c32301e0ce179143577f34fe78b6e#555d12458a1c32301e0ce179143577f34fe78b6e"
+source = "git+https://github.com/houqp/arrow.git?rev=f7cf15749f2df907994f48ef0bfbed3001bf145e#f7cf15749f2df907994f48ef0bfbed3001bf145e"
 dependencies = [
  "ahash 0.7.0",
  "arrow",
@@ -800,6 +800,7 @@ dependencies = [
  "sha2",
  "sqlparser 0.8.0",
  "tokio",
+ "unicode-segmentation",
 ]
 
 [[package]]
@@ -1718,7 +1719,7 @@ dependencies = [
 [[package]]
 name = "parquet"
 version = "4.0.0-SNAPSHOT"
-source = "git+https://github.com/houqp/arrow.git?rev=555d12458a1c32301e0ce179143577f34fe78b6e#555d12458a1c32301e0ce179143577f34fe78b6e"
+source = "git+https://github.com/houqp/arrow.git?rev=f7cf15749f2df907994f48ef0bfbed3001bf145e#f7cf15749f2df907994f48ef0bfbed3001bf145e"
 dependencies = [
  "arrow",
  "base64 0.12.3",
diff --git a/Cargo.toml b/Cargo.toml
index 5e25410..2cb10e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,9 +6,9 @@ members = [
 ]
 
 [patch.crates-io]
-arrow = { git = "https://github.com/houqp/arrow.git", rev = "555d12458a1c32301e0ce179143577f34fe78b6e" }
-parquet = { git = "https://github.com/houqp/arrow.git", rev = "555d12458a1c32301e0ce179143577f34fe78b6e" }
-datafusion = { git = "https://github.com/houqp/arrow.git", rev = "555d12458a1c32301e0ce179143577f34fe78b6e" }
+arrow = { git = "https://github.com/houqp/arrow.git", rev = "f7cf15749f2df907994f48ef0bfbed3001bf145e" }
+parquet = { git = "https://github.com/houqp/arrow.git", rev = "f7cf15749f2df907994f48ef0bfbed3001bf145e" }
+datafusion = { git = "https://github.com/houqp/arrow.git", rev = "f7cf15749f2df907994f48ef0bfbed3001bf145e" }
 
 actix-web = { git = "https://github.com/actix/actix-web.git", rev = "b37669cb3b47eeb60c161ff12156d1c877af91a2" }
 actix-http = { git = "https://github.com/actix/actix-web.git", rev = "b37669cb3b47eeb60c161ff12156d1c877af91a2" }
diff --git a/README.md b/README.md
index 1de09d9..9dd88eb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 # ROAPI
 
 ![build](https://github.com/roapi/roapi/workflows/build/badge.svg)
diff --git a/columnq/src/table/csv.rs b/columnq/src/table/csv.rs
index 80c4347..662e394 100644
--- a/columnq/src/table/csv.rs
+++ b/columnq/src/table/csv.rs
@@ -19,9 +19,8 @@ pub async fn to_mem_table(
         Some(s) => Arc::new(s.into()),
         None => {
             let schemas = partitions_from_table_source!(t, |mut r| {
-                let (schema, record_count) = arrow::csv::reader::infer_schema_from_reader(
-                    &mut r, delimiter, None, has_header,
-                )?;
+                let (schema, record_count) =
+                    arrow::csv::reader::infer_reader_schema(&mut r, delimiter, None, has_header)?;
 
                 if record_count > 0 {
                     Ok(Some(schema))