git.delta.rocks / jrsonnet / refs/commits / a8186ce96137

difftreelog

perf move mapWithIndex to native

Yaroslav Bolyukin2024-05-19parent: #d5d1e03.patch.diff
in: master

5 files changed

modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/arr/mod.rs
1use std::{any::Any, num::NonZeroU32};23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IBytes;5use jrsonnet_parser::LocExpr;67use crate::{function::FuncVal, gc::TraceBox, tb, Context, Result, Thunk, Val};89mod spec;10pub use spec::{ArrayLike, *};1112/// Represents a Jsonnet array value.13#[derive(Debug, Clone, Trace)]14// may contain other ArrValue15#[trace(tracking(force))]16pub struct ArrValue(Cc<TraceBox<dyn ArrayLike>>);1718pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}19impl<I, T> ArrayLikeIter<T> for I where20	I: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator21{22}2324impl ArrValue {25	pub fn new(v: impl ArrayLike) -> Self {26		Self(Cc::new(tb!(v)))27	}28	pub fn empty() -> Self {29		Self::new(RangeArray::empty())30	}3132	pub fn expr(ctx: Context, exprs: impl IntoIterator<Item = LocExpr>) -> Self {33		Self::new(ExprArray::new(ctx, exprs))34	}3536	pub fn lazy(thunks: Vec<Thunk<Val>>) -> Self {37		Self::new(LazyArray(thunks))38	}3940	pub fn eager(values: Vec<Val>) -> Self {41		Self::new(EagerArray(values))42	}4344	pub fn repeated(data: Self, repeats: usize) -> Option<Self> {45		Some(Self::new(RepeatedArray::new(data, repeats)?))46	}4748	pub fn bytes(bytes: IBytes) -> Self {49		Self::new(BytesArray(bytes))50	}51	pub fn chars(chars: impl Iterator<Item = char>) -> Self {52		Self::new(CharArray(chars.collect()))53	}5455	#[must_use]56	pub fn map(self, mapper: FuncVal) -> Self {57		Self::new(MappedArray::new(self, mapper))58	}5960	pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {61		// TODO: ArrValue::Picked(inner, indexes) for large arrays62		let mut out = Vec::new();63		for i in self.iter() {64			let i = i?;65			if filter(&i)? {66				out.push(i);67			};68		}69		Ok(Self::eager(out))70	}7172	pub fn extended(a: Self, b: Self) -> Self {73		// TODO: benchmark for an optimal value, currently just a arbitrary choice74		const ARR_EXTEND_THRESHOLD: usize = 100;7576		if a.is_empty() {77			b78		} else if b.is_empty() {79			a80		} else if a.len() + b.len() > ARR_EXTEND_THRESHOLD {81			Self::new(ExtendedArray::new(a, b))82		} else if let (Some(a), Some(b)) = (a.iter_cheap(), b.iter_cheap()) {83			let mut out = Vec::with_capacity(a.len() + b.len());84			out.extend(a);85			out.extend(b);86			Self::eager(out)87		} else {88			let mut out = Vec::with_capacity(a.len() + b.len());89			out.extend(a.iter_lazy());90			out.extend(b.iter_lazy());91			Self::lazy(out)92		}93	}9495	pub fn range_exclusive(a: i32, b: i32) -> Self {96		Self::new(RangeArray::new_exclusive(a, b))97	}98	pub fn range_inclusive(a: i32, b: i32) -> Self {99		Self::new(RangeArray::new_inclusive(a, b))100	}101102	#[must_use]103	pub fn slice(self, index: Option<i32>, end: Option<i32>, step: Option<NonZeroU32>) -> Self {104		let get_idx = |pos: Option<i32>, len: usize, default| match pos {105			Some(v) if v < 0 => len.saturating_sub((-v) as usize),106			Some(v) => (v as usize).min(len),107			None => default,108		};109		let index = get_idx(index, self.len(), 0);110		let end = get_idx(end, self.len(), self.len());111		let step = step.unwrap_or_else(|| NonZeroU32::new(1).expect("1 != 0"));112113		if index >= end {114			return Self::empty();115		}116117		Self::new(SliceArray {118			inner: self,119			from: index as u32,120			to: end as u32,121			step: step.get(),122		})123	}124125	/// Array length.126	pub fn len(&self) -> usize {127		self.0.len()128	}129130	/// Is array contains no elements?131	pub fn is_empty(&self) -> bool {132		self.0.is_empty()133	}134135	/// Get array element by index, evaluating it, if it is lazy.136	///137	/// Returns `None` on out-of-bounds condition.138	pub fn get(&self, index: usize) -> Result<Option<Val>> {139		self.0.get(index)140	}141142	/// Returns None if get is either non cheap, or out of bounds143	fn get_cheap(&self, index: usize) -> Option<Val> {144		self.0.get_cheap(index)145	}146147	/// Get array element by index, without evaluation.148	///149	/// Returns `None` on out-of-bounds condition.150	pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {151		self.0.get_lazy(index)152	}153154	pub fn iter(&self) -> impl ArrayLikeIter<Result<Val>> + '_ {155		(0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))156	}157158	/// Iterate over elements, returning lazy values.159	pub fn iter_lazy(&self) -> impl ArrayLikeIter<Thunk<Val>> + '_ {160		(0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))161	}162163	pub fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {164		if self.is_cheap() {165			Some((0..self.len()).map(|i| self.get_cheap(i).expect("length and is_cheap checked")))166		} else {167			None168		}169	}170171	/// Return a reversed view on current array.172	#[must_use]173	pub fn reversed(self) -> Self {174		Self::new(ReverseArray(self))175	}176177	pub fn ptr_eq(a: &Self, b: &Self) -> bool {178		Cc::ptr_eq(&a.0, &b.0)179	}180181	/// Is this vec supports `.get_cheap()?`182	pub fn is_cheap(&self) -> bool {183		self.0.is_cheap()184	}185186	pub fn as_any(&self) -> &dyn Any {187		&self.0188	}189}190impl From<Vec<Val>> for ArrValue {191	fn from(value: Vec<Val>) -> Self {192		Self::eager(value)193	}194}195impl From<Vec<Thunk<Val>>> for ArrValue {196	fn from(value: Vec<Thunk<Val>>) -> Self {197		Self::lazy(value)198	}199}200impl FromIterator<Val> for ArrValue {201	fn from_iter<T: IntoIterator<Item = Val>>(iter: T) -> Self {202		Self::eager(iter.into_iter().collect())203	}204}205impl ArrayLike for ArrValue {206	fn len(&self) -> usize {207		self.0.len()208	}209210	fn get(&self, index: usize) -> Result<Option<Val>> {211		self.0.get(index)212	}213214	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {215		self.0.get_lazy(index)216	}217218	fn get_cheap(&self, index: usize) -> Option<Val> {219		self.0.get_cheap(index)220	}221222	fn is_cheap(&self) -> bool {223		self.0.is_cheap()224	}225}226227#[cfg(target_pointer_width = "64")]228static_assertions::assert_eq_size!(ArrValue, [u8; 8]);
after · crates/jrsonnet-evaluator/src/arr/mod.rs
1use std::{any::Any, num::NonZeroU32};23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IBytes;5use jrsonnet_parser::LocExpr;67use crate::{function::FuncVal, gc::TraceBox, tb, Context, Result, Thunk, Val};89mod spec;10pub use spec::{ArrayLike, *};1112/// Represents a Jsonnet array value.13#[derive(Debug, Clone, Trace)]14// may contain other ArrValue15#[trace(tracking(force))]16pub struct ArrValue(Cc<TraceBox<dyn ArrayLike>>);1718pub trait ArrayLikeIter<T>: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator {}19impl<I, T> ArrayLikeIter<T> for I where20	I: Iterator<Item = T> + DoubleEndedIterator + ExactSizeIterator21{22}2324impl ArrValue {25	pub fn new(v: impl ArrayLike) -> Self {26		Self(Cc::new(tb!(v)))27	}28	pub fn empty() -> Self {29		Self::new(RangeArray::empty())30	}3132	pub fn expr(ctx: Context, exprs: impl IntoIterator<Item = LocExpr>) -> Self {33		Self::new(ExprArray::new(ctx, exprs))34	}3536	pub fn lazy(thunks: Vec<Thunk<Val>>) -> Self {37		Self::new(LazyArray(thunks))38	}3940	pub fn eager(values: Vec<Val>) -> Self {41		Self::new(EagerArray(values))42	}4344	pub fn repeated(data: Self, repeats: usize) -> Option<Self> {45		Some(Self::new(RepeatedArray::new(data, repeats)?))46	}4748	pub fn bytes(bytes: IBytes) -> Self {49		Self::new(BytesArray(bytes))50	}51	pub fn chars(chars: impl Iterator<Item = char>) -> Self {52		Self::new(CharArray(chars.collect()))53	}5455	#[must_use]56	pub fn map(self, mapper: FuncVal) -> Self {57		Self::new(<MappedArray<false>>::new(self, mapper))58	}5960	#[must_use]61	pub fn map_with_index(self, mapper: FuncVal) -> Self {62		Self::new(<MappedArray<true>>::new(self, mapper))63	}6465	pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {66		// TODO: ArrValue::Picked(inner, indexes) for large arrays67		let mut out = Vec::new();68		for i in self.iter() {69			let i = i?;70			if filter(&i)? {71				out.push(i);72			};73		}74		Ok(Self::eager(out))75	}7677	pub fn extended(a: Self, b: Self) -> Self {78		// TODO: benchmark for an optimal value, currently just a arbitrary choice79		const ARR_EXTEND_THRESHOLD: usize = 100;8081		if a.is_empty() {82			b83		} else if b.is_empty() {84			a85		} else if a.len() + b.len() > ARR_EXTEND_THRESHOLD {86			Self::new(ExtendedArray::new(a, b))87		} else if let (Some(a), Some(b)) = (a.iter_cheap(), b.iter_cheap()) {88			let mut out = Vec::with_capacity(a.len() + b.len());89			out.extend(a);90			out.extend(b);91			Self::eager(out)92		} else {93			let mut out = Vec::with_capacity(a.len() + b.len());94			out.extend(a.iter_lazy());95			out.extend(b.iter_lazy());96			Self::lazy(out)97		}98	}99100	pub fn range_exclusive(a: i32, b: i32) -> Self {101		Self::new(RangeArray::new_exclusive(a, b))102	}103	pub fn range_inclusive(a: i32, b: i32) -> Self {104		Self::new(RangeArray::new_inclusive(a, b))105	}106107	#[must_use]108	pub fn slice(self, index: Option<i32>, end: Option<i32>, step: Option<NonZeroU32>) -> Self {109		let get_idx = |pos: Option<i32>, len: usize, default| match pos {110			Some(v) if v < 0 => len.saturating_sub((-v) as usize),111			Some(v) => (v as usize).min(len),112			None => default,113		};114		let index = get_idx(index, self.len(), 0);115		let end = get_idx(end, self.len(), self.len());116		let step = step.unwrap_or_else(|| NonZeroU32::new(1).expect("1 != 0"));117118		if index >= end {119			return Self::empty();120		}121122		Self::new(SliceArray {123			inner: self,124			from: index as u32,125			to: end as u32,126			step: step.get(),127		})128	}129130	/// Array length.131	pub fn len(&self) -> usize {132		self.0.len()133	}134135	/// Is array contains no elements?136	pub fn is_empty(&self) -> bool {137		self.0.is_empty()138	}139140	/// Get array element by index, evaluating it, if it is lazy.141	///142	/// Returns `None` on out-of-bounds condition.143	pub fn get(&self, index: usize) -> Result<Option<Val>> {144		self.0.get(index)145	}146147	/// Returns None if get is either non cheap, or out of bounds148	fn get_cheap(&self, index: usize) -> Option<Val> {149		self.0.get_cheap(index)150	}151152	/// Get array element by index, without evaluation.153	///154	/// Returns `None` on out-of-bounds condition.155	pub fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {156		self.0.get_lazy(index)157	}158159	pub fn iter(&self) -> impl ArrayLikeIter<Result<Val>> + '_ {160		(0..self.len()).map(|i| self.get(i).transpose().expect("length checked"))161	}162163	/// Iterate over elements, returning lazy values.164	pub fn iter_lazy(&self) -> impl ArrayLikeIter<Thunk<Val>> + '_ {165		(0..self.len()).map(|i| self.get_lazy(i).expect("length checked"))166	}167168	pub fn iter_cheap(&self) -> Option<impl ArrayLikeIter<Val> + '_> {169		if self.is_cheap() {170			Some((0..self.len()).map(|i| self.get_cheap(i).expect("length and is_cheap checked")))171		} else {172			None173		}174	}175176	/// Return a reversed view on current array.177	#[must_use]178	pub fn reversed(self) -> Self {179		Self::new(ReverseArray(self))180	}181182	pub fn ptr_eq(a: &Self, b: &Self) -> bool {183		Cc::ptr_eq(&a.0, &b.0)184	}185186	/// Is this vec supports `.get_cheap()?`187	pub fn is_cheap(&self) -> bool {188		self.0.is_cheap()189	}190191	pub fn as_any(&self) -> &dyn Any {192		&self.0193	}194}195impl From<Vec<Val>> for ArrValue {196	fn from(value: Vec<Val>) -> Self {197		Self::eager(value)198	}199}200impl From<Vec<Thunk<Val>>> for ArrValue {201	fn from(value: Vec<Thunk<Val>>) -> Self {202		Self::lazy(value)203	}204}205impl FromIterator<Val> for ArrValue {206	fn from_iter<T: IntoIterator<Item = Val>>(iter: T) -> Self {207		Self::eager(iter.into_iter().collect())208	}209}210impl ArrayLike for ArrValue {211	fn len(&self) -> usize {212		self.0.len()213	}214215	fn get(&self, index: usize) -> Result<Option<Val>> {216		self.0.get(index)217	}218219	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {220		self.0.get_lazy(index)221	}222223	fn get_cheap(&self, index: usize) -> Option<Val> {224		self.0.get_cheap(index)225	}226227	fn is_cheap(&self) -> bool {228		self.0.is_cheap()229	}230}231232#[cfg(target_pointer_width = "64")]233static_assertions::assert_eq_size!(ArrValue, [u8; 8]);
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -430,12 +430,12 @@
 }
 
 #[derive(Trace, Debug, Clone)]
-pub struct MappedArray {
+pub struct MappedArray<const WithIndex: bool> {
 	inner: ArrValue,
 	cached: Cc<RefCell<Vec<ArrayThunk<()>>>>,
 	mapper: FuncVal,
 }
-impl MappedArray {
+impl<const WithIndex: bool> MappedArray<WithIndex> {
 	pub fn new(inner: ArrValue, mapper: FuncVal) -> Self {
 		let len = inner.len();
 		Self {
@@ -444,8 +444,15 @@
 			mapper,
 		}
 	}
+	fn evaluate(&self, index: usize, value: Val) -> Result<Val> {
+		if WithIndex {
+			self.mapper.evaluate_simple(&(index, value), false)
+		} else {
+			self.mapper.evaluate_simple(&(value,), false)
+		}
+	}
 }
-impl ArrayLike for MappedArray {
+impl<const WithIndex: bool> ArrayLike for MappedArray<WithIndex> {
 	fn len(&self) -> usize {
 		self.cached.borrow().len()
 	}
@@ -472,7 +479,7 @@
 			.get(index)
 			.transpose()
 			.expect("index checked")
-			.and_then(|r| self.mapper.evaluate_simple(&(r,), false));
+			.and_then(|r| self.evaluate(index, r));
 
 		let new_value = match val {
 			Ok(v) => v,
@@ -486,12 +493,12 @@
 	}
 	fn get_lazy(&self, index: usize) -> Option<Thunk<Val>> {
 		#[derive(Trace)]
-		struct ArrayElement {
-			arr_thunk: MappedArray,
+		struct ArrayElement<const WithIndex: bool> {
+			arr_thunk: MappedArray<WithIndex>,
 			index: usize,
 		}
 
-		impl ThunkValue for ArrayElement {
+		impl<const WithIndex: bool> ThunkValue for ArrayElement<WithIndex> {
 			type Output = Val;
 
 			fn get(self: Box<Self>) -> Result<Self::Output> {
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -62,6 +62,12 @@
 }
 
 #[builtin]
+pub fn builtin_map_with_index(func: FuncVal, arr: IndexableVal) -> ArrValue {
+	let arr = arr.to_array();
+	arr.map_with_index(func)
+}
+
+#[builtin]
 pub fn builtin_flatmap(
 	func: NativeFn<((Either![String, Val],), Val)>,
 	arr: IndexableVal,
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -78,6 +78,7 @@
 		("repeat", builtin_repeat::INST),
 		("slice", builtin_slice::INST),
 		("map", builtin_map::INST),
+		("mapWithIndex", builtin_map_with_index::INST),
 		("flatMap", builtin_flatmap::INST),
 		("filter", builtin_filter::INST),
 		("foldl", builtin_foldl::INST),
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -3,14 +3,6 @@
 
   thisFile:: error 'std.thisFile is deprecated, to enable its support in jrsonnet - recompile it with "legacy-this-file" support.\nThis will slow down stdlib caching a bit, though',
 
-  mapWithIndex(func, arr)::
-    if !std.isFunction(func) then
-      error ('std.mapWithIndex first param must be function, got ' + std.type(func))
-    else if !std.isArray(arr) && !std.isString(arr) then
-      error ('std.mapWithIndex second param must be array, got ' + std.type(arr))
-    else
-      std.makeArray(std.length(arr), function(i) func(i, arr[i])),
-
   mapWithKey(func, obj)::
     if !std.isFunction(func) then
       error ('std.mapWithKey first param must be function, got ' + std.type(func))