Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Deadletter path is being incorrectly joined #1144

Merged
merged 2 commits into from
Nov 6, 2020
Merged

Deadletter path is being incorrectly joined #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deab12e
fix deadletter path join
pyalex Nov 6, 2020
530dbb4
cleanup
pyalex Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions spark/ingestion/src/main/scala/feast/ingestion/BatchPipeline.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
*/
package feast.ingestion

import java.nio.file.Paths

import feast.ingestion.sources.bq.BigQueryReader
import feast.ingestion.sources.file.FileReader
import feast.ingestion.validation.{RowValidator, TypeCheck}
import org.apache.commons.lang.StringUtils
import org.apache.spark.SparkEnv
import org.apache.spark.sql.{Column, SaveMode, SparkSession}
import org.apache.spark.sql.functions.col
import org.apache.spark.sql.{SaveMode, SparkSession}

/**
* Batch Ingestion Flow:
Expand Down Expand Up @@ -83,7 +81,7 @@ object BatchPipeline extends BasePipeline {
.write
.format("parquet")
.mode(SaveMode.Append)
.save(Paths.get(path, SparkEnv.get.conf.getAppId).toString)
.save(StringUtils.stripEnd(path, "/") + "/" + SparkEnv.get.conf.getAppId)
case _ => None
}

Expand Down
5 changes: 2 additions & 3 deletions spark/ingestion/src/main/scala/feast/ingestion/StreamingPipeline.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
*/
package feast.ingestion

import java.nio.file.Paths

import feast.ingestion.registry.proto.ProtoRegistryFactory
import org.apache.spark.sql.{DataFrame, Row, SaveMode, SparkSession}
import org.apache.spark.sql.functions.udf
import feast.ingestion.utils.ProtoReflection
import feast.ingestion.validation.{RowValidator, TypeCheck}
import org.apache.commons.lang.StringUtils
import org.apache.spark.SparkEnv
import org.apache.spark.sql.streaming.StreamingQuery
import org.apache.spark.sql.avro._
Expand Down Expand Up @@ -97,7 +96,7 @@ object StreamingPipeline extends BasePipeline with Serializable {
.write
.format("parquet")
.mode(SaveMode.Append)
.save(Paths.get(path, SparkEnv.get.conf.getAppId).toString)
.save(StringUtils.stripEnd(path, "/") + "/" + SparkEnv.get.conf.getAppId)
case _ =>
batchDF
.filter(!validator.checkAll)
Expand Down