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

DNM nested ternary - WIP #2021

Open
wants to merge 1 commit into
base: 3.0
Choose a base branch
from
Open

DNM nested ternary - WIP #2021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion core/src/main/antlr4/MetricExpression.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ relationalop: '<'|'>'|'=='|'<='|'>='|'!=';

ternaryExpression : '(' ternaryExpression ')' #paren_ternary_rule
| (logicalExpression|relationalExpression|metric) '?' ternaryOperands ':' ternaryOperands #main_ternary_rule
| ternaryExpression '?' ternaryOperands ':' ternaryOperands #nested_ternary_rule
;

ternaryOperands: expression // We can label alternatives - but seems to me like the output will have a single type
ternaryOperands: expression
;


Expand Down
12 changes: 11 additions & 1 deletion core/src/main/java/net/opentsdb/query/processor/expressions/ExpressionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,17 @@ public Object visitTernary(TernaryContext ctx) {

@Override
public Object visitParen_ternary_rule(Paren_ternary_ruleContext ctx) {
return null;
ctx.getChild(0).accept(this);
ctx.getChild(2).accept(this);
return ctx.getChild(1).accept(this);
}

@Override
public Object visitNested_ternary_rule(MetricExpressionParser.Nested_ternary_ruleContext ctx) {
Object condition = ctx.getChild(0).accept(this);
Object left = ctx.getChild(2).accept(this);
Object right = ctx.getChild(4).accept(this);
return newTernary(condition, left, right);
}

@Override
Expand Down
101 changes: 101 additions & 0 deletions core/src/test/java/net/opentsdb/query/processor/expressions/TestExpressionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,107 @@ public void ternary() throws Exception {
//ExpressionParser parser = new ExpressionParser(config("a + 1 * c"));
// TODO - allow "1 > a : b"?
}

@Test
public void nested_ternary() throws Exception {
ExpressionParser parser = new ExpressionParser(config("(a > b ? c : d)"));
List<ExpressionParseNode> nodes = parser.parse();
assertEquals(2, nodes.size());
ExpressionParseNode node = nodes.get(0);
assertEquals("e1_SubExp#0", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("a", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("b", node.getRight());
assertEquals(ExpressionOp.GT, node.getOperator());

node = nodes.get(1);
assertEquals("e1", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("c", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("d", node.getRight());
assertNull(node.getOperator());
assertEquals(OperandType.SUB_EXP, ((TernaryParseNode) node).getConditionType());
assertEquals("e1_SubExp#0", ((TernaryParseNode) node).getCondition());

parser = new ExpressionParser(config("a <= 1 ?(a > m && j < l) : o + y >= 1.89 ? h : p"));
nodes = parser.parse();
assertEquals(8, nodes.size());
node = nodes.get(0);
assertEquals("e1_SubExp#0", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("a", node.getLeft());
assertEquals(OperandType.LITERAL_NUMERIC, node.getRightType());
assertEquals(new NumericLiteral(1), node.getRight());
assertEquals(ExpressionOp.LE, node.getOperator());

node = nodes.get(1);
assertEquals("e1_SubExp#1", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("a", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("m", node.getRight());
assertEquals(ExpressionOp.GT, node.getOperator());

node = nodes.get(2);
assertEquals("e1_SubExp#2", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("j", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("l", node.getRight());
assertEquals(ExpressionOp.LT, node.getOperator());

node = nodes.get(3);
assertEquals("e1_SubExp#3", node.getId());
assertEquals(OperandType.SUB_EXP, node.getLeftType());
assertEquals("e1_SubExp#1", node.getLeft());
assertEquals(OperandType.SUB_EXP, node.getRightType());
assertEquals("e1_SubExp#2", node.getRight());
assertEquals(ExpressionOp.AND, node.getOperator());

node = nodes.get(4);
assertEquals("e1_SubExp#4", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("o", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("y", node.getRight());
assertEquals(ExpressionOp.ADD, node.getOperator());

node = nodes.get(5);
assertEquals("e1_SubExp#5", node.getId());
assertEquals(OperandType.SUB_EXP, node.getLeftType());
assertEquals("e1_SubExp#4", node.getLeft());
assertEquals(OperandType.LITERAL_NUMERIC, node.getRightType());
assertEquals(new NumericLiteral(1.89), node.getRight());
assertEquals(ExpressionOp.GE, node.getOperator());

node = nodes.get(6);

assertEquals("e1_TernaryExp#6", node.getId());
assertEquals(OperandType.SUB_EXP, node.getLeftType());
assertEquals("e1_SubExp#3", node.getLeft());
assertEquals(OperandType.SUB_EXP, node.getRightType());
assertEquals("e1_SubExp#5", node.getRight());
assertEquals(OperandType.SUB_EXP, ((TernaryParseNode) node).getConditionType());
assertEquals("e1_SubExp#0", ((TernaryParseNode) node).getCondition());

node = nodes.get(7);

assertEquals("e1", node.getId());
assertEquals(OperandType.VARIABLE, node.getLeftType());
assertEquals("h", node.getLeft());
assertEquals(OperandType.VARIABLE, node.getRightType());
assertEquals("p", node.getRight());
assertEquals(OperandType.SUB_EXP, ((TernaryParseNode) node).getConditionType());
assertEquals("e1_TernaryExp#6", ((TernaryParseNode) node).getCondition());

//parser = new ExpressionParser(config("a <= 1 ?(a > m && j < l) : o + y >= 1.89 ? h : p"));

//parser = new ExpressionParser(config("a <= 1 ?(a > m && j < l) : o + y >= 1.89 ? h : p : !(h > 1) && k < i "));

//parser = new ExpressionParser(config("(a + c) > 3 ? (a > m && j < l) ? o + y >= 1.89 : h > 4 ? p : k * l /i > 6 : i"));
}

ExpressionConfig config(final String exp) {
return (ExpressionConfig) ExpressionConfig.newBuilder()
Expand Down