diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index eb89f143dc09206461c2aba67812810dbe7066ff..b635980b73f51381a23de8a25ea324967af5d988 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 2b949ee1694087b744a8d3ded7c7c672a6f2373e..9295821ee6b7790ba35f6250acb0c0a143e3793c 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 2a666b15ac5fe18b82b512132c8b658ccadcb0d1..11ca78bc6bb6a580455bd305b07aeb3d62eb8673 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 71da67e112561c68f5badcbf4d9ad7fd7c633e8d..119e3226bc056d5fcae95383a82c93894dceb273 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 231b4cb6a19711fae5b87e49ba089f81031db58c..934026b9eb8a1c0d812c0056434c3da16ab70b67 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 064f4d9e0f2421219dd81b4da9b48c37881a2e01..32dba2fb16ce6c82b48f70474c487e1b78f314bd 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 92b341b66beacfe9a6a553c72f9ccb6436a73668..d62527f59b877552960dda1b9d021976da80a08b 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 e821246bf1b4c1b7cf4ec35e0b9563203727cf7c..77b70326900a7eefb07e8bd408b511ce4e56c17d 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 650ee09b281a705e713d80a47a3ba63a59fac700..9da77919eab0c8d2e7846669f7921645406b3727 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 6ad2be0e86b5f4974b800786f0182491a1043587..650e4208564c4b4a927ab23e1287392ddd373650 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 701862168341fb92fbc52e7c519e5f1b8a4c3f0c..2ee3b0869e0f00ca4fde62dcfed83ef3a8f7a93b 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 9253ae3037b9a35a415f92d7e158c63314a848c8..4f2cf9b829c2355bfe40a5bb0c996aba1d7c95a2 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 9088bf336b0c1ac4d46130052474814725ada530..aa820197ea3020c8f7e02faad4c13617b0b873be 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 7274372a07b43e670a240332b418d77c6af4ca40..da8864bf07a6931e927abb34b000143c7bb11d9e 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 39be2b64ffb7de10837db0fd006e8e895578255a..4f6ce676fedfa0ae51d9096199cd61ce98115d0d 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 95f295b7639f7ce21a1f3a636f59a11c0b4be509..9d6351c2d851a32fcded7a83d8e9ea8e2611d436 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 @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 b924bdbfb40dd8a14f1ef785f2a4893987c9e3fe..76bcf523eeeb8a141ec0f499aa5a466d72b7ef81 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 6d56de2d27796bd4464f6260fb154b55495ca257..055a11b1d1a783fbdffaa34b7b416a3006c5c92d 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 2783fc02286a12bf2485b5243445435806fb770b..89f94d66a8b1ec39c9665b19b73ace6b489253d0 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 586f7806deb80fdb333e29907c811b3e0b4c53b2..8ebe8ed4f9663291de9079829e93a6fd3acdf3ab 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 @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 a06ce935a8e828582e76e21be6f0d251cb5af6e4..fc99621d79b8fbe137818b9909df89af46652a52 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 4774e06ce093ec60c2e9abdc06e40cf225d7d4b7..918837ed77a5602416c542070ce193bd698394da 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 d246370f9b680028b64fb0ba12814e82bf5321bc..8a806234548db349be28bc61bc3df7ce46a05fb8 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 88a070ad7c016b8893993b9f26e483277811e3f3..d1ed9936089b885c468ab4ec347dd1b84064cf4f 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 ffc73b93b39accc60fc212e18ea7bf386a70a61b..73aec272cc198872fb202d4ea15d3540b55b2f11 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 d57e17daa7751220bfc1a4a5c0cde7c697490d43..4bbe8586105b96913439d266cc6781eac9a67198 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 1be7d826ff92ee0d9abe9bfa69dd7b018077e325..1e34112d33c28827ef4b9b42e64336cf20856a9b 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 7bb872e185ea077149809b8e491ecb687fdaa4a8..8102067a7932aa9064781a69d6d5fc3b9e3c457e 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 287f37a2266d5ef1777a42c001bce1ea8050464c..729b41f538c2edbb0e220fc29eb9d86abc071853 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 454019a46dbb51bc847577eb555517f239fc4ab9..da239b72ec1bebc418fe602bd42f6ff3ea83d375 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 43f517db028dc79515d80ad9c22a752e9511d388..d3cd601081965302736673e1b37fe17840e01652 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 d1fdb008c8705a712196286ae87cabf74482195f..5c2ab25438b4d27199a375cfdb19d7a8533ababa 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 f8fc461093c2196b79012df166edbcfe3db7f1e1..a8cc41b518a63db0268eef5aa93463c4dd4c8195 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 267694203261e784956c3b79ec1fd6a0c5dfe338..875b8f21dd8b61cfe297cf19c8453ea23ba25f6a 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