* 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.
apache · Jan 5, 2025 · 776a757 · 776a757
1 parent fcb08ac
commit 776a757
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 16 deletions.
diff --git a/...ava/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java b/...ava/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheReadCommand.java
@@ -18,6 +18,7 @@
 
 package org.apache.skywalking.oap.server.core.analysis.manual.cache;
 
+import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
 import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
 import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
 
-import java.util.Objects;
-
 /**
  * Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
  */
 @Stream(name = TopNCacheReadCommand.INDEX_NAME, scopeId = DefaultScopeDefine.CACHE_SLOW_ACCESS, builder = TopNCacheReadCommand.Builder.class, processor = TopNStreamProcessor.class)
 @BanyanDB.TimestampColumn(TopN.TIMESTAMP)
-@BanyanDB.IndexMode
 public class TopNCacheReadCommand extends TopN {
     public static final String INDEX_NAME = "top_n_cache_read_command";
 

diff --git a/...va/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java b/...va/org/apache/skywalking/oap/server/core/analysis/manual/cache/TopNCacheWriteCommand.java
@@ -18,6 +18,7 @@
 
 package org.apache.skywalking.oap.server.core.analysis.manual.cache;
 
+import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
 import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
 import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
 
-import java.util.Objects;
-
 /**
  * Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
  */
 @Stream(name = TopNCacheWriteCommand.INDEX_NAME, scopeId = DefaultScopeDefine.CACHE_SLOW_ACCESS, builder = TopNCacheWriteCommand.Builder.class, processor = TopNStreamProcessor.class)
 @BanyanDB.TimestampColumn(TopN.TIMESTAMP)
-@BanyanDB.IndexMode
 public class TopNCacheWriteCommand extends TopN {
     public static final String INDEX_NAME = "top_n_cache_write_command";
 

diff --git a/...org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java b/...org/apache/skywalking/oap/server/core/analysis/manual/database/TopNDatabaseStatement.java
@@ -18,6 +18,7 @@
 
 package org.apache.skywalking.oap.server.core.analysis.manual.database;
 
+import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.skywalking.oap.server.core.analysis.Stream;
@@ -31,14 +32,11 @@
 import org.apache.skywalking.oap.server.core.storage.type.Convert2Storage;
 import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder;
 
-import java.util.Objects;
-
 /**
  * Database TopN statement, including Database SQL statement, mongoDB and Redis commands.
  */
 @Stream(name = TopNDatabaseStatement.INDEX_NAME, scopeId = DefaultScopeDefine.DATABASE_SLOW_STATEMENT, builder = TopNDatabaseStatement.Builder.class, processor = TopNStreamProcessor.class)
 @BanyanDB.TimestampColumn(TopN.TIMESTAMP)
-@BanyanDB.IndexMode
 public class TopNDatabaseStatement extends TopN {
     public static final String INDEX_NAME = "top_n_database_statement";
 

diff --git a/.../oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java b/.../oap/server/core/analysis/manual/relation/endpoint/EndpointRelationServerSideMetrics.java
@@ -41,7 +41,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class EndpointRelationServerSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "endpoint_relation_server_side";

diff --git a/...rver/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java b/...rver/core/analysis/manual/relation/instance/ServiceInstanceRelationClientSideMetrics.java
@@ -41,7 +41,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ServiceInstanceRelationClientSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "service_instance_relation_client_side";

diff --git a/...rver/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java b/...rver/core/analysis/manual/relation/instance/ServiceInstanceRelationServerSideMetrics.java
@@ -41,7 +41,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ServiceInstanceRelationServerSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "service_instance_relation_server_side";

diff --git a/...ng/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java b/...ng/oap/server/core/analysis/manual/relation/process/ProcessRelationClientSideMetrics.java
@@ -43,7 +43,6 @@
     "entityId",
     "component_id"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ProcessRelationClientSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "process_relation_client_side";

diff --git a/...ng/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java b/...ng/oap/server/core/analysis/manual/relation/process/ProcessRelationServerSideMetrics.java
@@ -42,7 +42,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ProcessRelationServerSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "process_relation_server_side";

diff --git a/...ng/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java b/...ng/oap/server/core/analysis/manual/relation/service/ServiceRelationClientSideMetrics.java
@@ -40,7 +40,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ServiceRelationClientSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "service_relation_client_side";

diff --git a/...ng/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java b/...ng/oap/server/core/analysis/manual/relation/service/ServiceRelationServerSideMetrics.java
@@ -42,7 +42,6 @@
 @EqualsAndHashCode(of = {
     "entityId"
 }, callSuper = true)
-@BanyanDB.IndexMode
 public class ServiceRelationServerSideMetrics extends Metrics {
 
     public static final String INDEX_NAME = "service_relation_server_side";