@@ -3,7 +3,7 @@ use crate::dataframe::JsDataFrame;
33use crate :: prelude:: * ;
44use polars:: prelude:: { col, lit, ClosedWindow , JoinType } ;
55use polars_io:: cloud:: CloudOptions ;
6- use polars_io:: RowIndex ;
6+ use polars_io:: { HiveOptions , RowIndex } ;
77use std:: collections:: HashMap ;
88use std:: num:: NonZeroUsize ;
99use std:: path:: PathBuf ;
@@ -134,34 +134,37 @@ impl JsLazyFrame {
134134 pub fn sort (
135135 & self ,
136136 by_column : String ,
137- reverse : bool ,
137+ descending : bool ,
138138 nulls_last : bool ,
139- multithreaded : bool ,
140139 maintain_order : bool ,
141140 ) -> JsLazyFrame {
142141 let ldf = self . ldf . clone ( ) ;
143142 ldf. sort (
144- & by_column,
145- SortOptions {
146- descending : reverse,
147- nulls_last,
148- multithreaded,
149- maintain_order,
150- } ,
143+ [ & by_column] ,
144+ SortMultipleOptions :: default ( )
145+ . with_order_descending ( descending)
146+ . with_nulls_last ( nulls_last)
147+ . with_maintain_order ( maintain_order) ,
151148 )
152149 . into ( )
153150 }
154151 #[ napi( catch_unwind) ]
155152 pub fn sort_by_exprs (
156153 & self ,
157154 by_column : Vec < & JsExpr > ,
158- reverse : Vec < bool > ,
155+ descending : bool ,
159156 nulls_last : bool ,
160157 maintain_order : bool ,
161158 ) -> JsLazyFrame {
162159 let ldf = self . ldf . clone ( ) ;
163- ldf. sort_by_exprs ( by_column. to_exprs ( ) , reverse, nulls_last, maintain_order)
164- . into ( )
160+ ldf. sort_by_exprs (
161+ by_column. to_exprs ( ) ,
162+ SortMultipleOptions :: default ( )
163+ . with_order_descending ( descending)
164+ . with_nulls_last ( nulls_last)
165+ . with_maintain_order ( maintain_order) ,
166+ )
167+ . into ( )
165168 }
166169 #[ napi( catch_unwind) ]
167170 pub fn cache ( & self ) -> JsLazyFrame {
@@ -229,7 +232,7 @@ impl JsLazyFrame {
229232 let closed_window = closed. 0 ;
230233 let ldf = self . ldf . clone ( ) ;
231234 let by = by. to_exprs ( ) ;
232- let lazy_gb = ldf. group_by_rolling (
235+ let lazy_gb = ldf. rolling (
233236 index_column. inner . clone ( ) ,
234237 by,
235238 RollingGroupOptions {
@@ -711,8 +714,7 @@ pub struct ScanParquetOptions {
711714 pub rechunk : Option < bool > ,
712715 pub low_memory : Option < bool > ,
713716 pub use_statistics : Option < bool > ,
714- pub hive_partitioning : Option < bool > ,
715- pub cloud_options : Option < HashMap :: < String , String > > ,
717+ pub cloud_options : Option < HashMap < String , String > > ,
716718 pub retries : Option < i64 > ,
717719}
718720
@@ -725,14 +727,14 @@ pub fn scan_parquet(path: String, options: ScanParquetOptions) -> napi::Result<J
725727 let rechunk = options. rechunk . unwrap_or ( false ) ;
726728 let low_memory = options. low_memory . unwrap_or ( false ) ;
727729 let use_statistics = options. use_statistics . unwrap_or ( false ) ;
728-
730+
729731 let mut cloud_options: Option < CloudOptions > = if let Some ( o) = options. cloud_options {
730732 let co: Vec < ( String , String ) > = o. into_iter ( ) . map ( |kv : ( String , String ) | kv) . collect ( ) ;
731733 Some ( CloudOptions :: from_untyped_config ( & path, co) . map_err ( JsPolarsErr :: from) ?)
732734 } else {
733735 None
734736 } ;
735-
737+
736738 let retries = options. retries . unwrap_or_else ( || 2 ) as usize ;
737739 if retries > 0 {
738740 cloud_options =
@@ -744,7 +746,6 @@ pub fn scan_parquet(path: String, options: ScanParquetOptions) -> napi::Result<J
744746 } ) ;
745747 }
746748
747- let hive_partitioning: bool = options. hive_partitioning . unwrap_or ( false ) ;
748749 let args = ScanArgsParquet {
749750 n_rows,
750751 cache,
@@ -754,7 +755,11 @@ pub fn scan_parquet(path: String, options: ScanParquetOptions) -> napi::Result<J
754755 low_memory,
755756 cloud_options,
756757 use_statistics,
757- hive_partitioning,
758+ // TODO: Support Hive partitioning.
759+ hive_options : HiveOptions {
760+ enabled : false ,
761+ ..Default :: default ( )
762+ } ,
758763 } ;
759764 let lf = LazyFrame :: scan_parquet ( path, args) . map_err ( JsPolarsErr :: from) ?;
760765 Ok ( lf. into ( ) )
@@ -774,14 +779,14 @@ pub fn scan_ipc(path: String, options: ScanIPCOptions) -> napi::Result<JsLazyFra
774779 let n_rows = options. n_rows . map ( |i| i as usize ) ;
775780 let cache = options. cache . unwrap_or ( true ) ;
776781 let rechunk = options. rechunk . unwrap_or ( false ) ;
777- let memmap = options. memmap . unwrap_or ( true ) ;
782+ let memory_map = options. memmap . unwrap_or ( true ) ;
778783 let row_index: Option < RowIndex > = options. row_count . map ( |rc| rc. into ( ) ) ;
779784 let args = ScanArgsIpc {
780785 n_rows,
781786 cache,
782787 rechunk,
783788 row_index,
784- memmap ,
789+ memory_map ,
785790 cloud_options : Default :: default ( ) ,
786791 } ;
787792 let lf = LazyFrame :: scan_ipc ( path, args) . map_err ( JsPolarsErr :: from) ?;
0 commit comments