InConversion -> NativeInConversion; PromoteStrings -> NativePromoteSt…

…rings

docs/sql-programming-guide.md

@@ -1497,10 +1497,8 @@ that these options will be deprecated in future release as more optimizations ar
     <td><code>spark.sql.typeCoercion.mode</code></td>
     <td><code>default</code></td>
     <td>
-      The <code>default</code> type coercion mode was used in spark prior to 2.3.0, and so it
-      continues to be the default to avoid breaking behavior. However, it has logical
-      inconsistencies. The <code>hive</code> mode is preferred for most new applications, though
-      it may require additional manual casting.
+      Since Spark 2.3, the <code>hive</code> mode is introduced for Hive compatiblity.
+      Spark SQL has its native type cocersion mode, which is enabled by default.
     </td>
   </tr>
 </table>

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercion.scala

@@ -67,8 +67,8 @@ object TypeCoercion {
         HivePromoteStrings
     } else {
       commonTypeCoercionRules :+
-        InConversion :+
-        PromoteStrings
+        NativeInConversion :+
+        NativePromoteStrings
     }
   }
 
@@ -348,7 +348,7 @@ object TypeCoercion {
   /**
    * Promotes strings that appear in arithmetic expressions.
    */
-  object PromoteStrings extends TypeCoercionRule {
+  object NativePromoteStrings extends TypeCoercionRule {
 
     override protected def coerceTypes(
         plan: LogicalPlan): LogicalPlan = plan transformAllExpressions {
@@ -451,7 +451,7 @@ object TypeCoercion {
    *    operator type is found the original expression will be returned and an
    *    Analysis Exception will be raised at the type checking phase.
    */
-  object InConversion extends TypeCoercionRule {
+  object NativeInConversion extends TypeCoercionRule {
 
     override protected def coerceTypes(
         plan: LogicalPlan): LogicalPlan = plan transformAllExpressions {

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

@@ -1032,11 +1032,8 @@ object SQLConf {
 
   val typeCoercionMode =
     buildConf("spark.sql.typeCoercion.mode")
-      .doc("The 'default' typeCoercion mode was used in spark prior to 2.3, " +
-        "and so it continues to be the default to avoid breaking behavior. " +
-        "However, it has logical inconsistencies. " +
-        "The 'hive' mode is preferred for most new applications, " +
-        "though it may require additional manual casting.")
+      .doc("Since Spark 2.3, the 'hive' mode is introduced for Hive compatiblity. " +
+        "Spark SQL has its native type cocersion mode, which is enabled by default.")
       .stringConf
       .transform(_.toLowerCase(Locale.ROOT))
       .checkValues(Set("default", "hive"))

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercionSuite.scala

@@ -1207,7 +1207,7 @@ class TypeCoercionSuite extends AnalysisTest {
    */
   test("make sure rules do not fire early") {
     // InConversion
-    val inConversion = TypeCoercion.InConversion
+    val inConversion = TypeCoercion.NativeInConversion
     ruleTest(inConversion,
       In(UnresolvedAttribute("a"), Seq(Literal(1))),
       In(UnresolvedAttribute("a"), Seq(Literal(1)))
@@ -1251,16 +1251,16 @@ class TypeCoercionSuite extends AnalysisTest {
   }
 
   test("binary comparison with string promotion") {
-    ruleTest(PromoteStrings,
+    ruleTest(NativePromoteStrings,
       GreaterThan(Literal("123"), Literal(1)),
       GreaterThan(Cast(Literal("123"), IntegerType), Literal(1)))
-    ruleTest(PromoteStrings,
+    ruleTest(NativePromoteStrings,
       LessThan(Literal(true), Literal("123")),
       LessThan(Literal(true), Cast(Literal("123"), BooleanType)))
-    ruleTest(PromoteStrings,
+    ruleTest(NativePromoteStrings,
       EqualTo(Literal(Array(1, 2)), Literal("123")),
       EqualTo(Literal(Array(1, 2)), Literal("123")))
-    ruleTest(PromoteStrings,
+    ruleTest(NativePromoteStrings,
       GreaterThan(Literal("1.5"), Literal(BigDecimal("0.5"))),
       GreaterThan(Cast(Literal("1.5"), DoubleType), Cast(Literal(BigDecimal("0.5")), DoubleType)))
   }