You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/09/14 12:09:59 UTC
[iotdb] branch master updated: [ISSUE-3945] Fuzzy query support
multiDevices and alignByDevice Dataset (#3958)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 184fd6f [ISSUE-3945] Fuzzy query support multiDevices and alignByDevice Dataset (#3958)
184fd6f is described below
commit 184fd6fc4176987bb8bdb1426644f00d126f0ed6
Author: Hang Ji <55...@users.noreply.github.com>
AuthorDate: Tue Sep 14 20:09:17 2021 +0800
[ISSUE-3945] Fuzzy query support multiDevices and alignByDevice Dataset (#3958)
---
.../iotdb/db/qp/logical/crud/LikeOperator.java | 4 +
.../iotdb/db/qp/logical/crud/QueryOperator.java | 4 +
.../iotdb/db/qp/logical/crud/RegexpOperator.java | 4 +
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 14 +++
.../{IoTDBLikeIT.java => IoTDBFuzzyQueryIT.java} | 125 ++++++++++++++++++++-
5 files changed, 150 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
index d552b9c..38a76f7 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/LikeOperator.java
@@ -122,4 +122,8 @@ public class LikeOperator extends FunctionOperator {
public String toString() {
return "[" + singlePath.getFullPath() + getFilterSymbol() + value + "]";
}
+
+ public String getValue() {
+ return value;
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
index 842850a..352f5ab 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
@@ -453,6 +453,10 @@ public class QueryOperator extends Operator {
FunctionOperator basicOperator;
if (operator instanceof InOperator) {
basicOperator = (InOperator) operator;
+ } else if (operator instanceof LikeOperator) {
+ basicOperator = (LikeOperator) operator;
+ } else if (operator instanceof RegexpOperator) {
+ basicOperator = (RegexpOperator) operator;
} else {
basicOperator = (BasicFunctionOperator) operator;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
index 5988d63..9134cbd 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/RegexpOperator.java
@@ -121,4 +121,8 @@ public class RegexpOperator extends FunctionOperator {
public String toString() {
return "[" + singlePath.getFullPath() + value + "]";
}
+
+ public String getValue() {
+ return value;
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
index 3025014..09fe651 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java
@@ -31,7 +31,9 @@ import org.apache.iotdb.db.qp.logical.crud.FilterOperator;
import org.apache.iotdb.db.qp.logical.crud.FromComponent;
import org.apache.iotdb.db.qp.logical.crud.FunctionOperator;
import org.apache.iotdb.db.qp.logical.crud.InOperator;
+import org.apache.iotdb.db.qp.logical.crud.LikeOperator;
import org.apache.iotdb.db.qp.logical.crud.QueryOperator;
+import org.apache.iotdb.db.qp.logical.crud.RegexpOperator;
import org.apache.iotdb.db.qp.logical.crud.SelectComponent;
import org.apache.iotdb.db.qp.logical.crud.WhereComponent;
import org.apache.iotdb.db.qp.utils.WildcardsRemover;
@@ -188,6 +190,18 @@ public class ConcatPathOptimizer implements ILogicalOptimizer {
noStarPaths.get(i),
((InOperator) operator).getNot(),
((InOperator) operator).getValues()));
+ } else if (operator instanceof LikeOperator) {
+ currentNode.addChildOperator(
+ new LikeOperator(
+ operator.getFilterType(),
+ noStarPaths.get(i),
+ ((LikeOperator) operator).getValue()));
+ } else if (operator instanceof RegexpOperator) {
+ currentNode.addChildOperator(
+ new RegexpOperator(
+ operator.getFilterType(),
+ noStarPaths.get(i),
+ ((RegexpOperator) operator).getValue()));
} else {
currentNode.addChildOperator(
new BasicFunctionOperator(
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLikeIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFuzzyQueryIT.java
similarity index 57%
rename from server/src/test/java/org/apache/iotdb/db/integration/IoTDBLikeIT.java
rename to server/src/test/java/org/apache/iotdb/db/integration/IoTDBFuzzyQueryIT.java
index 030397e..d7d33d2 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLikeIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFuzzyQueryIT.java
@@ -30,13 +30,19 @@ import org.junit.Test;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
+import java.sql.Types;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
-public class IoTDBLikeIT {
+import static org.junit.Assert.fail;
+
+public class IoTDBFuzzyQueryIT {
private static List<String> sqls = new ArrayList<>();
private static Connection connection;
@@ -68,6 +74,8 @@ public class IoTDBLikeIT {
sqls.add("SET STORAGE GROUP TO root.t1");
sqls.add("CREATE TIMESERIES root.t1.wf01.wt01.status WITH DATATYPE=TEXT, ENCODING=PLAIN");
sqls.add("CREATE TIMESERIES root.t1.wf01.wt01.temperature WITH DATATYPE=FLOAT, ENCODING=RLE");
+ sqls.add("CREATE TIMESERIES root.t1.wf01.wt02.status WITH DATATYPE=TEXT, ENCODING=PLAIN");
+
sqls.add(
"insert into root.t1.wf01.wt01 (time,status,temperature) values (1509465600000,'1',12.1)");
sqls.add(
@@ -88,6 +96,7 @@ public class IoTDBLikeIT {
"insert into root.t1.wf01.wt01 (time,status,temperature) values (1509466080000,'123%',18.3)");
sqls.add(
"insert into root.t1.wf01.wt01 (time,status,temperature) values (1509466090000,'\\',10.3)");
+ sqls.add("insert into root.t1.wf01.wt02 (time,status) values (1509465600000,'14')");
}
private static void insertData() throws ClassNotFoundException, SQLException {
@@ -166,4 +175,118 @@ public class IoTDBLikeIT {
String result = resultBuilder.toString();
return result.substring(0, result.length() - 1);
}
+
+ private List<Integer> checkHeader(
+ ResultSetMetaData resultSetMetaData, String expectedHeaderStrings, int[] expectedTypes)
+ throws SQLException {
+ String[] expectedHeaders = expectedHeaderStrings.split(",");
+ Map<String, Integer> expectedHeaderToTypeIndexMap = new HashMap<>();
+ for (int i = 0; i < expectedHeaders.length; ++i) {
+ expectedHeaderToTypeIndexMap.put(expectedHeaders[i], i);
+ }
+
+ List<Integer> actualIndexToExpectedIndexList = new ArrayList<>();
+ for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ Integer typeIndex = expectedHeaderToTypeIndexMap.get(resultSetMetaData.getColumnName(i));
+ Assert.assertNotNull(typeIndex);
+ Assert.assertEquals(expectedTypes[typeIndex], resultSetMetaData.getColumnType(i));
+ actualIndexToExpectedIndexList.add(typeIndex);
+ }
+ return actualIndexToExpectedIndexList;
+ }
+
+ @Test
+ public void selectLikeAlignByDevice() throws ClassNotFoundException {
+ String[] retArray =
+ new String[] {"1509465660000,root.t1.wf01.wt01,14,", "1509465600000,root.t1.wf01.wt02,14"};
+
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection =
+ DriverManager.getConnection(
+ Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement()) {
+ boolean hasResultSet =
+ statement.execute(
+ "select status from root.t1.wf01.wt0* where status like '14%' align by device");
+ Assert.assertTrue(hasResultSet);
+
+ try (ResultSet resultSet = statement.getResultSet()) {
+ ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ List<Integer> actualIndexToExpectedIndexList =
+ checkHeader(
+ resultSetMetaData,
+ "Time,Device,status,",
+ new int[] {Types.TIMESTAMP, Types.VARCHAR, Types.VARCHAR});
+
+ int cnt = 0;
+ while (resultSet.next()) {
+ String[] expectedStrings = retArray[cnt].split(",");
+ StringBuilder expectedBuilder = new StringBuilder();
+ StringBuilder actualBuilder = new StringBuilder();
+ for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ actualBuilder.append(resultSet.getString(i)).append(",");
+ expectedBuilder
+ .append(expectedStrings[actualIndexToExpectedIndexList.get(i - 1)])
+ .append(",");
+ }
+ Assert.assertEquals(expectedBuilder.toString(), actualBuilder.toString());
+ cnt++;
+ }
+ Assert.assertEquals(2, cnt);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void selectRegexpAlignByDevice() throws ClassNotFoundException {
+ String[] retArray =
+ new String[] {
+ "1509465600000,root.t1.wf01.wt01,1,",
+ "1509465660000,root.t1.wf01.wt01,14,",
+ "1509466080000,root.t1.wf01.wt01,123%,",
+ "1509465600000,root.t1.wf01.wt02,14,"
+ };
+
+ Class.forName(Config.JDBC_DRIVER_NAME);
+ try (Connection connection =
+ DriverManager.getConnection(
+ Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
+ Statement statement = connection.createStatement()) {
+ boolean hasResultSet =
+ statement.execute(
+ "select status from root.t1.wf01.wt0* where status regexp '^1.*' align by device");
+ Assert.assertTrue(hasResultSet);
+
+ try (ResultSet resultSet = statement.getResultSet()) {
+ ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
+ List<Integer> actualIndexToExpectedIndexList =
+ checkHeader(
+ resultSetMetaData,
+ "Time,Device,status,",
+ new int[] {Types.TIMESTAMP, Types.VARCHAR, Types.VARCHAR});
+
+ int cnt = 0;
+ while (resultSet.next()) {
+ String[] expectedStrings = retArray[cnt].split(",");
+ StringBuilder expectedBuilder = new StringBuilder();
+ StringBuilder actualBuilder = new StringBuilder();
+ for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {
+ actualBuilder.append(resultSet.getString(i)).append(",");
+ expectedBuilder
+ .append(expectedStrings[actualIndexToExpectedIndexList.get(i - 1)])
+ .append(",");
+ }
+ Assert.assertEquals(expectedBuilder.toString(), actualBuilder.toString());
+ cnt++;
+ }
+ Assert.assertEquals(4, cnt);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
}