Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling for columns that appear multiple times in join conditions (#9362) 

* Fix handling for columns that appear multiple times in join conditions

* Remove unneeded comment

* Fix test
This commit is contained in:
Jonathan Wei 2020-02-17 10:54:04 -08:00 committed by GitHub
parent 5befd40638
commit 73a0181e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 229 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
processing/src/main/java/org/apache/druid/segment/ColumnProcessors.java
View File

@ -79,9 +79,9 @@ public class ColumnProcessors
final ColumnSelectorFactory selectorFactory
)
{
if (expr.getIdentifierIfIdentifier() != null) {
if (expr.getBindingIfIdentifier() != null) {
// If expr is an identifier, treat this the same way as a direct column reference.
return makeProcessor(expr.getIdentifierIfIdentifier(), processorFactory, selectorFactory);
return makeProcessor(expr.getBindingIfIdentifier(), processorFactory, selectorFactory);
} else {
return makeProcessorInternal(
factory -> exprTypeHint,

8
processing/src/main/java/org/apache/druid/segment/join/JoinConditionAnalysis.java
View File

@ -113,9 +113,9 @@ public class JoinConditionAnalysis
if (isLeftExprAndRightColumn(lhs, rhs, rightPrefix)) {
// rhs is a right-hand column; lhs is an expression solely of the left-hand side.
equiConditions.add(new Equality(lhs, rhs.getIdentifierIfIdentifier().substring(rightPrefix.length())));
equiConditions.add(new Equality(lhs, rhs.getBindingIfIdentifier().substring(rightPrefix.length())));
} else if (isLeftExprAndRightColumn(rhs, lhs, rightPrefix)) {
equiConditions.add(new Equality(rhs, lhs.getIdentifierIfIdentifier().substring(rightPrefix.length())));
equiConditions.add(new Equality(rhs, lhs.getBindingIfIdentifier().substring(rightPrefix.length())));
} else {
nonEquiConditions.add(childExpr);
}
@ -128,8 +128,8 @@ public class JoinConditionAnalysis
private static boolean isLeftExprAndRightColumn(final Expr a, final Expr b, final String rightPrefix)
{
return a.analyzeInputs().getRequiredBindings().stream().noneMatch(c -> Joinables.isPrefixedBy(c, rightPrefix))
&& b.getIdentifierIfIdentifier() != null
&& Joinables.isPrefixedBy(b.getIdentifierIfIdentifier(), rightPrefix);
&& b.getBindingIfIdentifier() != null
&& Joinables.isPrefixedBy(b.getBindingIfIdentifier(), rightPrefix);
}
/**

153
processing/src/main/java/org/apache/druid/segment/join/filter/JoinFilterAnalyzer.java
View File

@ -41,6 +41,7 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -98,14 +99,18 @@ public class JoinFilterAnalyzer
// build the prefix and equicondition maps
// We should check that the prefixes do not duplicate or shadow each other. This is not currently implemented,
// but this is tracked at https://github.com/apache/druid/issues/9329
// We should also consider the case where one RHS column is joined to multiple columns:
// https://github.com/apache/druid/issues/9328
Map<String, Expr> equiconditions = new HashMap<>();
Map<String, Set<Expr>> equiconditions = new HashMap<>();
Map<String, JoinableClause> prefixes = new HashMap<>();
for (JoinableClause clause : hashJoinSegmentStorageAdapter.getClauses()) {
prefixes.put(clause.getPrefix(), clause);
for (Equality equality : clause.getCondition().getEquiConditions()) {
equiconditions.put(clause.getPrefix() + equality.getRightColumn(), equality.getLeftExpr());
Set<Expr> exprsForRhs = equiconditions.computeIfAbsent(
clause.getPrefix() + equality.getRightColumn(),
(rhs) -> {
return new HashSet<>();
}
);
exprsForRhs.add(equality.getLeftExpr());
}
}
@ -170,7 +175,7 @@ public class JoinFilterAnalyzer
HashJoinSegmentStorageAdapter adapter,
Filter filterClause,
Map<String, JoinableClause> prefixes,
Map<String, Expr> equiconditions,
Map<String, Set<Expr>> equiconditions,
Map<String, Optional<List<JoinFilterColumnCorrelationAnalysis>>> correlationCache
)
{
@ -232,7 +237,7 @@ public class JoinFilterAnalyzer
HashJoinSegmentStorageAdapter adapter,
OrFilter orFilter,
Map<String, JoinableClause> prefixes,
Map<String, Expr> equiconditions,
Map<String, Set<Expr>> equiconditions,
Map<String, Optional<List<JoinFilterColumnCorrelationAnalysis>>> correlationCache
)
{
@ -294,7 +299,7 @@ public class JoinFilterAnalyzer
HashJoinSegmentStorageAdapter baseAdapter,
SelectorFilter selectorFilter,
Map<String, JoinableClause> prefixes,
Map<String, Expr> equiconditions,
Map<String, Set<Expr>> equiconditions,
Map<String, Optional<List<JoinFilterColumnCorrelationAnalysis>>> correlationCache
)
{
@ -459,57 +464,34 @@ public class JoinFilterAnalyzer
HashJoinSegmentStorageAdapter adapter,
String tablePrefix,
JoinableClause clauseForTablePrefix,
Map<String, Expr> equiConditions
Map<String, Set<Expr>> equiConditions
)
{
JoinConditionAnalysis jca = clauseForTablePrefix.getCondition();
List<String> rhsColumns = new ArrayList<>();
Set<String> rhsColumns = new HashSet<>();
for (Equality eq : jca.getEquiConditions()) {
rhsColumns.add(tablePrefix + eq.getRightColumn());
}
List<JoinFilterColumnCorrelationAnalysis> correlations = new ArrayList<>();
for (String rhsColumn : rhsColumns) {
List<String> correlatedBaseColumns = new ArrayList<>();
List<Expr> correlatedBaseExpressions = new ArrayList<>();
boolean terminate = false;
String findMappingFor = rhsColumn;
while (!terminate) {
Expr lhs = equiConditions.get(findMappingFor);
if (lhs == null) {
break;
}
Set<String> correlatedBaseColumns = new HashSet<>();
Set<Expr> correlatedBaseExpressions = new HashSet<>();
String identifier = lhs.getBindingIfIdentifier();
if (identifier == null) {
// We push down if the function only requires base table columns
Expr.BindingDetails bindingDetails = lhs.analyzeInputs();
Set<String> requiredBindings = bindingDetails.getRequiredBindings();
if (!requiredBindings.stream().allMatch(requiredBinding -> adapter.isBaseColumn(requiredBinding))) {
return Optional.empty();
}
terminate = true;
correlatedBaseExpressions.add(lhs);
} else {
// simple identifier, see if we can correlate it with a column on the base table
findMappingFor = identifier;
if (adapter.isBaseColumn(identifier)) {
terminate = true;
correlatedBaseColumns.add(findMappingFor);
}
}
}
getCorrelationForRHSColumn(
adapter,
equiConditions,
rhsColumn,
correlatedBaseColumns,
correlatedBaseExpressions
);
if (correlatedBaseColumns.isEmpty() && correlatedBaseExpressions.isEmpty()) {
return Optional.empty();
}
// We should merge correlation analyses if they're for the same rhsColumn
// See https://github.com/apache/druid/issues/9328
correlations.add(
new JoinFilterColumnCorrelationAnalysis(
rhsColumn,
@ -519,7 +501,94 @@ public class JoinFilterAnalyzer
);
}
return Optional.of(correlations);
List<JoinFilterColumnCorrelationAnalysis> dedupCorrelations = eliminateCorrelationDuplicates(correlations);
return Optional.of(dedupCorrelations);
}
/**
* Helper method for {@link #findCorrelatedBaseTableColumns} that determines correlated base table columns
* and/or expressions for a single RHS column and adds them to the provided sets as it traverses the
* equicondition column relationships.
*
* @param adapter The adapter for the join. Used to determine if a column is a base table column.
* @param equiConditions Map of equiconditions, keyed by the right hand columns
* @param rhsColumn RHS column to find base table correlations for
* @param correlatedBaseColumns Set of correlated base column names for the provided RHS column. Will be modified.
* @param correlatedBaseExpressions Set of correlated base column expressions for the provided RHS column. Will be
* modified.
*/
private static void getCorrelationForRHSColumn(
HashJoinSegmentStorageAdapter adapter,
Map<String, Set<Expr>> equiConditions,
String rhsColumn,
Set<String> correlatedBaseColumns,
Set<Expr> correlatedBaseExpressions
)
{
String findMappingFor = rhsColumn;
Set<Expr> lhsExprs = equiConditions.get(findMappingFor);
if (lhsExprs == null) {
return;
}
for (Expr lhsExpr : lhsExprs) {
String identifier = lhsExpr.getBindingIfIdentifier();
if (identifier == null) {
// We push down if the function only requires base table columns
Expr.BindingDetails bindingDetails = lhsExpr.analyzeInputs();
Set<String> requiredBindings = bindingDetails.getRequiredBindings();
if (!requiredBindings.stream().allMatch(requiredBinding -> adapter.isBaseColumn(requiredBinding))) {
break;
}
correlatedBaseExpressions.add(lhsExpr);
} else {
// simple identifier, see if we can correlate it with a column on the base table
findMappingFor = identifier;
if (adapter.isBaseColumn(identifier)) {
correlatedBaseColumns.add(findMappingFor);
} else {
getCorrelationForRHSColumn(
adapter,
equiConditions,
findMappingFor,
correlatedBaseColumns,
correlatedBaseExpressions
);
}
}
}
}
/**
* Given a list of JoinFilterColumnCorrelationAnalysis, prune the list so that we only have one
* JoinFilterColumnCorrelationAnalysis for each unique combination of base columns.
*
* Suppose we have a join condition like the following, where A is the base table:
* A.joinColumn == B.joinColumn && A.joinColumn == B.joinColumn2
*
* We only need to consider one correlation to A.joinColumn since B.joinColumn and B.joinColumn2 must
* have the same value in any row that matches the join condition.
*
* In the future this method could consider which column correlation should be preserved based on availability of
* indices and other heuristics.
*
* When push down of filters with LHS expressions in the join condition is supported, this method should also
* consider expressions.
*
* @param originalList Original list of column correlation analyses.
* @return Pruned list of column correlation analyses.
*/
private static List<JoinFilterColumnCorrelationAnalysis> eliminateCorrelationDuplicates(
List<JoinFilterColumnCorrelationAnalysis> originalList
)
{
Map<List<String>, JoinFilterColumnCorrelationAnalysis> uniquesMap = new HashMap<>();
for (JoinFilterColumnCorrelationAnalysis jca : originalList) {
uniquesMap.put(jca.getBaseColumns(), jca);
}
return new ArrayList<>(uniquesMap.values());
}
private static boolean filterMatchesNull(Filter filter)

11
processing/src/main/java/org/apache/druid/segment/join/filter/JoinFilterColumnCorrelationAnalysis.java
View File

@ -21,7 +21,9 @@ package org.apache.druid.segment.join.filter;
import org.apache.druid.math.expr.Expr;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* Represents an analysis of what base table columns, if any, can be correlated with a column that will
@ -38,13 +40,14 @@ public class JoinFilterColumnCorrelationAnalysis
public JoinFilterColumnCorrelationAnalysis(
String joinColumn,
List<String> baseColumns,
List<Expr> baseExpressions
Set<String> baseColumns,
Set<Expr> baseExpressions
)
{
this.joinColumn = joinColumn;
this.baseColumns = baseColumns;
this.baseExpressions = baseExpressions;
this.baseColumns = new ArrayList<>(baseColumns);
this.baseExpressions = new ArrayList<>(baseExpressions);
this.baseColumns.sort(String.CASE_INSENSITIVE_ORDER);
}
public String getJoinColumn()

43
processing/src/test/java/org/apache/druid/segment/join/HashJoinSegmentStorageAdapterTest.java
View File

@ -47,7 +47,7 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
public void test_getInterval_factToCountry()
{
Assert.assertEquals(
Intervals.of("2015-09-12/2015-09-12T04:43:40.060Z"),
Intervals.of("2015-09-12/2015-09-12T05:21:00.060Z"),
makeFactToCountrySegment().getInterval()
);
}
@ -88,7 +88,7 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
public void test_getDimensionCardinality_factToCountryFactColumn()
{
Assert.assertEquals(
17,
18,
makeFactToCountrySegment().getDimensionCardinality("countryIsoCode")
);
}
@ -97,7 +97,7 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
public void test_getDimensionCardinality_factToCountryJoinColumn()
{
Assert.assertEquals(
17,
18,
makeFactToCountrySegment().getDimensionCardinality(FACT_TO_COUNTRY_ON_ISO_CODE_PREFIX + "countryName")
);
}
@ -133,7 +133,7 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
public void test_getMaxTime_factToCountry()
{
Assert.assertEquals(
DateTimes.of("2015-09-12T04:43:40.059Z"),
DateTimes.of("2015-09-12T05:21:00.059Z"),
makeFactToCountrySegment().getMaxTime()
);
}
@ -268,7 +268,7 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
public void test_getMaxIngestedEventTime_factToCountry()
{
Assert.assertEquals(
DateTimes.of("2015-09-12T04:43:40.059Z"),
DateTimes.of("2015-09-12T05:21:00.059Z"),
makeFactToCountrySegment().getMaxIngestedEventTime()
);
}
@ -341,7 +341,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Gabinete Ministerial de Rafael Correa", "EC", "EC", "Ecuador", 4L},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States", 13L},
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L},
new Object[]{"Orange Soda", "MatchNothing", null, null, NULL_COUNTRY}
new Object[]{"Orange Soda", "MatchNothing", null, null, NULL_COUNTRY},
new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems", 205L}
)
);
}
@ -390,7 +391,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Алиса в Зазеркалье", "NO", "NO", "Norway", 11L},
new Object[]{"Gabinete Ministerial de Rafael Correa", "EC", "EC", "Ecuador", 4L},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States", 13L},
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L}
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L},
new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems", 205L}
)
);
}
@ -438,7 +440,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Алиса в Зазеркалье", "NO", "NO", "Norway"},
new Object[]{"Gabinete Ministerial de Rafael Correa", "EC", "EC", "Ecuador"},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States"},
new Object[]{"Cream Soda", "SU", "SU", "States United"}
new Object[]{"Cream Soda", "SU", "SU", "States United"},
new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems"}
)
);
}
@ -480,7 +483,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Giusy Ferreri discography", "IT", "IT", "Italy", 7L},
new Object[]{"Roma-Bangkok", "IT", "IT", "Italy", 7L},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States", 13L},
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L}
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L},
new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems", 205L}
) :
ImmutableList.of(
new Object[]{"Talk:Oswald Tilghman", null, "AU", "Australia", 0L},
@ -494,7 +498,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Giusy Ferreri discography", "IT", "IT", "Italy", 7L},
new Object[]{"Roma-Bangkok", "IT", "IT", "Italy", 7L},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States", 13L},
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L}
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L},
new Object[][]{new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems", 205L}}
)
);
}
@ -534,7 +539,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Giusy Ferreri discography", "IT", "Italy"},
new Object[]{"Roma-Bangkok", "IT", "Italy"},
new Object[]{"Old Anatolian Turkish", "US", "United States"},
new Object[]{"Cream Soda", "SU", "States United"}
new Object[]{"Cream Soda", "SU", "States United"},
new Object[]{"History of Fourems", "MMMM", "Fourems"}
) :
ImmutableList.of(
new Object[]{"Talk:Oswald Tilghman", null, "Australia"},
@ -548,7 +554,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Giusy Ferreri discography", "IT", "Italy"},
new Object[]{"Roma-Bangkok", "IT", "Italy"},
new Object[]{"Old Anatolian Turkish", "US", "United States"},
new Object[]{"Cream Soda", "SU", "States United"}
new Object[]{"Cream Soda", "SU", "States United"},
new Object[][]{new Object[]{"History of Fourems", "MMMM", "Fourems"}}
)
);
}
@ -800,7 +807,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Алиса в Зазеркалье", "NO", "NO", "Norway", 11L},
new Object[]{"Gabinete Ministerial de Rafael Correa", "EC", "EC", "Ecuador", 4L},
new Object[]{"Old Anatolian Turkish", "US", "US", "United States", 13L},
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L}
new Object[]{"Cream Soda", "SU", "SU", "States United", 15L},
new Object[]{"History of Fourems", "MMMM", "MMMM", "Fourems", 205L}
)
);
}
@ -856,7 +864,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Gabinete Ministerial de Rafael Correa", "Provincia del Guayas", "Ecuador"},
new Object[]{"Old Anatolian Turkish", "Virginia", "United States"},
new Object[]{"Cream Soda", "Ainigriv", "States United"},
new Object[]{"Orange Soda", null, null}
new Object[]{"Orange Soda", null, null},
new Object[]{"History of Fourems", "Fourems Province", "Fourems"}
)
);
}
@ -908,7 +917,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Diskussion:Sebastian Schulz", "United States"},
new Object[]{"Diskussion:Sebastian Schulz", "Atlantis"},
new Object[]{"Diskussion:Sebastian Schulz", "States United"},
new Object[]{"Diskussion:Sebastian Schulz", "Usca"}
new Object[]{"Diskussion:Sebastian Schulz", "Usca"},
new Object[]{"Diskussion:Sebastian Schulz", "Fourems"}
)
);
}
@ -996,7 +1006,8 @@ public class HashJoinSegmentStorageAdapterTest extends BaseHashJoinSegmentStorag
new Object[]{"Diskussion:Sebastian Schulz", "United States"},
new Object[]{"Diskussion:Sebastian Schulz", "Atlantis"},
new Object[]{"Diskussion:Sebastian Schulz", "States United"},
new Object[]{"Diskussion:Sebastian Schulz", "Usca"}
new Object[]{"Diskussion:Sebastian Schulz", "Usca"},
new Object[]{"Diskussion:Sebastian Schulz", "Fourems"}
)
);
}

87
processing/src/test/java/org/apache/druid/segment/join/JoinFilterAnalyzerTest.java
View File

@ -98,7 +98,8 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
new Object[]{"Roma-Bangkok", "Provincia di Varese", "Italy"},
new Object[]{"Old Anatolian Turkish", "Virginia", "United States"},
new Object[]{"Cream Soda", "Ainigriv", "States United"},
new Object[][]{new Object[]{"Orange Soda", null, null}}
new Object[]{"Orange Soda", null, null},
new Object[]{"History of Fourems", "Fourems Province", "Fourems"}
)
);
}
@ -400,7 +401,8 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
new Object[]{"Roma-Bangkok", "Provincia di Varese", "Italy"},
new Object[]{"Old Anatolian Turkish", "Virginia", "United States"},
new Object[]{"Cream Soda", "Ainigriv", "States United"},
new Object[][]{new Object[]{"Orange Soda", null, null}}
new Object[]{"Orange Soda", null, null},
new Object[]{"History of Fourems", "Fourems Province", "Fourems"}
)
);
}
@ -737,8 +739,8 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
new SelectorFilter("channel", "#ko.wikipedia"),
new AndFilter(
ImmutableList.of(
new InDimFilter("regionIsoCode", ImmutableSet.of("VA"), null, null).toFilter(),
new InDimFilter("countryIsoCode", ImmutableSet.of("US"), null, null).toFilter()
new InDimFilter("countryIsoCode", ImmutableSet.of("US"), null, null).toFilter(),
new InDimFilter("regionIsoCode", ImmutableSet.of("VA"), null, null).toFilter()
)
)
)
@ -1201,13 +1203,9 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
);
}
@Test
public void test_filterPushDown_factToRegionTwoColumnsToOneRHSColumnAndFilterOnRHS()
{
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("Cannot build hash-join matcher on non-key-based condition: Equality{leftExpr=countryIsoCode, rightColumn='regionIsoCode_0'}");
JoinableClause factExprToRegon = new JoinableClause(
FACT_TO_REGION_PREFIX,
new IndexedTableJoinable(regionsTable),
@ -1229,11 +1227,16 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
factExprToRegon
)
);
Filter originalFilter = new SelectorFilter("r1.regionName", "Blah");
Filter originalFilter = new SelectorFilter("r1.regionName", "Fourems Province");
JoinFilterSplit expectedFilterSplit = new JoinFilterSplit(
null,
new SelectorFilter("r1.regionName", "Blah"),
new AndFilter(
ImmutableList.of(
new InDimFilter("countryIsoCode", ImmutableSet.of("MMMM"), null, null).toFilter(),
new InDimFilter("regionIsoCode", ImmutableSet.of("MMMM"), null, null).toFilter()
)
),
new SelectorFilter("r1.regionName", "Fourems Province"),
ImmutableList.of()
);
JoinFilterSplit actualFilterSplit = JoinFilterAnalyzer.splitFilter(
@ -1254,11 +1257,69 @@ public class JoinFilterAnalyzerTest extends BaseHashJoinSegmentStorageAdapterTes
),
ImmutableList.of(
"page",
FACT_TO_REGION_PREFIX + "regionName",
REGION_TO_COUNTRY_PREFIX + "countryName"
FACT_TO_REGION_PREFIX + "regionName"
),
ImmutableList.of(
new Object[]{"History of Fourems", "Fourems Province"}
)
);
}
@Test
public void test_filterPushDown_factToRegionOneColumnToTwoRHSColumnsAndFilterOnRHS()
{
JoinableClause factExprToRegon = new JoinableClause(
FACT_TO_REGION_PREFIX,
new IndexedTableJoinable(regionsTable),
JoinType.LEFT,
JoinConditionAnalysis.forExpression(
StringUtils.format(
"\"%sregionIsoCode\" == regionIsoCode && \"%scountryIsoCode\" == regionIsoCode",
FACT_TO_REGION_PREFIX,
FACT_TO_REGION_PREFIX
),
FACT_TO_REGION_PREFIX,
ExprMacroTable.nil()
)
);
HashJoinSegmentStorageAdapter adapter = new HashJoinSegmentStorageAdapter(
factSegment.asStorageAdapter(),
ImmutableList.of(
factExprToRegon
)
);
Filter originalFilter = new SelectorFilter("r1.regionName", "Fourems Province");
JoinFilterSplit expectedFilterSplit = new JoinFilterSplit(
new InDimFilter("regionIsoCode", ImmutableSet.of("MMMM"), null, null).toFilter(),
new SelectorFilter("r1.regionName", "Fourems Province"),
ImmutableList.of()
);
JoinFilterSplit actualFilterSplit = JoinFilterAnalyzer.splitFilter(
adapter,
originalFilter,
true
);
Assert.assertEquals(expectedFilterSplit, actualFilterSplit);
JoinTestHelper.verifyCursors(
adapter.makeCursors(
originalFilter,
Intervals.ETERNITY,
VirtualColumns.EMPTY,
Granularities.ALL,
false,
null
),
ImmutableList.of(
"page",
FACT_TO_REGION_PREFIX + "regionName"
),
ImmutableList.of(
new Object[]{"History of Fourems", "Fourems Province"}
)
);
}
@Test

2
processing/src/test/java/org/apache/druid/segment/join/table/RowBasedIndexedTableTest.java
View File

@ -93,7 +93,7 @@ public class RowBasedIndexedTableTest
@Test
public void test_numRows_countries()
{
Assert.assertEquals(17, countriesTable.numRows());
Assert.assertEquals(18, countriesTable.numRows());
}
@Test

1
processing/src/test/resources/wikipedia/countries.json
View File

@ -15,3 +15,4 @@
{"countryNumber":14,"countryIsoCode":"AX","countryName":"Atlantis"}
{"countryNumber":15,"countryIsoCode":"SU","countryName":"States United"}
{"countryNumber":16,"countryIsoCode":"USCA","countryName":"Usca"}
{"countryNumber":205,"countryIsoCode":"MMMM","countryName":"Fourems"}

1
processing/src/test/resources/wikipedia/data.json
View File

@ -26,3 +26,4 @@
{"time":"2015-09-12T02:33:40.059Z","channel":"#en.wikipedia","regionIsoCode":"VA","countryNumber":13,"countryIsoCode":"US","user":"68.100.166.227","delta":14,"isRobot":false,"isAnonymous":true,"page":"Old Anatolian Turkish","namespace":"Main"}
{"time":"2015-09-12T03:43:40.059Z","channel":"#en.wikipedia","regionIsoCode":"AV","countryNumber":15,"countryIsoCode":"SU","user":"68.100.166.227","delta":14,"isRobot":false,"isAnonymous":true,"page":"Cream Soda","namespace":"Main"}
{"time":"2015-09-12T04:43:40.059Z","channel":"#en.wikipedia","regionIsoCode":"MatchNothing","countryNumber":99,"countryIsoCode":"MatchNothing","user":"68.100.166.227","delta":14,"isRobot":false,"isAnonymous":true,"page":"Orange Soda","namespace":"Main"}
{"time":"2015-09-12T05:21:00.059Z","channel":"#en.wikipedia","regionIsoCode":"MMMM","countryNumber":205,"countryIsoCode":"MMMM","user":"SomeUser","delta":14,"isRobot":false,"isAnonymous":true,"page":"History of Fourems","namespace":"Main"}

1
processing/src/test/resources/wikipedia/regions.json
View File

@ -17,3 +17,4 @@
{"regionIsoCode":"VA","countryIsoCode":"US","regionName":"Virginia"}
{"regionIsoCode":"AV","countryIsoCode":"SU","regionName":"Ainigriv"}
{"regionIsoCode":"ZZ","countryIsoCode":"USCA","regionName":"Usca City"}
{"regionIsoCode":"MMMM","countryIsoCode":"MMMM","regionName":"Fourems Province"}