Skip to content

[SPARK-29755][CORE] Provide @JsonDeserialize for Option[Long] in LogInfo & AttemptInfoWrapper #26397

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

Closed
HeartSaVioR wants to merge 5 commits into from
Closed

[SPARK-29755][CORE] Provide @JsonDeserialize for Option[Long] in LogInfo & AttemptInfoWrapper #26397

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f505521
[SPARK-29755][CORE] Provide @JsonDeserialize for Option[Long] in LogI…
HeartSaVioR Nov 5, 2019
ae2e43c
Add UT which fails on master branch and passes with the patch
HeartSaVioR Nov 6, 2019
8ba7014
Reflect review comment
HeartSaVioR Nov 6, 2019
c665983
Reflect review comments
HeartSaVioR Nov 8, 2019
698a657
Reflect review comment
HeartSaVioR Nov 8, 2019
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
Prev Previous commit
Next Next commit
Reflect review comments
  • Loading branch information
@HeartSaVioR
HeartSaVioR committed Nov 10, 2019
commit c665983204f591bcf5a343b4afd611db37011854
6 changes: 4 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,14 +1169,16 @@ private[history] case class LogInfo(
appId: Option[String],
attemptId: Option[String],
fileSize: Long,
@JsonDeserialize(contentAs = classOf[JLong]) lastIndex: Option[Long],
@JsonDeserialize(contentAs = classOf[JLong])
lastIndex: Option[Long],
isComplete: Boolean)

private[history] class AttemptInfoWrapper(
val info: ApplicationAttemptInfo,
val logPath: String,
val fileSize: Long,
@JsonDeserialize(contentAs = classOf[JLong]) val lastIndex: Option[Long],
@JsonDeserialize(contentAs = classOf[JLong])
val lastIndex: Option[Long],
val adminAcls: Option[String],
val viewAcls: Option[String],
val adminAclsGroups: Option[String],
Expand Down
5 changes: 1 addition & 4 deletions core/src/test/scala/org/apache/spark/deploy/history/FsHistoryProviderSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.zip.{ZipInputStream, ZipOutputStream}

import scala.collection.JavaConverters._
import scala.concurrent.duration._
import scala.runtime.BoxesRunTime

import com.google.common.io.{ByteStreams, Files}
import org.apache.commons.io.FileUtils
Expand Down Expand Up @@ -53,7 +52,6 @@ import org.apache.spark.status.api.v1.{ApplicationAttemptInfo, ApplicationInfo}
import org.apache.spark.util.{Clock, JsonProtocol, ManualClock, Utils}
import org.apache.spark.util.logging.DriverLogger


class FsHistoryProviderSuite extends SparkFunSuite with Matchers with Logging {

private var testDir: File = null
Expand Down Expand Up @@ -1287,8 +1285,7 @@ class FsHistoryProviderSuite extends SparkFunSuite with Matchers with Logging {

test("SPARK-29755 LogInfo should be serialized/deserialized by jackson properly") {
def assertSerDe(serializer: KVStoreScalaSerializer, info: LogInfo): Unit = {
val infoAfterSerDe = serializer.deserialize(
serializer.serialize(info), classOf[LogInfo])
val infoAfterSerDe = serializer.deserialize(serializer.serialize(info), classOf[LogInfo])
assert(infoAfterSerDe === info)
assertOptionAfterSerde(infoAfterSerDe.lastIndex, info.lastIndex)
}
Expand Down