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

issue_486 #487

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

issue_486 #487

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
acdbdff
removed null assignment and redundant casting, returned NullNode inst…
Abigael-JT Jan 24, 2025
d523dee
made local variables final, changed exception message and cleaned up …
Abigael-JT Jan 28, 2025
68824aa
removed unnecessary check, clarified exception message and run spotless
Abigael-JT Jan 29, 2025
cc533c7
removed debug print
Abigael-JT Jan 29, 2025
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
38 changes: 19 additions & 19 deletions ...ain/java/com/teragrep/pth10/ast/commands/transformstatement/EventstatsTransformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import com.teragrep.pth_03.antlr.DPLParser;
import com.teragrep.pth_03.antlr.DPLParserBaseVisitor;
import com.teragrep.pth_03.shaded.org.antlr.v4.runtime.tree.ParseTree;
import com.teragrep.pth_03.shaded.org.antlr.v4.runtime.tree.TerminalNode;
import org.apache.spark.sql.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -116,32 +115,33 @@ else if (child instanceof DPLParser.T_eventstats_fieldRenameInstructionContext)

@Override
public Node visitT_eventstats_aggregationInstruction(DPLParser.T_eventstats_aggregationInstructionContext ctx) {
ParseTree cmd = ctx.getChild(0);
AggregateFunction aggFunction = new AggregateFunction(catCtx);
Column aggCol = null;

if (cmd instanceof TerminalNode) {
Abigael-JT marked this conversation as resolved.
Show resolved Hide resolved
/* if (((TerminalNode)cmd).getSymbol().getType() == DPLLexer.COMMAND_EVENTSTATS_MODE_COUNT) {
LOGGER.info("Implied wildcard COUNT mode - count({}", ds.columns()[0] + ")");
aggCol = functions.count(ds.columns()[0]).as("count");
}*/
final ParseTree cmd = ctx.getChild(0);
if (!(cmd instanceof DPLParser.AggregateFunctionContext)) {
throw new RuntimeException("Eventstats command expected an aggregation function, but found " + cmd + ".");
}
else if (cmd instanceof DPLParser.AggregateFunctionContext) {
// visit agg function

final AggregateFunction aggFunction = new AggregateFunction(catCtx);
final Node aggNode = aggFunction.visit(cmd);
final Column aggCol = ((ColumnNode) aggNode).getColumn();
final ParseTree fieldRenameInst = ctx.getChild(1);

// visit agg function
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Aggregate function: text=<{}>", cmd.getText());
Node aggNode = aggFunction.visit((DPLParser.AggregateFunctionContext) cmd);
aggCol = ((ColumnNode) aggNode).getColumn();
}

ParseTree fieldRenameInst = ctx.getChild(1);
if (fieldRenameInst instanceof DPLParser.T_eventstats_fieldRenameInstructionContext) {
Abigael-JT marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.debug("Field rename instruction: text=<{}>", fieldRenameInst.getText());
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Field rename instruction: text=<{}>", fieldRenameInst.getText());
}
// AS new-fieldname
aggCol = aggCol.as(fieldRenameInst.getChild(1).getText());
listOfAggregations.add(aggCol.as(fieldRenameInst.getChild(1).getText()));
}
else {
listOfAggregations.add(aggCol);
}

listOfAggregations.add(aggCol);
return null;
return new NullNode();
}

@Override
Expand Down