SetCommand

Author: yhuai

sql/core/src/main/scala/org/apache/spark/sql/execution/commands.scala

@@ -102,16 +102,25 @@ case class SetCommand(kv: Option[(String, Option[String])]) extends RunnableComm
       }
       (keyValueOutput, runFunc)
 
-    case Some((key, Some(value)))
-      if key == SQLConf.Deprecated.EXTERNAL_SORT || key == SQLConf.Deprecated.USE_SQL_AGGREGATE2 =>
+    case Some((SQLConf.Deprecated.EXTERNAL_SORT, Some(value))) =>
       val runFunc = (sqlContext: SQLContext) => {
         logWarning(
-          s"Property ${key} is deprecated and will be ignored. " +
+          s"Property ${SQLConf.Deprecated.EXTERNAL_SORT} is deprecated and will be ignored. " +
             s"External sort will continue to be used.")
         Seq(Row(SQLConf.Deprecated.EXTERNAL_SORT, "true"))
       }
       (keyValueOutput, runFunc)
 
+    case Some((SQLConf.Deprecated.USE_SQL_AGGREGATE2, Some(value))) =>
+      val runFunc = (sqlContext: SQLContext) => {
+        logWarning(
+          s"Property ${SQLConf.Deprecated.USE_SQL_AGGREGATE2} is deprecated and " +
+            s"will be ignored. ${SQLConf.Deprecated.USE_SQL_AGGREGATE2} will " +
+            s"continue to be true.")
+        Seq(Row(SQLConf.Deprecated.USE_SQL_AGGREGATE2, "true"))
+      }
+      (keyValueOutput, runFunc)
+
     // Configures a single property.
     case Some((key, Some(value))) =>
       val runFunc = (sqlContext: SQLContext) => {