Skip to content

issue_484: Null pointer passed to DPLParserCatalystVisitor #485

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

Open
Abigael-JT wants to merge 10 commits into
base: main
Choose a base branch
from
Open

issue_484: Null pointer passed to DPLParserCatalystVisitor #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fff7994
throw an exception to avoid passing Null pointer to DPLParserCatalyst…
Abigael-JT Jan 24, 2025
5d8fdb3
removed DPLParserCatalystContext null check, made objects final and r…
Abigael-JT Jan 29, 2025
8ecd7ca
logging info moved to before the clone() method, and checked the node…
Abigael-JT Feb 6, 2025
aac6eae
changed to have single point of return
Abigael-JT Feb 6, 2025
9de4abd
to remove instance checks,added isStub() method to Node interface and…
Abigael-JT Apr 15, 2025
ed12335
run spotless
Abigael-JT Apr 15, 2025
583d653
rebased
Abigael-JT Aug 22, 2025
f9f0280
run spotless
Abigael-JT Jan 8, 2026
45af707
used isNull() method instead of isStub()
Abigael-JT Feb 3, 2026
8c5dc89
override and throw exceptions from all methods from super class
Abigael-JT Feb 3, 2026
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
4 changes: 4 additions & 0 deletions src/main/java/com/teragrep/pth_10/ast/bo/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,8 @@ public String toXMLTree() {
return this.toString();
}
}

public boolean isStub() {
return false;
}
}
27 changes: 26 additions & 1 deletion src/main/java/com/teragrep/pth_10/ast/bo/NullNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,33 @@ public NullNode() {
super();
}

@Override
public Token.Type getNodeType() {
throw new UnsupportedOperationException("NullNode does not support getNodeType()");
}

@Override
public String toTree() {
throw new UnsupportedOperationException("NullNode does not support toTree()");
}

@Override
public void addChild(Node child) {
throw new UnsupportedOperationException("NullNode does not support addChild()");
}

@Override
public String toString() {
return "";
return "NullNode";
}

@Override
public String toXMLTree() {
throw new UnsupportedOperationException("NullNode does not support toXMLTree()");
}

@Override
public boolean isStub() {
return true;
Comment thread
kortemik marked this conversation as resolved.
}
}
113 changes: 75 additions & 38 deletions ...main/java/com/teragrep/pth_10/ast/commands/logicalstatement/LogicalStatementCatalyst.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,9 @@ public LogicalStatementCatalyst(DPLParserCatalystContext catCtx) {
public AbstractStep visitLogicalStatementCatalyst(DPLParser.SearchTransformationRootContext ctx) {
if (ctx != null) {
final Node ret = visitSearchTransformationRoot(ctx);
if (ret != null) {
final ColumnNode colNode = (ColumnNode) visitSearchTransformationRoot(ctx);
if (colNode.getColumn() != null) {
final Column filterColumn = colNode.getColumn();
return new LogicalCatalystStep(filterColumn);
}
if (!ret.isStub()) {
final Column filterColumn = ((ColumnNode) visitSearchTransformationRoot(ctx)).getColumn();
return new LogicalCatalystStep(filterColumn);
}
}
return new NullStep();
Expand All @@ -145,46 +142,75 @@ public AbstractStep visitLogicalStatementCatalyst(DPLParser.SearchTransformation
*/
@Override
public Node visitSearchTransformationRoot(DPLParser.SearchTransformationRootContext ctx) {
final ColumnNode rv;
final Node rv;
if (LOGGER.isInfoEnabled()) {
LOGGER
.info(
"queryId <{}> [SearchTransformationRoot CAT] Visiting: <{}> with <{}> children",
catCtx.getQueryName(), ctx.getText(), ctx.getChildCount()
"[SearchTransformationRoot CAT] Visiting: <{}> with <{}> children", ctx.getText(),
ctx.getChildCount()
);
}

if (ctx.getChildCount() == 1) {
// just a single directoryStatement -or- logicalStatement
rv = (ColumnNode) visit(ctx.getChild(0));
final Node singleNode = visit(ctx.getChild(0));
if (singleNode.isStub()) {
LOGGER.info("Child node was a NullNode");
rv = singleNode;
}
else {
rv = singleNode;
}
}
else {
final ParseTree secondChild = ctx.getChild(1);

if (
secondChild instanceof TerminalNode && ((TerminalNode) secondChild).getSymbol().getType() == DPLLexer.OR
) {
// case: directoryStmt OR logicalStmt
final ColumnNode dirStatColumnNode = (ColumnNode) visit(ctx.directoryStatement());
final ColumnNode logiStatColumnNode = (ColumnNode) visit(ctx.logicalStatement(0));
rv = new ColumnNode(dirStatColumnNode.getColumn().or(logiStatColumnNode.getColumn()));
final Node directoryNode = visit(ctx.directoryStatement());
final Node logicalNode = visit(ctx.logicalStatement(0));
if (directoryNode.isStub()) {
LOGGER.info("Directory statement node was a NullNode");
rv = directoryNode;
}
else if (logicalNode.isStub()) {
LOGGER.info("Logical statement node was a NullNode");
rv = logicalNode;
}
else {
final ColumnNode dirStatColumnNode = (ColumnNode) directoryNode;
final ColumnNode logiStatColumnNode = (ColumnNode) logicalNode;
rv = new ColumnNode(dirStatColumnNode.getColumn().or(logiStatColumnNode.getColumn()));
}
}
else {
// case: (logicalStmt AND?)*? directoryStmt (AND? logicalStmt)*?
Column finalColumn = ((ColumnNode) visit(ctx.directoryStatement())).getColumn();

for (DPLParser.LogicalStatementContext logiStatCtx : ctx.logicalStatement()) {
finalColumn = finalColumn.and(((ColumnNode) visit(logiStatCtx)).getColumn());
final Node finalNode = visit(ctx.directoryStatement());
if (finalNode.isStub()) {
LOGGER.info("Directory statement node was a NullNode");
rv = finalNode;
}
else {

Column finalColumn = ((ColumnNode) finalNode).getColumn();

rv = new ColumnNode(finalColumn);
for (DPLParser.LogicalStatementContext logiStatCtx : ctx.logicalStatement()) {
finalColumn = finalColumn.and(((ColumnNode) visit(logiStatCtx)).getColumn());
}

rv = new ColumnNode(finalColumn);
}
}
}

if (rv != null && rv.getColumn() != null) {
this.catCtx.setSparkQuery(rv.getColumn().toString());
if (LOGGER.isInfoEnabled()) {
LOGGER.info("queryId <{}> Spark column: <{}>", catCtx.getQueryName(), rv.getColumn().toString());
if (rv instanceof ColumnNode) {
final ColumnNode columnNode = (ColumnNode) rv;
if (columnNode.getColumn() != null) {
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Spark column: <{}>", columnNode.getColumn().toString());
}
this.catCtx.setSparkQuery(columnNode.getColumn().toString());
}
}

Expand Down Expand Up @@ -598,33 +624,44 @@ private Column addOperation(Column source, TerminalNode operation, String value)

@Override
public Node visitSubsearchStatement(DPLParser.SubsearchStatementContext ctx) {
LOGGER.info("queryId <{}> visitSubsearchStatement with brackets: <{}>", catCtx.getQueryName(), ctx.getText());
if (LOGGER.isInfoEnabled()) {
LOGGER
.info(
"queryId <{}> visitSubsearchStatement with brackets: <{}>", catCtx.getQueryName(),
ctx.getText()
);
}
if (catCtx == null) {
throw new IllegalStateException("Catalyst context is null!");
throw new IllegalStateException("DPL parser catalyst context is missing");
}
if (LOGGER.isInfoEnabled()) {
LOGGER.info("queryId <{}> Cloning main visitor to subsearch", catCtx.getQueryName());
}
LOGGER.info("queryId <{}> Cloning main visitor to subsearch", catCtx.getQueryName());
final DPLParserCatalystContext subCtx = catCtx.clone();
LOGGER.info("queryId <{}> (Catalyst) subVisitor init with subCtx= <{}>", catCtx.getQueryName(), subCtx);
DPLParserCatalystVisitor subVisitor = new DPLParserCatalystVisitor(subCtx);
if (LOGGER.isInfoEnabled()) {
LOGGER.info("queryId <{}> (Catalyst) subVisitor init with subCtx= <{}>", catCtx.getQueryName(), subCtx);
}
final DPLParserCatalystVisitor subVisitor = new DPLParserCatalystVisitor(subCtx);

// Pass actual subsearch branch
StepNode subSearchNode = (StepNode) subVisitor.visit(ctx);
LOGGER
.info(
"queryId <{}> SubSearchTransformation (Catalyst) Result: class=<{}>", catCtx.getQueryName(),
subSearchNode.getClass().getName()
);

SubsearchStep subsearchStep = (SubsearchStep) subSearchNode.get();
final StepNode subSearchNode = (StepNode) subVisitor.visit(ctx);
if (LOGGER.isInfoEnabled()) {
LOGGER
.info(
"queryId <{}> SubSearchTransformation (Catalyst) Result: class=<{}>", catCtx.getQueryName(),
subSearchNode.getClass().getName()
);
}

final SubsearchStep subsearchStep = (SubsearchStep) subSearchNode.get();
// These have to be set here and not in subVisitor to be the same as in other Steps
subsearchStep.setListener(this.catCtx.getInternalStreamingQueryListener());
subsearchStep.setHdfsPath(this.catVisitor.getHdfsPath());

// add subsearch to stepList
this.catVisitor.getStepList().add(subsearchStep);

//Node rv = new CatalystNode(subVisitor.getStack().pop());
return null;
return new NullNode();
}

/*@Override
Expand Down