You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/11/26 03:29:21 UTC
[skywalking] branch rename created (now 16caeec33a)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch rename
in repository https://gitbox.apache.org/repos/asf/skywalking.git
at 16caeec33a Rename `BanyanDB.ShardingKey` to `BanyanDB.SeriesID`
This branch includes the following new commits:
new 16caeec33a Rename `BanyanDB.ShardingKey` to `BanyanDB.SeriesID`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Rename `BanyanDB.ShardingKey` to `BanyanDB.SeriesID`
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch rename
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 16caeec33a993db8d5d538c04420ca9b3562263d
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Nov 26 11:29:13 2022 +0800
Rename `BanyanDB.ShardingKey` to `BanyanDB.SeriesID`
---
docs/en/changes/changes.md | 1 +
.../src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java | 4 ++--
.../org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java | 2 +-
.../oap/server/core/analysis/manual/log/AbstractLogRecord.java | 4 ++--
.../core/analysis/manual/networkalias/NetworkAddressAlias.java | 2 +-
.../relation/endpoint/EndpointRelationServerSideMetrics.java | 2 +-
.../instance/ServiceInstanceRelationServerSideMetrics.java | 2 +-
.../manual/relation/service/ServiceRelationServerSideMetrics.java | 2 +-
.../oap/server/core/analysis/manual/segment/SegmentRecord.java | 6 +++---
.../core/analysis/manual/spanattach/SpanAttachedEventRecord.java | 2 +-
.../server/core/analysis/manual/trace/SampledSlowTraceRecord.java | 2 +-
.../core/analysis/manual/trace/SampledStatus4xxTraceRecord.java | 2 +-
.../core/analysis/manual/trace/SampledStatus5xxTraceRecord.java | 2 +-
.../oap/server/core/analysis/meter/function/HistogramFunction.java | 2 +-
.../server/core/analysis/meter/function/PercentileFunction.java | 2 +-
.../oap/server/core/analysis/meter/function/avg/AvgFunction.java | 2 +-
.../core/analysis/meter/function/avg/AvgHistogramFunction.java | 2 +-
.../meter/function/avg/AvgHistogramPercentileFunction.java | 2 +-
.../core/analysis/meter/function/avg/AvgLabeledFunction.java | 2 +-
.../server/core/analysis/meter/function/latest/LatestFunction.java | 2 +-
.../oap/server/core/analysis/meter/function/sum/SumFunction.java | 2 +-
.../meter/function/sum/SumHistogramPercentileFunction.java | 2 +-
.../core/analysis/meter/function/sumpermin/SumPerMinFunction.java | 2 +-
.../meter/function/sumpermin/SumPerMinLabeledFunction.java | 2 +-
.../org/apache/skywalking/oap/server/core/analysis/topn/TopN.java | 2 +-
.../server/core/browser/manual/errorlog/BrowserErrorLogRecord.java | 2 +-
.../core/profiling/ebpf/storage/EBPFProfilingDataRecord.java | 2 +-
.../core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java | 2 +-
.../oap/server/core/profiling/trace/ProfileTaskLogRecord.java | 2 +-
.../oap/server/core/profiling/trace/ProfileTaskRecord.java | 2 +-
.../server/core/profiling/trace/ProfileThreadSnapshotRecord.java | 2 +-
.../skywalking/oap/server/core/storage/annotation/BanyanDB.java | 7 ++++---
.../oap/server/core/storage/model/BanyanDBExtension.java | 2 +-
.../skywalking/oap/server/core/storage/model/StorageModels.java | 6 +++---
.../apache/skywalking/oap/server/core/zipkin/ZipkinSpanRecord.java | 2 +-
35 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index eb89f143dc..b635980b73 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -134,6 +134,7 @@
* Internal API: remove undocumented ElasticSearch API usage and use documented one.
* Fix `BanyanDB.ShardingKey` annotation missed in the generated OAL metrics classes.
* Fix Elasticsearch storage: Query `sortMetrics` missing transform real index column name.
+* Rename `BanyanDB.ShardingKey` to `BanyanDB.SeriesID`.
#### UI
diff --git a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java
index 2b949ee169..9295821ee6 100644
--- a/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java
+++ b/oap-server/oal-rt/src/main/java/org/apache/skywalking/oal/rt/OALRuntime.java
@@ -270,8 +270,8 @@ public class OALRuntime implements OALEngine {
}
annotationsAttribute.addAnnotation(columnAnnotation);
if (field.isID()) {
- // Add shardingKeyIdx = 0 to column annotation.
- Annotation banyanShardingKeyAnnotation = new Annotation(BanyanDB.ShardingKey.class.getName(), constPool);
+ // Add SeriesID = 0 annotation to ID field.
+ Annotation banyanShardingKeyAnnotation = new Annotation(BanyanDB.SeriesID.class.getName(), constPool);
banyanShardingKeyAnnotation.addMemberValue("index", new IntegerMemberValue(constPool, 0));
annotationsAttribute.addAnnotation(banyanShardingKeyAnnotation);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
index 2a666b15ac..11ca78bc6b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java
@@ -68,7 +68,7 @@ public class AlarmRecord extends Record {
@Column(columnName = NAME, storageOnly = true, length = 512)
private String name;
@Column(columnName = ID0, storageOnly = true, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String id0;
@Column(columnName = ID1, storageOnly = true)
private String id1;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
index 71da67e112..119e3226bc 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/log/AbstractLogRecord.java
@@ -51,13 +51,13 @@ public abstract class AbstractLogRecord extends Record {
@Setter
@Getter
@Column(columnName = SERVICE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
@SQLDatabase.AdditionalEntity(additionalTables = {ADDITIONAL_TAG_TABLE}, reserveOriginalColumns = true)
private String serviceId;
@Setter
@Getter
@Column(columnName = SERVICE_INSTANCE_ID, length = 512)
- @BanyanDB.ShardingKey(index = 1)
+ @BanyanDB.SeriesID(index = 1)
private String serviceInstanceId;
@Setter
@Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/networkalias/NetworkAddressAlias.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/networkalias/NetworkAddressAlias.java
index 231b4cb6a1..934026b9eb 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/networkalias/NetworkAddressAlias.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/networkalias/NetworkAddressAlias.java
@@ -56,7 +56,7 @@ public class NetworkAddressAlias extends Metrics {
@Setter
@Getter
@Column(columnName = ADDRESS)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String address;
@Setter
@Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java
index 064f4d9e0f..32dba2fb16 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java
@@ -66,7 +66,7 @@ public class EndpointRelationServerSideMetrics extends Metrics {
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @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/relation/instance/ServiceInstanceRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java
index 92b341b66b..d62527f59b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java
@@ -76,7 +76,7 @@ public class ServiceInstanceRelationServerSideMetrics extends Metrics {
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @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/relation/service/ServiceRelationServerSideMetrics.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java
index e821246bf1..77b7032690 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java
@@ -66,7 +66,7 @@ public class ServiceRelationServerSideMetrics extends Metrics {
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @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/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
index 650ee09b28..9da77919ea 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
@@ -70,13 +70,13 @@ public class SegmentRecord extends Record {
@Setter
@Getter
@Column(columnName = SERVICE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
@SQLDatabase.AdditionalEntity(additionalTables = {ADDITIONAL_TAG_TABLE}, reserveOriginalColumns = true)
private String serviceId;
@Setter
@Getter
@Column(columnName = SERVICE_INSTANCE_ID, length = 512)
- @BanyanDB.ShardingKey(index = 1)
+ @BanyanDB.SeriesID(index = 1)
private String serviceInstanceId;
@Setter
@Getter
@@ -93,7 +93,7 @@ public class SegmentRecord extends Record {
@Setter
@Getter
@Column(columnName = IS_ERROR)
- @BanyanDB.ShardingKey(index = 2)
+ @BanyanDB.SeriesID(index = 2)
private int isError;
@Setter
@Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/spanattach/SpanAttachedEventRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/spanattach/SpanAttachedEventRecord.java
index 6ad2be0e86..650e420856 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/spanattach/SpanAttachedEventRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/spanattach/SpanAttachedEventRecord.java
@@ -66,7 +66,7 @@ public class SpanAttachedEventRecord extends Record {
@Column(columnName = TRACE_REF_TYPE)
private int traceRefType;
@Column(columnName = TRACE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String traceId;
@Column(columnName = TRACE_SEGMENT_ID)
private String traceSegmentId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledSlowTraceRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledSlowTraceRecord.java
index 7018621683..2ee3b0869e 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledSlowTraceRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledSlowTraceRecord.java
@@ -54,7 +54,7 @@ public class SampledSlowTraceRecord extends Record {
@Column(columnName = ENTITY_ID)
private String entityId;
@Column(columnName = TRACE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String traceId;
@Column(columnName = URI, storageOnly = true)
private String uri;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus4xxTraceRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus4xxTraceRecord.java
index 9253ae3037..4f2cf9b829 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus4xxTraceRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus4xxTraceRecord.java
@@ -55,7 +55,7 @@ public class SampledStatus4xxTraceRecord extends Record {
@Column(columnName = ENTITY_ID)
private String entityId;
@Column(columnName = TRACE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String traceId;
@Column(columnName = URI, storageOnly = true)
private String uri;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus5xxTraceRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus5xxTraceRecord.java
index 9088bf336b..aa820197ea 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus5xxTraceRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/trace/SampledStatus5xxTraceRecord.java
@@ -55,7 +55,7 @@ public class SampledStatus5xxTraceRecord extends Record {
@Column(columnName = ENTITY_ID)
private String entityId;
@Column(columnName = TRACE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String traceId;
@Column(columnName = URI, storageOnly = true)
private String uri;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunction.java
index 7274372a07..da8864bf07 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/HistogramFunction.java
@@ -50,7 +50,7 @@ public abstract class HistogramFunction extends Meter implements AcceptableValue
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunction.java
index 39be2b64ff..4f6ce676fe 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/PercentileFunction.java
@@ -58,7 +58,7 @@ public abstract class PercentileFunction extends Meter implements AcceptableValu
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
index 95f295b763..9d6351c2d8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgFunction.java
@@ -52,7 +52,7 @@ public abstract class AvgFunction extends Meter implements AcceptableValue<Long>
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunction.java
index b924bdbfb4..76bcf523ee 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramFunction.java
@@ -62,7 +62,7 @@ public abstract class AvgHistogramFunction extends Meter implements AcceptableVa
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunction.java
index 6d56de2d27..055a11b1d1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgHistogramPercentileFunction.java
@@ -77,7 +77,7 @@ public abstract class AvgHistogramPercentileFunction extends Meter implements Ac
@Setter
@Getter
@Column(columnName = ENTITY_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunction.java
index 2783fc0228..89f94d66a8 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/avg/AvgLabeledFunction.java
@@ -51,7 +51,7 @@ public abstract class AvgLabeledFunction extends Meter implements AcceptableValu
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
index 586f7806de..8ebe8ed4f9 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/latest/LatestFunction.java
@@ -49,7 +49,7 @@ public abstract class LatestFunction extends Meter implements AcceptableValue<Lo
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
index 545a21c4e7..be861d371f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumFunction.java
@@ -49,7 +49,7 @@ public abstract class SumFunction extends Meter implements AcceptableValue<Long>
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumHistogramPercentileFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumHistogramPercentileFunction.java
index a06ce935a8..fc99621d79 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumHistogramPercentileFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sum/SumHistogramPercentileFunction.java
@@ -68,7 +68,7 @@ public abstract class SumHistogramPercentileFunction extends Meter implements Ac
@Setter
@Getter
@Column(columnName = ENTITY_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
index 4774e06ce0..918837ed77 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinFunction.java
@@ -51,7 +51,7 @@ public abstract class SumPerMinFunction extends Meter implements AcceptableValue
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
index d246370f9b..8a80623454 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/meter/function/sumpermin/SumPerMinLabeledFunction.java
@@ -50,7 +50,7 @@ public abstract class SumPerMinLabeledFunction extends Meter implements Acceptab
@Setter
@Getter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
index 88a070ad7c..d1ed993608 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java
@@ -46,7 +46,7 @@ public abstract class TopN extends Record implements ComparableStorageData {
@Getter
@Setter
@Column(columnName = ENTITY_ID, length = 512)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String entityId;
@Getter
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
index ffc73b93b3..73aec272cc 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/browser/manual/errorlog/BrowserErrorLogRecord.java
@@ -62,7 +62,7 @@ public class BrowserErrorLogRecord extends Record {
@Setter
@Getter
@Column(columnName = SERVICE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String serviceId;
@Setter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
index d57e17daa7..4bbe858610 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java
@@ -50,7 +50,7 @@ public class EBPFProfilingDataRecord extends Record {
public static final String UPLOAD_TIME = "upload_time";
@Column(columnName = TASK_ID, length = 600)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String taskId;
@Column(columnName = SCHEDULE_ID, length = 600)
private String scheduleId;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
index 1be7d826ff..1e34112d33 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java
@@ -61,7 +61,7 @@ public class EBPFProfilingTaskRecord extends NoneStream {
@Column(columnName = LOGICAL_ID)
private String logicalId;
@Column(columnName = SERVICE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String serviceId;
@Column(columnName = PROCESS_LABELS_JSON, length = PROCESS_LABELS_JSON_MAX_LENGTH)
private String processLabelsJson;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskLogRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskLogRecord.java
index 7bb872e185..8102067a79 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskLogRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskLogRecord.java
@@ -53,7 +53,7 @@ public class ProfileTaskLogRecord extends Record {
@Column(columnName = TASK_ID)
private String taskId;
@Column(columnName = INSTANCE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String instanceId;
@Column(columnName = OPERATION_TYPE, storageOnly = true)
private int operationType;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
index 287f37a226..729b41f538 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java
@@ -59,7 +59,7 @@ public class ProfileTaskRecord extends NoneStream {
}
@Column(columnName = SERVICE_ID)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String serviceId;
@Column(columnName = ENDPOINT_NAME, length = 512)
private String endpointName;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileThreadSnapshotRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileThreadSnapshotRecord.java
index 454019a46d..da239b72ec 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileThreadSnapshotRecord.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/trace/ProfileThreadSnapshotRecord.java
@@ -57,7 +57,7 @@ public class ProfileThreadSnapshotRecord extends Record {
@Column(columnName = SEGMENT_ID)
@SQLDatabase.QueryUnifiedIndex(withColumns = {SEQUENCE})
@SQLDatabase.QueryUnifiedIndex(withColumns = {DUMP_TIME})
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String segmentId;
@Column(columnName = DUMP_TIME)
private long dumpTime;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java
index 43f517db02..d3cd601081 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java
@@ -46,8 +46,8 @@ public @interface BanyanDB {
}
/**
- * Sharding key is used to group time series data per metric of one entity in one place (same sharding and/or same
- * row for column-oriented database).
+ * Series key is used to group time series data per metric of one entity in one place.
+ *
* For example,
* ServiceA's traffic gauge, service call per minute, includes following timestamp values, then it should be sharded
* by service ID
@@ -66,12 +66,13 @@ public @interface BanyanDB {
* Only work with {@link Column}
*
* @return non-negative if this column be used for sharding. -1 means not as a sharding key
+ * @since 9.3.0 Rename as SeriesID.
* @since 9.1.0 created as a new annotation.
* @since 9.0.0 added in {@link Column}
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
- @interface ShardingKey {
+ @interface SeriesID {
/**
* Relative entity tag
*
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
index d1fdb008c8..5c2ab25438 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBExtension.java
@@ -31,7 +31,7 @@ import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
public class BanyanDBExtension {
/**
* Sharding key is used to group time series data per metric of one entity. See {@link
- * BanyanDB.ShardingKey#index()}.
+ * BanyanDB.SeriesID#index()}.
*
* @since 9.1.0 moved into BanyanDBExtension
* @since 9.0.0 added into {@link ModelColumn}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
index f8fc461093..a8cc41b518 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/StorageModels.java
@@ -191,8 +191,8 @@ public class StorageModels implements IModelManager, ModelCreator, ModelManipula
);
// BanyanDB extension
- final BanyanDB.ShardingKey banyanDBShardingKey = field.getAnnotation(
- BanyanDB.ShardingKey.class);
+ final BanyanDB.SeriesID banyanDBSeriesID = field.getAnnotation(
+ BanyanDB.SeriesID.class);
final BanyanDB.GlobalIndex banyanDBGlobalIndex = field.getAnnotation(
BanyanDB.GlobalIndex.class);
final BanyanDB.NoIndexing banyanDBNoIndex = field.getAnnotation(
@@ -200,7 +200,7 @@ public class StorageModels implements IModelManager, ModelCreator, ModelManipula
final BanyanDB.IndexRule banyanDBIndexRule = field.getAnnotation(
BanyanDB.IndexRule.class);
BanyanDBExtension banyanDBExtension = new BanyanDBExtension(
- banyanDBShardingKey == null ? -1 : banyanDBShardingKey.index(),
+ banyanDBSeriesID == null ? -1 : banyanDBSeriesID.index(),
banyanDBGlobalIndex != null,
banyanDBNoIndex == null && column.storageOnly(),
banyanDBIndexRule == null ? BanyanDB.IndexRule.IndexType.INVERTED : banyanDBIndexRule.indexType()
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 2676942032..875b8f21dd 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
@@ -114,7 +114,7 @@ public class ZipkinSpanRecord extends Record {
@Setter
@Getter
@Column(columnName = LOCAL_ENDPOINT_SERVICE_NAME)
- @BanyanDB.ShardingKey(index = 0)
+ @BanyanDB.SeriesID(index = 0)
private String localEndpointServiceName;
@Setter
@Getter