change cargo temporarily

apache · Dec 30, 2021 · a2551db · a2551db
1 parent ed8ef8f
commit a2551db
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/ballista/rust/core/Cargo.toml b/ballista/rust/core/Cargo.toml
@@ -43,8 +43,8 @@ tonic = "0.5"
 uuid = { version = "0.8", features = ["v4"] }
 chrono = { version = "0.4", default-features = false }
 
-arrow-flight = { version = "6.4.0"  }
-
+#arrow-flight = { version = "6.4.0"  }
+arrow-flight = { path = "/Users/kliu3/Documents/github/arrow-rs/arrow-flight" }
 datafusion = { path = "../../../datafusion", version = "6.0.0" }
 
 [dev-dependencies]

diff --git a/ballista/rust/core/proto/ballista.proto b/ballista/rust/core/proto/ballista.proto
@@ -1011,6 +1011,7 @@ enum TimeUnit{
 enum IntervalUnit{
     YearMonth = 0;
     DayTime = 1;
+    MonthDayNano = 2;
 }
 
 message Decimal{

diff --git a/ballista/rust/core/src/serde/logical_plan/to_proto.rs b/ballista/rust/core/src/serde/logical_plan/to_proto.rs
@@ -60,6 +60,7 @@ impl protobuf::IntervalUnit {
         match interval_unit {
             IntervalUnit::YearMonth => protobuf::IntervalUnit::YearMonth,
             IntervalUnit::DayTime => protobuf::IntervalUnit::DayTime,
+            IntervalUnit::MonthDayNano =>  protobuf::IntervalUnit::MonthDayNano,
         }
     }
 
@@ -71,6 +72,7 @@ impl protobuf::IntervalUnit {
             Some(interval_unit) => Ok(match interval_unit {
                 protobuf::IntervalUnit::YearMonth => IntervalUnit::YearMonth,
                 protobuf::IntervalUnit::DayTime => IntervalUnit::DayTime,
+                protobuf::IntervalUnit::MonthDayNano => IntervalUnit::MonthDayNano,
             }),
             None => Err(proto_error(
                 "Error converting i32 to DateUnit: Passed invalid variant",

diff --git a/ballista/rust/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml
@@ -29,8 +29,10 @@ edition = "2018"
 snmalloc = ["snmalloc-rs"]
 
 [dependencies]
-arrow = { version = "6.4.0"  }
-arrow-flight = { version = "6.4.0"  }
+#arrow = { version = "6.4.0"  }
+#arrow-flight = { version = "6.4.0"  }
+arrow = { path = "/Users/kliu3/Documents/github/arrow-rs/arrow" }
+arrow-flight = { path = "/Users/kliu3/Documents/github/arrow-rs/arrow-flight" }
 anyhow = "1"
 async-trait = "0.1.36"
 ballista-core = { path = "../core", version = "0.6.0" }

diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
@@ -31,5 +31,6 @@ clap = "2.33"
 rustyline = "9.0"
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
 datafusion = { path = "../datafusion", version = "6.0.0" }
-arrow = { version = "6.4.0" }
+#arrow = { version = "6.4.0" }
 ballista = { path = "../ballista/rust/client", version = "0.6.0" }
+arrow = { path = "/Users/kliu3/Documents/github/arrow-rs/arrow" }
diff --git a/datafusion-examples/Cargo.toml b/datafusion-examples/Cargo.toml
@@ -34,8 +34,9 @@ path = "examples/avro_sql.rs"
 required-features = ["datafusion/avro"]
 
 [dev-dependencies]
-arrow-flight = { version = "6.4.0" }
+#arrow-flight = { version = "6.4.0" }
 datafusion = { path = "../datafusion" }
+arrow-flight = { path = "/Users/kliu3/Documents/github/arrow-rs/arrow-flight" }
 prost = "0.8"
 tonic = "0.5"
 tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }