You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2023/01/03 07:23:42 UTC
[skywalking] branch banyandb updated: Mark series id
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch banyandb
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/banyandb by this push:
new 50a5833c8d Mark series id
50a5833c8d is described below
commit 50a5833c8d34faca4c62925629d44a8c58c00ad0
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Jan 3 15:23:15 2023 +0800
Mark series id
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../analysis/manual/endpoint/EndpointTraffic.java | 3 ++
.../analysis/manual/instance/InstanceTraffic.java | 3 ++
.../analysis/manual/process/ProcessTraffic.java | 3 ++
.../ServiceInstanceRelationClientSideMetrics.java | 2 ++
.../manual/searchtag/TagAutocompleteData.java | 4 +++
.../analysis/manual/service/ServiceTraffic.java | 3 ++
.../oap/server/core/analysis/metrics/Event.java | 2 ++
.../ebpf/storage/EBPFProfilingScheduleRecord.java | 2 ++
.../core/zipkin/ZipkinServiceRelationTraffic.java | 3 ++
.../core/zipkin/ZipkinServiceSpanTraffic.java | 3 ++
.../server/core/zipkin/ZipkinServiceTraffic.java | 2 ++
.../oap/server/core/zipkin/ZipkinSpanRecord.java | 3 +-
.../storage/plugin/banyandb/MetadataRegistry.java | 13 ++++---
.../banyandb/measure/BanyanDBMetricsDAO.java | 40 ++++++----------------
14 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpoint/EndpointTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpoint/EndpointTraffic.java
index a520cb7d14..3c764e7b9a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpoint/EndpointTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/endpoint/EndpointTraffic.java
@@ -32,6 +32,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.ElasticSearch;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
@@ -57,12 +58,14 @@ public class EndpointTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = SERVICE_ID)
+ @BanyanDB.SeriesID(index = 0)
private String serviceId;
@Setter
@Getter
@Column(columnName = NAME)
@ElasticSearch.MatchQuery
@ElasticSearch.Column(columnAlias = "endpoint_traffic_name")
+ @BanyanDB.SeriesID(index = 1)
private String name = Const.EMPTY_STRING;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
index d69af09e5e..eb3e1bc45a 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/instance/InstanceTraffic.java
@@ -32,6 +32,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProces
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.ElasticSearch;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
@@ -62,12 +63,14 @@ public class InstanceTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = SERVICE_ID)
+ @BanyanDB.SeriesID(index = 0)
private String serviceId;
@Setter
@Getter
@Column(columnName = NAME, storageOnly = true)
@ElasticSearch.Column(columnAlias = "instance_traffic_name")
+ @BanyanDB.SeriesID(index = 1)
private String name;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java
index 98e14a4336..f763fe12c7 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/process/ProcessTraffic.java
@@ -34,6 +34,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProces
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -73,6 +74,7 @@ public class ProcessTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = INSTANCE_ID, length = 600)
+ @BanyanDB.SeriesID(index = 0)
private String instanceId;
@Getter
@@ -82,6 +84,7 @@ public class ProcessTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = NAME, length = 500)
+ @BanyanDB.SeriesID(index = 1)
private String name;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java
index 17c60b848b..5304666d51 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java
@@ -29,6 +29,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -72,6 +73,7 @@ public class ServiceInstanceRelationClientSideMetrics extends Metrics {
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/TagAutocompleteData.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/TagAutocompleteData.java
index 7474fd24d8..cfc10c9647 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/TagAutocompleteData.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/searchtag/TagAutocompleteData.java
@@ -29,6 +29,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -56,15 +57,18 @@ public class TagAutocompleteData extends Metrics {
@Setter
@Getter
@Column(columnName = TAG_KEY)
+ @BanyanDB.SeriesID(index = 1)
private String tagKey;
@Setter
@Getter
@Column(columnName = TAG_VALUE, length = Tag.TAG_LENGTH)
+ @BanyanDB.SeriesID(index = 2)
private String tagValue;
@Setter
@Getter
@Column(columnName = TAG_TYPE)
+ @BanyanDB.SeriesID(index = 0)
private String tagType;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceTraffic.java
index 3aaca1e99d..c88cb0bdb5 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceTraffic.java
@@ -32,6 +32,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.ElasticSearch;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
@@ -68,6 +69,7 @@ public class ServiceTraffic extends Metrics {
@Column(columnName = NAME)
@ElasticSearch.MatchQuery
@ElasticSearch.Column(columnAlias = "service_traffic_name")
+ @BanyanDB.SeriesID(index = 0)
private String name = Const.EMPTY_STRING;
@Setter
@@ -90,6 +92,7 @@ public class ServiceTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = LAYER)
+ @BanyanDB.SeriesID(index = 1)
private Layer layer = Layer.UNDEFINED;
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Event.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Event.java
index cc14d37545..12a434812f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Event.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/metrics/Event.java
@@ -31,6 +31,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.ScopeDeclaration;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -84,6 +85,7 @@ public class Event extends Metrics {
}
@Column(columnName = UUID)
+ @BanyanDB.SeriesID(index = 0)
private String uuid;
@Column(columnName = SERVICE)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java
index 2c086d488e..6af14c30ff 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingScheduleRecord.java
@@ -28,6 +28,7 @@ import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProces
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -70,6 +71,7 @@ public class EBPFProfilingScheduleRecord extends Metrics {
@Column(columnName = END_TIME)
private long endTime;
@Column(columnName = EBPF_PROFILING_SCHEDULE_ID)
+ @BanyanDB.SeriesID(index = 0)
private String scheduleId;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceRelationTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceRelationTraffic.java
index 93f267ce04..3e7eac78e2 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceRelationTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceRelationTraffic.java
@@ -29,6 +29,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -52,10 +53,12 @@ public class ZipkinServiceRelationTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = SERVICE_NAME)
+ @BanyanDB.SeriesID(index = 0)
private String serviceName;
@Setter
@Getter
@Column(columnName = REMOTE_SERVICE_NAME)
+ @BanyanDB.SeriesID(index = 1)
private String remoteServiceName;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
index 6fd873e310..ebb1c9bf23 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
@@ -30,6 +30,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -54,10 +55,12 @@ public class ZipkinServiceSpanTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = SERVICE_NAME)
+ @BanyanDB.SeriesID(index = 0)
private String serviceName;
@Setter
@Getter
@Column(columnName = SPAN_NAME)
+ @BanyanDB.SeriesID(index = 1)
private String spanName = Const.EMPTY_STRING;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceTraffic.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceTraffic.java
index 098790919b..9d962936bf 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceTraffic.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceTraffic.java
@@ -30,6 +30,7 @@ import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.ShardingAlgorithm;
import org.apache.skywalking.oap.server.core.storage.StorageID;
+import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.SQLDatabase;
import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity;
@@ -51,6 +52,7 @@ public class ZipkinServiceTraffic extends Metrics {
@Setter
@Getter
@Column(columnName = SERVICE_NAME)
+ @BanyanDB.SeriesID(index = 0)
private String serviceName = Const.EMPTY_STRING;
@Override
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinSpanRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinSpanRecord.java
index 959476867f..0d58266a31 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinSpanRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinSpanRecord.java
@@ -83,10 +83,12 @@ public class ZipkinSpanRecord extends Record {
@Getter
@Column(columnName = TRACE_ID)
@SQLDatabase.AdditionalEntity(additionalTables = {ADDITIONAL_QUERY_TABLE}, reserveOriginalColumns = true)
+ @BanyanDB.SeriesID(index = 0)
private String traceId;
@Setter
@Getter
@Column(columnName = SPAN_ID)
+ @BanyanDB.SeriesID(index = 1)
private String spanId;
@Setter
@Getter
@@ -115,7 +117,6 @@ public class ZipkinSpanRecord extends Record {
@Setter
@Getter
@Column(columnName = LOCAL_ENDPOINT_SERVICE_NAME)
- @BanyanDB.SeriesID(index = 0)
private String localEndpointServiceName;
@Setter
@Getter
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
index c3ada1e898..b8b6b37eac 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java
@@ -64,6 +64,7 @@ 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.config.ConfigService;
import org.apache.skywalking.oap.server.core.query.enumeration.Step;
+import org.apache.skywalking.oap.server.core.storage.StorageException;
import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
import org.apache.skywalking.oap.server.core.storage.annotation.ValueColumnMetadata;
@@ -122,13 +123,16 @@ public enum MetadataRegistry {
return builder.build();
}
- public Measure registerMeasureModel(Model model, BanyanDBStorageConfig config, ConfigService configService) {
+ public Measure registerMeasureModel(Model model, BanyanDBStorageConfig config, ConfigService configService) throws StorageException {
final SchemaMetadata schemaMetadata = parseMetadata(model, config, configService);
Schema.SchemaBuilder schemaBuilder = Schema.builder().metadata(schemaMetadata);
Map<String, ModelColumn> modelColumnMap = model.getColumns().stream()
.collect(Collectors.toMap(modelColumn -> modelColumn.getColumnName().getStorageName(), Function.identity()));
// parse and set sharding keys
List<String> shardingColumns = parseEntityNames(modelColumnMap);
+ if (shardingColumns.isEmpty()) {
+ throw new StorageException("model " + model.getName() + " doesn't contain series id");
+ }
// parse tag metadata
// this can be used to build both
// 1) a list of TagFamilySpec,
@@ -148,12 +152,7 @@ public enum MetadataRegistry {
final Measure.Builder builder = Measure.create(schemaMetadata.getGroup(), schemaMetadata.name(),
downSamplingDuration(model.getDownsampling()));
- if (shardingColumns.isEmpty()) {
- // if shardingKeys is empty, for measure, we can use ID as a single sharding key.
- builder.setEntityRelativeTags(Measure.ID);
- } else {
- builder.setEntityRelativeTags(shardingColumns);
- }
+ builder.setEntityRelativeTags(shardingColumns);
builder.addTagFamilies(tagFamilySpecs);
builder.addIndexes(indexRules);
// parse and set field
diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
index e4b3ba2670..2623afae2a 100644
--- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
+++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsDAO.java
@@ -50,7 +50,6 @@ import java.util.Map;
import java.util.Optional;
import static org.apache.skywalking.oap.server.core.analysis.metrics.Metrics.ENTITY_ID;
-import static org.apache.skywalking.oap.server.core.analysis.metrics.Metrics.ID;
import static org.apache.skywalking.oap.server.core.storage.StorageData.TIME_BUCKET;
@Slf4j
@@ -84,15 +83,12 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO implements IMetricsD
});
if (seriesIDColumns.isEmpty()) {
seriesIDColumns.put(ENTITY_ID, new ArrayList<>());
- seriesIDColumns.put(ID, new ArrayList<>());
}
StringBuilder idStr = new StringBuilder();
- List<String> ids = new ArrayList<>();
for (Metrics m : metrics) {
AnalyticalResult result = analyze(m, tsCol, seriesIDColumns);
idStr.append(result.cols()).append("=").append(m.id().build()).append(",");
if (!result.success) {
- ids.add(result.id);
continue;
}
if (begin == 0 || result.begin < begin) {
@@ -110,27 +106,16 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO implements IMetricsD
}
List<Metrics> metricsInStorage = new ArrayList<>(metrics.size());
- MeasureQueryResponse resp;
- if (ids.isEmpty()) {
- resp = query(model.getName(), schema.getTags(), schema.getFields(), timestampRange, new QueryBuilder<MeasureQuery>() {
+ MeasureQueryResponse resp = query(model.getName(), schema.getTags(), schema.getFields(), timestampRange, new QueryBuilder<MeasureQuery>() {
@Override
- protected void apply(MeasureQuery query) {
- seriesIDColumns.entrySet().forEach(entry -> {
- if (!entry.getValue().isEmpty()) {
- query.or(in(entry.getKey(), entry.getValue()));
- }
- });
- }
- });
- } else {
- resp = query(model.getName(), schema.getTags(), schema.getFields(), new QueryBuilder<MeasureQuery>() {
- @Override
- protected void apply(MeasureQuery query) {
- query.or(in(ID, ids));
- }
- });
- }
-
+ protected void apply(MeasureQuery query) {
+ seriesIDColumns.entrySet().forEach(entry -> {
+ if (!entry.getValue().isEmpty()) {
+ query.or(in(entry.getKey(), entry.getValue()));
+ }
+ });
+ }
+ });
if (resp.size() == 0) {
return Collections.emptyList();
}
@@ -176,7 +161,6 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO implements IMetricsD
private static class AnalyticalResult {
private boolean success;
private List<String[]> cols = new ArrayList<>();
- private String id;
private long begin;
private long end;
@@ -214,14 +198,12 @@ public class BanyanDBMetricsDAO extends AbstractBanyanDBDAO implements IMetricsD
Preconditions.checkState(f.getType().equals(String.class));
seriesIDColumns.get(col).add((String) f.getValue());
} else {
- result.id = id.build();
- log.info("col [{}] in fragment [{}] in id [{}] is not ts or seriesID", col, f, result.id);
+ log.error("col [{}] in fragment [{}] in id [{}] is not ts or seriesID", col, f, id.build());
return result;
}
}
} else {
- result.id = id.build();
- log.info("fragment [{}] in id [{}] doesn't contains cols", f, result.id);
+ log.error("fragment [{}] in id [{}] doesn't contains cols", f, id.build());
return result;
}
}