You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/10/31 11:37:34 UTC
[incubator-iotdb] branch master updated: add delete storage group
test (#498)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 8d87e58 add delete storage group test (#498)
8d87e58 is described below
commit 8d87e58dda59922dcd521bdf96d0c455f8e4767d
Author: Ring-k <36...@users.noreply.github.com>
AuthorDate: Thu Oct 31 19:37:28 2019 +0800
add delete storage group test (#498)
* add delete storage group test
---
.../org/apache/iotdb/db/sql/parse/TqlParser.g | 2 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 174 +++++++++++++++++++++
2 files changed, 175 insertions(+), 1 deletion(-)
diff --git a/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlParser.g b/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlParser.g
index c366c99..659223a 100644
--- a/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlParser.g
+++ b/server/src/main/antlr3/org/apache/iotdb/db/sql/parse/TqlParser.g
@@ -288,7 +288,7 @@ ddlStatement
: createTimeseries
| deleteTimeseries
| setStorageGroup
- | deleteStorageGroup // todo to implement
+ | deleteStorageGroup
| createProperty
| addLabel
| deleteLabel
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
new file mode 100644
index 0000000..c9ba55d
--- /dev/null
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeleteStorageGroupIT.java
@@ -0,0 +1,174 @@
+/*
+ * 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.integration;
+
+import org.apache.iotdb.db.service.IoTDB;
+import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.jdbc.Config;
+import org.apache.iotdb.jdbc.IoTDBSQLException;
+import org.junit.Test;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class IoTDBDeleteStorageGroupIT {
+
+ private static IoTDB daemon;
+
+ public static void setUp() throws Exception {
+ EnvironmentUtils.closeStatMonitor();
+ daemon = IoTDB.getInstance();
+ daemon.active();
+ EnvironmentUtils.envSetUp();
+ }
+
+ public static void tearDown() throws Exception {
+ daemon.stop();
+ EnvironmentUtils.cleanEnv();
+ }
+
+ @Test
+ public void testDeleteStorageGroup() throws Exception {
+ setUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ Connection connection = DriverManager.
+ getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement();
+ statement.execute("SET STORAGE GROUP TO root.ln.wf01.wt01");
+ statement.execute("SET STORAGE GROUP TO root.ln.wf01.wt02");
+ statement.execute("SET STORAGE GROUP TO root.ln.wf01.wt03");
+ statement.execute("SET STORAGE GROUP TO root.ln.wf01.wt04");
+ statement.execute("DELETE STORAGE GROUP root.ln.wf01.wt01");
+ boolean hasResult = statement.execute("SHOW STORAGE GROUP");
+ assertTrue(hasResult);
+ String[] expected = new String[]{
+ "root.ln.wf01.wt02",
+ "root.ln.wf01.wt03",
+ "root.ln.wf01.wt04"
+ };
+ List<String> expectedList = new ArrayList<>();
+ Collections.addAll(expectedList, expected);
+ ResultSet resultSet = statement.getResultSet();
+ List<String> result = new ArrayList<>();
+ while (resultSet.next()) {
+ result.add(resultSet.getString(1));
+ }
+ assertEquals(expected.length, result.size());
+ assertTrue(expectedList.containsAll(result));
+ tearDown();
+ }
+
+ /**
+ * Star is not allowed in delete storage group statement
+ *
+ * @throws SQLException
+ * @throws ClassNotFoundException
+ */
+ @Test(expected = IoTDBSQLException.class)
+ public void testDeleteStorageGroupWithStar() throws Exception {
+ try {
+ setUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ Connection connection = DriverManager.
+ getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement();
+ statement.execute("SET STORAGE GROUP TO root.ln1.wf01.wt01");
+ statement.execute("SET STORAGE GROUP TO root.ln1.wf01.wt02");
+ statement.execute("SET STORAGE GROUP TO root.ln1.wf02.wt03");
+ statement.execute("SET STORAGE GROUP TO root.ln1.wf02.wt04");
+ statement.execute("DELETE STORAGE GROUP root.ln1.wf02.*");
+ } catch (Exception e) {
+ throw e;
+ } finally {
+ tearDown();
+ }
+ }
+
+ @Test
+ public void testDeleteMultipleStorageGroupWithQuote() throws Exception {
+ setUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ Connection connection = DriverManager.
+ getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement();
+ statement.execute("SET STORAGE GROUP TO root.ln2.wf01.wt01");
+ statement.execute("SET STORAGE GROUP TO root.ln2.wf01.wt02");
+ statement.execute("SET STORAGE GROUP TO root.ln2.wf02.wt03");
+ statement.execute("SET STORAGE GROUP TO root.ln2.wf02.wt04");
+ statement.execute("DELETE STORAGE GROUP root.ln2.wf01.wt01, root.ln2.wf02.wt03");
+ boolean hasResult = statement.execute("SHOW STORAGE GROUP");
+ assertTrue(hasResult);
+ String[] expected = new String[]{
+ "root.ln2.wf01.wt02",
+ "root.ln2.wf02.wt04"
+ };
+ List<String> expectedList = new ArrayList<>();
+ Collections.addAll(expectedList, expected);
+ ResultSet resultSet = statement.getResultSet();
+ List<String> result = new ArrayList<>();
+ while (resultSet.next()) {
+ result.add(resultSet.getString(1));
+ }
+ assertEquals(expected.length, result.size());
+ assertTrue(expectedList.containsAll(result));
+ tearDown();
+ }
+
+ @Test(expected = IoTDBSQLException.class)
+ public void testCreateTimeseriesInDeletedStorageGroup() throws Exception {
+ try {
+ setUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ Connection connection = DriverManager.
+ getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement();
+ statement.execute("SET STORAGE GROUP TO root.ln3.wf01.wt01");
+ statement.execute("DELETE STORAGE GROUP root.ln3.wf01.wt01");
+ statement.execute("CREATE TIMESERIES root.ln3.wf01.wt01.status WITH DATATYPE=BOOLEAN, ENCODING=PLAIN");
+ } catch (Exception e) {
+ throw e;
+ } finally {
+ tearDown();
+ }
+
+
+ }
+
+ @Test(expected = IoTDBSQLException.class)
+ public void deleteNonExistStorageGroup() throws Exception {
+ try {
+ setUp();
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ Connection connection = DriverManager.
+ getConnection("jdbc:iotdb://127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement();
+ statement.execute("SET STORAGE GROUP TO root.ln4.wf01.wt01");
+ statement.execute("DELETE STORAGE GROUP root.ln4.wf01.wt02");
+ } catch (Exception e) {
+ throw e;
+ } finally {
+ tearDown();
+ }
+ }
+}