From b737cccd3026598a06c3fe807d84c03a619500d3 Mon Sep 17 00:00:00 2001 From: Yongzao Date: Thu, 30 May 2024 16:14:36 +0800 Subject: [PATCH] Forbid auto create database when disable auto create schema (#12590) * Update ClusterPartitionFetcher.java * add IT --- .../IoTDBDisableAutoCreateSchemaIT.java | 74 +++++++++++++++++++ .../plan/analyze/ClusterPartitionFetcher.java | 3 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDisableAutoCreateSchemaIT.java diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDisableAutoCreateSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDisableAutoCreateSchemaIT.java new file mode 100644 index 000000000000..cac1691cfdbd --- /dev/null +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDisableAutoCreateSchemaIT.java @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iotdb.db.it.schema; + +import org.apache.iotdb.it.env.EnvFactory; +import org.apache.iotdb.itbase.category.ClusterIT; +import org.apache.iotdb.itbase.category.LocalStandaloneIT; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +@Category({LocalStandaloneIT.class, ClusterIT.class}) +public class IoTDBDisableAutoCreateSchemaIT { + + @BeforeClass + public static void setUp() throws Exception { + EnvFactory.getEnv().getConfig().getCommonConfig().setAutoCreateSchemaEnabled(false); + + // Init 1C1D environment + EnvFactory.getEnv().initClusterEnvironment(1, 1); + } + + @AfterClass + public static void tearDown() { + EnvFactory.getEnv().cleanClusterEnvironment(); + } + + @Test + public void disableAutoCreateSchemaTest() throws SQLException { + try (Connection connection = EnvFactory.getEnv().getConnection(); + Statement statement = connection.createStatement()) { + try { + statement.executeQuery("insert into root.db.d(timestamp, s) values(233, 666)"); + } catch (SQLException e) { + Assert.assertTrue(e.getMessage().contains("because enable_auto_create_schema is FALSE.")); + } + try { + ResultSet databaseResultSet = statement.executeQuery("count databases"); + databaseResultSet.next(); + Assert.assertEquals(0, databaseResultSet.getInt("count")); + ResultSet timeseriesResultSet = statement.executeQuery("count timeseries"); + timeseriesResultSet.next(); + Assert.assertEquals(0, timeseriesResultSet.getInt("count(timeseries)")); + } catch (SQLException e) { + Assert.fail(e.getMessage()); + } + } + } +} diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java index 1069aca33b8d..e76973c516b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ClusterPartitionFetcher.java @@ -254,7 +254,8 @@ public DataPartition getOrCreateDataPartition( List dataPartitionQueryParams, String userName) { Map> splitDataPartitionQueryParams = - splitDataPartitionQueryParam(dataPartitionQueryParams, true, userName); + splitDataPartitionQueryParam( + dataPartitionQueryParams, config.isAutoCreateSchemaEnabled(), userName); DataPartition dataPartition = partitionCache.getDataPartition(splitDataPartitionQueryParams); if (null == dataPartition) {