Skip to content

[Feat] Add table less query for table model #17437

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
FearfulTomcat27 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Feat] Add table less query for table model #17437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b6083
feat: Support for queries without a FROM clause and ValuesNodes
FearfulTomcat27 Apr 3, 2026
421e507
test: Add test cases for table-less queries in IoTDBComplexQueryIT
FearfulTomcat27 Apr 7, 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
26 changes: 26 additions & 0 deletions ...n-test/src/test/java/org/apache/iotdb/relational/it/query/recent/IoTDBComplexQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,30 @@ public void queryTest1() {
retArray,
DATABASE_NAME);
}

@Test
public void testTableLessQuery() {
String[] expectedHeader;
String[] retArray;

expectedHeader = new String[] {"_col0", "_col1", "_col2", "_col3"};
retArray = new String[] {"2,0,1,1,"};
tableResultSetEqualTest("SELECT 1+1, 1-1, 1*1, 1/1", expectedHeader, retArray, DATABASE_NAME);

expectedHeader = new String[] {"_col0", "_col1", "_col2"};
retArray =
new String[] {Math.sin(1) + "," + Math.cos(1) + "," + Math.tan(1) + ","};
tableResultSetEqualTest(
"SELECT sin(1), cos(1), tan(1)", expectedHeader, retArray, DATABASE_NAME);
Comment on lines +95 to +98
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assertion is likely flaky because it compares ResultSet.getString() output against Double.toString(Math.sin(1))/cos/tan. JDBC/IoTDB formatting (precision, trailing zeros, scientific notation, locale) can differ from Java's Double.toString, causing intermittent failures. Consider using tableResultSetEqualByDataTypeTest (double comparison with delta) or explicitly formatting/rounding in SQL (e.g., ROUND(sin(1), n)) so the returned strings are deterministic.

Suggested change
retArray =
new String[] {Math.sin(1) + "," + Math.cos(1) + "," + Math.tan(1) + ","};
tableResultSetEqualTest(
"SELECT sin(1), cos(1), tan(1)", expectedHeader, retArray, DATABASE_NAME);
retArray = new String[] {"0.841471,0.540302,1.557408,"};
tableResultSetEqualTest(
"SELECT round(sin(1), 6), round(cos(1), 6), round(tan(1), 6)",
expectedHeader,
retArray,
DATABASE_NAME);

Copilot uses AI. Check for mistakes.

expectedHeader = new String[] {"_col0"};
retArray = new String[] {"Hello world,"};
tableResultSetEqualTest(
"SELECT FORMAT('Hello %s','world')", expectedHeader, retArray, DATABASE_NAME);

// SELECT COUNT(*) without FROM returns 1 (implicit single-row semantics)
expectedHeader = new String[] {"_col0"};
retArray = new String[] {"1,"};
tableResultSetEqualTest("SELECT COUNT(*)", expectedHeader, retArray, DATABASE_NAME);
}
}
18 changes: 15 additions & 3 deletions ...de/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,14 @@
import org.apache.tsfile.file.metadata.idcolumn.TwoLevelDBExtractor;
import org.apache.tsfile.read.TimeValuePair;
import org.apache.tsfile.read.common.TimeRange;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.BinaryColumn;
import org.apache.tsfile.read.common.block.column.BooleanColumn;
import org.apache.tsfile.read.common.block.column.DoubleColumn;
import org.apache.tsfile.read.common.block.column.FloatColumn;
import org.apache.tsfile.read.common.block.column.IntColumn;
import org.apache.tsfile.read.common.block.column.LongColumn;
import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn;
import org.apache.tsfile.read.common.type.BinaryType;
import org.apache.tsfile.read.common.type.BlobType;
import org.apache.tsfile.read.common.type.BooleanType;
Expand Down Expand Up @@ -4403,9 +4405,19 @@ public Operator visitValuesNode(ValuesNode node, LocalExecutionPlanContext conte
node.getPlanNodeId(),
MappingCollectOperator.class.getSimpleName());

// Currently we only support empty values operator
assert node.getRowCount() == 0;
return new ValuesOperator(operatorContext, ImmutableList.of());
if (node.getRowCount() == 0) {
return new ValuesOperator(operatorContext, ImmutableList.of());
}

// No-FROM query (e.g. SELECT 1+1): produce rowCount rows with no value columns so that the
// upstream ProjectNode can evaluate expressions once per row.
TsBlock emptyRowBlock =
new TsBlock(
node.getRowCount(),
new RunLengthEncodedColumn(
AbstractTableScanOperator.TIME_COLUMN_TEMPLATE, node.getRowCount()),
new Column[0]);
return new ValuesOperator(operatorContext, ImmutableList.of(emptyRowBlock));
}

@Override
Expand Down
12 changes: 11 additions & 1 deletion ...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/QueryPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.FieldId;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.RelationType;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl;
import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.GapFillStartAndEndTimeExtractVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.PredicateWithUncorrelatedScalarSubqueryReconstructor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
Expand All @@ -43,6 +44,7 @@
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Cast;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression;
Expand All @@ -65,6 +67,7 @@
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.VariableDefinition;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WindowFrame;
import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -783,7 +786,14 @@ private PlanBuilder planFrom(QuerySpecification node) {
.process(node.getFrom().orElse(null), null);
return newPlanBuilder(relationPlan, analysis);
} else {
throw new SemanticException("From clause must not be empty");
return new PlanBuilder(
new TranslationMap(
outerContext,
analysis.getImplicitFromScope(node),
analysis,
ImmutableList.of(),
new PlannerContext(new TableMetadataImpl(), new InternalTypeManager())),
new ValuesNode(queryIdAllocator.genPlanNodeId(), 1));
}
}

Expand Down
5 changes: 5 additions & 0 deletions ...rc/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ValuesNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ public static ValuesNode deserialize(ByteBuffer byteBuffer) {
planNodeId, outputSymbols, rowCount, flag ? Optional.of(rows) : Optional.empty());
}

@Override
public List<Symbol> getOutputSymbols() {
return outputSymbols;
}

public int getRowCount() {
return rowCount;
}
Expand Down
14 changes: 14 additions & 0 deletions ...e/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TreeDeviceViewScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.UnionNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValuesNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.WindowNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.NullLiteral;
Expand Down Expand Up @@ -510,6 +511,19 @@ public PlanAndMappings visitGroup(GroupNode node, UnaliasContext context) {
mapping);
}

@Override
public PlanAndMappings visitValuesNode(ValuesNode node, UnaliasContext context) {
Map<Symbol, Symbol> mapping = new HashMap<>(context.getCorrelationMapping());
SymbolMapper mapper = symbolMapper(mapping);

List<Symbol> newOutputs = mapper.map(node.getOutputSymbols());
Optional<List<Expression>> newRows =
node.getRows().map(rows -> rows.stream().map(mapper::map).collect(toImmutableList()));

return new PlanAndMappings(
new ValuesNode(node.getPlanNodeId(), newOutputs, node.getRowCount(), newRows), mapping);
}

@Override
public PlanAndMappings visitFilter(FilterNode node, UnaliasContext context) {
PlanAndMappings rewrittenSource = node.getChild().accept(this, context);
Expand Down
Loading