Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,23 @@
package org.apache.iotdb.db.it.alignbydevice;

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.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.utils.TestUtils.resultSetEqualTest;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBAlignByDeviceWithTemplateIT {
private static final String[] sqls =
new String[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@
package org.apache.iotdb.db.it.alignbydevice;

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.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;

import java.sql.Connection;
import java.sql.Statement;
Expand All @@ -31,6 +36,8 @@
import static org.apache.iotdb.db.it.alignbydevice.IoTDBOrderByWithAlignByDeviceIT.insertData2;
import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBOrderByLimitOffsetAlignByDeviceIT {

@BeforeClass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public static PipeTransferTabletBatchReq fromTPipeTransferReq(TPipeTransferReq t
for (int i = 0; i < size; ++i) {
batchReq.insertNodeReqs.add(
PipeTransferTabletInsertNodeReq.toTPipeTransferReq(
(InsertNode) PlanFragment.deserializeHelper(transferReq.body)));
(InsertNode) PlanFragment.deserializeHelper(transferReq.body, null)));
}

size = ReadWriteIOUtils.readInt(transferReq.body);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,12 @@ public Analysis visitQuery(QueryStatement queryStatement, MPPQueryContext contex
Analysis analysis = new Analysis();
analysis.setLastLevelUseWildcard(queryStatement.isLastLevelUseWildcard());

long startTime = System.currentTimeMillis();
try {
// check for semantic errors
queryStatement.semanticCheck();

ISchemaTree schemaTree = analyzeSchema(queryStatement, analysis, context);

logger.warn("--- [analyzeSchema] : {}ms", System.currentTimeMillis() - startTime);

// If there is no leaf node in the schema tree, the query should be completed immediately
if (schemaTree.isEmpty()) {
return finishQuery(queryStatement, analysis);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,307 @@
/*
* 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.queryengine.plan.analyze;

import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import org.apache.iotdb.tsfile.read.filter.factory.FilterFactory;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;

import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/**
* If in align by device query ,all queried devices are set in one template, we can store the common
* variables in TemplatedInfo to avoid repeated creation.
*/
public class TemplatedInfo {
private List<String> measurementList;
private List<IMeasurementSchema> schemaList;
private List<TSDataType> dataTypes;
private Set<String> allSensors;
private Filter timeFilter;
private Ordering scanOrder;
private boolean queryAllSensors;
private List<String> selectMeasurements;
private List<Integer> deviceToMeasurementIndexes;
private long offsetValue;
private long limitValue;

public TemplatedInfo(
List<String> measurementList,
List<IMeasurementSchema> schemaList,
List<TSDataType> dataTypes,
Set<String> allSensors,
Filter timeFilter,
Ordering scanOrder,
boolean queryAllSensors,
List<String> selectMeasurements,
List<Integer> deviceToMeasurementIndexes,
long offsetValue,
long limitValue) {
this.measurementList = measurementList;
this.schemaList = schemaList;
this.dataTypes = dataTypes;
this.allSensors = allSensors;
this.timeFilter = timeFilter;
this.scanOrder = scanOrder;
this.queryAllSensors = queryAllSensors;
this.selectMeasurements = selectMeasurements;
this.deviceToMeasurementIndexes = deviceToMeasurementIndexes;
this.offsetValue = offsetValue;
this.limitValue = limitValue;
}

public void setMeasurementList(List<String> measurementList) {
this.measurementList = measurementList;
}

public List<String> getMeasurementList() {
return this.measurementList;
}

public void setSchemaList(List<IMeasurementSchema> schemaList) {
this.schemaList = schemaList;
}

public List<IMeasurementSchema> getSchemaList() {
return this.schemaList;
}

public void setDataTypes(List<TSDataType> dataTypes) {
this.dataTypes = dataTypes;
}

public List<TSDataType> getDataTypes() {
return this.dataTypes;
}

public void setAllSensors(Set<String> allSensors) {
this.allSensors = allSensors;
}

public Set<String> getAllSensors() {
return this.allSensors;
}

public void setTimeFilter(Filter timeFilter) {
this.timeFilter = timeFilter;
}

public Filter getTimeFilter() {
return this.timeFilter;
}

public void setScanOrder(Ordering scanOrder) {
this.scanOrder = scanOrder;
}

public Ordering getScanOrder() {
return this.scanOrder;
}

public void setQueryAllSensors(boolean queryAllSensors) {
this.queryAllSensors = queryAllSensors;
}

public boolean isQueryAllSensors() {
return this.queryAllSensors;
}

public void setSelectMeasurements(List<String> selectMeasurements) {
this.selectMeasurements = selectMeasurements;
}

public List<String> getSelectMeasurements() {
return this.selectMeasurements;
}

public void setDeviceToMeasurementIndexes(List<Integer> deviceToMeasurementIndexes) {
this.deviceToMeasurementIndexes = deviceToMeasurementIndexes;
}

public long getOffsetValue() {
return this.offsetValue;
}

public void setLimitValue(long limitValue) {
this.limitValue = limitValue;
}

public long getLimitValue() {
return this.limitValue;
}

public List<Integer> getDeviceToMeasurementIndexes() {
return this.deviceToMeasurementIndexes;
}

public void serialize(ByteBuffer byteBuffer) {
ReadWriteIOUtils.write(measurementList.size(), byteBuffer);
for (String measurement : measurementList) {
ReadWriteIOUtils.write(measurement, byteBuffer);
}
for (IMeasurementSchema schema : schemaList) {
schema.serializeTo(byteBuffer);
}
for (TSDataType dataType : dataTypes) {
ReadWriteIOUtils.write(dataType, byteBuffer);
}
ReadWriteIOUtils.write(allSensors.size(), byteBuffer);
for (String dataType : allSensors) {
ReadWriteIOUtils.write(dataType, byteBuffer);
}
if (timeFilter == null) {
ReadWriteIOUtils.write((byte) 0, byteBuffer);
} else {
ReadWriteIOUtils.write((byte) 1, byteBuffer);
timeFilter.serialize(byteBuffer);
}
ReadWriteIOUtils.write(scanOrder.ordinal(), byteBuffer);
ReadWriteIOUtils.write(queryAllSensors, byteBuffer);

ReadWriteIOUtils.write(selectMeasurements.size(), byteBuffer);
for (String selectMeasurement : selectMeasurements) {
ReadWriteIOUtils.write(selectMeasurement, byteBuffer);
}

ReadWriteIOUtils.write(deviceToMeasurementIndexes.size(), byteBuffer);
for (int index : deviceToMeasurementIndexes) {
ReadWriteIOUtils.write(index, byteBuffer);
}

ReadWriteIOUtils.write(offsetValue, byteBuffer);
ReadWriteIOUtils.write(limitValue, byteBuffer);
}

public void serialize(DataOutputStream stream) throws IOException {
ReadWriteIOUtils.write(measurementList.size(), stream);
for (String measurement : measurementList) {
ReadWriteIOUtils.write(measurement, stream);
}
for (IMeasurementSchema schema : schemaList) {
schema.serializeTo(stream);
}
for (TSDataType dataType : dataTypes) {
ReadWriteIOUtils.write(dataType, stream);
}
ReadWriteIOUtils.write(allSensors.size(), stream);
for (String dataType : allSensors) {
ReadWriteIOUtils.write(dataType, stream);
}
if (timeFilter == null) {
ReadWriteIOUtils.write((byte) 0, stream);
} else {
ReadWriteIOUtils.write((byte) 1, stream);
timeFilter.serialize(stream);
}
ReadWriteIOUtils.write(scanOrder.ordinal(), stream);
ReadWriteIOUtils.write(queryAllSensors, stream);

ReadWriteIOUtils.write(selectMeasurements.size(), stream);
for (String selectMeasurement : selectMeasurements) {
ReadWriteIOUtils.write(selectMeasurement, stream);
}

ReadWriteIOUtils.write(deviceToMeasurementIndexes.size(), stream);
for (int index : deviceToMeasurementIndexes) {
ReadWriteIOUtils.write(index, stream);
}

ReadWriteIOUtils.write(offsetValue, stream);
ReadWriteIOUtils.write(limitValue, stream);
}

public static TemplatedInfo deserialize(ByteBuffer byteBuffer) {

int measurementSize = ReadWriteIOUtils.readInt(byteBuffer);
List<String> measurementList = new ArrayList<>();
int cnt = measurementSize;
while (cnt-- > 0) {
measurementList.add(ReadWriteIOUtils.readString(byteBuffer));
}

cnt = measurementSize;
List<IMeasurementSchema> measurementSchemaList = new ArrayList<>();
while (cnt-- > 0) {
// MeasurementSchema is ok?
measurementSchemaList.add(MeasurementSchema.deserializeFrom(byteBuffer));
}

cnt = measurementSize;
List<TSDataType> dataTypeList = new ArrayList<>();
while (cnt-- > 0) {
dataTypeList.add(ReadWriteIOUtils.readDataType(byteBuffer));
}

int allSensorSize = ReadWriteIOUtils.readInt(byteBuffer);
Set<String> allSensorSet = new HashSet<>();
while (allSensorSize-- > 0) {
allSensorSet.add(ReadWriteIOUtils.readString(byteBuffer));
}

byte isNull = ReadWriteIOUtils.readByte(byteBuffer);
Filter timeFilter = null;
if (isNull == 1) {
timeFilter = FilterFactory.deserialize(byteBuffer);
}

Ordering scanOrder = Ordering.values()[ReadWriteIOUtils.readInt(byteBuffer)];

boolean queryAllSensors = ReadWriteIOUtils.readBool(byteBuffer);

int listSize = ReadWriteIOUtils.readInt(byteBuffer);
List<String> selectMeasurements = new ArrayList<>(listSize);
while (listSize-- > 0) {
selectMeasurements.add(ReadWriteIOUtils.readString(byteBuffer));
}

listSize = ReadWriteIOUtils.readInt(byteBuffer);
List<Integer> deviceToMeasurementIndexes = new ArrayList<>(listSize);
while (listSize-- > 0) {
deviceToMeasurementIndexes.add(ReadWriteIOUtils.readInt(byteBuffer));
}

long offsetValue = ReadWriteIOUtils.readLong(byteBuffer);

long limitValue = ReadWriteIOUtils.readLong(byteBuffer);

return new TemplatedInfo(
measurementList,
measurementSchemaList,
dataTypeList,
allSensorSet,
timeFilter,
scanOrder,
queryAllSensors,
selectMeasurements,
deviceToMeasurementIndexes,
offsetValue,
limitValue);
}
}
Loading