git commit: SPARK-2804: Remove scalalogging-slf4j dependency
Repository: spark
Updated Branches:
refs/heads/branch-1.1 bb0ac6d7c -> 7924d72cf
SPARK-2804: Remove scalalogging-slf4j dependency
This also Closes #1701.
Author: GuoQiang Li
Closes #1208 from witgo/SPARK-1470 and squashes the following commits:
422646b [GuoQiang Li] Remove scalalogging-slf4j dependency
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7924d72c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7924d72c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7924d72c
Branch: refs/heads/branch-1.1
Commit: 7924d72cf8aae945d72f355c54c4fcb3d62e6c48
Parents: bb0ac6d
Author: GuoQiang Li
Authored: Sat Aug 2 13:55:28 2014 -0700
Committer: Patrick Wendell
Committed: Sat Aug 2 14:04:06 2014 -0700
--
.../main/scala/org/apache/spark/Logging.scala | 10 ++---
sql/catalyst/pom.xml| 5 -
.../spark/sql/catalyst/analysis/Analyzer.scala | 4 ++--
.../catalyst/analysis/HiveTypeCoercion.scala| 8 +++
.../catalyst/expressions/BoundAttribute.scala | 2 +-
.../expressions/codegen/GenerateOrdering.scala | 4 ++--
.../org/apache/spark/sql/catalyst/package.scala | 1 -
.../sql/catalyst/planning/QueryPlanner.scala| 2 +-
.../spark/sql/catalyst/planning/patterns.scala | 6 +++---
.../apache/spark/sql/catalyst/rules/Rule.scala | 2 +-
.../spark/sql/catalyst/rules/RuleExecutor.scala | 12 +--
.../spark/sql/catalyst/trees/package.scala | 8 ---
.../scala/org/apache/spark/sql/SQLContext.scala | 2 +-
.../compression/CompressibleColumnBuilder.scala | 5 +++--
.../apache/spark/sql/execution/Exchange.scala | 2 +-
.../org/apache/spark/sql/json/JsonRDD.scala | 2 +-
.../scala/org/apache/spark/sql/package.scala| 2 --
.../spark/sql/columnar/ColumnTypeSuite.scala| 4 ++--
.../hive/thriftserver/HiveThriftServer2.scala | 12 +--
.../hive/thriftserver/SparkSQLCLIDriver.scala | 2 +-
.../sql/hive/thriftserver/SparkSQLDriver.scala | 6 +++---
.../sql/hive/thriftserver/SparkSQLEnv.scala | 6 +++---
.../server/SparkSQLOperationManager.scala | 13 ++--
.../thriftserver/HiveThriftServer2Suite.scala | 2 +-
.../org/apache/spark/sql/hive/HiveContext.scala | 2 +-
.../spark/sql/hive/HiveMetastoreCatalog.scala | 3 ++-
.../org/apache/spark/sql/hive/TestHive.scala| 10 -
.../org/apache/spark/sql/hive/hiveUdfs.scala| 4 ++--
.../sql/hive/execution/HiveComparisonTest.scala | 22 ++--
.../sql/hive/execution/HiveQueryFileTest.scala | 2 +-
30 files changed, 83 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/7924d72c/core/src/main/scala/org/apache/spark/Logging.scala
--
diff --git a/core/src/main/scala/org/apache/spark/Logging.scala
b/core/src/main/scala/org/apache/spark/Logging.scala
index 807ef3e..d4f2624 100644
--- a/core/src/main/scala/org/apache/spark/Logging.scala
+++ b/core/src/main/scala/org/apache/spark/Logging.scala
@@ -39,13 +39,17 @@ trait Logging {
// be serialized and used on another machine
@transient private var log_ : Logger = null
+ // Method to get the logger name for this object
+ protected def logName = {
+// Ignore trailing $'s in the class names for Scala objects
+this.getClass.getName.stripSuffix("$")
+ }
+
// Method to get or create the logger for this object
protected def log: Logger = {
if (log_ == null) {
initializeIfNecessary()
- var className = this.getClass.getName
- // Ignore trailing $'s in the class names for Scala objects
- log_ = LoggerFactory.getLogger(className.stripSuffix("$"))
+ log_ = LoggerFactory.getLogger(logName)
}
log_
}
http://git-wip-us.apache.org/repos/asf/spark/blob/7924d72c/sql/catalyst/pom.xml
--
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 54fa96b..58d44e7 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -55,11 +55,6 @@
${project.version}
- com.typesafe
- scalalogging-slf4j_${scala.binary.version}
- 1.0.1
-
-
org.scalatest
scalatest_${scala.binary.version}
test
http://git-wip-us.apache.org/repos/asf/spark/blob/7924d72c/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
--
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
index 74c0104..2ba68ca 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.sc
git commit: SPARK-2804: Remove scalalogging-slf4j dependency
Repository: spark
Updated Branches:
refs/heads/master 91f9504e6 -> 4c477117b
SPARK-2804: Remove scalalogging-slf4j dependency
This also Closes #1701.
Author: GuoQiang Li
Closes #1208 from witgo/SPARK-1470 and squashes the following commits:
422646b [GuoQiang Li] Remove scalalogging-slf4j dependency
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4c477117
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4c477117
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4c477117
Branch: refs/heads/master
Commit: 4c477117bb1ffef463776c86f925d35036f96b7a
Parents: 91f9504
Author: GuoQiang Li
Authored: Sat Aug 2 13:55:28 2014 -0700
Committer: Patrick Wendell
Committed: Sat Aug 2 13:59:58 2014 -0700
--
.../main/scala/org/apache/spark/Logging.scala | 10 ++---
sql/catalyst/pom.xml| 5 -
.../spark/sql/catalyst/analysis/Analyzer.scala | 4 ++--
.../catalyst/analysis/HiveTypeCoercion.scala| 8 +++
.../catalyst/expressions/BoundAttribute.scala | 2 +-
.../expressions/codegen/GenerateOrdering.scala | 4 ++--
.../org/apache/spark/sql/catalyst/package.scala | 1 -
.../sql/catalyst/planning/QueryPlanner.scala| 2 +-
.../spark/sql/catalyst/planning/patterns.scala | 6 +++---
.../apache/spark/sql/catalyst/rules/Rule.scala | 2 +-
.../spark/sql/catalyst/rules/RuleExecutor.scala | 12 +--
.../spark/sql/catalyst/trees/package.scala | 8 ---
.../scala/org/apache/spark/sql/SQLContext.scala | 2 +-
.../compression/CompressibleColumnBuilder.scala | 5 +++--
.../apache/spark/sql/execution/Exchange.scala | 2 +-
.../org/apache/spark/sql/json/JsonRDD.scala | 2 +-
.../scala/org/apache/spark/sql/package.scala| 2 --
.../spark/sql/columnar/ColumnTypeSuite.scala| 4 ++--
.../hive/thriftserver/HiveThriftServer2.scala | 12 +--
.../hive/thriftserver/SparkSQLCLIDriver.scala | 2 +-
.../sql/hive/thriftserver/SparkSQLDriver.scala | 6 +++---
.../sql/hive/thriftserver/SparkSQLEnv.scala | 6 +++---
.../server/SparkSQLOperationManager.scala | 13 ++--
.../thriftserver/HiveThriftServer2Suite.scala | 2 +-
.../org/apache/spark/sql/hive/HiveContext.scala | 2 +-
.../spark/sql/hive/HiveMetastoreCatalog.scala | 3 ++-
.../org/apache/spark/sql/hive/TestHive.scala| 10 -
.../org/apache/spark/sql/hive/hiveUdfs.scala| 4 ++--
.../sql/hive/execution/HiveComparisonTest.scala | 22 ++--
.../sql/hive/execution/HiveQueryFileTest.scala | 2 +-
30 files changed, 83 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/4c477117/core/src/main/scala/org/apache/spark/Logging.scala
--
diff --git a/core/src/main/scala/org/apache/spark/Logging.scala
b/core/src/main/scala/org/apache/spark/Logging.scala
index 807ef3e..d4f2624 100644
--- a/core/src/main/scala/org/apache/spark/Logging.scala
+++ b/core/src/main/scala/org/apache/spark/Logging.scala
@@ -39,13 +39,17 @@ trait Logging {
// be serialized and used on another machine
@transient private var log_ : Logger = null
+ // Method to get the logger name for this object
+ protected def logName = {
+// Ignore trailing $'s in the class names for Scala objects
+this.getClass.getName.stripSuffix("$")
+ }
+
// Method to get or create the logger for this object
protected def log: Logger = {
if (log_ == null) {
initializeIfNecessary()
- var className = this.getClass.getName
- // Ignore trailing $'s in the class names for Scala objects
- log_ = LoggerFactory.getLogger(className.stripSuffix("$"))
+ log_ = LoggerFactory.getLogger(logName)
}
log_
}
http://git-wip-us.apache.org/repos/asf/spark/blob/4c477117/sql/catalyst/pom.xml
--
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 54fa96b..58d44e7 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -55,11 +55,6 @@
${project.version}
- com.typesafe
- scalalogging-slf4j_${scala.binary.version}
- 1.0.1
-
-
org.scalatest
scalatest_${scala.binary.version}
test
http://git-wip-us.apache.org/repos/asf/spark/blob/4c477117/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
--
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
index 74c0104..2ba68ca 100644
---
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
+++
