This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch feature/table-session-db-insert in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e5a271504520e04172e0b6395ad860f9ad47dfbf Author: shuwenwei <[email protected]> AuthorDate: Thu Nov 12 12:07:23 2026 +0800 Add database-scoped tablet insertion for table sessions --- .../it/session/IoTDBSessionRelationalIT.java | 57 ++++++++++++++++++++++ .../org/apache/iotdb/isession/ITableSession.java | 15 ++++++ .../java/org/apache/iotdb/session/Session.java | 34 ++++++++++--- .../org/apache/iotdb/session/TableSession.java | 6 +++ .../iotdb/session/pool/TableSessionWrapper.java | 8 ++- .../plan/parser/StatementGenerator.java | 17 +++++++ .../thrift-datanode/src/main/thrift/client.thrift | 3 +- 7 files changed, 132 insertions(+), 8 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java index 73e9881dfca..6cecfe79182 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java @@ -177,6 +177,63 @@ public class IoTDBSessionRelationalIT { } } + @Test + public void testInsertTabletIntoSpecifiedDatabase() + throws IoTDBConnectionException, StatementExecutionException { + try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) { + session.executeNonQueryStatement( + "CREATE TABLE db1.tablet_database (tag1 STRING TAG, m1 DOUBLE FIELD)"); + session.executeNonQueryStatement( + "CREATE TABLE db2.tablet_database (tag1 STRING TAG, m1 DOUBLE FIELD)"); + + List<String> columnNames = Arrays.asList("tag1", "m1"); + List<TSDataType> dataTypes = Arrays.asList(TSDataType.STRING, TSDataType.DOUBLE); + List<ColumnCategory> columnCategories = + Arrays.asList(ColumnCategory.TAG, ColumnCategory.FIELD); + Tablet tablet = new Tablet("tablet_database", columnNames, dataTypes, columnCategories, 2); + for (int row = 0; row < 2; row++) { + tablet.addTimestamp(row, row); + tablet.addValue("tag1", row, "tag:" + row); + tablet.addValue("m1", row, row * 1.0); + } + + session.insert(tablet, "db1"); + session.executeNonQueryStatement("USE db1"); + session.insert(tablet, "db2"); + Tablet currentDatabaseTablet = + new Tablet("tablet_database", columnNames, dataTypes, columnCategories, 1); + currentDatabaseTablet.addTimestamp(0, 2); + currentDatabaseTablet.addValue("tag1", 0, "tag:2"); + currentDatabaseTablet.addValue("m1", 0, 2.0); + session.insert(currentDatabaseTablet, null); + + try (SessionDataSet dataSet = + session.executeQueryStatement("SELECT * FROM db1.tablet_database")) { + assertTrue(dataSet.hasNext()); + dataSet.next(); + assertTrue(dataSet.hasNext()); + dataSet.next(); + assertTrue(dataSet.hasNext()); + dataSet.next(); + assertFalse(dataSet.hasNext()); + } + try (SessionDataSet dataSet = + session.executeQueryStatement("SELECT * FROM db2.tablet_database")) { + assertTrue(dataSet.hasNext()); + dataSet.next(); + assertTrue(dataSet.hasNext()); + dataSet.next(); + assertFalse(dataSet.hasNext()); + } + try (SessionDataSet dataSet = session.executeQueryStatement("SHOW CURRENT_DATABASE")) { + assertTrue(dataSet.hasNext()); + assertEquals("db1", dataSet.next().getField(0).getStringValue()); + } + + assertThrows(StatementExecutionException.class, () -> session.insert(tablet, "")); + } + } + private static void insertRelationalTabletPerformanceTest() throws IoTDBConnectionException, StatementExecutionException { try (ITableSession session = EnvFactory.getEnv().getTableSessionConnection()) { diff --git a/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/ITableSession.java b/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/ITableSession.java index 75a37f83847..dfb7372f3ac 100644 --- a/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/ITableSession.java +++ b/iotdb-client/isession/src/main/java/org/apache/iotdb/isession/ITableSession.java @@ -46,6 +46,21 @@ public interface ITableSession extends AutoCloseable { */ void insert(Tablet tablet) throws StatementExecutionException, IoTDBConnectionException; + /** + * Inserts a {@link Tablet} into the specified database for this invocation only. + * + * <p>The database does not become the current database of this session and subsequent operations + * are unaffected. + * + * @param tablet the tablet containing time-series data to be inserted. + * @param database the target database for this insertion; if null, the current database of this + * session is used. + * @throws StatementExecutionException if an error occurs while executing the statement. + * @throws IoTDBConnectionException if there is an issue with the IoTDB connection. + */ + void insert(Tablet tablet, String database) + throws StatementExecutionException, IoTDBConnectionException; + /** * Executes a non-query SQL statement, such as a DDL or DML command. * diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java index d8bcce5e13d..59bdcf2b7af 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/Session.java @@ -2907,11 +2907,22 @@ public class Session implements ISession { */ public void insertRelationalTablet(Tablet tablet) throws IoTDBConnectionException, StatementExecutionException { + insertRelationalTablet(tablet, null); + } + + /** + * Inserts a relational {@link Tablet} into the specified database for this invocation only. + * + * @param tablet data batch + * @param database target database; if null, use the current database of this session + */ + public void insertRelationalTablet(Tablet tablet, String database) + throws IoTDBConnectionException, StatementExecutionException { if (tablet.getRowSize() == 0) { return; } if (enableRedirection) { - insertRelationalTabletWithLeaderCache(tablet); + insertRelationalTabletWithLeaderCache(tablet, database); } else { TSInsertTabletReq request = genTSInsertTabletReq(tablet, false, false); if (request == null) { @@ -2923,6 +2934,7 @@ public class Session implements ISession { return; } request.setWriteToTable(true); + setRelationalRequestDatabase(request, database); try { getDefaultSessionConnection().insertTablet(request); } catch (RedirectException ignored) { @@ -2930,7 +2942,7 @@ public class Session implements ISession { } } - private void insertRelationalTabletWithLeaderCache(Tablet tablet) + private void insertRelationalTabletWithLeaderCache(Tablet tablet, String database) throws IoTDBConnectionException, StatementExecutionException { Map<SessionConnection, Tablet> relationalTabletGroup = new HashMap<>(); if (tableModelDeviceIdToEndpoint.isEmpty()) { @@ -2975,13 +2987,14 @@ public class Session implements ISession { } } if (relationalTabletGroup.size() == 1) { - insertRelationalTabletOnce(relationalTabletGroup); + insertRelationalTabletOnce(relationalTabletGroup, database); } else { - insertRelationalTabletByGroup(relationalTabletGroup); + insertRelationalTabletByGroup(relationalTabletGroup, database); } } - private void insertRelationalTabletOnce(Map<SessionConnection, Tablet> relationalTabletGroup) + private void insertRelationalTabletOnce( + Map<SessionConnection, Tablet> relationalTabletGroup, String database) throws IoTDBConnectionException, StatementExecutionException { Map.Entry<SessionConnection, Tablet> entry = relationalTabletGroup.entrySet().iterator().next(); SessionConnection connection = entry.getKey(); @@ -2996,6 +3009,7 @@ public class Session implements ISession { return; } request.setWriteToTable(true); + setRelationalRequestDatabase(request, database); try { connection.insertTablet(request); } catch (RedirectException e) { @@ -3024,7 +3038,8 @@ public class Session implements ISession { @SuppressWarnings({ "squid:S3776" }) // ignore Cognitive Complexity of methods should not be too high - private void insertRelationalTabletByGroup(Map<SessionConnection, Tablet> relationalTabletGroup) + private void insertRelationalTabletByGroup( + Map<SessionConnection, Tablet> relationalTabletGroup, String database) throws IoTDBConnectionException, StatementExecutionException { List<CompletableFuture<Void>> completableFutures = relationalTabletGroup.entrySet().stream() @@ -3044,6 +3059,7 @@ public class Session implements ISession { return; } request.setWriteToTable(true); + setRelationalRequestDatabase(request, database); InsertConsumer<TSInsertTabletReq> insertConsumer = SessionConnection::insertTablet; try { @@ -3101,6 +3117,12 @@ public class Session implements ISession { } } + private static void setRelationalRequestDatabase(TSInsertTabletReq request, String database) { + if (database != null) { + request.setDatabase(database); + } + } + /** * insert the aligned timeseries data of a device. For each timestamp, the number of measurements * is the same. diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSession.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSession.java index 059fdea3469..b51a3a59831 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSession.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/TableSession.java @@ -39,6 +39,12 @@ public class TableSession implements ITableSession { session.insertRelationalTablet(tablet); } + @Override + public void insert(Tablet tablet, String database) + throws StatementExecutionException, IoTDBConnectionException { + session.insertRelationalTablet(tablet, database); + } + @Override public void executeNonQueryStatement(String sql) throws IoTDBConnectionException, StatementExecutionException { diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionWrapper.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionWrapper.java index 4cf7ca980f3..5cb7a89fc0e 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionWrapper.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/pool/TableSessionWrapper.java @@ -58,8 +58,14 @@ public class TableSessionWrapper implements ITableSession { @Override public void insert(Tablet tablet) throws StatementExecutionException, IoTDBConnectionException { + insert(tablet, null); + } + + @Override + public void insert(Tablet tablet, String database) + throws StatementExecutionException, IoTDBConnectionException { try { - session.insertRelationalTablet(tablet); + session.insertRelationalTablet(tablet, database); } catch (IoTDBConnectionException e) { sessionPool.cleanSessionAndMayThrowConnectionException(session); closed.set(true); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 046a94c1fa2..8fc1826994e 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -24,11 +24,14 @@ import org.apache.iotdb.calc.utils.constant.SqlConstant; import org.apache.iotdb.common.rpc.thrift.TAggregationType; import org.apache.iotdb.commons.exception.IllegalPathException; import org.apache.iotdb.commons.exception.MetadataException; +import org.apache.iotdb.commons.exception.SemanticException; import org.apache.iotdb.commons.path.MeasurementPath; import org.apache.iotdb.commons.path.PartialPath; import org.apache.iotdb.commons.queryengine.utils.TimestampPrecisionUtils; import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics; +import org.apache.iotdb.commons.utils.PathUtils; +import org.apache.iotdb.db.i18n.DataNodeMiscMessages; import org.apache.iotdb.db.i18n.DataNodeQueryMessages; import org.apache.iotdb.db.qp.sql.IoTDBSqlParser; import org.apache.iotdb.db.qp.sql.SqlLexer; @@ -116,6 +119,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; @@ -385,6 +389,19 @@ public class StatementGenerator { ColumnCategory.values()[insertTabletReq.columnCategories.get(i).intValue()]); } insertStatement.setColumnCategories(columnCategories); + if (insertTabletReq.isSetDatabase()) { + if (insertTabletReq.getDatabase().isEmpty()) { + throw new IllegalArgumentException( + DataNodeQueryMessages.DATABASE_IS_NOT_SPECIFIED_FOR_INSERT); + } + if (!PathUtils.isTableModelDatabase(insertTabletReq.getDatabase())) { + throw new SemanticException( + String.format( + DataNodeMiscMessages.DATABASE_NAME_IS_TREE_MODEL_DATABASE, + insertTabletReq.getDatabase())); + } + insertStatement.setDatabaseName(insertTabletReq.getDatabase().toLowerCase(Locale.ENGLISH)); + } } PERFORMANCE_OVERVIEW_METRICS.recordParseCost(System.nanoTime() - startTime); return insertStatement; diff --git a/iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift b/iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift index 7ff12ceb021..4ac00b7e270 100644 --- a/iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift +++ b/iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift @@ -274,6 +274,7 @@ struct TSInsertTabletReq { 11: optional bool isCompressed 12: optional list<byte> encodingTypes 13: optional byte compressType + 14: optional string database } struct TSInsertTabletsReq { @@ -705,4 +706,4 @@ service IClientRPCService { /** For other node's call */ common.TSStatus testConnectionEmptyRPC(); -} \ No newline at end of file +}
