Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M/equi join detector #1748

Merged
merged 3 commits into from
Mar 5, 2015
Merged

M/equi join detector #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1850898
renamed SymbolType.isValueSymbol() to isLiteral()
msbt Mar 3, 2015
cc3fb55
added equi join detector
msbt Mar 3, 2015
9e8da0e
try to fix flaky tests
msbt Mar 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/CopyStatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private Settings settingsFromProperties(GenericProperties properties, TableRelat
}

Symbol v = tableRelation.resolve(expressionAnalyzer.convert(expression, expressionAnalysisContext));
if (!v.symbolType().isValueSymbol()) {
if (!v.symbolType().isLiteral()) {
throw new UnsupportedFeatureException("Only literals are allowed as parameter values");
}
builder.put(key, ValueSymbolVisitor.STRING.process(v));
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/QueriedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public Symbol visitFunction(Function function, SplitContext context) {
}
}
}
if (!newArg.symbolType().isValueSymbol()) {
if (!newArg.symbolType().isLiteral()) {
context.mixedSplit.add(newArg);
}
}
Expand Down
4 changes: 2 additions & 2 deletions sql/src/main/java/io/crate/analyze/QueryClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ public QueryClause() {
}

public QueryClause(Symbol normalizedQuery) {
if (normalizedQuery.symbolType().isValueSymbol()) {
if (normalizedQuery.symbolType().isLiteral()) {
noMatch = !canMatch(normalizedQuery);
} else {
query = normalizedQuery;
}
}

public static boolean canMatch(Symbol query) {
if (query.symbolType().isValueSymbol()) {
if (query.symbolType().isLiteral()) {
Object value = ((Input) query).value();
if (value == null) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/UpdateStatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ private static void ensureNotUpdated(ColumnIdent columnUpdated,
}
if (protectedColumnIdent.isChildOf(columnUpdated)) {
if (newValue.valueType().equals(DataTypes.OBJECT)
&& newValue.symbolType().isValueSymbol()
&& newValue.symbolType().isLiteral()
&& StringObjectMaps.fromMapByPath((Map) ((Literal) newValue).value(), protectedColumnIdent.path()) == null) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/VersionRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public Symbol visitFunction(Function function, Context context){
Symbol left = function.arguments().get(0);
Symbol right = function.arguments().get(1);

if (left.symbolType() != SymbolType.REFERENCE || !right.symbolType().isValueSymbol()) {
if (left.symbolType() != SymbolType.REFERENCE || !right.symbolType().isLiteral()) {
return function;
}

Expand Down
12 changes: 6 additions & 6 deletions sql/src/main/java/io/crate/analyze/expressions/ExpressionAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ private static Symbol castIfNeededOrFail(Symbol symbolToCast, DataType targetTyp
}

private static Symbol cast(Symbol sourceSymbol, DataType targetType, ExpressionAnalysisContext context) {
if (sourceSymbol.symbolType().isValueSymbol()) {
if (sourceSymbol.symbolType().isLiteral()) {
return Literal.convert(sourceSymbol, targetType);
}
FunctionInfo functionInfo = CastFunctionResolver.functionInfo(sourceSymbol.valueType(), targetType);
Expand Down Expand Up @@ -583,7 +583,7 @@ public Symbol visitArrayComparisonExpression(ArrayComparisonExpression node, Exp
throw new IllegalArgumentException("ANY on object arrays is not supported");
}

if (right.symbolType().isValueSymbol()) {
if (right.symbolType().isLiteral()) {
right = Literal.convert(right, leftInnerType);
} else {
throw new IllegalArgumentException(
Expand Down Expand Up @@ -625,7 +625,7 @@ public Symbol visitArrayLikePredicate(ArrayLikePredicate node, ExpressionAnalysi
}
}

if (right.symbolType().isValueSymbol()) {
if (right.symbolType().isLiteral()) {
right = normalizeInputForType(right, leftInnerType);
} else {
throw new IllegalArgumentException(
Expand All @@ -650,7 +650,7 @@ protected Symbol visitLikePredicate(LikePredicate node, ExpressionAnalysisContex
}
expression = castIfNeededOrFail(expression, DataTypes.STRING, context);
Symbol pattern = normalize(castIfNeededOrFail(process(node.getPattern(), context), DataTypes.STRING, context));
if (!pattern.symbolType().isValueSymbol()) {
if (!pattern.symbolType().isLiteral()) {
throw new UnsupportedOperationException("<expression> LIKE <pattern>: pattern must not be a reference.");
}
FunctionIdent functionIdent = FunctionIdent.of(LikeOperator.NAME, expression.valueType(), pattern.valueType());
Expand All @@ -662,7 +662,7 @@ protected Symbol visitIsNullPredicate(IsNullPredicate node, ExpressionAnalysisCo
Symbol value = process(node.getValue(), context);

// currently there will be no result for dynamic references, so return here
if (!value.symbolType().isValueSymbol() && value.valueType().equals(DataTypes.UNDEFINED)) {
if (!value.symbolType().isLiteral() && value.valueType().equals(DataTypes.UNDEFINED)) {
return Literal.NULL;
}

Expand Down Expand Up @@ -847,7 +847,7 @@ void normalize(ExpressionAnalysisContext context) {
* eq(2, name) becomes eq(name, 2)
*/
private void swapIfNecessary() {
if (!(left.symbolType().isValueSymbol() && (right instanceof Reference || right instanceof Field))) {
if (!(left.symbolType().isLiteral() && (right instanceof Reference || right instanceof Field))) {
return;
}
ComparisonExpression.Type type = SWAP_OPERATOR_TABLE.get(comparisonExpressionType);
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/relations/RelationAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ private Symbol symbolFromSelectOutputReferenceOrExpression(Expression expression
}
}
symbol = context.expressionAnalyzer().convert(expression, context.expressionAnalysisContext());
if (symbol.symbolType().isValueSymbol()) {
if (symbol.symbolType().isLiteral()) {
Literal longLiteral;
try {
longLiteral = io.crate.planner.symbol.Literal.convert(symbol, DataTypes.LONG);
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/analyze/where/WhereClauseValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private void validateSysReference(Context context, String requiredFunctionName,
}
assert function.arguments().size() == 2;
Symbol right = function.arguments().get(1);
if(!right.symbolType().isValueSymbol()){
if(!right.symbolType().isLiteral()){
throw new UnsupportedOperationException(error);
}
}
Expand Down
16 changes: 8 additions & 8 deletions sql/src/main/java/io/crate/executor/transport/task/elasticsearch/ESQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public boolean convert(Function function, Context context) throws IOException {
String functionName = function.info().ident().name();
Symbol functionSymbol = function.arguments().get(0);
Symbol valueSymbol = function.arguments().get(1);
if (functionSymbol.symbolType().isValueSymbol()) {
if (functionSymbol.symbolType().isLiteral()) {
valueSymbol = functionSymbol;
functionSymbol = function.arguments().get(1);
if (functionSymbol.symbolType() != SymbolType.FUNCTION) {
Expand Down Expand Up @@ -379,15 +379,15 @@ public boolean convert(Function function, Context context) throws IOException {
} else {
Symbol functionSymbol = function.arguments().get(0);
Symbol valueSymbol;
if (functionSymbol.symbolType().isValueSymbol()) {
if (functionSymbol.symbolType().isLiteral()) {
valueSymbol = functionSymbol;
functionSymbol = function.arguments().get(1);
if (functionSymbol.symbolType() != SymbolType.FUNCTION) {
throw new IllegalArgumentException("Can't compare two within functions");
}
} else {
valueSymbol = function.arguments().get(1);
if (!valueSymbol.symbolType().isValueSymbol()) {
if (!valueSymbol.symbolType().isLiteral()) {
throw new IllegalArgumentException("Can't compare two within functions");
}
}
Expand Down Expand Up @@ -486,15 +486,15 @@ public boolean convert(Function function, Context context) throws IOException {

Symbol valueSymbol;
Symbol functionSymbol = function.arguments().get(0);
if (functionSymbol.symbolType().isValueSymbol()) {
if (functionSymbol.symbolType().isLiteral()) {
valueSymbol = functionSymbol;
functionSymbol = function.arguments().get(1);
if (functionSymbol.symbolType() != SymbolType.FUNCTION) {
throw new IllegalArgumentException("Can't compare two distance functions");
}
} else {
valueSymbol = function.arguments().get(1);
if (!valueSymbol.symbolType().isValueSymbol()) {
if (!valueSymbol.symbolType().isLiteral()) {
throw new IllegalArgumentException("Can't compare two distance functions");
}
}
Expand All @@ -515,7 +515,7 @@ private void handleFunctionSymbol(Context context, Function functionSymbol) thro
for (Symbol distanceArgument : functionSymbol.arguments()) {
if (distanceArgument instanceof Reference) {
fieldName = ((Reference)distanceArgument).info().ident().columnIdent().fqn();
} else if (distanceArgument.symbolType().isValueSymbol()) {
} else if (distanceArgument.symbolType().isLiteral()) {
point = ((Input) distanceArgument).value();
}
}
Expand Down Expand Up @@ -600,7 +600,7 @@ protected Tuple<String, Object> prepare(Function function) {
value = ((BytesRef)value).utf8ToString();
}
} else {
assert right.symbolType().isValueSymbol();
assert right.symbolType().isLiteral();
value = ((Literal) right).value();
}
return new Tuple<>(((Reference) left).info().ident().columnIdent().fqn(), value);
Expand Down Expand Up @@ -944,7 +944,7 @@ private boolean fieldIgnored(Function function, Context context) {
Symbol left = function.arguments().get(0);
Symbol right = function.arguments().get(1);

if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isValueSymbol()) {
if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isLiteral()) {
String columnName = ((Reference) left).info().ident().columnIdent().name();
if (context.filteredFields.contains(columnName)) {
context.ignoredFields.put(columnName, ((Literal) right).value());
Expand Down
14 changes: 7 additions & 7 deletions sql/src/main/java/io/crate/lucene/LuceneQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ protected Tuple<Reference, Literal> prepare(Function input) {
Symbol left = input.arguments().get(0);
Symbol right = input.arguments().get(1);

if (!(left instanceof Reference) || !(right.symbolType().isValueSymbol())) {
if (!(left instanceof Reference) || !(right.symbolType().isLiteral())) {
return null;
}
assert right.symbolType() == SymbolType.LITERAL;
Expand Down Expand Up @@ -846,7 +846,7 @@ private boolean fieldIgnored(Function function, Context context) {

Symbol left = function.arguments().get(0);
Symbol right = function.arguments().get(1);
if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isValueSymbol()) {
if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isLiteral()) {
String columnName = ((Reference) left).info().ident().columnIdent().name();
if (Context.FILTERED_FIELDS.contains(columnName)) {
context.filteredFieldValues.put(columnName, ((Input) right).value());
Expand All @@ -867,7 +867,7 @@ private String validateNoUnsupportedFields(Function function, Context context){
}
Symbol left = function.arguments().get(0);
Symbol right = function.arguments().get(1);
if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isValueSymbol()) {
if (left.symbolType() == SymbolType.REFERENCE && right.symbolType().isLiteral()) {
String columnName = ((Reference) left).info().ident().columnIdent().name();
String unsupportedMessage = context.unsupportedMessage(columnName);
if(unsupportedMessage != null){
Expand Down Expand Up @@ -1011,9 +1011,9 @@ static class FunctionLiteralPair {
function = null;
}

if (left.symbolType().isValueSymbol()) {
if (left.symbolType().isLiteral()) {
input = (Input) left;
} else if (right.symbolType().isValueSymbol()) {
} else if (right.symbolType().isLiteral()) {
input = (Input) right;
} else {
input = null;
Expand Down Expand Up @@ -1051,9 +1051,9 @@ static class RefLiteralPair {
reference = null;
}

if (left.symbolType().isValueSymbol()) {
if (left.symbolType().isLiteral()) {
input = (Input) left;
} else if (right.symbolType().isValueSymbol()) {
} else if (right.symbolType().isLiteral()) {
input = (Input) right;
} else {
input = null;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/metadata/Scalar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Scalar<ReturnType, InputType> compile(List<Symbol> arguments) {

protected static boolean anyNonLiterals(List<Symbol> arguments) {
for (Symbol symbol : arguments) {
if (!symbol.symbolType().isValueSymbol()) {
if (!symbol.symbolType().isLiteral()) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/aggregation/impl/CountAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public Symbol normalizeSymbol(Function function) {
assert (function.arguments().size() <= 1);

if (function.arguments().size() == 1) {
if (function.arguments().get(0).symbolType().isValueSymbol()) {
if (function.arguments().get(0).symbolType().isLiteral()) {
if ((function.arguments().get(0)).valueType() == DataTypes.UNDEFINED) {
return Literal.newLiteral(0L);
} else{
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/CmpOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public Symbol normalizeSymbol(Function symbol) {
return Literal.NULL;
}

if (left.symbolType().isValueSymbol() && right.symbolType().isValueSymbol()) {
if (left.symbolType().isLiteral() && right.symbolType().isLiteral()) {
// must be true due to the function registration (argument DataType signature)
if (compare(((Literal) left).compareTo((Literal) right))){
return Literal.BOOLEAN_TRUE;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/EqOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public Symbol normalizeSymbol(Function symbol) {
Symbol left = symbol.arguments().get(0);
Symbol right = symbol.arguments().get(1);

if (left.symbolType().isValueSymbol() && right.symbolType().isValueSymbol()) {
if (left.symbolType().isLiteral() && right.symbolType().isLiteral()) {
return Literal.newLiteral(evaluate(new Input[] {(Input)left, (Input)right}));
}
return symbol;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/InOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Symbol normalizeSymbol(Function function) {
// arguments.get(0) ... id
// arguments.get(1) ... SetLiteral<Literal> (1,2,3,4,...)
Symbol left = function.arguments().get(0);
if (!left.symbolType().isValueSymbol()) {
if (!left.symbolType().isLiteral()) {
return function;
}
Object inValue = ((Literal) left).value();
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/LikeOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public Symbol normalizeSymbol(Function symbol) {
assert (symbol != null);
assert (symbol.arguments().size() == 2);

if (!symbol.arguments().get(0).symbolType().isValueSymbol()) {
if (!symbol.arguments().get(0).symbolType().isLiteral()) {
return symbol;
}

Expand Down
4 changes: 2 additions & 2 deletions sql/src/main/java/io/crate/operation/operator/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ protected static FunctionInfo generateInfo(String name, DataType type) {
}

protected boolean containsNull(Symbol left, Symbol right) {
if (left.symbolType().isValueSymbol() && ((Input<?>)left).value() == null) {
if (left.symbolType().isLiteral() && ((Input<?>)left).value() == null) {
return true;
}
if (right.symbolType().isValueSymbol() && ((Input<?>)right).value() == null) {
if (right.symbolType().isLiteral() && ((Input<?>)right).value() == null) {
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/OrOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Symbol normalizeSymbol(Function function) {
Symbol left = function.arguments().get(0);
Symbol right = function.arguments().get(1);

if (left.symbolType().isValueSymbol() && right.symbolType().isValueSymbol()) {
if (left.symbolType().isLiteral() && right.symbolType().isLiteral()) {
return Literal.newLiteral(evaluate((Input) left, (Input) right));
}

Expand Down
4 changes: 1 addition & 3 deletions sql/src/main/java/io/crate/operation/operator/RegexpMatchCaseInsensitiveOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import io.crate.planner.symbol.Symbol;
import io.crate.types.DataTypes;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.automaton.ByteRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;

import java.util.regex.Pattern;

Expand Down Expand Up @@ -76,7 +74,7 @@ public Symbol normalizeSymbol(Function symbol) {
if (containsNull(sourceSymbol, patternSymbol)) {
return Literal.NULL;
}
if (!sourceSymbol.symbolType().isValueSymbol() || !patternSymbol.symbolType().isValueSymbol()) {
if (!sourceSymbol.symbolType().isLiteral() || !patternSymbol.symbolType().isLiteral()) {
return symbol;
}

Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/operator/RegexpMatchOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public Symbol normalizeSymbol(Function symbol) {
if (containsNull(sourceSymbol, patternSymbol)) {
return Literal.NULL;
}
if (!sourceSymbol.symbolType().isValueSymbol() || !patternSymbol.symbolType().isValueSymbol()) {
if (!sourceSymbol.symbolType().isLiteral() || !patternSymbol.symbolType().isLiteral()) {
return symbol;
}

Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/predicate/IsNullPredicate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public Symbol normalizeSymbol(Function symbol) {
Symbol arg = symbol.arguments().get(0);
if (arg.equals(Literal.NULL) || arg.valueType().equals(DataTypes.UNDEFINED)) {
return Literal.newLiteral(true);
} else if (arg.symbolType().isValueSymbol()) {
} else if (arg.symbolType().isLiteral()) {
return Literal.newLiteral(((Input) arg).value() == null);
}
return symbol;
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/scalar/DateTruncFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Symbol normalizeSymbol(Function symbol) {
isValidInterval(interval, symbol);
Symbol tsSymbol = symbol.arguments().get(1);

if (tsSymbol.symbolType().isValueSymbol()) {
if (tsSymbol.symbolType().isLiteral()) {
return Literal.newLiteral(
DataTypes.TIMESTAMP,
evaluate((BytesRef)interval.value(), DataTypes.TIMESTAMP.value(((Input) tsSymbol).value()))
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/scalar/DateTruncTimeZoneAwareFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public Symbol normalizeSymbol(Function symbol) {
}

Symbol tsSymbol = symbol.arguments().get(2);
if (tsSymbol.symbolType().isValueSymbol()) {
if (tsSymbol.symbolType().isLiteral()) {
return Literal.newLiteral(
DataTypes.TIMESTAMP,
evaluate((BytesRef)interval.value(),
Expand Down
2 changes: 1 addition & 1 deletion sql/src/main/java/io/crate/operation/scalar/ExtractFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public Integer evaluate(Input... args) {
public Symbol normalizeSymbol(Function symbol) {
assert symbol.arguments().size() == 1 : "extract only takes one argument";
Symbol arg = symbol.arguments().get(0);
if (arg.symbolType().isValueSymbol()) {
if (arg.symbolType().isLiteral()) {
return Literal.newLiteral(evaluate(((Input) arg)));
}
return symbol;
Expand Down
Loading