This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 1943ce0c25 Fix elasticsearch merge management (#11334)
1943ce0c25 is described below
commit 1943ce0c2554aeec12b563e36481bc457073af4d
Author: Wan Kai <[email protected]>
AuthorDate: Fri Sep 15 16:19:34 2023 +0800
Fix elasticsearch merge management (#11334)
---
.../skywalking/oap/server/core/management/ui/menu/UIMenu.java | 2 +-
.../oap/server/core/management/ui/template/UITemplate.java | 5 +++--
.../org/apache/skywalking/oap/server/core/storage/AbstractDAO.java | 2 +-
.../oap/server/core/management/ui/template/UITemplateTest.java | 4 +++-
.../storage/plugin/elasticsearch/base/ManagementCRUDEsDAO.java | 6 +++---
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/menu/UIMenu.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/menu/UIMenu.java
index a6bc46ef19..c93069bc04 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/menu/UIMenu.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/menu/UIMenu.java
@@ -49,7 +49,7 @@ public class UIMenu extends ManagementData {
@Column(name = CONFIGURATION, storageOnly = true, length = 1_000_000)
private String configurationJson;
@Column(name = UPDATE_TIME)
- private long updateTime;
+ private Long updateTime;
@Override
public StorageID id() {
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplate.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplate.java
index 7f6b4a360b..bcc90548ea 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplate.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplate.java
@@ -55,9 +55,9 @@ public class UITemplate extends ManagementData {
@Column(name = CONFIGURATION, storageOnly = true, length = 1_000_000)
private String configuration;
@Column(name = UPDATE_TIME)
- private long updateTime;
+ private Long updateTime;
@Column(name = DISABLED)
- private int disabled;
+ private Integer disabled;
@Override
public StorageID id() {
@@ -70,6 +70,7 @@ public class UITemplate extends ManagementData {
UITemplate uiTemplate = new UITemplate();
uiTemplate.setTemplateId((String) converter.get(TEMPLATE_ID));
uiTemplate.setConfiguration((String) converter.get(CONFIGURATION));
+ uiTemplate.setUpdateTime(((Number)
converter.get(UPDATE_TIME)).longValue());
uiTemplate.setDisabled(((Number)
converter.get(DISABLED)).intValue());
return uiTemplate;
}
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java
index 7720562cb7..922d650b15 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/AbstractDAO.java
@@ -27,7 +27,7 @@ public abstract class AbstractDAO<C extends Client>
implements DAO {
this.client = client;
}
- public final C getClient() {
+ public C getClient() {
return client;
}
}
diff --git
a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplateTest.java
b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplateTest.java
index e05200066e..334350a0a6 100644
---
a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplateTest.java
+++
b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/management/ui/template/UITemplateTest.java
@@ -19,6 +19,7 @@
package org.apache.skywalking.oap.server.core.management.ui.template;
import org.apache.skywalking.oap.server.core.storage.type.HashMapConverter;
+import org.apache.skywalking.oap.server.library.util.BooleanUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -28,7 +29,8 @@ public class UITemplateTest {
UITemplate uiTemplate = new UITemplate();
uiTemplate.setTemplateId("id");
uiTemplate.setConfiguration("configuration");
-
+ uiTemplate.setUpdateTime(1694760289493L);
+ uiTemplate.setDisabled(BooleanUtils.FALSE);
final UITemplate.Builder builder = new UITemplate.Builder();
final HashMapConverter.ToStorage toStorage = new
HashMapConverter.ToStorage();
diff --git
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementCRUDEsDAO.java
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementCRUDEsDAO.java
index 8fc22535d9..142577ed8b 100644
---
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementCRUDEsDAO.java
+++
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/ManagementCRUDEsDAO.java
@@ -52,7 +52,7 @@ public abstract class ManagementCRUDEsDAO extends EsDAO {
final ElasticSearchConverter.ToStorage toStorage = new
ElasticSearchConverter.ToStorage(modelName);
storageBuilder.entity2Storage(managementData, toStorage);
final String docId = IndexController.INSTANCE.generateDocId(modelName,
managementData.id().build());
- final boolean exist = getClient().existDoc(modelName, docId);
+ final boolean exist = getClient().existDoc(index, docId);
if (exist) {
return false;
}
@@ -100,7 +100,7 @@ public abstract class ManagementCRUDEsDAO extends EsDAO {
final ElasticSearchConverter.ToStorage toStorage = new
ElasticSearchConverter.ToStorage(modelName);
storageBuilder.entity2Storage(managementData, toStorage);
final String docId = IndexController.INSTANCE.generateDocId(modelName,
managementData.id().build());
- final boolean exist = getClient().existDoc(modelName, docId);
+ final boolean exist = getClient().existDoc(index, docId);
if (!exist) {
return false;
}
@@ -120,7 +120,7 @@ public abstract class ManagementCRUDEsDAO extends EsDAO {
final String index =
IndexController.LogicIndicesRegister.getPhysicalTableName(modelName);
final String docId = IndexController.INSTANCE.generateDocId(modelName,
id);
- final boolean exist = getClient().existDoc(modelName, docId);
+ final boolean exist = getClient().existDoc(index, docId);
if (!exist) {
return false;
}
