new function plainFile, mapPartitions preservesPartitioning argument …

…removed
ignishpc · Apr 25, 2022 · be18e3f · be18e3f
1 parent 29660ff
commit be18e3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ignis/rpc/driver/IDataFrameService.thrift b/ignis/rpc/driver/IDataFrameService.thrift
@@ -35,8 +35,8 @@ service IDataFrameService{
 	IDataFrameId filter(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameId flatmap(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameId keyBy(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
-	IDataFrameId mapPartitions(1: IDataFrameId id, 2: ISource.ISource src, 3:  bool preservesPartitioning) throws (1:IDriverException.IDriverException ex),
-	IDataFrameId mapPartitionsWithIndex(1: IDataFrameId id, 2: ISource.ISource src, 3:  bool preservesPartitioning) throws (1:IDriverException.IDriverException ex),
+	IDataFrameId mapPartitions(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
+	IDataFrameId mapPartitionsWithIndex(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameId mapExecutor(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameId mapExecutorTo(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameId groupBy(1: IDataFrameId id, 2: ISource.ISource src) throws (1:IDriverException.IDriverException ex),

diff --git a/ignis/rpc/driver/IWorkerService.thrift b/ignis/rpc/driver/IWorkerService.thrift
@@ -25,6 +25,8 @@ service IWorkerService{
 	IDataFrameService.IDataFrameId parallelize4(1: IWorkerId id, 2: i64 dataId, 3: i64 partitions, 4: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
 	IDataFrameService.IDataFrameId importDataFrame(1: IWorkerId id, 2: IDataFrameService.IDataFrameId data) throws (1:IDriverException.IDriverException ex),
 	IDataFrameService.IDataFrameId importDataFrame3(1: IWorkerId id, 2: IDataFrameService.IDataFrameId data, 3: ISource.ISource src) throws (1:IDriverException.IDriverException ex),
+	IDataFrameService.IDataFrameId plainFile(1: IWorkerId id, 2: string path, 3: i8 delim) throws (1:IDriverException.IDriverException ex),
+	IDataFrameService.IDataFrameId plainFile4(1: IWorkerId id, 2: string path, 3: i64 minPartitions, 4: i8 delim) throws (1:IDriverException.IDriverException ex),
 	IDataFrameService.IDataFrameId textFile(1: IWorkerId id, 2: string path) throws (1:IDriverException.IDriverException ex),
 	IDataFrameService.IDataFrameId textFile3(1: IWorkerId id, 2: string path, 3: i64 minPartitions) throws (1:IDriverException.IDriverException ex),
 	IDataFrameService.IDataFrameId partitionObjectFile(1: IWorkerId id, 2: string path) throws (1:IDriverException.IDriverException ex),

diff --git a/ignis/rpc/executor/IGeneralModule.thrift b/ignis/rpc/executor/IGeneralModule.thrift
@@ -20,7 +20,7 @@ service IGeneralModule{
 
 	void mapPartitions(1: ISource.ISource src) throws (1:IExecutorException.IExecutorException ex),
 
-	void mapPartitionsWithIndex(1: ISource.ISource src, 2:  bool preservesPartitioning) throws (1:IExecutorException.IExecutorException ex),
+	void mapPartitionsWithIndex(1: ISource.ISource src) throws (1:IExecutorException.IExecutorException ex),
 
 	void mapExecutor(1: ISource.ISource src) throws (1:IExecutorException.IExecutorException ex),
 

diff --git a/ignis/rpc/executor/IIOModule.thrift b/ignis/rpc/executor/IIOModule.thrift
@@ -19,6 +19,10 @@ service IIOModule{
 
 	i64 partitionApproxSize() throws (1:IExecutorException.IExecutorException ex),
 
+	void plainFile(1: string path, 2: i8 delim) throws (1:IExecutorException.IExecutorException ex),
+
+	void plainFile3(1: string path, 2: i64 minPartitions, 3: i8 delim) throws (1:IExecutorException.IExecutorException ex),
+
 	void textFile(1: string path) throws (1:IExecutorException.IExecutorException ex),
 
 	void textFile2(1: string path, 2: i64 minPartitions) throws (1:IExecutorException.IExecutorException ex),