Skip to content

Prevent ingestion job config parser from unwanted fieldMapping transformation #1261

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
pyalex merged 1 commit into from
Jan 11, 2021
Merged

Prevent ingestion job config parser from unwanted fieldMapping transformation #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions spark/ingestion/src/main/scala/feast/ingestion/IngestionJob.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package feast.ingestion

import feast.ingestion.utils.JsonUtils
import org.joda.time.DateTime
import org.json4s._
import org.json4s.jackson.JsonMethods.{parse => parseJSON}
Expand All @@ -38,13 +39,20 @@ object IngestionJob {
.text("Mode to operate ingestion job (offline or online)")

opt[String](name = "source")
.action((x, c) =>
parseJSON(x).camelizeKeys.extract[Sources] match {
.action((x, c) => {
val json = parseJSON(x)
JsonUtils
.mapFieldWithParent(json) {
case (parent: String, (key: String, v: JValue)) if !parent.equals("field_mapping") =>
JsonUtils.camelize(key) -> v
case (_, x) => x
}
.extract[Sources] match {
case Sources(file: Some[FileSource], _, _) => c.copy(source = file.get)
case Sources(_, bq: Some[BQSource], _) => c.copy(source = bq.get)
case Sources(_, _, kafka: Some[KafkaSource]) => c.copy(source = kafka.get)
}
)
})
.required()
.text("JSON-encoded source object (e.g. {\"kafka\":{\"bootstrapServers\":...}}")

Expand Down
47 changes: 47 additions & 0 deletions spark/ingestion/src/main/scala/feast/ingestion/utils/JsonUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* SPDX-License-Identifier: Apache-2.0
* Copyright 2018-2021 The Feast Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package feast.ingestion.utils

import java.util.Locale.ENGLISH

import org.json4s.{JArray, JField, JObject, JValue}

object JsonUtils {
def mapFieldWithParent(jv: JValue)(f: (String, JField) => JField): JValue = {
def rec(v: JValue, parent: String = ""): JValue = v match {
case JObject(l) => JObject(l.map { case (key, va) => f(parent, key -> rec(va, key)) })
case JArray(l) => JArray(l.map(rec(_, parent)))
case x => x
}
rec(jv)
}

def camelize(word: String): String = {
if (word.nonEmpty) {
val w = pascalize(word)
w.substring(0, 1).toLowerCase(ENGLISH) + w.substring(1)
} else {
word
}
}

def pascalize(word: String): String = {
val lst = word.split("_").toList
(lst.headOption.map(s => s.substring(0, 1).toUpperCase(ENGLISH) + s.substring(1)).get ::
lst.tail.map(s => s.substring(0, 1).toUpperCase + s.substring(1))).mkString("")
}
}