Skip to content

Commit 776a757

Browse files
authored
* Fix wrong index mode declarations
* Remove `@BanyanDB.IndexMode` from TopN implementation, as it's not necessary. Those are records, not metrics. * Fix, move `Service`, `Instance`, `Endpoint` and `Process` relations out of `index-mode`, as they are time series.
1 parent fcb08ac commit 776a757

File tree

10 files changed

+3
-16
lines changed

10 files changed

+3
-16
lines changed

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.skywalking.oap.server.core.analysis.manual.cache;
2020

21+
import java.util.Objects;
2122
import lombok.Getter;
2223
import lombok.Setter;
2324
import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
3132
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
3233
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
3334

34-
import java.util.Objects;
35-
3635
/**
3736
* Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
3837
*/
3938
@Stream(name = TopNCacheReadCommand.INDEX_NAME, scopeId = DefaultScopeDefine.CACHE_SLOW_ACCESS, builder = TopNCacheReadCommand.Builder.class, processor = TopNStreamProcessor.class)
4039
@BanyanDB.TimestampColumn(TopN.TIMESTAMP)
41-
@BanyanDB.IndexMode
4240
public class TopNCacheReadCommand extends TopN {
4341
public static final String INDEX_NAME = "top_n_cache_read_command";
4442

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.skywalking.oap.server.core.analysis.manual.cache;
2020

21+
import java.util.Objects;
2122
import lombok.Getter;
2223
import lombok.Setter;
2324
import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
3132
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
3233
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
3334

34-
import java.util.Objects;
35-
3635
/**
3736
* Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
3837
*/
3938
@Stream(name = TopNCacheWriteCommand.INDEX_NAME, scopeId = DefaultScopeDefine.CACHE_SLOW_ACCESS, builder = TopNCacheWriteCommand.Builder.class, processor = TopNStreamProcessor.class)
4039
@BanyanDB.TimestampColumn(TopN.TIMESTAMP)
41-
@BanyanDB.IndexMode
4240
public class TopNCacheWriteCommand extends TopN {
4341
public static final String INDEX_NAME = "top_n_cache_write_command";
4442

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.skywalking.oap.server.core.analysis.manual.database;
2020

21+
import java.util.Objects;
2122
import lombok.Getter;
2223
import lombok.Setter;
2324
import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
3132
import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
3233
import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
3334

34-
import java.util.Objects;
35-
3635
/**
3736
* Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
3837
*/
3938
@Stream(name = TopNDatabaseStatement.INDEX_NAME, scopeId = DefaultScopeDefine.DATABASE_SLOW_STATEMENT, builder = TopNDatabaseStatement.Builder.class, processor = TopNStreamProcessor.class)
4039
@BanyanDB.TimestampColumn(TopN.TIMESTAMP)
41-
@BanyanDB.IndexMode
4240
public class TopNDatabaseStatement extends TopN {
4341
public static final String INDEX_NAME = "top_n_database_statement";
4442

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
@EqualsAndHashCode(of = {
4242
"entityId"
4343
}, callSuper = true)
44-
@BanyanDB.IndexMode
4544
public class EndpointRelationServerSideMetrics extends Metrics {
4645

4746
public static final String INDEX_NAME = "endpoint_relation_server_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
@EqualsAndHashCode(of = {
4242
"entityId"
4343
}, callSuper = true)
44-
@BanyanDB.IndexMode
4544
public class ServiceInstanceRelationClientSideMetrics extends Metrics {
4645

4746
public static final String INDEX_NAME = "service_instance_relation_client_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
@EqualsAndHashCode(of = {
4242
"entityId"
4343
}, callSuper = true)
44-
@BanyanDB.IndexMode
4544
public class ServiceInstanceRelationServerSideMetrics extends Metrics {
4645

4746
public static final String INDEX_NAME = "service_instance_relation_server_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"entityId",
4444
"component_id"
4545
}, callSuper = true)
46-
@BanyanDB.IndexMode
4746
public class ProcessRelationClientSideMetrics extends Metrics {
4847

4948
public static final String INDEX_NAME = "process_relation_client_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
@EqualsAndHashCode(of = {
4343
"entityId"
4444
}, callSuper = true)
45-
@BanyanDB.IndexMode
4645
public class ProcessRelationServerSideMetrics extends Metrics {
4746

4847
public static final String INDEX_NAME = "process_relation_server_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
@EqualsAndHashCode(of = {
4141
"entityId"
4242
}, callSuper = true)
43-
@BanyanDB.IndexMode
4443
public class ServiceRelationClientSideMetrics extends Metrics {
4544

4645
public static final String INDEX_NAME = "service_relation_client_side";

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
@EqualsAndHashCode(of = {
4343
"entityId"
4444
}, callSuper = true)
45-
@BanyanDB.IndexMode
4645
public class ServiceRelationServerSideMetrics extends Metrics {
4746

4847
public static final String INDEX_NAME = "service_relation_server_side";

0 commit comments

Comments
 (0)