Skip to content

Feature addtotals and addcoltotals #4754

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

Merged
dai-chen merged 10 commits into from
Dec 15, 2025
Merged

Feature addtotals and addcoltotals #4754

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
d4a3595
Feature addtotals and addcoltotals #4754
asifabashar Dec 11, 2025
f71f935
Update integ-test/src/test/java/org/opensearch/sql/security/CrossClus…
asifabashar Dec 11, 2025
a879e6d
Update integ-test/src/test/java/org/opensearch/sql/calcite/remote/Cal…
asifabashar Dec 11, 2025
9a243a8
Update integ-test/src/test/java/org/opensearch/sql/calcite/remote/Cal…
asifabashar Dec 11, 2025
0b4a100
Update integ-test/src/test/java/org/opensearch/sql/calcite/remote/Cal…
asifabashar Dec 11, 2025
2391fd8
Update core/src/main/java/org/opensearch/sql/ast/tree/AddColTotals.java
asifabashar Dec 11, 2025
c874251
syntax error fix
asifabashar Dec 11, 2025
2d18f7e
syntax error fix
asifabashar Dec 11, 2025
ad94472
trigger ci workflow
asifabashar Dec 11, 2025
6471023
remove line wrapping for relavant md files per recommendation
asifabashar Dec 11, 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
12 changes: 12 additions & 0 deletions core/src/main/java/org/opensearch/sql/analysis/Analyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
import org.opensearch.sql.ast.expression.UnresolvedExpression;
import org.opensearch.sql.ast.expression.WindowFunction;
import org.opensearch.sql.ast.tree.AD;
import org.opensearch.sql.ast.tree.AddColTotals;
import org.opensearch.sql.ast.tree.AddTotals;
import org.opensearch.sql.ast.tree.Aggregation;
import org.opensearch.sql.ast.tree.Append;
import org.opensearch.sql.ast.tree.AppendCol;
Expand Down Expand Up @@ -521,6 +523,16 @@ public LogicalPlan visitEval(Eval node, AnalysisContext context) {
return new LogicalEval(child, expressionsBuilder.build());
}

@Override
public LogicalPlan visitAddTotals(AddTotals node, AnalysisContext context) {
throw getOnlyForCalciteException("addtotals");
}

@Override
public LogicalPlan visitAddColTotals(AddColTotals node, AnalysisContext context) {
throw getOnlyForCalciteException("addcoltotals");
}

/** Build {@link ParseExpression} to context and skip to child nodes. */
@Override
public LogicalPlan visitParse(Parse node, AnalysisContext context) {
Expand Down
10 changes: 10 additions & 0 deletions core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
import org.opensearch.sql.ast.statement.Query;
import org.opensearch.sql.ast.statement.Statement;
import org.opensearch.sql.ast.tree.AD;
import org.opensearch.sql.ast.tree.AddColTotals;
import org.opensearch.sql.ast.tree.AddTotals;
import org.opensearch.sql.ast.tree.Aggregation;
import org.opensearch.sql.ast.tree.Append;
import org.opensearch.sql.ast.tree.AppendCol;
Expand Down Expand Up @@ -451,4 +453,12 @@ public T visitAppend(Append node, C context) {
public T visitMultisearch(Multisearch node, C context) {
return visitChildren(node, context);
}

public T visitAddTotals(AddTotals node, C context) {
return visitChildren(node, context);
}

public T visitAddColTotals(AddColTotals node, C context) {
return visitChildren(node, context);
}
}
47 changes: 47 additions & 0 deletions core/src/main/java/org/opensearch/sql/ast/tree/AddColTotals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.sql.ast.tree;

import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Map;
import lombok.*;
import org.opensearch.sql.ast.AbstractNodeVisitor;
import org.opensearch.sql.ast.expression.Field;
import org.opensearch.sql.ast.expression.Literal;

/**
* AST node representing the PPL addcoltotals command. Computes column-wise totals across events and
* optionally appends a summary event.
*
* @see AddTotals for row-wise totals
*/
@Getter
@Setter
@ToString
@EqualsAndHashCode(callSuper = false)
@RequiredArgsConstructor
public class AddColTotals extends UnresolvedPlan {
private final List<Field> fieldList;
private final Map<String, Literal> options;
private UnresolvedPlan child;

@Override
public AddColTotals attach(UnresolvedPlan child) {
this.child = child;
return this;
}

@Override
public List<UnresolvedPlan> getChild() {
return child == null ? ImmutableList.of() : ImmutableList.of(child);
}

@Override
public <T, C> T accept(AbstractNodeVisitor<T, C> visitor, C context) {
return visitor.visitAddColTotals(this, context);
}
}
45 changes: 45 additions & 0 deletions core/src/main/java/org/opensearch/sql/ast/tree/AddTotals.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.sql.ast.tree;

import com.google.common.collect.ImmutableList;
import java.util.List;
import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import org.opensearch.sql.ast.AbstractNodeVisitor;
import org.opensearch.sql.ast.expression.Field;
import org.opensearch.sql.ast.expression.Literal;

@Getter
@Setter
@ToString
@EqualsAndHashCode(callSuper = false)
@RequiredArgsConstructor
public class AddTotals extends UnresolvedPlan {
private final List<Field> fieldList;
private final Map<String, Literal> options;
private UnresolvedPlan child;

@Override
public AddTotals attach(UnresolvedPlan child) {
this.child = child;
return this;
}

@Override
public List<UnresolvedPlan> getChild() {
return child == null ? ImmutableList.of() : ImmutableList.of(child);
}

@Override
public <T, C> T accept(AbstractNodeVisitor<T, C> visitor, C context) {
return visitor.visitAddTotals(this, context);
}
}
Loading
Loading