Skip to content

Commit 51fd604

Browse files
committed
Merge branch 'fix/add_files' into HEAD
2 parents 74228bb + 70a7453 commit 51fd604

File tree

8 files changed

+10
-17
lines changed

8 files changed

+10
-17
lines changed

java/beam/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>hsfs-parent</artifactId>
77
<groupId>com.logicalclocks</groupId>
8-
<version>3.9.0-RC9</version>
8+
<version>3.9.0-RC10</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

java/flink/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>hsfs-parent</artifactId>
77
<groupId>com.logicalclocks</groupId>
8-
<version>3.9.0-RC9</version>
8+
<version>3.9.0-RC10</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

java/hsfs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>hsfs-parent</artifactId>
77
<groupId>com.logicalclocks</groupId>
8-
<version>3.9.0-RC9</version>
8+
<version>3.9.0-RC10</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.logicalclocks</groupId>
88
<artifactId>hsfs-parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>3.9.0-RC9</version>
10+
<version>3.9.0-RC10</version>
1111
<modules>
1212
<module>hsfs</module>
1313
<module>spark</module>

java/spark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>hsfs-parent</artifactId>
2424
<groupId>com.logicalclocks</groupId>
25-
<version>3.9.0-RC9</version>
25+
<version>3.9.0-RC10</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

python/hsfs/engine/spark.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import json
2121
import os
2222
import re
23-
import shutil
2423
import warnings
2524
from datetime import date, datetime, timezone
2625
from typing import Any, List, Optional, TypeVar, Union
@@ -994,22 +993,16 @@ def add_file(self, file):
994993

995994
# for external clients, download the file
996995
if isinstance(client.get_instance(), client.external.Client):
997-
tmp_file = os.path.join(SparkFiles.getRootDirectory(), file_name)
996+
tmp_file = "f/tmp/{file_name)"
998997
print("Reading key file from storage connector.")
999998
response = self._dataset_api.read_content(file, util.get_dataset_type(file))
1000999

10011000
with open(tmp_file, "wb") as f:
10021001
f.write(response.content)
1003-
else:
1004-
self._spark_context.addFile(file)
10051002

1006-
# The file is not added to the driver current working directory
1007-
# We should add it manually by copying from the download location
1008-
# The file will be added to the executors current working directory
1009-
# before the next task is executed
1010-
shutil.copy(SparkFiles.get(file_name), file_name)
1003+
self._spark_context.addFile(file)
10111004

1012-
return file_name
1005+
return SparkFiles.get(file_name)
10131006

10141007
def profile(
10151008
self,

python/hsfs/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# limitations under the License.
1515
#
1616

17-
__version__ = "3.9.0rc9"
17+
__version__ = "3.9.0rc10"

utils/java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.logicalclocks</groupId>
77
<artifactId>hsfs-utils</artifactId>
8-
<version>3.9.0-RC9</version>
8+
<version>3.9.0-RC10</version>
99

1010
<properties>
1111
<hops.version>3.2.0.0-SNAPSHOT</hops.version>

0 commit comments

Comments
 (0)