This is an automated email from the ASF dual-hosted git repository. lujiajing pushed a commit to branch add-missing-sharding-keys in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit aed59cc09bd62d1ded0d4425c9e5eb355c3c053a Author: Megrez Lu <[email protected]> AuthorDate: Sat Apr 30 19:12:21 2022 +0800 add sharding keys to remaining stream records Signed-off-by: Megrez Lu <[email protected]> --- .../java/org/apache/skywalking/oap/server/core/alarm/AlarmRecord.java | 2 ++ .../java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java | 2 ++ .../oap/server/core/profiling/ebpf/storage/EBPFProfilingTaskRecord.java | 2 ++ .../oap/server/core/profiling/trace/ProfileTaskLogRecord.java | 2 ++ .../skywalking/oap/server/core/profiling/trace/ProfileTaskRecord.java | 2 ++ .../oap/server/core/profiling/trace/ProfileThreadSnapshotRecord.java | 2 ++ 6 files changed, 12 insertions(+) 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 b55585b7ad..8ca134d3fe 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 @@ -28,6 +28,7 @@ import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine; import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.annotation.ElasticSearchMatchQuery; import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity; @@ -64,6 +65,7 @@ public class AlarmRecord extends Record { @Column(columnName = NAME, storageOnly = true) private String name; @Column(columnName = ID0, storageOnly = true) + @BanyanDBShardingKey(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/topn/TopN.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/topn/TopN.java index 8a4d7b9c32..315f543c96 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 @@ -22,6 +22,7 @@ import lombok.Getter; import lombok.Setter; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.storage.ComparableStorageData; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; /** @@ -44,6 +45,7 @@ public abstract class TopN extends Record implements ComparableStorageData { @Getter @Setter @Column(columnName = SERVICE_ID) + @BanyanDBShardingKey(index = 0) private String serviceId; @Override 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 fc55ab850f..51e8506da5 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 @@ -25,6 +25,7 @@ import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.config.NoneStream; import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamProcessor; import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity; import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage; @@ -53,6 +54,7 @@ public class EBPFProfilingTaskRecord extends NoneStream { public static final int PROCESS_LABELS_JSON_MAX_LENGTH = 1000; @Column(columnName = SERVICE_ID) + @BanyanDBShardingKey(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 d888003521..79b2093f3a 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 @@ -25,6 +25,7 @@ import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity; import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage; @@ -50,6 +51,7 @@ public class ProfileTaskLogRecord extends Record { @Column(columnName = TASK_ID, storageOnly = true) private String taskId; @Column(columnName = INSTANCE_ID, storageOnly = true) + @BanyanDBShardingKey(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 14f11592ec..59e8d2e26b 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 @@ -25,6 +25,7 @@ import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.config.NoneStream; import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamProcessor; import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity; import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage; @@ -57,6 +58,7 @@ public class ProfileTaskRecord extends NoneStream { } @Column(columnName = SERVICE_ID) + @BanyanDBShardingKey(index = 0) private String serviceId; @Column(columnName = ENDPOINT_NAME) 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 7823187bf1..a66633a797 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 @@ -26,6 +26,7 @@ import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.record.Record; import org.apache.skywalking.oap.server.core.analysis.worker.RecordStreamProcessor; import org.apache.skywalking.oap.server.core.source.ScopeDeclaration; +import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDBShardingKey; import org.apache.skywalking.oap.server.core.storage.annotation.Column; import org.apache.skywalking.oap.server.core.storage.annotation.QueryUnifiedIndex; import org.apache.skywalking.oap.server.core.storage.type.Convert2Entity; @@ -57,6 +58,7 @@ public class ProfileThreadSnapshotRecord extends Record { @Column(columnName = SEGMENT_ID) @QueryUnifiedIndex(withColumns = {SEQUENCE}) @QueryUnifiedIndex(withColumns = {DUMP_TIME}) + @BanyanDBShardingKey(index = 0) private String segmentId; @Column(columnName = DUMP_TIME) private long dumpTime;
