Change systemPath => indexLocationDir

microsoft · Apr 12, 2021 · 4537281 · 4537281
1 parent 4423b3b
commit 4537281
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/scala/com/microsoft/hyperspace/index/IndexCollectionManager.scala b/src/main/scala/com/microsoft/hyperspace/index/IndexCollectionManager.scala
@@ -152,7 +152,7 @@ class IndexCollectionManager(
 
   private def indexLogManagers: Seq[IndexLogManager] = {
     val hadoopConf = spark.sessionState.newHadoopConf()
-    val rootPath = PathResolver(conf, hadoopConf).systemPath
+    val rootPath = PathResolver(conf, hadoopConf).indexLocationDir
     val fs = fileSystemFactory.create(rootPath, hadoopConf)
     val indexPaths: Seq[Path] = if (fs.exists(rootPath)) {
       fs.listStatus(rootPath).map(_.getPath)

diff --git a/src/main/scala/com/microsoft/hyperspace/index/IndexConstants.scala b/src/main/scala/com/microsoft/hyperspace/index/IndexConstants.scala
@@ -25,7 +25,7 @@ object IndexConstants {
 
   // Config used for subdirectory name under the system path.
   val INDEX_DIR_NAME = "spark.hyperspace.system.indexDirName"
-  val INDEX_DIR_NAME_DEFAULT = "indexes"
+  val INDEX_DIR_NAME_DEFAULT = "hyperspace"
 
   // Config used to set the number of buckets for the index.
   val INDEX_NUM_BUCKETS_LEGACY = "spark.hyperspace.index.num.buckets"

diff --git a/src/main/scala/com/microsoft/hyperspace/index/PathResolver.scala b/src/main/scala/com/microsoft/hyperspace/index/PathResolver.scala
@@ -37,7 +37,7 @@ private[hyperspace] class PathResolver(conf: SQLConf, hadoopConf: Configuration)
    * @return resolved index path
    */
   def getIndexPath(name: String): Path = {
-    val root = systemPath
+    val root = indexLocationDir
     val fs = root.getFileSystem(hadoopConf)
     if (fs.exists(root)) {
       // Note that fs.exists() is case-sensitive in some platforms and case-insensitive
@@ -58,11 +58,11 @@ private[hyperspace] class PathResolver(conf: SQLConf, hadoopConf: Configuration)
   }
 
   /**
-   * Get the Hyperspace index system path.
+   * Get the Hyperspace index location dir path.
    *
-   * @return Hyperspace index system path.
+   * @return Hyperspace index location dir path.
    */
-  def systemPath: Path = {
+  def indexLocationDir: Path = {
     val indexDirName =
       conf.getConfString(IndexConstants.INDEX_DIR_NAME, IndexConstants.INDEX_DIR_NAME_DEFAULT)
     val indexSystemPath = conf.getConfString(