This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch refactor
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/refactor by this push:
new c2fa987 Fix compiling.
c2fa987 is described below
commit c2fa987bc9cbc9da8dc3795b674c387501738f1f
Author: Wu Sheng <[email protected]>
AuthorDate: Tue Mar 15 21:01:46 2022 +0800
Fix compiling.
---
.../server/storage/plugin/iotdb/IoTDBClient.java | 34 +++++++++++++-------
.../plugin/iotdb/base/IoTDBInsertRequest.java | 8 +++--
.../plugin/iotdb/base/IoTDBManagementDAO.java | 3 +-
.../storage/plugin/iotdb/base/IoTDBMetricsDAO.java | 3 +-
.../plugin/iotdb/base/IoTDBNoneStreamDAO.java | 3 +-
.../storage/plugin/iotdb/base/IoTDBRecordDAO.java | 3 +-
.../storage/plugin/iotdb/base/IoTDBStorageDAO.java | 12 +++----
.../management/IoTDBUITemplateManagementDAO.java | 37 +++++++++++++++-------
.../iotdb/profile/IoTDBProfileTaskLogQueryDAO.java | 3 +-
.../IoTDBProfileThreadSnapshotQueryDAO.java | 5 +--
.../plugin/iotdb/query/IoTDBAlarmQueryDAO.java | 3 +-
.../iotdb/query/IoTDBBrowserLogQueryDAO.java | 3 +-
.../plugin/iotdb/query/IoTDBEventQueryDAO.java | 3 +-
.../plugin/iotdb/query/IoTDBLogQueryDAO.java | 3 +-
.../plugin/iotdb/query/IoTDBMetadataQueryDAO.java | 9 +++---
.../plugin/iotdb/query/IoTDBTraceQueryDAO.java | 3 +-
16 files changed, 85 insertions(+), 50 deletions(-)
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/IoTDBClient.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/IoTDBClient.java
index 7a89440..0d7f886 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/IoTDBClient.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/IoTDBClient.java
@@ -37,6 +37,8 @@ import
org.apache.skywalking.oap.server.core.analysis.manual.log.LogRecord;
import
org.apache.skywalking.oap.server.core.browser.manual.errorlog.BrowserErrorLogRecord;
import org.apache.skywalking.oap.server.core.management.ui.template.UITemplate;
import org.apache.skywalking.oap.server.core.storage.StorageData;
+import org.apache.skywalking.oap.server.core.storage.type.HashMapConverter;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.client.Client;
import
org.apache.skywalking.oap.server.library.client.healthcheck.DelegatedHealthChecker;
import
org.apache.skywalking.oap.server.library.client.healthcheck.HealthCheckable;
@@ -67,10 +69,11 @@ public class IoTDBClient implements Client, HealthCheckable
{
public void connect() throws IoTDBConnectionException,
StatementExecutionException {
try {
final int sessionPoolSize = config.getSessionPoolSize() == 0 ?
- Runtime.getRuntime().availableProcessors() * 2 :
config.getSessionPoolSize();
+ Runtime.getRuntime().availableProcessors() * 2 :
config.getSessionPoolSize();
log.info("SessionPool Size: {}", sessionPoolSize);
sessionPool = new SessionPool(config.getHost(),
config.getRpcPort(), config.getUsername(),
- config.getPassword(), sessionPoolSize, false, false);
+ config.getPassword(),
sessionPoolSize, false, false
+ );
sessionPool.setStorageGroup(storageGroup);
healthChecker.health();
@@ -118,10 +121,12 @@ public class IoTDBClient implements Client,
HealthCheckable {
// make an index value as a layer name of the storage path
if (!request.getIndexes().isEmpty()) {
request.getIndexValues().forEach(value ->
devicePath.append(IoTDBClient.DOT)
- .append(indexValue2LayerName(value)));
+
.append(indexValue2LayerName(value)));
}
sessionPool.insertRecord(devicePath.toString(), request.getTime(),
- request.getMeasurements(), request.getMeasurementTypes(),
request.getMeasurementValues());
+ request.getMeasurements(),
request.getMeasurementTypes(),
+ request.getMeasurementValues()
+ );
healthChecker.health();
} catch (IoTDBConnectionException | StatementExecutionException e) {
healthChecker.unHealth(e);
@@ -154,7 +159,7 @@ public class IoTDBClient implements Client, HealthCheckable
{
// make an index value as a layer name of the storage path
if (!request.getIndexes().isEmpty()) {
request.getIndexValues().forEach(value ->
devicePath.append(IoTDBClient.DOT)
- .append(indexValue2LayerName(value)));
+
.append(indexValue2LayerName(value)));
}
devicePathList.add(devicePath.toString());
timeList.add(request.getTime());
@@ -182,8 +187,8 @@ public class IoTDBClient implements Client, HealthCheckable
{
* @throws IOException IoTDBConnectionException or
StatementExecutionException
*/
public List<? super StorageData> filterQuery(String modelName, String
querySQL,
- StorageHashMapBuilder<?
extends StorageData> storageBuilder)
- throws IOException {
+ StorageBuilder<? extends
StorageData> storageBuilder)
+ throws IOException {
if (!querySQL.contains("align by device")) {
throw new IOException("querySQL must contain \"align by device\"");
}
@@ -204,8 +209,10 @@ public class IoTDBClient implements Client,
HealthCheckable {
List<Field> fields = rowRecord.getFields();
// transform timestamp to time_bucket
if (!UITemplate.INDEX_NAME.equals(modelName)) {
- map.put(IoTDBClient.TIME_BUCKET,
TimeBucket.getTimeBucket(rowRecord.getTimestamp(),
- tableMetaInfo.getModel().getDownsampling()));
+ map.put(IoTDBClient.TIME_BUCKET, TimeBucket.getTimeBucket(
+ rowRecord.getTimestamp(),
+ tableMetaInfo.getModel().getDownsampling()
+ ));
}
// field.get(0) -> Device, transform layerName to indexValue
String[] layerNames =
fields.get(0).getStringValue().split("\\" + IoTDBClient.DOT + "\"");
@@ -239,7 +246,7 @@ public class IoTDBClient implements Client, HealthCheckable
{
}
}
- storageDataList.add(storageBuilder.storage2Entity(map));
+ storageDataList.add(storageBuilder.storage2Entity(new
HashMapConverter.ToEntity(map)));
}
healthChecker.health();
} catch (IoTDBConnectionException | StatementExecutionException e) {
@@ -254,7 +261,8 @@ public class IoTDBClient implements Client, HealthCheckable
{
}
/**
- * Query with aggregation function: count, sum, avg, last_value,
first_value, min_time, max_time, min_value, max_value
+ * Query with aggregation function: count, sum, avg, last_value,
first_value, min_time, max_time, min_value,
+ * max_value
*
* @param querySQL the SQL for query which should contain aggregation
function
* @return the result of aggregation function
@@ -316,7 +324,9 @@ public class IoTDBClient implements Client, HealthCheckable
{
return layerName.substring(0, layerName.length() - 1);
}
- public StringBuilder addQueryIndexValue(String modelName, StringBuilder
query, Map<String, String> indexAndValueMap) {
+ public StringBuilder addQueryIndexValue(String modelName,
+ StringBuilder query,
+ Map<String, String>
indexAndValueMap) {
List<String> indexes = IoTDBTableMetaInfo.get(modelName).getIndexes();
indexes.forEach(index -> {
if (indexAndValueMap.containsKey(index)) {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBInsertRequest.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBInsertRequest.java
index cb61c2f..56de4f8 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBInsertRequest.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBInsertRequest.java
@@ -28,6 +28,8 @@ import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.skywalking.oap.server.core.storage.StorageData;
+import org.apache.skywalking.oap.server.core.storage.type.HashMapConverter;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import
org.apache.skywalking.oap.server.core.storage.type.StorageDataComplexObject;
import org.apache.skywalking.oap.server.library.client.request.InsertRequest;
import org.apache.skywalking.oap.server.library.client.request.UpdateRequest;
@@ -49,12 +51,14 @@ public class IoTDBInsertRequest implements InsertRequest,
UpdateRequest {
private List<Object> measurementValues;
public <T extends StorageData> IoTDBInsertRequest(String modelName, long
time, T storageData,
- StorageHashMapBuilder<T>
storageBuilder) {
+ StorageBuilder<T>
storageBuilder) {
this.modelName = modelName;
this.time = time;
indexes = IoTDBTableMetaInfo.get(modelName).getIndexes();
indexValues = new ArrayList<>(indexes.size());
- Map<String, Object> storageMap =
storageBuilder.entity2Storage(storageData);
+ final HashMapConverter.ToStorage toStorage = new
HashMapConverter.ToStorage();
+ storageBuilder.entity2Storage(storageData, toStorage);
+ Map<String, Object> storageMap = toStorage.obtain();
indexes.forEach(index -> {
if (index.equals(IoTDBIndexes.ID_IDX)) {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBManagementDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBManagementDAO.java
index 80ad4e9..52bb6ed 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBManagementDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBManagementDAO.java
@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.skywalking.oap.server.core.analysis.management.ManagementData;
import org.apache.skywalking.oap.server.core.storage.IManagementDAO;
import org.apache.skywalking.oap.server.core.storage.model.Model;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
import java.io.IOException;
@@ -31,7 +32,7 @@ import java.io.IOException;
@RequiredArgsConstructor
public class IoTDBManagementDAO implements IManagementDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<ManagementData> storageBuilder;
+ private final StorageBuilder<ManagementData> storageBuilder;
@Override
public void insert(Model model, ManagementData storageData) throws
IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBMetricsDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBMetricsDAO.java
index 0975d85..114290b 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBMetricsDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBMetricsDAO.java
@@ -28,6 +28,7 @@ import
org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
import org.apache.skywalking.oap.server.core.storage.IMetricsDAO;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.model.Model;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.client.request.InsertRequest;
import org.apache.skywalking.oap.server.library.client.request.UpdateRequest;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@@ -36,7 +37,7 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@RequiredArgsConstructor
public class IoTDBMetricsDAO implements IMetricsDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<Metrics> storageBuilder;
+ private final StorageBuilder<Metrics> storageBuilder;
@Override
public List<Metrics> multiGet(Model model, List<Metrics> metrics) throws
IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBNoneStreamDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBNoneStreamDAO.java
index 82b3055..6a8a414 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBNoneStreamDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBNoneStreamDAO.java
@@ -24,12 +24,13 @@ import
org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.analysis.config.NoneStream;
import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO;
import org.apache.skywalking.oap.server.core.storage.model.Model;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@RequiredArgsConstructor
public class IoTDBNoneStreamDAO implements INoneStreamDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<NoneStream> storageBuilder;
+ private final StorageBuilder<NoneStream> storageBuilder;
@Override
public void insert(Model model, NoneStream noneStream) throws IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBRecordDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBRecordDAO.java
index cf5b38d..ff2375f 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBRecordDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBRecordDAO.java
@@ -30,11 +30,12 @@ import
org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentReco
import org.apache.skywalking.oap.server.core.analysis.record.Record;
import org.apache.skywalking.oap.server.core.storage.IRecordDAO;
import org.apache.skywalking.oap.server.core.storage.model.Model;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.client.request.InsertRequest;
@RequiredArgsConstructor
public class IoTDBRecordDAO implements IRecordDAO {
- private final StorageHashMapBuilder<Record> storageBuilder;
+ private final StorageBuilder<Record> storageBuilder;
@Override
public InsertRequest prepareBatchInsert(Model model, Record record) {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBStorageDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBStorageDAO.java
index d6cf6ef..54c3435 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBStorageDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/base/IoTDBStorageDAO.java
@@ -19,10 +19,6 @@
package org.apache.skywalking.oap.server.storage.plugin.iotdb.base;
import lombok.RequiredArgsConstructor;
-import org.apache.skywalking.oap.server.core.analysis.config.NoneStream;
-import
org.apache.skywalking.oap.server.core.analysis.management.ManagementData;
-import org.apache.skywalking.oap.server.core.analysis.metrics.Metrics;
-import org.apache.skywalking.oap.server.core.analysis.record.Record;
import org.apache.skywalking.oap.server.core.storage.IManagementDAO;
import org.apache.skywalking.oap.server.core.storage.IMetricsDAO;
import org.apache.skywalking.oap.server.core.storage.INoneStreamDAO;
@@ -37,21 +33,21 @@ public class IoTDBStorageDAO implements StorageDAO {
@Override
public IMetricsDAO newMetricsDao(StorageBuilder storageBuilder) {
- return new IoTDBMetricsDAO(ioTDBClient,
(StorageHashMapBuilder<Metrics>) storageBuilder);
+ return new IoTDBMetricsDAO(ioTDBClient, storageBuilder);
}
@Override
public IRecordDAO newRecordDao(StorageBuilder storageBuilder) {
- return new IoTDBRecordDAO((StorageHashMapBuilder<Record>)
storageBuilder);
+ return new IoTDBRecordDAO(storageBuilder);
}
@Override
public INoneStreamDAO newNoneStreamDao(StorageBuilder storageBuilder) {
- return new IoTDBNoneStreamDAO(ioTDBClient,
(StorageHashMapBuilder<NoneStream>) storageBuilder);
+ return new IoTDBNoneStreamDAO(ioTDBClient, storageBuilder);
}
@Override
public IManagementDAO newManagementDao(StorageBuilder storageBuilder) {
- return new IoTDBManagementDAO(ioTDBClient,
(StorageHashMapBuilder<ManagementData>) storageBuilder);
+ return new IoTDBManagementDAO(ioTDBClient, storageBuilder);
}
}
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/management/IoTDBUITemplateManagementDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/management/IoTDBUITemplateManagementDAO.java
index 5d3e9d8..471feee 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/management/IoTDBUITemplateManagementDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/management/IoTDBUITemplateManagementDAO.java
@@ -31,6 +31,7 @@ import
org.apache.skywalking.oap.server.core.query.type.DashboardConfiguration;
import org.apache.skywalking.oap.server.core.query.type.TemplateChangeStatus;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import
org.apache.skywalking.oap.server.core.storage.management.UITemplateManagementDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.BooleanUtils;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@@ -41,7 +42,7 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.base.IoTDBInsertReq
@RequiredArgsConstructor
public class IoTDBUITemplateManagementDAO implements UITemplateManagementDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<UITemplate> storageBuilder = new
UITemplate.Builder();
+ private final StorageBuilder<UITemplate> storageBuilder = new
UITemplate.Builder();
private static final long UI_TEMPLATE_TIMESTAMP = 1L;
@Override
@@ -57,7 +58,8 @@ public class IoTDBUITemplateManagementDAO implements
UITemplateManagementDAO {
query = client.addQueryIndexValue(UITemplate.INDEX_NAME, query,
indexAndValueMap);
query.append(" limit 1").append(IoTDBClient.ALIGN_BY_DEVICE);
- List<? super StorageData> storageDataList =
client.filterQuery(UITemplate.INDEX_NAME, query.toString(), storageBuilder);
+ List<? super StorageData> storageDataList = client.filterQuery(
+ UITemplate.INDEX_NAME, query.toString(), storageBuilder);
if (storageDataList.size() > 0) {
return new DashboardConfiguration().fromEntity((UITemplate)
storageDataList.get(0));
}
@@ -76,10 +78,12 @@ public class IoTDBUITemplateManagementDAO implements
UITemplateManagementDAO {
query.append(IoTDBClient.ALIGN_BY_DEVICE);
List<? super StorageData> storageDataList =
client.filterQuery(UITemplate.INDEX_NAME, query.toString(),
- storageBuilder);
+
storageBuilder
+ );
List<DashboardConfiguration> dashboardConfigurationList = new
ArrayList<>(storageDataList.size());
storageDataList.forEach(storageData ->
- dashboardConfigurationList.add(new
DashboardConfiguration().fromEntity((UITemplate) storageData)));
+ dashboardConfigurationList.add(
+ new
DashboardConfiguration().fromEntity((UITemplate) storageData)));
return dashboardConfigurationList;
}
@@ -88,7 +92,8 @@ public class IoTDBUITemplateManagementDAO implements
UITemplateManagementDAO {
final UITemplate uiTemplate = setting.toEntity();
IoTDBInsertRequest request = new
IoTDBInsertRequest(UITemplate.INDEX_NAME, UI_TEMPLATE_TIMESTAMP,
- uiTemplate, storageBuilder);
+ uiTemplate,
storageBuilder
+ );
client.write(request);
return
TemplateChangeStatus.builder().status(true).id(setting.getId()).build();
}
@@ -101,13 +106,19 @@ public class IoTDBUITemplateManagementDAO implements
UITemplateManagementDAO {
query.append("select * from ");
query = client.addModelPath(query, UITemplate.INDEX_NAME);
query.append(IoTDBClient.DOT).append(client.indexValue2LayerName(uiTemplate.id()))
- .append(IoTDBClient.ALIGN_BY_DEVICE);
- List<? super StorageData> queryResult =
client.filterQuery(UITemplate.INDEX_NAME, query.toString(), storageBuilder);
+ .append(IoTDBClient.ALIGN_BY_DEVICE);
+ List<? super StorageData> queryResult = client.filterQuery(
+ UITemplate.INDEX_NAME, query.toString(), storageBuilder);
if (queryResult.size() == 0) {
- return
TemplateChangeStatus.builder().status(false).id(setting.getId()).message("Can't
find the template").build();
+ return TemplateChangeStatus.builder()
+ .status(false)
+ .id(setting.getId())
+ .message("Can't find the template")
+ .build();
} else {
IoTDBInsertRequest request = new
IoTDBInsertRequest(UITemplate.INDEX_NAME, UI_TEMPLATE_TIMESTAMP,
- uiTemplate, storageBuilder);
+ uiTemplate,
storageBuilder
+ );
client.write(request);
return
TemplateChangeStatus.builder().status(true).id(setting.getId()).build();
}
@@ -119,16 +130,18 @@ public class IoTDBUITemplateManagementDAO implements
UITemplateManagementDAO {
query.append("select * from ");
query = client.addModelPath(query, UITemplate.INDEX_NAME);
query.append(IoTDBClient.DOT).append(client.indexValue2LayerName(id))
- .append(IoTDBClient.ALIGN_BY_DEVICE);
+ .append(IoTDBClient.ALIGN_BY_DEVICE);
- List<? super StorageData> queryResult =
client.filterQuery(UITemplate.INDEX_NAME, query.toString(), storageBuilder);
+ List<? super StorageData> queryResult = client.filterQuery(
+ UITemplate.INDEX_NAME, query.toString(), storageBuilder);
if (queryResult.size() == 0) {
return
TemplateChangeStatus.builder().status(false).id(id).message("Can't find the
template").build();
} else {
final UITemplate uiTemplate = (UITemplate) queryResult.get(0);
uiTemplate.setDisabled(BooleanUtils.TRUE);
IoTDBInsertRequest request = new
IoTDBInsertRequest(UITemplate.INDEX_NAME, UI_TEMPLATE_TIMESTAMP,
- uiTemplate, storageBuilder);
+ uiTemplate,
storageBuilder
+ );
client.write(request);
return TemplateChangeStatus.builder().status(true).id(id).build();
}
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileTaskLogQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileTaskLogQueryDAO.java
index 367d651..5ece7bc 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileTaskLogQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileTaskLogQueryDAO.java
@@ -28,13 +28,14 @@ import
org.apache.skywalking.oap.server.core.query.type.ProfileTaskLog;
import
org.apache.skywalking.oap.server.core.query.type.ProfileTaskLogOperationType;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import
org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskLogQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@Slf4j
@RequiredArgsConstructor
public class IoTDBProfileTaskLogQueryDAO implements IProfileTaskLogQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<ProfileTaskLogRecord> storageBuilder =
new ProfileTaskLogRecord.Builder();
+ private final StorageBuilder<ProfileTaskLogRecord> storageBuilder = new
ProfileTaskLogRecord.Builder();
private final int fetchTaskLogMaxSize;
@Override
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileThreadSnapshotQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileThreadSnapshotQueryDAO.java
index 4906eb7..39c5864 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileThreadSnapshotQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/profile/IoTDBProfileThreadSnapshotQueryDAO.java
@@ -29,14 +29,15 @@ import
org.apache.skywalking.oap.server.core.profile.ProfileThreadSnapshotRecord
import org.apache.skywalking.oap.server.core.query.type.BasicTrace;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import
org.apache.skywalking.oap.server.core.storage.profile.IProfileThreadSnapshotQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.BooleanUtils;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@RequiredArgsConstructor
public class IoTDBProfileThreadSnapshotQueryDAO implements
IProfileThreadSnapshotQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<ProfileThreadSnapshotRecord>
profileThreadSnapshotRecordBuilder = new ProfileThreadSnapshotRecord.Builder();
- private final StorageHashMapBuilder<SegmentRecord> segmentRecordBuilder =
new SegmentRecord.Builder();
+ private final StorageBuilder<ProfileThreadSnapshotRecord>
profileThreadSnapshotRecordBuilder = new ProfileThreadSnapshotRecord.Builder();
+ private final StorageBuilder<SegmentRecord> segmentRecordBuilder = new
SegmentRecord.Builder();
@Override
public List<BasicTrace> queryProfiledSegments(String taskId) throws
IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBAlarmQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBAlarmQueryDAO.java
index d925d60..f646373 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBAlarmQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBAlarmQueryDAO.java
@@ -31,13 +31,14 @@ import
org.apache.skywalking.oap.server.core.query.type.AlarmMessage;
import org.apache.skywalking.oap.server.core.query.type.Alarms;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@RequiredArgsConstructor
public class IoTDBAlarmQueryDAO implements IAlarmQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<AlarmRecord> storageBuilder = new
AlarmRecord.Builder();
+ private final StorageBuilder<AlarmRecord> storageBuilder = new
AlarmRecord.Builder();
@Override
public Alarms getAlarm(Integer scopeId, String keyword, int limit, int
from, long startTB, long endTB, List<Tag> tags) throws IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBBrowserLogQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBBrowserLogQueryDAO.java
index b751a7a..dabbbb1 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBBrowserLogQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBBrowserLogQueryDAO.java
@@ -35,6 +35,7 @@ import
org.apache.skywalking.oap.server.core.query.type.BrowserErrorLogs;
import org.apache.skywalking.oap.server.core.query.type.ErrorCategory;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.IBrowserLogQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@@ -44,7 +45,7 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBIndexes;
@RequiredArgsConstructor
public class IoTDBBrowserLogQueryDAO implements IBrowserLogQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<BrowserErrorLogRecord> storageBuilder
= new BrowserErrorLogRecord.Builder();
+ private final StorageBuilder<BrowserErrorLogRecord> storageBuilder = new
BrowserErrorLogRecord.Builder();
@Override
public BrowserErrorLogs queryBrowserErrorLogs(String serviceId, String
serviceVersionId, String pagePathId,
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBEventQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBEventQueryDAO.java
index d7c3679..577a8f5 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBEventQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBEventQueryDAO.java
@@ -34,13 +34,14 @@ import
org.apache.skywalking.oap.server.core.query.type.event.Source;
import org.apache.skywalking.oap.server.core.source.Event;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.IEventQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@Slf4j
@RequiredArgsConstructor
public class IoTDBEventQueryDAO implements IEventQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<Event> storageBuilder = new
Event.Builder();
+ private final StorageBuilder<Event> storageBuilder = new Event.Builder();
@Override
public Events queryEvents(EventQueryCondition condition) throws Exception {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBLogQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBLogQueryDAO.java
index 46806cd..25f4f44 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBLogQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBLogQueryDAO.java
@@ -40,6 +40,7 @@ import org.apache.skywalking.oap.server.core.query.type.Log;
import org.apache.skywalking.oap.server.core.query.type.Logs;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.ILogQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
@@ -49,7 +50,7 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBIndexes;
@RequiredArgsConstructor
public class IoTDBLogQueryDAO implements ILogQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<LogRecord> storageBuilder = new
LogRecord.Builder();
+ private final StorageBuilder<LogRecord> storageBuilder = new
LogRecord.Builder();
@Override
public Logs queryLogs(String serviceId, String serviceInstanceId, String
endpointId,
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java
index 6051a99..f338c5d 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBMetadataQueryDAO.java
@@ -44,6 +44,7 @@ import
org.apache.skywalking.oap.server.core.query.type.Service;
import org.apache.skywalking.oap.server.core.query.type.ServiceInstance;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.IMetadataQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBClient;
import org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBIndexes;
@@ -52,10 +53,10 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBIndexes;
@RequiredArgsConstructor
public class IoTDBMetadataQueryDAO implements IMetadataQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<ServiceTraffic> serviceBuilder = new
ServiceTraffic.Builder();
- private final StorageHashMapBuilder<EndpointTraffic> endpointBuilder = new
EndpointTraffic.Builder();
- private final StorageHashMapBuilder<InstanceTraffic> instanceBuilder = new
InstanceTraffic.Builder();
- private final StorageHashMapBuilder<ProcessTraffic> processBuilder = new
ProcessTraffic.Builder();
+ private final StorageBuilder<ServiceTraffic> serviceBuilder = new
ServiceTraffic.Builder();
+ private final StorageBuilder<EndpointTraffic> endpointBuilder = new
EndpointTraffic.Builder();
+ private final StorageBuilder<InstanceTraffic> instanceBuilder = new
InstanceTraffic.Builder();
+ private final StorageBuilder<ProcessTraffic> processBuilder = new
ProcessTraffic.Builder();
@Override
public List<Service> listServices(final String layer, final String group)
throws IOException {
diff --git
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBTraceQueryDAO.java
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBTraceQueryDAO.java
index 0e1b0d3..229421d 100644
---
a/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBTraceQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-iotdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/iotdb/query/IoTDBTraceQueryDAO.java
@@ -37,6 +37,7 @@ import
org.apache.skywalking.oap.server.core.query.type.TraceBrief;
import org.apache.skywalking.oap.server.core.query.type.TraceState;
import org.apache.skywalking.oap.server.core.storage.StorageData;
import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO;
+import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
import org.apache.skywalking.oap.server.library.util.BooleanUtils;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.StringUtil;
@@ -46,7 +47,7 @@ import
org.apache.skywalking.oap.server.storage.plugin.iotdb.IoTDBIndexes;
@RequiredArgsConstructor
public class IoTDBTraceQueryDAO implements ITraceQueryDAO {
private final IoTDBClient client;
- private final StorageHashMapBuilder<SegmentRecord> storageBuilder = new
SegmentRecord.Builder();
+ private final StorageBuilder<SegmentRecord> storageBuilder = new
SegmentRecord.Builder();
@Override
public TraceBrief queryBasicTraces(long startSecondTB, long endSecondTB,
long minDuration, long maxDuration,
