-
Notifications
You must be signed in to change notification settings - Fork 176
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.
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
feat: rand expression support #1199
Open
akupchinskiy
wants to merge
8
commits into
apache:main
Choose a base branch
from
akupchinskiy:rand-expr-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c5c80e2
feat: rand expression support
akupchinskiy 7e4ca2c
fix: support for spark-compatible null seed
akupchinskiy 41c917b
fix: unnecessary borrowing removal
akupchinskiy fdb8949
Merge branch 'main' into rand-expr-support
akupchinskiy cc2b20f
added references to the constants and typo fix
akupchinskiy 783c381
Merge remote-tracking branch 'forked/rand-expr-support' into rand-exp…
akupchinskiy 10f310d
added permalinks for the reference links
akupchinskiy e7e629c
fixed compile errors after master merge
akupchinskiy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,272 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
use crate::spark_hash::spark_compatible_murmur3_hash; | ||
use arrow_array::builder::Float64Builder; | ||
use arrow_array::{Float64Array, RecordBatch}; | ||
use arrow_schema::{DataType, Schema}; | ||
use datafusion::logical_expr::ColumnarValue; | ||
use datafusion::physical_expr::PhysicalExpr; | ||
use datafusion::physical_expr_common::physical_expr::down_cast_any_ref; | ||
use datafusion_common::ScalarValue; | ||
use datafusion_common::{DataFusionError, Result}; | ||
use std::any::Any; | ||
use std::fmt::Display; | ||
use std::hash::{Hash, Hasher}; | ||
use std::sync::{Arc, Mutex}; | ||
|
||
/// Adoption of the XOR-shift algorithm used in Apache Spark. | ||
/// See: https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/util/random/XORShiftRandom.scala | ||
|
||
/// Normalization multiplier used in mapping from a random i64 value to the f64 interval [0.0, 1.0). | ||
/// Corresponds to the java implementation: https://github.com/openjdk/jdk/blob/master/src/java.base/share/classes/java/util/Random.java#L302) | ||
/// Due to the lack of hexadecimal float literals support in rust, the scientific notation is used instead. | ||
const DOUBLE_UNIT: f64 = 1.1102230246251565e-16; | ||
|
||
/// Spark-compatible initial seed which is actually a part of the scala standard library murmurhash3 implementation. | ||
/// The references: | ||
/// https://github.com/apache/spark/blob/master/core/src/main/scala/org/apache/spark/util/random/XORShiftRandom.scala#L63 | ||
/// https://github.com/scala/scala/blob/2.13.x/src/library/scala/util/hashing/MurmurHash3.scala#L331 | ||
const SPARK_MURMUR_ARRAY_SEED: u32 = 0x3c074a61; | ||
akupchinskiy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
#[derive(Debug, Clone)] | ||
struct XorShiftRandom { | ||
seed: i64, | ||
} | ||
|
||
impl XorShiftRandom { | ||
fn from_init_seed(init_seed: i64) -> Self { | ||
XorShiftRandom { | ||
seed: Self::init_seed(init_seed), | ||
} | ||
} | ||
|
||
fn from_stored_seed(stored_seed: i64) -> Self { | ||
XorShiftRandom { seed: stored_seed } | ||
} | ||
|
||
fn next(&mut self, bits: u8) -> i32 { | ||
let mut next_seed = self.seed ^ (self.seed << 21); | ||
next_seed ^= ((next_seed as u64) >> 35) as i64; | ||
next_seed ^= next_seed << 4; | ||
self.seed = next_seed; | ||
(next_seed & ((1i64 << bits) - 1)) as i32 | ||
} | ||
|
||
pub fn next_f64(&mut self) -> f64 { | ||
let a = self.next(26) as i64; | ||
let b = self.next(27) as i64; | ||
((a << 27) + b) as f64 * DOUBLE_UNIT | ||
} | ||
|
||
fn init_seed(init: i64) -> i64 { | ||
let bytes_repr = init.to_be_bytes(); | ||
let low_bits = spark_compatible_murmur3_hash(bytes_repr, SPARK_MURMUR_ARRAY_SEED); | ||
let high_bits = spark_compatible_murmur3_hash(bytes_repr, low_bits); | ||
((high_bits as i64) << 32) | (low_bits as i64 & 0xFFFFFFFFi64) | ||
} | ||
} | ||
|
||
#[derive(Debug)] | ||
pub struct RandExpr { | ||
seed: Arc<dyn PhysicalExpr>, | ||
init_seed_shift: i32, | ||
state_holder: Arc<Mutex<Option<i64>>>, | ||
} | ||
|
||
impl RandExpr { | ||
pub fn new(seed: Arc<dyn PhysicalExpr>, init_seed_shift: i32) -> Self { | ||
Self { | ||
seed, | ||
init_seed_shift, | ||
state_holder: Arc::new(Mutex::new(None::<i64>)), | ||
} | ||
} | ||
|
||
fn extract_init_state(seed: ScalarValue) -> Result<i64> { | ||
if let ScalarValue::Int64(seed_opt) = seed.cast_to(&DataType::Int64)? { | ||
Ok(seed_opt.unwrap_or(0)) | ||
} else { | ||
Err(DataFusionError::Internal( | ||
"unexpected execution branch".to_string(), | ||
)) | ||
} | ||
} | ||
fn evaluate_batch(&self, seed: ScalarValue, num_rows: usize) -> Result<ColumnarValue> { | ||
let mut seed_state = self.state_holder.lock().unwrap(); | ||
let mut rnd = if seed_state.is_none() { | ||
let init_seed = RandExpr::extract_init_state(seed)?; | ||
let init_seed = init_seed.wrapping_add(self.init_seed_shift as i64); | ||
*seed_state = Some(init_seed); | ||
XorShiftRandom::from_init_seed(init_seed) | ||
} else { | ||
let stored_seed = seed_state.unwrap(); | ||
XorShiftRandom::from_stored_seed(stored_seed) | ||
}; | ||
|
||
let mut arr_builder = Float64Builder::with_capacity(num_rows); | ||
std::iter::repeat_with(|| rnd.next_f64()) | ||
.take(num_rows) | ||
.for_each(|v| arr_builder.append_value(v)); | ||
let array_ref = Arc::new(Float64Array::from(arr_builder.finish())); | ||
*seed_state = Some(rnd.seed); | ||
Ok(ColumnarValue::Array(array_ref)) | ||
} | ||
} | ||
|
||
impl Display for RandExpr { | ||
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||
write!(f, "RAND({})", self.seed) | ||
} | ||
} | ||
|
||
impl PartialEq<dyn Any> for RandExpr { | ||
fn eq(&self, other: &dyn Any) -> bool { | ||
down_cast_any_ref(other) | ||
.downcast_ref::<Self>() | ||
.map(|x| self.seed.eq(&x.seed)) | ||
.unwrap_or(false) | ||
} | ||
} | ||
|
||
impl PhysicalExpr for RandExpr { | ||
fn as_any(&self) -> &dyn Any { | ||
self | ||
} | ||
|
||
fn data_type(&self, _input_schema: &Schema) -> Result<DataType> { | ||
Ok(DataType::Float64) | ||
} | ||
|
||
fn nullable(&self, _input_schema: &Schema) -> Result<bool> { | ||
Ok(false) | ||
} | ||
|
||
fn evaluate(&self, batch: &RecordBatch) -> Result<ColumnarValue> { | ||
match self.seed.evaluate(batch)? { | ||
ColumnarValue::Scalar(seed) => self.evaluate_batch(seed, batch.num_rows()), | ||
ColumnarValue::Array(_arr) => Err(DataFusionError::NotImplemented(format!( | ||
"Only literal seeds are supported for {}", | ||
self | ||
))), | ||
} | ||
} | ||
|
||
fn children(&self) -> Vec<&Arc<dyn PhysicalExpr>> { | ||
vec![&self.seed] | ||
} | ||
|
||
fn with_new_children( | ||
self: Arc<Self>, | ||
children: Vec<Arc<dyn PhysicalExpr>>, | ||
) -> Result<Arc<dyn PhysicalExpr>> { | ||
Ok(Arc::new(RandExpr::new( | ||
Arc::clone(&children[0]), | ||
self.init_seed_shift, | ||
))) | ||
} | ||
|
||
fn dyn_hash(&self, state: &mut dyn Hasher) { | ||
let mut s = state; | ||
self.children().hash(&mut s); | ||
} | ||
} | ||
|
||
pub fn rand(seed: Arc<dyn PhysicalExpr>, init_seed_shift: i32) -> Result<Arc<dyn PhysicalExpr>> { | ||
Ok(Arc::new(RandExpr::new(seed, init_seed_shift))) | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
use arrow::{array::StringArray, compute::concat, datatypes::*}; | ||
use arrow_array::{Array, BooleanArray, Float64Array, Int64Array}; | ||
use datafusion_common::cast::as_float64_array; | ||
use datafusion_physical_expr::expressions::lit; | ||
|
||
const SPARK_SEED_42_FIRST_5: [f64; 5] = [ | ||
0.619189370225301, | ||
0.5096018842446481, | ||
0.8325259388871524, | ||
0.26322809041172357, | ||
0.6702867696264135, | ||
]; | ||
|
||
#[test] | ||
fn test_rand_single_batch() -> Result<()> { | ||
let schema = Schema::new(vec![Field::new("a", DataType::Utf8, true)]); | ||
let data = StringArray::from(vec![Some("foo"), None, None, Some("bar"), None]); | ||
let batch = RecordBatch::try_new(Arc::new(schema), vec![Arc::new(data)])?; | ||
let rand_expr = rand(lit(42), 0)?; | ||
let result = rand_expr.evaluate(&batch)?.into_array(batch.num_rows())?; | ||
let result = as_float64_array(&result)?; | ||
let expected = &Float64Array::from(Vec::from(SPARK_SEED_42_FIRST_5)); | ||
assert_eq!(result, expected); | ||
Ok(()) | ||
} | ||
|
||
#[test] | ||
fn test_rand_multi_batch() -> Result<()> { | ||
let first_batch_schema = Schema::new(vec![Field::new("a", DataType::Int64, true)]); | ||
let first_batch_data = Int64Array::from(vec![Some(42), None]); | ||
let second_batch_schema = first_batch_schema.clone(); | ||
let second_batch_data = Int64Array::from(vec![None, Some(-42), None]); | ||
let rand_expr = rand(lit(42), 0)?; | ||
let first_batch = RecordBatch::try_new( | ||
Arc::new(first_batch_schema), | ||
vec![Arc::new(first_batch_data)], | ||
)?; | ||
let first_batch_result = rand_expr | ||
.evaluate(&first_batch)? | ||
.into_array(first_batch.num_rows())?; | ||
let second_batch = RecordBatch::try_new( | ||
Arc::new(second_batch_schema), | ||
vec![Arc::new(second_batch_data)], | ||
)?; | ||
let second_batch_result = rand_expr | ||
.evaluate(&second_batch)? | ||
.into_array(second_batch.num_rows())?; | ||
let result_arrays: Vec<&dyn Array> = vec![ | ||
as_float64_array(&first_batch_result)?, | ||
as_float64_array(&second_batch_result)?, | ||
]; | ||
let result_arrays = &concat(&result_arrays)?; | ||
let final_result = as_float64_array(result_arrays)?; | ||
let expected = &Float64Array::from(Vec::from(SPARK_SEED_42_FIRST_5)); | ||
assert_eq!(final_result, expected); | ||
Ok(()) | ||
} | ||
|
||
#[test] | ||
fn test_overflow_shift_seed() -> Result<()> { | ||
let schema = Schema::new(vec![Field::new("a", DataType::Boolean, false)]); | ||
let data = BooleanArray::from(vec![Some(true), Some(false)]); | ||
let batch = RecordBatch::try_new(Arc::new(schema), vec![Arc::new(data)])?; | ||
let max_seed_and_shift_expr = rand(lit(i64::MAX), 1)?; | ||
let min_seed_no_shift_expr = rand(lit(i64::MIN), 0)?; | ||
let first_expr_result = max_seed_and_shift_expr | ||
.evaluate(&batch)? | ||
.into_array(batch.num_rows())?; | ||
let first_expr_result = as_float64_array(&first_expr_result)?; | ||
let second_expr_result = min_seed_no_shift_expr | ||
.evaluate(&batch)? | ||
.into_array(batch.num_rows())?; | ||
let second_expr_result = as_float64_array(&second_expr_result)?; | ||
assert_eq!(first_expr_result, second_expr_result); | ||
Ok(()) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
here is interesting. Is there any reason the partition is not used in Comet native physical planner? this is def used in DF physical plan during plan node execution https://github.com/apache/datafusion/blob/main/datafusion/physical-plan/src/execution_plan.rs#L371
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The spark partition index is erased when a native DF plan is sent for the execution for some reason : https://github.com/apache/datafusion-comet/blob/main/native/core/src/execution/jni_api.rs#L496
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is something that I would like to see improved. We currently use partition 0 for each native plan rather than the real partition id.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@andygrove Can i do it as a part of this PR or it would be better to create a separate one?