ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

Closed
velvia wants to merge 5 commits into from
Closed

ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates #9773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa22808
[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…
Mar 19, 2021
72f915d
cargo fmt
Mar 20, 2021
11ab229
CR feedback
Mar 26, 2021
bd5a0f4
Add test for group by timestamp millis
Mar 29, 2021
b3cd8dd
Oops, cargo fmt
Mar 30, 2021
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
12 changes: 5 additions & 7 deletions rust/datafusion/src/logical_plan/plan.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
partitioning_scheme,
..
} => match partitioning_scheme {
Partitioning::RoundRobinBatch(n) => {
write!(
f,
"Repartition: RoundRobinBatch partition_count={}",
n
)
}
Partitioning::RoundRobinBatch(n) => write!(
f,
"Repartition: RoundRobinBatch partition_count={}",
n
),
Partitioning::Hash(expr, n) => {
let hash_expr: Vec<String> =
expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down
5 changes: 5 additions & 0 deletions rust/datafusion/src/physical_plan/group_scalar.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
Int64(i64),
Utf8(Box<String>),
Boolean(bool),
TimeMillisecond(i64),
TimeMicrosecond(i64),
TimeNanosecond(i64),
Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),

@alambalambMar 24, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?

@velviavelviaMar 24, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....

ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
ScalarValue::Float32(None)
| ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down
21 changes: 20 additions & 1 deletion rust/datafusion/src/physical_plan/hash_aggregate.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
vec.extend_from_slice(&array.value(row).to_le_bytes());
}
DataType::Timestamp(TimeUnit::Millisecond, None) => {
let array = col
.as_any()
.downcast_ref::<TimestampMillisecondArray>()
.unwrap();
vec.extend_from_slice(&array.value(row).to_le_bytes());
}
DataType::Timestamp(TimeUnit::Microsecond, None) => {
let array = col
.as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
Arc::new(StringArray::from(vec![&***str]))
}
GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
GroupByScalar::TimeMillisecond(n) => {
Arc::new(TimestampMillisecondArray::from(vec![*n]))
}
GroupByScalar::TimeMicrosecond(n) => {
Arc::new(TimestampMicrosecondArray::from(vec![*n]))
}
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
Ok(GroupByScalar::Boolean(array.value(row)))
}
DataType::Timestamp(TimeUnit::Millisecond, None) => {
let array = col
.as_any()
.downcast_ref::<TimestampMillisecondArray>()
.unwrap();
Ok(GroupByScalar::TimeMillisecond(array.value(row)))
}
DataType::Timestamp(TimeUnit::Microsecond, None) => {
let array = col
.as_any()
Expand Down
44 changes: 11 additions & 33 deletions rust/datafusion/src/physical_plan/hash_join.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
.zip(right_arrays)
.all(|(l, r)| match l.data_type() {
DataType::Null => true,
DataType::Boolean => {
equal_rows_elem!(BooleanArray, l, r, left, right)
}
DataType::Int8 => {
equal_rows_elem!(Int8Array, l, r, left, right)
}
DataType::Int16 => {
equal_rows_elem!(Int16Array, l, r, left, right)
}
DataType::Int32 => {
equal_rows_elem!(Int32Array, l, r, left, right)
}
DataType::Int64 => {
equal_rows_elem!(Int64Array, l, r, left, right)
}
DataType::UInt8 => {
equal_rows_elem!(UInt8Array, l, r, left, right)
}
DataType::UInt16 => {
equal_rows_elem!(UInt16Array, l, r, left, right)
}
DataType::UInt32 => {
equal_rows_elem!(UInt32Array, l, r, left, right)
}
DataType::UInt64 => {
equal_rows_elem!(UInt64Array, l, r, left, right)
}
DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),

@DandandanDandandanMar 23, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?

@velviavelviaMar 23, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)

Should arrow project have a rust-toolchain to specify what version of Rust to run on?

@velviavelviaMar 24, 2021•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....

DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
DataType::Timestamp(_, None) => {
equal_rows_elem!(Int64Array, l, r, left, right)
}
DataType::Utf8 => {
equal_rows_elem!(StringArray, l, r, left, right)
}
DataType::LargeUtf8 => {
equal_rows_elem!(LargeStringArray, l, r, left, right)
}
DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
_ => {
// This is internal because we should have caught this before.
err = Some(Err(DataFusionError::Internal(
Expand Down
26 changes: 25 additions & 1 deletion rust/datafusion/src/scalar.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{

@DandandanDandandanMar 23, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?

@velviavelviaMar 23, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....

ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
Date32(Option<i32>),
/// Date stored as a signed 64bit int
Date64(Option<i64>),
/// Timestamp Milliseconds
TimeMillisecond(Option<i64>),
/// Timestamp Microseconds
TimeMicrosecond(Option<i64>),
/// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
ScalarValue::TimeNanosecond(_) => {
DataType::Timestamp(TimeUnit::Nanosecond, None)
}
ScalarValue::TimeMillisecond(_) => {
DataType::Timestamp(TimeUnit::Millisecond, None)
}
ScalarValue::Float32(_) => DataType::Float32,
ScalarValue::Float64(_) => DataType::Float64,
ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
_ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
_ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
}
}

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
| ScalarValue::Utf8(None)
| ScalarValue::LargeUtf8(None)
| ScalarValue::List(None, _)
| ScalarValue::TimeMillisecond(None)
| ScalarValue::TimeMicrosecond(None)
| ScalarValue::TimeNanosecond(None)
)
}

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
}
None => new_null_array(&DataType::UInt64, size),
},
ScalarValue::TimeMillisecond(e) => match e {
Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
repeat(*value).take(size),
)),
None => new_null_array(
&DataType::Timestamp(TimeUnit::Millisecond, None),
size,
),
},
ScalarValue::TimeMicrosecond(e) => match e {
Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
ScalarValue::UInt16(e) => format_option!(f, e)?,
ScalarValue::UInt32(e) => format_option!(f, e)?,
ScalarValue::UInt64(e) => format_option!(f, e)?,
ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down
44 changes: 44 additions & 0 deletions rust/datafusion/tests/sql.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
let mut ctx = ExecutionContext::new();

let schema = Arc::new(Schema::new(vec![
Field::new(
"timestamp",
DataType::Timestamp(TimeUnit::Millisecond, None),
false,
),
Field::new("count", DataType::Int32, false),
]));
let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
let hour1 = Duration::hours(1);
let timestamps = vec![
base_dt.timestamp_millis(),
(base_dt + hour1).timestamp_millis(),
base_dt.timestamp_millis(),
base_dt.timestamp_millis(),
(base_dt + hour1).timestamp_millis(),
(base_dt + hour1).timestamp_millis(),
];
let data = RecordBatch::try_new(
schema.clone(),
vec![
Arc::new(TimestampMillisecondArray::from(timestamps)),
Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
],
)?;
let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
ctx.register_table("t1", Arc::new(t1_table));

let sql =
"SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
let actual = execute(&mut ctx, sql).await;
let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
let expected = vec!["80", "130"];
assert_eq!(expected, actual);
Ok(())
}

macro_rules! test_expression {
($SQL:expr, $EXPECTED:expr) => {
let mut ctx = ExecutionContext::new();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates#9773

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

 Closed

velvia
wants to merge
5
commits into

from

 Closed


ARROW-12028 ARROW-11940: [Rust][DataFusion] Add TimestampMillisecond support to GROUP BY/hash aggregates
#9773
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
fa22808

[datafusion] Add support for TimestampMillisecondArray in hash_aggreg…

Mar 19, 2021
72f915d

cargo fmt

Mar 20, 2021
11ab229

CR feedback

Mar 26, 2021
bd5a0f4

Add test for group by timestamp millis

Mar 29, 2021
b3cd8dd

Oops, cargo fmt

Mar 30, 2021

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


12 changes: 5 additions & 7 deletions
rust/datafusion/src/logical_plan/plan.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -673,13 +673,11 @@ impl LogicalPlan {
 partitioning_scheme,
 ..
 } => match partitioning_scheme {
 Partitioning::RoundRobinBatch(n) => {
 write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 )
 }
 Partitioning::RoundRobinBatch(n) => write!(
 f,
 "Repartition: RoundRobinBatch partition_count={}",
 n
 ),
 Partitioning::Hash(expr, n) => {
 let hash_expr: Vec<String> =
 expr.iter().map(|e| format!("{:?}", e)).collect();
Expand Down

5 changes: 5 additions & 0 deletions
rust/datafusion/src/physical_plan/group_scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ pub(crate) enum GroupByScalar {
 Int64(i64),
 Utf8(Box<String>),
 Boolean(bool),
 TimeMillisecond(i64),
 TimeMicrosecond(i64),
 TimeNanosecond(i64),
 Date32(i32),
Expand All@@ -63,6 +64,9 @@ impl TryFrom<&ScalarValue> for GroupByScalar {
 ScalarValue::UInt16(Some(v)) => GroupByScalar::UInt16(*v),
 ScalarValue::UInt32(Some(v)) => GroupByScalar::UInt32(*v),
 ScalarValue::UInt64(Some(v)) => GroupByScalar::UInt64(*v),
 ScalarValue::TimeMillisecond(Some(v)) => GroupByScalar::TimeMillisecond(*v),
@alambalambMar 24, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add support for ScalarValue::TimeMicrosecond and ScalarValue::TimeNanosecond?
@velviavelviaMar 24, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing, I wasn't sure why they weren't added here....
 ScalarValue::TimeMicrosecond(Some(v)) => GroupByScalar::TimeMicrosecond(*v),
 ScalarValue::TimeNanosecond(Some(v)) => GroupByScalar::TimeNanosecond(*v),
 ScalarValue::Utf8(Some(v)) => GroupByScalar::Utf8(Box::new(v.clone())),
 ScalarValue::Float32(None)
 | ScalarValue::Float64(None)
Expand DownExpand Up@@ -106,6 +110,7 @@ impl From<&GroupByScalar> for ScalarValue {
 GroupByScalar::UInt32(v) => ScalarValue::UInt32(Some(*v)),
 GroupByScalar::UInt64(v) => ScalarValue::UInt64(Some(*v)),
 GroupByScalar::Utf8(v) => ScalarValue::Utf8(Some(v.to_string())),
 GroupByScalar::TimeMillisecond(v) => ScalarValue::TimeMillisecond(Some(*v)),
 GroupByScalar::TimeMicrosecond(v) => ScalarValue::TimeMicrosecond(Some(*v)),
 GroupByScalar::TimeNanosecond(v) => ScalarValue::TimeNanosecond(Some(*v)),
 GroupByScalar::Date32(v) => ScalarValue::Date32(Some(*v)),
Expand Down

21 changes: 20 additions & 1 deletion
rust/datafusion/src/physical_plan/hash_aggregate.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,7 +58,9 @@ use hashbrown::HashMap;
use ordered_float::OrderedFloat;
use pin_project_lite::pin_project;

use arrow::array::{TimestampMicrosecondArray, TimestampNanosecondArray};
use arrow::array::{
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
};
use async_trait::async_trait;

use super::{
Expand DownExpand Up@@ -496,6 +498,13 @@ fn create_key_for_col(col: &ArrayRef, row: usize, vec: &mut Vec<u8>) -> Result<(
 let array = col.as_any().downcast_ref::<Int64Array>().unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 vec.extend_from_slice(&array.value(row).to_le_bytes());
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand DownExpand Up@@ -923,6 +932,9 @@ fn create_batch_from_map(
 Arc::new(StringArray::from(vec![&***str]))
 }
 GroupByScalar::Boolean(b) => Arc::new(BooleanArray::from(vec![*b])),
 GroupByScalar::TimeMillisecond(n) => {
 Arc::new(TimestampMillisecondArray::from(vec![*n]))
 }
 GroupByScalar::TimeMicrosecond(n) => {
 Arc::new(TimestampMicrosecondArray::from(vec![*n]))
 }
Expand DownExpand Up@@ -1073,6 +1085,13 @@ fn create_group_by_value(col: &ArrayRef, row: usize) -> Result<GroupByScalar> {
 let array = col.as_any().downcast_ref::<BooleanArray>().unwrap();
 Ok(GroupByScalar::Boolean(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Millisecond, None) => {
 let array = col
 .as_any()
 .downcast_ref::<TimestampMillisecondArray>()
 .unwrap();
 Ok(GroupByScalar::TimeMillisecond(array.value(row)))
 }
 DataType::Timestamp(TimeUnit::Microsecond, None) => {
 let array = col
 .as_any()
Expand Down

44 changes: 11 additions & 33 deletions
rust/datafusion/src/physical_plan/hash_join.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -656,42 +656,20 @@ fn equal_rows(
 .zip(right_arrays)
 .all(|(l, r)| match l.data_type() {
 DataType::Null => true,
 DataType::Boolean => {
 equal_rows_elem!(BooleanArray, l, r, left, right)
 }
 DataType::Int8 => {
 equal_rows_elem!(Int8Array, l, r, left, right)
 }
 DataType::Int16 => {
 equal_rows_elem!(Int16Array, l, r, left, right)
 }
 DataType::Int32 => {
 equal_rows_elem!(Int32Array, l, r, left, right)
 }
 DataType::Int64 => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::UInt8 => {
 equal_rows_elem!(UInt8Array, l, r, left, right)
 }
 DataType::UInt16 => {
 equal_rows_elem!(UInt16Array, l, r, left, right)
 }
 DataType::UInt32 => {
 equal_rows_elem!(UInt32Array, l, r, left, right)
 }
 DataType::UInt64 => {
 equal_rows_elem!(UInt64Array, l, r, left, right)
 }
 DataType::Boolean => equal_rows_elem!(BooleanArray, l, r, left, right),
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the formatting changed? Do you use a recent/stable rust/cargo/rustfmt version?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is what I'm running, is it too old?
nightly-2020-11-25-x86_64-apple-darwin (default)
Should arrow project have a rust-toolchain to specify what version of Rust to run on?
@velviavelviaMar 24, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I tried running cargo fmt with +stable on 1.50.0 and it did not generate any new diffs compared to what I have here....
 DataType::Int8 => equal_rows_elem!(Int8Array, l, r, left, right),
 DataType::Int16 => equal_rows_elem!(Int16Array, l, r, left, right),
 DataType::Int32 => equal_rows_elem!(Int32Array, l, r, left, right),
 DataType::Int64 => equal_rows_elem!(Int64Array, l, r, left, right),
 DataType::UInt8 => equal_rows_elem!(UInt8Array, l, r, left, right),
 DataType::UInt16 => equal_rows_elem!(UInt16Array, l, r, left, right),
 DataType::UInt32 => equal_rows_elem!(UInt32Array, l, r, left, right),
 DataType::UInt64 => equal_rows_elem!(UInt64Array, l, r, left, right),
 DataType::Timestamp(_, None) => {
 equal_rows_elem!(Int64Array, l, r, left, right)
 }
 DataType::Utf8 => {
 equal_rows_elem!(StringArray, l, r, left, right)
 }
 DataType::LargeUtf8 => {
 equal_rows_elem!(LargeStringArray, l, r, left, right)
 }
 DataType::Utf8 => equal_rows_elem!(StringArray, l, r, left, right),
 DataType::LargeUtf8 => equal_rows_elem!(LargeStringArray, l, r, left, right),
 _ => {
 // This is internal because we should have caught this before.
 err = Some(Err(DataFusionError::Internal(
Expand Down

26 changes: 25 additions & 1 deletion
rust/datafusion/src/scalar.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,11 @@

use std::{convert::TryFrom, fmt, iter::repeat, sync::Arc};

use arrow::array::{
@DandandanDandandanMar 23, 2021

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports don't seem to be necessary? The module already has array::*, ?
@velviavelviaMar 23, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh they were reformatted by cargo fmt which is what the README told me to run.....
 ArrayRef, Int16Builder, Int32Builder, Int64Builder, Int8Builder, ListBuilder,
 TimestampMicrosecondArray, TimestampMillisecondArray, TimestampNanosecondArray,
 UInt16Builder, UInt32Builder, UInt64Builder, UInt8Builder,
};
use arrow::datatypes::{DataType, Field, IntervalUnit, TimeUnit};
use arrow::{
 array::*,
Expand DownExpand Up@@ -67,6 +72,8 @@ pub enum ScalarValue {
 Date32(Option<i32>),
 /// Date stored as a signed 64bit int
 Date64(Option<i64>),
 /// Timestamp Milliseconds
 TimeMillisecond(Option<i64>),
 /// Timestamp Microseconds
 TimeMicrosecond(Option<i64>),
 /// Timestamp Nanoseconds
Expand DownExpand Up@@ -144,6 +151,9 @@ impl ScalarValue {
 ScalarValue::TimeNanosecond(_) => {
 DataType::Timestamp(TimeUnit::Nanosecond, None)
 }
 ScalarValue::TimeMillisecond(_) => {
 DataType::Timestamp(TimeUnit::Millisecond, None)
 }
 ScalarValue::Float32(_) => DataType::Float32,
 ScalarValue::Float64(_) => DataType::Float64,
 ScalarValue::Utf8(_) => DataType::Utf8,
Expand DownExpand Up@@ -177,7 +187,7 @@ impl ScalarValue {
 ScalarValue::Int16(Some(v)) => ScalarValue::Int16(Some(-v)),
 ScalarValue::Int32(Some(v)) => ScalarValue::Int32(Some(-v)),
 ScalarValue::Int64(Some(v)) => ScalarValue::Int64(Some(-v)),
 _ => panic!("Cannot run arithmetic negate on scala value: {:?}", self),
 _ => panic!("Cannot run arithmetic negate on scalar value: {:?}", self),
 }
 }

Expand All@@ -199,6 +209,9 @@ impl ScalarValue {
 | ScalarValue::Utf8(None)
 | ScalarValue::LargeUtf8(None)
 | ScalarValue::List(None, _)
 | ScalarValue::TimeMillisecond(None)
 | ScalarValue::TimeMicrosecond(None)
 | ScalarValue::TimeNanosecond(None)
 )
 }

Expand DownExpand Up@@ -273,6 +286,15 @@ impl ScalarValue {
 }
 None => new_null_array(&DataType::UInt64, size),
 },
 ScalarValue::TimeMillisecond(e) => match e {
 Some(value) => Arc::new(TimestampMillisecondArray::from_iter_values(
 repeat(*value).take(size),
 )),
 None => new_null_array(
 &DataType::Timestamp(TimeUnit::Millisecond, None),
 size,
 ),
 },
 ScalarValue::TimeMicrosecond(e) => match e {
 Some(value) => Arc::new(TimestampMicrosecondArray::from_iter_values(
 repeat(*value).take(size),
Expand DownExpand Up@@ -599,6 +621,7 @@ impl fmt::Display for ScalarValue {
 ScalarValue::UInt16(e) => format_option!(f, e)?,
 ScalarValue::UInt32(e) => format_option!(f, e)?,
 ScalarValue::UInt64(e) => format_option!(f, e)?,
 ScalarValue::TimeMillisecond(e) => format_option!(f, e)?,
 ScalarValue::TimeMicrosecond(e) => format_option!(f, e)?,
 ScalarValue::TimeNanosecond(e) => format_option!(f, e)?,
 ScalarValue::Utf8(e) => format_option!(f, e)?,
Expand DownExpand Up@@ -659,6 +682,7 @@ impl fmt::Debug for ScalarValue {
 ScalarValue::UInt16(_) => write!(f, "UInt16({})", self),
 ScalarValue::UInt32(_) => write!(f, "UInt32({})", self),
 ScalarValue::UInt64(_) => write!(f, "UInt64({})", self),
 ScalarValue::TimeMillisecond(_) => write!(f, "TimeMillisecond({})", self),
 ScalarValue::TimeMicrosecond(_) => write!(f, "TimeMicrosecond({})", self),
 ScalarValue::TimeNanosecond(_) => write!(f, "TimeNanosecond({})", self),
 ScalarValue::Utf8(None) => write!(f, "Utf8({})", self),
Expand Down

44 changes: 44 additions & 0 deletions
rust/datafusion/tests/sql.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,9 @@
use std::convert::TryFrom;
use std::sync::Arc;

use chrono::prelude::*;
use chrono::Duration;

extern crate arrow;
extern crate datafusion;

Expand DownExpand Up@@ -2046,6 +2049,47 @@ async fn csv_group_by_date() -> Result<()> {
 Ok(())
}

#[tokio::test]
async fn group_by_timestamp_millis() -> Result<()> {
 let mut ctx = ExecutionContext::new();

 let schema = Arc::new(Schema::new(vec![
 Field::new(
 "timestamp",
 DataType::Timestamp(TimeUnit::Millisecond, None),
 false,
 ),
 Field::new("count", DataType::Int32, false),
 ]));
 let base_dt = Utc.ymd(2018, 7, 1).and_hms(6, 0, 0); // 2018-Jul-01 06:00
 let hour1 = Duration::hours(1);
 let timestamps = vec![
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 base_dt.timestamp_millis(),
 base_dt.timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 (base_dt + hour1).timestamp_millis(),
 ];
 let data = RecordBatch::try_new(
 schema.clone(),
 vec![
 Arc::new(TimestampMillisecondArray::from(timestamps)),
 Arc::new(Int32Array::from(vec![10, 20, 30, 40, 50, 60])),
 ],
 )?;
 let t1_table = MemTable::try_new(schema, vec![vec![data]])?;
 ctx.register_table("t1", Arc::new(t1_table));

 let sql =
 "SELECT timestamp, SUM(count) FROM t1 GROUP BY timestamp ORDER BY timestamp ASC";
 let actual = execute(&mut ctx, sql).await;
 let actual: Vec<String> = actual.iter().map(|row| row[1].clone()).collect();
 let expected = vec!["80", "130"];
 assert_eq!(expected, actual);
 Ok(())
}

macro_rules! test_expression {
 ($SQL:expr, $EXPECTED:expr) => {
 let mut ctx = ExecutionContext::new();
Expand Down