Skip to content

Support active schema query #12718

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

Merged
ycycse merged 13 commits into from
Jun 18, 2024
Merged

Support active schema query #12718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
137998b
done
Cpaulyz Jun 11, 2024
adfe103
done
Cpaulyz Jun 12, 2024
217bf7f
save
Cpaulyz Jun 12, 2024
843cbcc
save
Cpaulyz Jun 12, 2024
52d3b7e
save
Cpaulyz Jun 12, 2024
d77cf62
fix compile error
Cpaulyz Jun 12, 2024
54f0e07
try fix UT
Cpaulyz Jun 12, 2024
4088153
fix ci
Cpaulyz Jun 13, 2024
88223a4
add attributes interface
Cpaulyz Jun 14, 2024
e950a18
delete useless
Cpaulyz Jun 14, 2024
d9bcddc
Add IT
Cpaulyz Jun 17, 2024
c564009
resolve conflict
Cpaulyz Jun 18, 2024
ad64f69
remove
Cpaulyz Jun 18, 2024
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
12 changes: 7 additions & 5 deletions ...t/regionscan/IoTDBActiveRegionScanIT.java → ...a/regionscan/IoTDBActiveRegionScanIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@
* under the License.
*/

package org.apache.iotdb.db.it.regionscan;
package org.apache.iotdb.db.it.schema.regionscan;

import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.util.AbstractSchemaIT;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

import java.sql.Connection;
import java.sql.ResultSet;
Expand All @@ -45,9 +44,8 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBActiveRegionScanIT {
public class IoTDBActiveRegionScanIT extends AbstractSchemaIT {
// Data can be viewed in
// https://docs.google.com/spreadsheets/d/11tNRIaHmNdFWc0RC4yAloO6JJbmo9S5qxwAqWxeVY6c/edit#gid=0
public static final String[] common_insert_sqls =
Expand Down Expand Up @@ -145,6 +143,10 @@ public class IoTDBActiveRegionScanIT {
public static final String COUNT_TIMESERIES_COLUMN_NAMES = "count(timeseries)";
public static final String COUNT_DEVICES_COLUMN_NAMES = "count(devices)";

public IoTDBActiveRegionScanIT(SchemaTestMode schemaTestMode) {
super(schemaTestMode);
}

public static void insertData() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
Expand Down
9 changes: 5 additions & 4 deletions .../regionscan/IoTDBActiveRegionScanIT2.java → .../regionscan/IoTDBActiveRegionScanIT2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@
* under the License.
*/

package org.apache.iotdb.db.it.regionscan;
package org.apache.iotdb.db.it.schema.regionscan;

import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBActiveRegionScanIT2 extends IoTDBActiveRegionScanIT {
public IoTDBActiveRegionScanIT2(SchemaTestMode schemaTestMode) {
super(schemaTestMode);
}

@BeforeClass
public static void setUp() throws Exception {
EnvFactory.getEnv()
Expand Down
26 changes: 14 additions & 12 deletions ...scan/IoTDBActiveRegionScanWithModsIT.java → ...scan/IoTDBActiveRegionScanWithModsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,32 @@
* under the License.
*/

package org.apache.iotdb.db.it.regionscan;
package org.apache.iotdb.db.it.schema.regionscan;

import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.util.AbstractSchemaIT;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

import java.sql.Connection;
import java.sql.Statement;

import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.COUNT_DEVICES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.COUNT_TIMESERIES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.SHOW_DEVICES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.SHOW_TIMESERIES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.basicCountActiveDeviceTest;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.basicShowActiveDeviceTest;
import static org.apache.iotdb.db.it.regionscan.IoTDBActiveRegionScanIT.common_insert_sqls;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.COUNT_DEVICES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.COUNT_TIMESERIES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.SHOW_DEVICES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.SHOW_TIMESERIES_COLUMN_NAMES;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.basicCountActiveDeviceTest;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.basicShowActiveDeviceTest;
import static org.apache.iotdb.db.it.schema.regionscan.IoTDBActiveRegionScanIT.common_insert_sqls;
import static org.junit.Assert.fail;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBActiveRegionScanWithModsIT {
public class IoTDBActiveRegionScanWithModsIT extends AbstractSchemaIT {

private static String[] delete_sqls =
new String[] {
Expand All @@ -57,6 +55,10 @@ public class IoTDBActiveRegionScanWithModsIT {
"delete from root.sg.unaligned.d2.* where time > 40 and time <= 43"
};

public IoTDBActiveRegionScanWithModsIT(SchemaTestMode schemaTestMode) {
super(schemaTestMode);
}

public static void insertData() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
Expand Down
9 changes: 5 additions & 4 deletions ...can/IoTDBActiveRegionScanWithModsIT2.java → ...can/IoTDBActiveRegionScanWithModsIT2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@
* under the License.
*/

package org.apache.iotdb.db.it.regionscan;
package org.apache.iotdb.db.it.schema.regionscan;

import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBActiveRegionScanWithModsIT2 extends IoTDBActiveRegionScanWithModsIT {
public IoTDBActiveRegionScanWithModsIT2(SchemaTestMode schemaTestMode) {
super(schemaTestMode);
}

@BeforeClass
public static void setUp() throws Exception {
EnvFactory.getEnv()
Expand Down
Loading