Thu Sep 29 18:46:00 PDT 2016

Author: ericl

core/src/test/scala/org/apache/spark/DebugFilesystem.scala

@@ -27,7 +27,9 @@ import scala.collection.mutable
 
 import org.apache.hadoop.fs._
 
-object DebugFilesystem {
+import org.apache.spark.internal.Logging
+
+object DebugFilesystem extends Logging {
   // Stores the set of active streams and their creation sites.
   private val openStreams = new ConcurrentHashMap[FSDataInputStream, Throwable]()
 
@@ -51,6 +53,7 @@ object DebugFilesystem {
  * DebugFilesystem wraps file open calls to track all open connections. This can be used in tests
  * to check that connections are not leaked.
  */
+// TODO(ekl) we should consider always interposing this to expose num open conns as a metric
 class DebugFilesystem extends LocalFileSystem {
   import DebugFilesystem._
 

sql/core/src/test/scala/org/apache/spark/sql/test/SharedSQLContext.scala

@@ -20,14 +20,13 @@ package org.apache.spark.sql.test
 import org.scalatest.BeforeAndAfterEach
 
 import org.apache.spark.{DebugFilesystem, SparkConf}
-import org.apache.spark.internal.Logging
 import org.apache.spark.sql.{SparkSession, SQLContext}
 
 
 /**
  * Helper trait for SQL test suites where all tests share a single [[TestSparkSession]].
  */
-trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach with Logging {
+trait SharedSQLContext extends SQLTestUtils with BeforeAndAfterEach {
 
   protected val sparkConf = new SparkConf()