-
Notifications
You must be signed in to change notification settings - Fork 752
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4771 from nange/feat/regexp_substr_function
feature: support REGEXP_SUBSTR function
- Loading branch information
Showing
12 changed files
with
515 additions
and
18 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,244 @@ | ||
| // Copyright 2022 Datafuse Labs. | ||
| // | ||
| // Licensed 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 | ||
| // | ||
| // https://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 std::collections::HashMap; | ||
| use std::fmt; | ||
| use std::sync::Arc; | ||
|
|
||
| use bstr::ByteSlice; | ||
| use common_datavalues::prelude::*; | ||
| use common_exception::ErrorCode; | ||
| use common_exception::Result; | ||
| use itertools::izip; | ||
| use regex::bytes::Regex; | ||
|
|
||
| use crate::scalars::assert_string; | ||
| use crate::scalars::cast_column_field; | ||
| use crate::scalars::strings::regexp_like::build_regexp_from_pattern; | ||
| use crate::scalars::Function; | ||
| use crate::scalars::FunctionDescription; | ||
| use crate::scalars::FunctionFeatures; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct RegexpSubStrFunction { | ||
| display_name: String, | ||
| } | ||
|
|
||
| impl RegexpSubStrFunction { | ||
| pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> { | ||
| Ok(Box::new(Self { | ||
| display_name: display_name.to_string(), | ||
| })) | ||
| } | ||
|
|
||
| pub fn desc() -> FunctionDescription { | ||
| FunctionDescription::creator(Box::new(Self::try_create)).features( | ||
| FunctionFeatures::default() | ||
| .deterministic() | ||
| .variadic_arguments(2, 5), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| impl Function for RegexpSubStrFunction { | ||
| fn name(&self) -> &str { | ||
| &self.display_name | ||
| } | ||
|
|
||
| fn return_type(&self, args: &[&DataTypePtr]) -> Result<DataTypePtr> { | ||
| for (i, arg) in args.iter().enumerate() { | ||
| if i < 2 || i == 4 { | ||
| assert_string(*arg)?; | ||
| } else if !arg.data_type_id().is_integer() | ||
| && !arg.data_type_id().is_string() | ||
| && !arg.data_type_id().is_null() | ||
| { | ||
| return Err(ErrorCode::IllegalDataType(format!( | ||
| "Expected integer or string or null, but got {}", | ||
| args[i].data_type_id() | ||
| ))); | ||
| } | ||
| } | ||
|
|
||
| Ok(Arc::new(NullableType::create(StringType::arc()))) | ||
| } | ||
|
|
||
| // Notes: https://dev.mysql.com/doc/refman/8.0/en/regexp.html#function_regexp-substr | ||
| fn eval(&self, columns: &ColumnsWithField, input_rows: usize) -> Result<ColumnRef> { | ||
| let mut pos = ConstColumn::new(Series::from_data(vec![1_i64]), input_rows).arc(); | ||
| let mut occurrence = ConstColumn::new(Series::from_data(vec![1_i64]), input_rows).arc(); | ||
| let mut match_type = ConstColumn::new(Series::from_data(vec![""]), input_rows).arc(); | ||
|
|
||
| for i in 2..columns.len() { | ||
| match i { | ||
| 2 => pos = cast_column_field(&columns[2], &Int64Type::arc())?, | ||
| 3 => occurrence = cast_column_field(&columns[3], &Int64Type::arc())?, | ||
| _ => match_type = cast_column_field(&columns[4], &StringType::arc())?, | ||
| } | ||
| } | ||
|
|
||
| let pat = columns[1].column(); | ||
|
|
||
| if pat.is_const() && match_type.is_const() { | ||
| let pat_value = pat.get_string(0)?; | ||
| let mt_value = match_type.get_string(0)?; | ||
|
|
||
| return self.a_regexp_substr_binary_scalar( | ||
| columns[0].column(), | ||
| &pat_value, | ||
| &pos, | ||
| &occurrence, | ||
| &mt_value, | ||
| input_rows, | ||
| ); | ||
| } | ||
|
|
||
| self.a_regexp_substr_binary( | ||
| columns[0].column(), | ||
| pat, | ||
| &pos, | ||
| &occurrence, | ||
| &match_type, | ||
| input_rows, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| impl RegexpSubStrFunction { | ||
| fn a_regexp_substr_binary_scalar( | ||
| &self, | ||
| source: &ColumnRef, | ||
| pat: &[u8], | ||
| pos: &ColumnRef, | ||
| occurrence: &ColumnRef, | ||
| mt: &[u8], | ||
| input_rows: usize, | ||
| ) -> Result<ColumnRef> { | ||
| let mut builder = NullableColumnBuilder::<Vu8>::with_capacity(source.len()); | ||
|
|
||
| let source = Vu8::try_create_viewer(source)?; | ||
| let pos = i64::try_create_viewer(pos)?; | ||
| let occur = i64::try_create_viewer(occurrence)?; | ||
|
|
||
| let re = build_regexp_from_pattern(self.name(), pat, Some(mt))?; | ||
|
|
||
| let iter = izip!(source, pos, occur); | ||
| for (s_value, pos_value, occur_value) in iter { | ||
| if s_value.is_empty() || pat.is_empty() { | ||
| builder.append_null(); | ||
| continue; | ||
| } | ||
|
|
||
| let substr = regexp_substr(s_value, &re, pos_value, occur_value); | ||
| match substr { | ||
| Some(ss) => builder.append(ss, true), | ||
| None => builder.append_null(), | ||
| } | ||
| } | ||
|
|
||
| Ok(builder.build(input_rows)) | ||
| } | ||
|
|
||
| fn a_regexp_substr_binary( | ||
| &self, | ||
| source: &ColumnRef, | ||
| pat: &ColumnRef, | ||
| pos: &ColumnRef, | ||
| occurrence: &ColumnRef, | ||
| match_type: &ColumnRef, | ||
| input_rows: usize, | ||
| ) -> Result<ColumnRef> { | ||
| let mut builder = NullableColumnBuilder::<Vu8>::with_capacity(source.len()); | ||
|
|
||
| let mut map: HashMap<Vec<u8>, Regex> = HashMap::new(); | ||
| let mut key: Vec<u8> = Vec::new(); | ||
|
|
||
| let source = Vu8::try_create_viewer(source)?; | ||
| let pat = Vu8::try_create_viewer(pat)?; | ||
| let pos = i64::try_create_viewer(pos)?; | ||
| let occur = i64::try_create_viewer(occurrence)?; | ||
| let mt = Vu8::try_create_viewer(match_type)?; | ||
|
|
||
| let iter = izip!(source, pat, pos, occur, mt); | ||
| for (s_value, pat_value, pos_value, occur_value, mt_value) in iter { | ||
| if mt_value.starts_with_str("-") { | ||
| return Err(ErrorCode::BadArguments(format!( | ||
| "Incorrect arguments to {} match type: {}", | ||
| self.name(), | ||
| mt_value.to_str_lossy(), | ||
| ))); | ||
| } | ||
| if s_value.is_empty() || pat_value.is_empty() { | ||
| builder.append_null(); | ||
| continue; | ||
| } | ||
|
|
||
| key.extend_from_slice(pat_value); | ||
| key.extend_from_slice("-".as_bytes()); | ||
| key.extend_from_slice(mt_value); | ||
| let re = if let Some(re) = map.get(&key) { | ||
| re | ||
| } else { | ||
| let re = build_regexp_from_pattern(self.name(), pat_value, Some(mt_value))?; | ||
| map.insert(key.clone(), re); | ||
| map.get(&key).unwrap() | ||
| }; | ||
| key.clear(); | ||
|
|
||
| let substr = regexp_substr(s_value, re, pos_value, occur_value); | ||
| if let Some(ss) = substr { | ||
| builder.append(ss, true); | ||
| } else { | ||
| builder.append_null(); | ||
| } | ||
| } | ||
|
|
||
| Ok(builder.build(input_rows)) | ||
| } | ||
| } | ||
|
|
||
| #[inline] | ||
| fn regexp_substr<'a>(s: &'a [u8], re: &Regex, pos: i64, occur: i64) -> Option<&'a [u8]> { | ||
| let occur = if occur < 1 { 1 } else { occur }; | ||
| let pos = if pos < 1 { 0 } else { (pos - 1) as usize }; | ||
|
|
||
| // the 'pos' postion is the character index, | ||
| // so we should iterate the character to find the byte index. | ||
| let mut pos = match s.char_indices().nth(pos) { | ||
| Some((start, _, _)) => start, | ||
| None => return None, | ||
| }; | ||
|
|
||
| let mut i = 1_i64; | ||
| let m = loop { | ||
| let m = re.find_at(s, pos); | ||
| if i == occur || m.is_none() { | ||
| break m; | ||
| } | ||
|
|
||
| i += 1; | ||
| if let Some(m) = m { | ||
| // set the start postion of 'find_at' function to the position following the matched substring | ||
| pos = m.end(); | ||
| } | ||
| }; | ||
|
|
||
| m.map(|m| m.as_bytes()) | ||
| } | ||
|
|
||
| impl fmt::Display for RegexpSubStrFunction { | ||
| fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
| write!(f, "{}", self.display_name) | ||
| } | ||
| } |
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 |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ | |
| mod lower; | ||
| mod regexp_instr; | ||
| mod regexp_like; | ||
| mod regexp_substr; | ||
| mod substring; | ||
| mod trim; | ||
|
|
||
|
|
||
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
Oops, something went wrong.
a279982There 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.
Successfully deployed to the following URLs:
databend – ./
databend.rs
databend.vercel.app
databend-git-main-databend.vercel.app
databend-databend.vercel.app