Skip to content

Commit 54fcb6e

Browse files
committed
some cleanup
Signed-off-by: Oleksii Moskalenko <moskalenko.alexey@gmail.com>
1 parent bf63033 commit 54fcb6e

3 files changed

Lines changed: 8 additions & 30 deletions

File tree

.github/workflows/complete.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ jobs:
144144
uses: actions/upload-artifact@v2
145145
if: failure()
146146
with:
147-
name: ingestion-it-report
147+
name: it-report
148148
path: spark/ingestion/target/test-reports/TestSuite.txt
149-
retention-days: 1
149+
retention-days: 5
150150

151151
tests-docker-compose:
152152
needs:
@@ -193,28 +193,3 @@ jobs:
193193
name: ingestion-jar
194194
path: spark/ingestion/target/feast-ingestion-spark-develop.jar
195195
retention-days: 1
196-
197-
publish-ingestion-pylibs:
198-
strategy:
199-
matrix:
200-
os: [ ubuntu-latest, macos-latest ]
201-
python-version: [ 3.6, 3.7, 3.8 ]
202-
runs-on: ${{ matrix.os }}
203-
steps:
204-
- uses: actions/checkout@v2
205-
- name: Set up Python
206-
uses: actions/setup-python@v2
207-
with:
208-
python-version: ${{ matrix.python-version }}
209-
- name: Create libs archive
210-
env:
211-
PY_VERSION: ${{ matrix.python-version }}
212-
run: |
213-
export PLATFORM=$(python -c 'import platform; print(platform.system().lower())')
214-
mkdir pylibs/
215-
./infra/scripts/build-ingestion-py-dependencies.sh "py${PY_VERSION}-$PLATFORM" $PWD/pylibs/
216-
- uses: actions/upload-artifact@v2
217-
with:
218-
name: pylibs
219-
path: pylibs/
220-
retention-days: 1

spark/ingestion/src/main/scala/feast/ingestion/stores/redis/RedisSinkRelation.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class RedisSinkRelation(override val sqlContext: SQLContext, config: SparkRedisC
8383

8484
groupKeysByNode(redisConfig.hosts, rowsWithKey.keysIterator).foreach { case (node, keys) =>
8585
val conn = node.connect()
86-
8786
// retrieve latest stored values
8887
val storedValues = mapWithPipeline(conn, keys) { (pipeline, key) =>
8988
persistence.get(pipeline, key.toByteArray)

spark/ingestion/src/main/scala/org/apache/spark/api/python/DynamicPythonFunction.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@ import java.util.{ArrayList => JArrayList, HashMap => JHashMap}
2222
import org.apache.commons.io.IOUtils
2323
import org.apache.spark.SparkEnv
2424
import org.apache.spark.broadcast.Broadcast
25-
import org.apache.spark.internal.config.PYSPARK_DRIVER_PYTHON
25+
import org.apache.spark.internal.config.{PYSPARK_DRIVER_PYTHON, PYSPARK_PYTHON}
2626

2727
import collection.JavaConverters._
2828

2929
object DynamicPythonFunction {
3030
private val conf = SparkEnv.get.conf
3131

32-
val pythonExec = conf.get(PYSPARK_DRIVER_PYTHON).getOrElse("python3")
32+
val pythonExec = conf.get(PYSPARK_DRIVER_PYTHON)
33+
.orElse(conf.get(PYSPARK_PYTHON))
34+
.orElse(sys.env.get("PYSPARK_DRIVER_PYTHON"))
35+
.orElse(sys.env.get("PYSPARK_PYTHON"))
36+
.getOrElse("python3")
3337

3438
private def runCommand(cmd: List[String]): String = {
3539
val pb = new ProcessBuilder(cmd.asJava)

0 commit comments

Comments
 (0)