types.covering -> covering

python/hyperspace/hyperspace.py

@@ -29,7 +29,7 @@ def _getJavaIndexConfig(self, index_config):
         """
         indexed_columns = self._getScalaSeqFromList(index_config.indexedColumns)
         included_columns = self._getScalaSeqFromList(index_config.includedColumns)
-        _jindexConfig = self.jvm.com.microsoft.hyperspace.index.types.covering.CoveringIndexConfig(
+        _jindexConfig = self.jvm.com.microsoft.hyperspace.index.covering.CoveringIndexConfig(
             self.jvm.java.lang.String(index_config.indexName), indexed_columns, included_columns)
         return _jindexConfig
 

src/main/scala/com/microsoft/hyperspace/index/types/covering/CoveringIndex.scala → src/main/scala/com/microsoft/hyperspace/index/covering/CoveringIndex.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.spark.sql.{DataFrame, SaveMode}
 import org.apache.spark.sql.catalyst.catalog.BucketSpec

src/main/scala/com/microsoft/hyperspace/index/types/covering/CoveringIndexConfig.scala → src/main/scala/com/microsoft/hyperspace/index/covering/CoveringIndexConfig.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import java.util.Locale
 

src/main/scala/com/microsoft/hyperspace/index/types/covering/CoveringIndexFilter.scala → src/main/scala/com/microsoft/hyperspace/index/covering/CoveringIndexFilter.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 

src/main/scala/com/microsoft/hyperspace/index/types/covering/FilterIndexRanker.scala → src/main/scala/com/microsoft/hyperspace/index/covering/FilterIndexRanker.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan

src/main/scala/com/microsoft/hyperspace/index/types/covering/FilterIndexRule.scala → src/main/scala/com/microsoft/hyperspace/index/covering/FilterIndexRule.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.spark.sql.catalyst.analysis.CleanupAliases
 import org.apache.spark.sql.catalyst.expressions.{AttributeReference, Expression}

src/main/scala/com/microsoft/hyperspace/index/types/covering/JoinIndexRanker.scala → src/main/scala/com/microsoft/hyperspace/index/covering/JoinIndexRanker.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan

src/main/scala/com/microsoft/hyperspace/index/types/covering/JoinIndexRule.scala → src/main/scala/com/microsoft/hyperspace/index/covering/JoinIndexRule.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import scala.collection.mutable
 import scala.util.Try
@@ -25,10 +25,10 @@ import org.apache.spark.sql.catalyst.plans.logical.{LeafNode, LogicalPlan}
 
 import com.microsoft.hyperspace.Hyperspace
 import com.microsoft.hyperspace.index.{IndexLogEntry, IndexLogEntryTags}
+import com.microsoft.hyperspace.index.covering.JoinAttributeFilter.extractConditions
 import com.microsoft.hyperspace.index.rules.{HyperspaceRule, IndexRankFilter, QueryPlanIndexFilter}
 import com.microsoft.hyperspace.index.rules.ApplyHyperspace.{PlanToIndexesMap, PlanToSelectedIndexMap}
 import com.microsoft.hyperspace.index.sources.FileBasedRelation
-import com.microsoft.hyperspace.index.types.covering.JoinAttributeFilter.extractConditions
 import com.microsoft.hyperspace.shim.JoinWithoutHint
 import com.microsoft.hyperspace.telemetry.{AppInfo, HyperspaceEventLogging, HyperspaceIndexUsageEvent}
 import com.microsoft.hyperspace.util.ResolverUtils.resolve

src/main/scala/com/microsoft/hyperspace/index/types/covering/RuleUtils.scala → src/main/scala/com/microsoft/hyperspace/index/covering/RuleUtils.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.SparkSession

src/main/scala/com/microsoft/hyperspace/index/package.scala

@@ -16,7 +16,7 @@
 
 package com.microsoft.hyperspace
 
-import com.microsoft.hyperspace.index.types.covering.CoveringIndexConfig
+import com.microsoft.hyperspace.index.covering.CoveringIndexConfig
 
 package object index {
 

src/main/scala/com/microsoft/hyperspace/index/rules/ScoreBasedIndexPlanOptimizer.scala

@@ -20,8 +20,8 @@ import scala.collection.mutable
 
 import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
 
+import com.microsoft.hyperspace.index.covering.{FilterIndexRule, JoinIndexRule}
 import com.microsoft.hyperspace.index.rules.ApplyHyperspace.PlanToIndexesMap
-import com.microsoft.hyperspace.index.types.covering.{FilterIndexRule, JoinIndexRule}
 
 /**
  * Apply Hyperspace indexes based on the score of each index application.

src/test/scala/com/microsoft/hyperspace/actions/RefreshActionTest.scala

@@ -27,8 +27,8 @@ import org.mockito.Mockito.{mock, when}
 import com.microsoft.hyperspace.{HyperspaceException, SampleData}
 import com.microsoft.hyperspace.actions.Constants.States.{ACTIVE, CREATING}
 import com.microsoft.hyperspace.index._
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.index.sources.FileBasedSourceProviderManager
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
 
 class RefreshActionTest extends HyperspaceSuite {
   private val sampleParquetDataLocation = inTempDir("sampleparquet")

src/test/scala/com/microsoft/hyperspace/index/E2EHyperspaceRulesTest.scala

@@ -28,9 +28,9 @@ import com.microsoft.hyperspace.{Hyperspace, Implicits, SampleData, TestConfig,
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index.IndexConstants.{GLOBBING_PATTERN_KEY, REFRESH_MODE_INCREMENTAL, REFRESH_MODE_QUICK}
 import com.microsoft.hyperspace.index.IndexLogEntryTags._
+import com.microsoft.hyperspace.index.covering.JoinIndexRule
 import com.microsoft.hyperspace.index.execution.BucketUnionStrategy
 import com.microsoft.hyperspace.index.rules.{ApplyHyperspace, CandidateIndexCollector}
-import com.microsoft.hyperspace.index.types.covering.JoinIndexRule
 import com.microsoft.hyperspace.util.PathUtils
 
 class E2EHyperspaceRulesTest extends QueryTest with HyperspaceSuite {

src/test/scala/com/microsoft/hyperspace/index/HyperspaceRuleSuite.scala

@@ -27,7 +27,7 @@ import org.apache.spark.sql.types.{StructField, StructType}
 import com.microsoft.hyperspace.HyperspaceException
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index.Hdfs.Properties
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.util.PathUtils
 
 trait HyperspaceRuleSuite extends HyperspaceSuite {

src/test/scala/com/microsoft/hyperspace/index/IndexCacheTest.scala

@@ -23,7 +23,7 @@ import org.apache.spark.sql.types.{StringType, StructField, StructType}
 
 import com.microsoft.hyperspace.{Hyperspace, HyperspaceException, SampleData}
 import com.microsoft.hyperspace.actions.Constants
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.util.FileUtils
 
 class IndexCacheTest extends HyperspaceSuite {

src/test/scala/com/microsoft/hyperspace/index/IndexCollectionManagerTest.scala

@@ -25,7 +25,7 @@ import org.mockito.Mockito.{mock, when}
 import com.microsoft.hyperspace.HyperspaceException
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index.IndexConstants.{REFRESH_MODE_FULL, REFRESH_MODE_INCREMENTAL}
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 
 class IndexCollectionManagerTest extends HyperspaceSuite {
   private val testLogManagerFactory: IndexLogManagerFactory = new IndexLogManagerFactory {

src/test/scala/com/microsoft/hyperspace/index/IndexLogEntryTest.scala

@@ -28,7 +28,7 @@ import org.apache.spark.sql.types.{StringType, StructField, StructType}
 
 import com.microsoft.hyperspace.{BuildInfo, HyperspaceException, TestUtils}
 import com.microsoft.hyperspace.index.IndexConstants.UNKNOWN_FILE_ID
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.util.{JsonUtils, PathUtils}
 
 class IndexLogEntryTest extends HyperspaceSuite with SQLHelper {
@@ -77,7 +77,7 @@ class IndexLogEntryTest extends HyperspaceSuite with SQLHelper {
          |{
          |  "name" : "indexName",
          |  "derivedDataset" : {
-         |    "type" : "com.microsoft.hyperspace.index.types.covering.CoveringIndex",
+         |    "type" : "com.microsoft.hyperspace.index.covering.CoveringIndex",
          |    "indexedColumns" : [ "col1" ],
          |    "includedColumns" : [ "col2", "col3" ],
          |    "schema" : {

src/test/scala/com/microsoft/hyperspace/index/IndexLogManagerImplTest.scala

@@ -25,7 +25,7 @@ import org.apache.spark.sql.types.{IntegerType, StringType, StructField, StructT
 import com.microsoft.hyperspace.HyperspaceException
 import com.microsoft.hyperspace.TestUtils
 import com.microsoft.hyperspace.index.IndexConstants.HYPERSPACE_LOG
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.util.{FileUtils, JsonUtils}
 
 class IndexLogManagerImplTest extends HyperspaceSuite {

src/test/scala/com/microsoft/hyperspace/index/IndexManagerTest.scala

@@ -28,7 +28,7 @@ import com.microsoft.hyperspace.{Hyperspace, HyperspaceException, MockEventLogge
 import com.microsoft.hyperspace.TestUtils.{copyWithState, getFileIdTracker, latestIndexLogEntry, logManager}
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index.IndexConstants.{GLOBBING_PATTERN_KEY, OPTIMIZE_FILE_SIZE_THRESHOLD, REFRESH_MODE_FULL, REFRESH_MODE_INCREMENTAL}
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.telemetry.OptimizeActionEvent
 import com.microsoft.hyperspace.util.{FileUtils, PathUtils}
 

src/test/scala/com/microsoft/hyperspace/index/IndexTest.scala

@@ -20,7 +20,7 @@ import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.types.{IntegerType, StringType, StructField, StructType}
 
 import com.microsoft.hyperspace.actions.Constants
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 
 class IndexTest extends SparkFunSuite {
   val indexConfig1 = IndexConfig("myIndex1", Array("id"), Seq("name"))

src/test/scala/com/microsoft/hyperspace/index/RefreshIndexNestedTest.scala

@@ -24,7 +24,7 @@ import com.microsoft.hyperspace.{Hyperspace, HyperspaceException, MockEventLogge
 import com.microsoft.hyperspace.TestUtils.{getFileIdTracker, logManager}
 import com.microsoft.hyperspace.actions.{RefreshIncrementalAction, RefreshQuickAction}
 import com.microsoft.hyperspace.index.IndexConstants.REFRESH_MODE_INCREMENTAL
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.telemetry.RefreshIncrementalActionEvent
 import com.microsoft.hyperspace.util.{FileUtils, PathUtils}
 import com.microsoft.hyperspace.util.PathUtils.DataPathFilter

src/test/scala/com/microsoft/hyperspace/index/RefreshIndexTest.scala

@@ -24,7 +24,7 @@ import com.microsoft.hyperspace.{Hyperspace, HyperspaceException, MockEventLogge
 import com.microsoft.hyperspace.TestUtils.{getFileIdTracker, logManager}
 import com.microsoft.hyperspace.actions.{RefreshIncrementalAction, RefreshQuickAction}
 import com.microsoft.hyperspace.index.IndexConstants.REFRESH_MODE_INCREMENTAL
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 import com.microsoft.hyperspace.telemetry.RefreshIncrementalActionEvent
 import com.microsoft.hyperspace.util.{FileUtils, PathUtils}
 import com.microsoft.hyperspace.util.PathUtils.DataPathFilter

src/test/scala/com/microsoft/hyperspace/index/types/covering/FilterIndexRankerTest.scala → src/test/scala/com/microsoft/hyperspace/index/covering/FilterIndexRankerTest.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.Path

src/test/scala/com/microsoft/hyperspace/index/types/covering/FilterIndexRuleTest.scala → src/test/scala/com/microsoft/hyperspace/index/covering/FilterIndexRuleTest.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.catalyst.catalog.BucketSpec

src/test/scala/com/microsoft/hyperspace/index/types/covering/JoinIndexRankerTest.scala → src/test/scala/com/microsoft/hyperspace/index/covering/JoinIndexRankerTest.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.Path

src/test/scala/com/microsoft/hyperspace/index/types/covering/JoinIndexRuleTest.scala → src/test/scala/com/microsoft/hyperspace/index/covering/JoinIndexRuleTest.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.Row

src/test/scala/com/microsoft/hyperspace/index/types/covering/RuleUtilsTest.scala → src/test/scala/com/microsoft/hyperspace/index/covering/RuleUtilsTest.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.microsoft.hyperspace.index.types.covering
+package com.microsoft.hyperspace.index.covering
 
 import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.catalyst.catalog.BucketSpec

src/test/scala/com/microsoft/hyperspace/index/rules/CandidateIndexCollectorTest.scala

@@ -26,7 +26,7 @@ import org.apache.spark.sql.types.{IntegerType, StringType}
 import com.microsoft.hyperspace.TestUtils.latestIndexLogEntry
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index.{HyperspaceRuleSuite, IndexCollectionManager, IndexConfig, IndexConstants, IndexLogEntryTags}
-import com.microsoft.hyperspace.index.types.covering.RuleUtils
+import com.microsoft.hyperspace.index.covering.RuleUtils
 import com.microsoft.hyperspace.util.FileUtils
 
 class CandidateIndexCollectorTest extends HyperspaceRuleSuite with SQLHelper {

src/test/scala/com/microsoft/hyperspace/index/rules/ScoreBasedIndexPlanOptimizerTest.scala

@@ -25,7 +25,7 @@ import org.apache.spark.sql.execution.datasources.{HadoopFsRelation, InMemoryFil
 import com.microsoft.hyperspace.{Hyperspace, Implicits, SampleData, TestConfig}
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index._
-import com.microsoft.hyperspace.index.types.covering.{FilterIndexRule, JoinIndexRule}
+import com.microsoft.hyperspace.index.covering.{FilterIndexRule, JoinIndexRule}
 
 class ScoreBasedIndexPlanOptimizerTest extends QueryTest with HyperspaceSuite {
   private val testDir = inTempDir("scoreBasedIndexPlanOptimizerTest")

src/test/scala/com/microsoft/hyperspace/util/JsonUtilsTest.scala

@@ -21,7 +21,7 @@ import org.apache.spark.sql.types.{IntegerType, StringType, StructField, StructT
 
 import com.microsoft.hyperspace.actions.Constants
 import com.microsoft.hyperspace.index._
-import com.microsoft.hyperspace.index.types.covering.CoveringIndex
+import com.microsoft.hyperspace.index.covering.CoveringIndex
 
 class JsonUtilsTest extends SparkFunSuite {
   test("Test for JsonUtils.") {