Skip to content
This repository has been archived by the owner on Jun 14, 2024. It is now read-only.

Commit

Permalink
remove space
Browse files Browse the repository at this point in the history
  • Loading branch information
@sezruby
sezruby committed Jul 23, 2021
1 parent ac83a25 commit 4155cad
Show file tree
Hide file tree
Showing 13 changed files with 142 additions and 142 deletions.
2 changes: 1 addition & 1 deletion src/main/scala/com/microsoft/hyperspace/index/plananalysis/CandidateIndexAnalyzer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ object CandidateIndexAnalyzer extends Logging {
} else {
-1
}
s"${plan.nodeName} @ $startLineNumber"
s"${plan.nodeName} @$startLineNumber"
}

private def generateApplicableIndexInfoString(
Expand Down
14 changes: 7 additions & 7 deletions src/test/resources/expected/spark-2.4/selfJoin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ Plan without Hyperspace:
03 +- Filter isnotnull(Col1#)
04 +- Relation[Col1#,Col2#] parquet

+----------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+----------+---------+---------+---------------+
|Filter @ 1|joinIndex|CI |FilterIndexRule|
|Filter @ 3|joinIndex|CI |FilterIndexRule|
|Join @ 0 |joinIndex|CI |JoinIndexRule |
+----------+---------+---------+---------------+
+---------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+---------+---------+---------+---------------+
|Filter @1|joinIndex|CI |FilterIndexRule|
|Filter @3|joinIndex|CI |FilterIndexRule|
|Join @0 |joinIndex|CI |JoinIndexRule |
+---------+---------+---------+---------------+

14 changes: 7 additions & 7 deletions src/test/resources/expected/spark-2.4/selfJoin_Iceberg.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ Plan without Hyperspace:
03 +- Filter isnotnull(Col1#)
04 +- RelationV2 iceberg[Col1#, Col2#] (Options: $icebergOptions)

+----------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+----------+---------+---------+---------------+
|Filter @ 1|joinIndex|CI |FilterIndexRule|
|Filter @ 3|joinIndex|CI |FilterIndexRule|
|Join @ 0 |joinIndex|CI |JoinIndexRule |
+----------+---------+---------+---------------+
+---------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+---------+---------+---------+---------------+
|Filter @1|joinIndex|CI |FilterIndexRule|
|Filter @3|joinIndex|CI |FilterIndexRule|
|Join @0 |joinIndex|CI |JoinIndexRule |
+---------+---------+---------+---------------+

48 changes: 24 additions & 24 deletions src/test/resources/expected/spark-2.4/whyNot_allIndex.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,27 +37,27 @@ Plan without Hyperspace & WhyNot reasons:
05 +- Filter ((isnotnull(c5#) && (c5# = 3000)) && isnotnull(c3#))
06 +- Relation[c1#,c2#,c3#,c4#,c5#] parquet

+-----------+------------------+---------+-------------------------+------------------------------------------------------------+
|SubPlan |IndexName |IndexType|Reason |Message |
+-----------+------------------+---------+-------------------------+------------------------------------------------------------+
|Filter @ 2 |leftDfFilterIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c4,c3] |
|Filter @ 2 |leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |
|Filter @ 2 |rightDfFilterIndex|CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c5], filterCols=[c4,c3] |
|Filter @ 2 |rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c5] |
|Filter @ 5 |leftDfFilterIndex |CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c4], filterCols=[c5,c3] |
|Filter @ 5 |leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |
|Filter @ 5 |rightDfFilterIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c5,c3] |
|Filter @ 5 |rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c5] |
|Join @ 0 |leftDfFilterIndex |CI |NOT_ALL_JOIN_COL_INDEXED |child=[left], joinCols=[c3], indexedCols=[c4] |
|Join @ 0 |leftDfFilterIndex |CI |NOT_ALL_JOIN_COL_INDEXED |child=[right], joinCols=[c3], indexedCols=[c4] |
|Join @ 0 |leftDfJoinIndex |CI |MISSING_INDEXED_COL |child=[right], requiredIndexedCols=[c5,c3], indexedCols=[c3]|
|Join @ 0 |rightDfFilterIndex|CI |NOT_ALL_JOIN_COL_INDEXED |child=[left], joinCols=[c3], indexedCols=[c5] |
|Join @ 0 |rightDfFilterIndex|CI |NOT_ALL_JOIN_COL_INDEXED |child=[right], joinCols=[c3], indexedCols=[c5] |
|Join @ 0 |rightDfJoinIndex |CI |MISSING_INDEXED_COL |child=[left], requiredIndexedCols=[c4,c3], indexedCols=[c3] |
|Project @ 1|leftDfJoinIndex |CI |ANOTHER_INDEX_APPLIED |appliedIndex=[leftDfFilterIndex] |
|Project @ 1|rightDfFilterIndex|CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c5], filterCols=[c4,c3] |
|Project @ 1|rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c4,c3], indexCols=[c3,c5] |
|Project @ 4|leftDfFilterIndex |CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c4], filterCols=[c5,c3] |
|Project @ 4|leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c5,c3], indexCols=[c3,c4] |
|Project @ 4|rightDfJoinIndex |CI |ANOTHER_INDEX_APPLIED |appliedIndex=[rightDfFilterIndex] |
+-----------+------------------+---------+-------------------------+------------------------------------------------------------+
+----------+------------------+---------+-------------------------+------------------------------------------------------------+
|SubPlan |IndexName |IndexType|Reason |Message |
+----------+------------------+---------+-------------------------+------------------------------------------------------------+
|Filter @2 |leftDfFilterIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c4,c3] |
|Filter @2 |leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |
|Filter @2 |rightDfFilterIndex|CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c5], filterCols=[c4,c3] |
|Filter @2 |rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c5] |
|Filter @5 |leftDfFilterIndex |CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c4], filterCols=[c5,c3] |
|Filter @5 |leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |
|Filter @5 |rightDfFilterIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c5,c3] |
|Filter @5 |rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c5] |
|Join @0 |leftDfFilterIndex |CI |NOT_ALL_JOIN_COL_INDEXED |child=[left], joinCols=[c3], indexedCols=[c4] |
|Join @0 |leftDfFilterIndex |CI |NOT_ALL_JOIN_COL_INDEXED |child=[right], joinCols=[c3], indexedCols=[c4] |
|Join @0 |leftDfJoinIndex |CI |MISSING_INDEXED_COL |child=[right], requiredIndexedCols=[c5,c3], indexedCols=[c3]|
|Join @0 |rightDfFilterIndex|CI |NOT_ALL_JOIN_COL_INDEXED |child=[left], joinCols=[c3], indexedCols=[c5] |
|Join @0 |rightDfFilterIndex|CI |NOT_ALL_JOIN_COL_INDEXED |child=[right], joinCols=[c3], indexedCols=[c5] |
|Join @0 |rightDfJoinIndex |CI |MISSING_INDEXED_COL |child=[left], requiredIndexedCols=[c4,c3], indexedCols=[c3] |
|Project @1|leftDfJoinIndex |CI |ANOTHER_INDEX_APPLIED |appliedIndex=[leftDfFilterIndex] |
|Project @1|rightDfFilterIndex|CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c5], filterCols=[c4,c3] |
|Project @1|rightDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c4,c3], indexCols=[c3,c5] |
|Project @4|leftDfFilterIndex |CI |NO_FIRST_INDEXED_COL_COND|firstIndexedCol=[c4], filterCols=[c5,c3] |
|Project @4|leftDfJoinIndex |CI |MISSING_REQUIRED_COL |requiredCols=[c5,c3], indexCols=[c3,c4] |
|Project @4|rightDfJoinIndex |CI |ANOTHER_INDEX_APPLIED |appliedIndex=[rightDfFilterIndex] |
+----------+------------------+---------+-------------------------+------------------------------------------------------------+
18 changes: 9 additions & 9 deletions src/test/resources/expected/spark-2.4/whyNot_indexName.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ Plan without Hyperspace & WhyNot reasons:
05 +- Filter ((isnotnull(c5#) && (c5# = 3000)) && isnotnull(c3#))
06 +- Relation[c1#,c2#,c3#,c4#,c5#] parquet

+-----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
|SubPlan |IndexName |IndexType|Reason |Message |VerboseMessage |
+-----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
|Filter @ 2 |leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c3,c4,c5,c2,c1], Index columns: [c3,c4] |
|Filter @ 5 |leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c3,c4,c5,c2,c1], Index columns: [c3,c4] |
|Join @ 0 |leftDfJoinIndex|CI |MISSING_INDEXED_COL |child=[right], requiredIndexedCols=[c5,c3], indexedCols=[c3]|Index does not contain required columns for right subplan. Required indexed columns: [c5,c3], Indexed columns: [c3]|
|Project @ 1|leftDfJoinIndex|CI |ANOTHER_INDEX_APPLIED|appliedIndex=[leftDfFilterIndex] |Another candidate index is applied: leftDfFilterIndex |
|Project @ 4|leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c5,c3], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c5,c3], Index columns: [c3,c4] |
+-----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
+----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
|SubPlan |IndexName |IndexType|Reason |Message |VerboseMessage |
+----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
|Filter @2 |leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c3,c4,c5,c2,c1], Index columns: [c3,c4] |
|Filter @5 |leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c3,c4,c5,c2,c1], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c3,c4,c5,c2,c1], Index columns: [c3,c4] |
|Join @0 |leftDfJoinIndex|CI |MISSING_INDEXED_COL |child=[right], requiredIndexedCols=[c5,c3], indexedCols=[c3]|Index does not contain required columns for right subplan. Required indexed columns: [c5,c3], Indexed columns: [c3]|
|Project @1|leftDfJoinIndex|CI |ANOTHER_INDEX_APPLIED|appliedIndex=[leftDfFilterIndex] |Another candidate index is applied: leftDfFilterIndex |
|Project @4|leftDfJoinIndex|CI |MISSING_REQUIRED_COL |requiredCols=[c5,c3], indexCols=[c3,c4] |Index does not contain required columns. Required columns: [c5,c3], Index columns: [c3,c4] |
+----------+---------------+---------+---------------------+------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+
14 changes: 7 additions & 7 deletions src/test/resources/expected/spark-3.0/selfJoin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ Plan without Hyperspace:
03 +- Filter isnotnull(Col1#)
04 +- Relation[Col1#,Col2#] parquet

+----------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+----------+---------+---------+---------------+
|Filter @ 1|joinIndex|CI |FilterIndexRule|
|Filter @ 3|joinIndex|CI |FilterIndexRule|
|Join @ 0 |joinIndex|CI |JoinIndexRule |
+----------+---------+---------+---------------+
+---------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+---------+---------+---------+---------------+
|Filter @1|joinIndex|CI |FilterIndexRule|
|Filter @3|joinIndex|CI |FilterIndexRule|
|Join @0 |joinIndex|CI |JoinIndexRule |
+---------+---------+---------+---------------+

14 changes: 7 additions & 7 deletions src/test/resources/expected/spark-3.0/selfJoin_Iceberg.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ Plan without Hyperspace:
03 +- Filter isnotnull(Col1#)
04 +- RelationV2[Col1#, Col2#] $icebergPath

+----------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+----------+---------+---------+---------------+
|Filter @ 1|joinIndex|CI |FilterIndexRule|
|Filter @ 3|joinIndex|CI |FilterIndexRule|
|Join @ 0 |joinIndex|CI |JoinIndexRule |
+----------+---------+---------+---------------+
+---------+---------+---------+---------------+
|SubPlan |IndexName|IndexType|RuleName |
+---------+---------+---------+---------------+
|Filter @1|joinIndex|CI |FilterIndexRule|
|Filter @3|joinIndex|CI |FilterIndexRule|
|Join @0 |joinIndex|CI |JoinIndexRule |
+---------+---------+---------+---------------+

Loading

0 comments on commit 4155cad

Please sign in to comment.