diff --git a/feathr-impl/src/main/scala/com/linkedin/feathr/offline/client/FeathrClient.scala b/feathr-impl/src/main/scala/com/linkedin/feathr/offline/client/FeathrClient.scala index 36b7184be..54d31721a 100644 --- a/feathr-impl/src/main/scala/com/linkedin/feathr/offline/client/FeathrClient.scala +++ b/feathr-impl/src/main/scala/com/linkedin/feathr/offline/client/FeathrClient.scala @@ -84,23 +84,6 @@ class FeathrClient private[offline] (sparkSession: SparkSession, featureGroups: -> SuppressedExceptionHandlerUtils.missingDataSuppressedExceptionMsgs)) } - - /** - * API which joins features and also returns any suppressed exception msgs. - * - * @param joinConfig feathr offline's [[FeatureJoinConfig]] - * @param obsData Observation data taken in as a [[SparkFeaturizedDataset]]. - * @param jobContext [[JoinJobContext]] - * @return Joined observation and feature data as a SparkFeaturizedDataset and a map of suppressed exceptions along with - * type of exception. - */ - def doJoinObsAndFeaturesWithSuppressedExceptions(joinConfig: FeatureJoinConfig, obsData: SparkFeaturizedDataset, - jobContext: JoinJobContext = JoinJobContext()): (DataFrame, Header, Map[String, String]) = { - val res = doJoinObsAndFeatures(joinConfig, jobContext, obsData.data) - (res._1, res._2, Map(SuppressedExceptionHandlerUtils.MISSING_DATA_EXCEPTION - -> SuppressedExceptionHandlerUtils.missingDataSuppressedExceptionMsgs)) - } - /** * Generates features by extracting feature data from its source. It returns generated features, the DataFrame for feature data * and the feature related metadata. The API takes in [[FeatureGenSpec]] as the input, which is expected to contain all the @@ -232,6 +215,23 @@ class FeathrClient private[offline] (sparkSession: SparkSession, featureGroups: (joinedDF, header) } + /** + * API which joins features and also returns any suppressed exception msgs. + * + * @param joinConfig feathr offline's [[FeatureJoinConfig]] + * @param obsData Observation data taken in as a [[SparkFeaturizedDataset]]. + * @param jobContext [[JoinJobContext]] + * @return Joined observation and feature data as a SparkFeaturizedDataset and a map of suppressed exceptions along with + * type of exception. + */ + private[offline] def doJoinObsAndFeaturesWithSuppressedExceptions(joinConfig: FeatureJoinConfig, jobContext: JoinJobContext, + obsData: DataFrame): (DataFrame, Header, Map[String, String]) = { + + val (joinedDF, header) = doJoinObsAndFeatures(joinConfig, jobContext, obsData) + (joinedDF, header, Map(SuppressedExceptionHandlerUtils.MISSING_DATA_EXCEPTION + -> SuppressedExceptionHandlerUtils.missingDataSuppressedExceptionMsgs)) + } + /** * Find feature names that are the same as the field names (from observation data) * @param keyTaggedFeatures request features diff --git a/gradle.properties b/gradle.properties index ae03bf733..a1d9bc4e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=1.0.2-rc9 +version=1.0.2-rc10 SONATYPE_AUTOMATIC_RELEASE=true POM_ARTIFACT_ID=feathr_2.12