Skip to content

Commit

Permalink
fix scalastyle
Browse files Browse the repository at this point in the history
  • Loading branch information
shahidki31 committed May 15, 2021
1 parent 3efa97c commit 7d6084a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2709,6 +2709,14 @@ object SQLConf {
.checkValue(_ > 3, "This value must be bigger than 3.")
.createWithDefault(100)

val ESCAPE_META_CHARACTERS_FOR_SHOW_ENABLED =
buildConf("spark.sql.escapeMetaCharactersForShow.enabled")
.doc("When true, the meta-characters `\n`, `\t`, `\r`, `\f` etc are escaped in the" +
" `show()` action.")
.version("3.2.0")
.booleanConf
.createWithDefault(true)

val SET_COMMAND_REJECTS_SPARK_CORE_CONFS =
buildConf("spark.sql.legacy.setCommandRejectsSparkCoreConfs")
.internal()
Expand Down Expand Up @@ -2775,13 +2783,6 @@ object SQLConf {
.stringConf
.createOptional

val ESCAPE_META_CHARACTERS_FOR_SHOW_ENABLED =
buildConf("spark.sql.escapeMetaCharactersForShow.enabled")
.doc("When true, the meta-characters `\n`, `\t`, `\r`, `\f` etc are escaped in the `show()` action.")
.version("3.2.0")
.booleanConf
.createWithDefault(true)

object MapKeyDedupPolicy extends Enumeration {
val EXCEPTION, LAST_WIN = Value
}
Expand Down Expand Up @@ -3840,6 +3841,9 @@ class SQLConf extends Serializable with Logging {

def maxMetadataStringLength: Int = getConf(SQLConf.MAX_METADATA_STRING_LENGTH)

def escapeMetaCharactersForShowEnabled: Boolean =
getConf(ESCAPE_META_CHARACTERS_FOR_SHOW_ENABLED)

def setCommandRejectsSparkCoreConfs: Boolean =
getConf(SQLConf.SET_COMMAND_REJECTS_SPARK_CORE_CONFS)

Expand Down Expand Up @@ -3879,8 +3883,6 @@ class SQLConf extends Serializable with Logging {

def maxConcurrentOutputFileWriters: Int = getConf(SQLConf.MAX_CONCURRENT_OUTPUT_FILE_WRITERS)

def escapeMetaCharactersForShowEnabled: Boolean = getConf(ESCAPE_META_CHARACTERS_FOR_SHOW_ENABLED)

/** ********************** SQLConf functionality methods ************ */

/** Set Spark SQL configuration properties. */
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,6 @@ class Dataset[T] private[sql](
} else {
cell.toString
}

//
}
if (truncate > 0 && str.length > truncate) {
// do not show ellipses for strings shorter than 4 characters.
Expand Down

0 comments on commit 7d6084a

Please sign in to comment.