Skip to content

Commit 485b7ff

Browse files
wankai123wankai123
authored
Chore: rename Banyandb Group setting env. (#13289)
1 parent df845c2 commit 485b7ff

File tree

14 files changed

+398
-399
lines changed

14 files changed

+398
-399
lines changed

‎docs/en/setup/backend/configuration-vocabulary.md‎

Lines changed: 136 additions & 136 deletions
Large diffs are not rendered by default.

‎docs/en/setup/backend/storages/banyandb.md‎

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

‎oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,13 @@ enum AnalyzerType {
288288
@Retention(RetentionPolicy.RUNTIME)
289289
@interface Group {
290290
/**
291-
* Specify the group name for the Stream (Record). The default value is "recordsNormal".
291+
* Specify the group name for the Stream (Record). The default value is "records".
292292
*/
293-
StreamGroup streamGroup() default StreamGroup.RECORDS_NORMAL;
293+
StreamGroup streamGroup() default StreamGroup.RECORDS;
294294
}
295295

296296
enum StreamGroup {
297-
RECORDS_NORMAL("recordsNormal"),
297+
RECORDS("records"),
298298
RECORDS_TRACE("recordsTrace"),
299299
RECORDS_ZIPKIN_TRACE("recordsZipkinTrace"),
300300
RECORDS_LOG("recordsLog"),
@@ -309,7 +309,7 @@ enum StreamGroup {
309309
}
310310

311311
enum MeasureGroup {
312-
METRICS_MIN("metricsMin"),
312+
METRICS_MINUTE("metricsMinute"),
313313
METRICS_HOUR("metricsHour"),
314314
METRICS_DAY("metricsDay"),
315315
METADATA("metadata");

‎oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/model/BanyanDBModelExtension.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ public static class TopN {
9191

9292
@Setter
9393
@Getter
94-
private BanyanDB.StreamGroup streamGroup = BanyanDB.StreamGroup.RECORDS_NORMAL;
94+
private BanyanDB.StreamGroup streamGroup = BanyanDB.StreamGroup.RECORDS;
9595
}

‎oap-server/server-starter/src/main/resources/bydb.yml‎

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

‎oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBConfigLoader.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public BanyanDBStorageConfig loadConfig() throws ModuleStartException {
7070
moduleProvider.name()
7171
);
7272
Properties groups = configProperties.get("groups");
73-
Properties recordsNormal = (Properties) groups.get("recordsNormal");
73+
Properties recordsNormal = (Properties) groups.get(BanyanDB.StreamGroup.RECORDS.getName());
7474
copyProperties(
7575
config.getRecordsNormal(), recordsNormal,
7676
moduleProvider.getModule().name(), moduleProvider.name()
@@ -105,7 +105,7 @@ public BanyanDBStorageConfig loadConfig() throws ModuleStartException {
105105
);
106106
copyStages(browserErrorLog, config.getRecordsBrowserErrorLog());
107107

108-
Properties metricsMin = (Properties) groups.get(BanyanDB.MeasureGroup.METRICS_MIN.getName());
108+
Properties metricsMin = (Properties) groups.get(BanyanDB.MeasureGroup.METRICS_MINUTE.getName());
109109
copyProperties(
110110
config.getMetricsMin(), metricsMin,
111111
moduleProvider.getModule().name(), moduleProvider.name()

‎oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageConfig.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
@Getter
3030
@Setter
3131
public class BanyanDBStorageConfig extends ModuleConfig {
32-
33-
public static final String PROPERTY_GROUP_NAME = "property";
34-
3532
private Global global = new Global();
3633
private RecordsNormal recordsNormal = new RecordsNormal();
3734
private RecordsTrace recordsTrace = new RecordsTrace();

‎oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUIMenuManagementDAO.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.skywalking.banyandb.v1.client.TagAndValue;
2525
import org.apache.skywalking.banyandb.property.v1.BanyandbProperty.Property;
2626
import org.apache.skywalking.oap.server.core.management.ui.menu.UIMenu;
27+
import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
2728
import org.apache.skywalking.oap.server.core.storage.management.UIMenuManagementDAO;
2829
import org.apache.skywalking.oap.server.storage.plugin.banyandb.stream.AbstractBanyanDBDAO;
2930

@@ -38,7 +39,7 @@ public BanyanDBUIMenuManagementDAO(BanyanDBStorageClient client) {
3839

3940
@Override
4041
public UIMenu getMenu(String id) throws IOException {
41-
Property p = getClient().queryProperty(BanyanDBStorageConfig.PROPERTY_GROUP_NAME, UIMenu.INDEX_NAME, id);
42+
Property p = getClient().queryProperty(BanyanDB.PropertyGroup.PROPERTY.getName(), UIMenu.INDEX_NAME, id);
4243
if (p == null) {
4344
return null;
4445
}
@@ -49,7 +50,7 @@ public UIMenu getMenu(String id) throws IOException {
4950
public void saveMenu(UIMenu menu) throws IOException {
5051
Property property = Property.newBuilder()
5152
.setMetadata(
52-
BanyandbCommon.Metadata.newBuilder().setGroup(BanyanDBStorageConfig.PROPERTY_GROUP_NAME).setName(UIMenu.INDEX_NAME))
53+
BanyandbCommon.Metadata.newBuilder().setGroup(BanyanDB.PropertyGroup.PROPERTY.getName()).setName(UIMenu.INDEX_NAME))
5354
.setId(menu.getMenuId())
5455
.addTags(TagAndValue.newStringTag(UIMenu.CONFIGURATION, menu.getConfigurationJson())
5556
.build())

‎oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBUITemplateManagementDAO.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.skywalking.oap.server.core.query.input.DashboardSetting;
2828
import org.apache.skywalking.oap.server.core.query.type.DashboardConfiguration;
2929
import org.apache.skywalking.oap.server.core.query.type.TemplateChangeStatus;
30+
import org.apache.skywalking.oap.server.core.storage.annotation.BanyanDB;
3031
import org.apache.skywalking.oap.server.core.storage.management.UITemplateManagementDAO;
3132
import org.apache.skywalking.oap.server.storage.plugin.banyandb.stream.AbstractBanyanDBDAO;
3233

@@ -43,7 +44,7 @@ public BanyanDBUITemplateManagementDAO(BanyanDBStorageClient client) {
4344

4445
@Override
4546
public DashboardConfiguration getTemplate(String id) throws IOException {
46-
Property p = getClient().queryProperty(BanyanDBStorageConfig.PROPERTY_GROUP_NAME, UITemplate.INDEX_NAME, id);
47+
Property p = getClient().queryProperty(BanyanDB.PropertyGroup.PROPERTY.getName(), UITemplate.INDEX_NAME, id);
4748
if (p == null) {
4849
return null;
4950
}
@@ -52,7 +53,7 @@ public DashboardConfiguration getTemplate(String id) throws IOException {
5253

5354
@Override
5455
public List<DashboardConfiguration> getAllTemplates(Boolean includingDisabled) throws IOException {
55-
List<Property> propertyList = getClient().listProperties(BanyanDBStorageConfig.PROPERTY_GROUP_NAME, UITemplate.INDEX_NAME);
56+
List<Property> propertyList = getClient().listProperties(BanyanDB.PropertyGroup.PROPERTY.getName(), UITemplate.INDEX_NAME);
5657
return propertyList.stream().map(p -> fromEntity(parse(p)))
5758
.filter(conf -> includingDisabled || !conf.isDisabled())
5859
.collect(Collectors.toList());
@@ -92,7 +93,7 @@ public TemplateChangeStatus changeTemplate(DashboardSetting setting) {
9293

9394
@Override
9495
public TemplateChangeStatus disableTemplate(String id) throws IOException {
95-
Property oldProperty = this.getClient().queryProperty(BanyanDBStorageConfig.PROPERTY_GROUP_NAME, UITemplate.INDEX_NAME, id);
96+
Property oldProperty = this.getClient().queryProperty(BanyanDB.PropertyGroup.PROPERTY.getName(), UITemplate.INDEX_NAME, id);
9697
if (oldProperty == null) {
9798
return TemplateChangeStatus.builder().status(false).id(id).message("Can't find the template")
9899
.build();
@@ -137,7 +138,7 @@ public UITemplate parse(Property property) {
137138
public Property applyAll(UITemplate uiTemplate) {
138139
return Property.newBuilder()
139140
.setMetadata(BanyandbCommon.Metadata.newBuilder()
140-
.setGroup(BanyanDBStorageConfig.PROPERTY_GROUP_NAME)
141+
.setGroup(BanyanDB.PropertyGroup.PROPERTY.getName())
141142
.setName(UITemplate.INDEX_NAME))
142143
.setId(uiTemplate.id().build())
143144
.addTags(TagAndValue.newStringTag(UITemplate.CONFIGURATION, uiTemplate.getConfiguration()).build())
@@ -155,7 +156,7 @@ public Property applyAll(UITemplate uiTemplate) {
155156
public Property applyStatus(UITemplate uiTemplate) {
156157
return Property.newBuilder()
157158
.setMetadata(BanyandbCommon.Metadata.newBuilder()
158-
.setGroup(BanyanDBStorageConfig.PROPERTY_GROUP_NAME)
159+
.setGroup(BanyanDB.PropertyGroup.PROPERTY.getName())
159160
.setName(UITemplate.INDEX_NAME))
160161
.setId(uiTemplate.id().build())
161162
.addTags(TagAndValue.newLongTag(UITemplate.DISABLED, uiTemplate.getDisabled()).build())
@@ -172,7 +173,7 @@ public Property applyStatus(UITemplate uiTemplate) {
172173
public Property applyConfiguration(UITemplate uiTemplate) {
173174
return Property.newBuilder()
174175
.setMetadata(BanyandbCommon.Metadata.newBuilder()
175-
.setGroup(BanyanDBStorageConfig.PROPERTY_GROUP_NAME)
176+
.setGroup(BanyanDB.PropertyGroup.PROPERTY.getName())
176177
.setName(UITemplate.INDEX_NAME))
177178
.setId(uiTemplate.id().build())
178179
.addTags(TagAndValue.newStringTag(UITemplate.CONFIGURATION, uiTemplate.getConfiguration()).build())

‎oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ private TagSpec parseTagSpec(ModelColumn modelColumn) {
494494

495495
public SchemaMetadata parseMetadata(Model model, BanyanDBStorageConfig config, DownSamplingConfigService configService) {
496496
if (!model.isTimeSeries()) {
497-
return new SchemaMetadata(BanyanDBStorageConfig.PROPERTY_GROUP_NAME, model.getName(), Kind.PROPERTY, DownSampling.None, config.getProperty());
497+
return new SchemaMetadata(BanyanDB.PropertyGroup.PROPERTY.getName(), model.getName(), Kind.PROPERTY, DownSampling.None, config.getProperty());
498498
}
499499
if (model.isRecord()) { // stream
500500
BanyanDB.StreamGroup streamGroup = model.getBanyanDBModelExtension().getStreamGroup();
@@ -523,8 +523,8 @@ public SchemaMetadata parseMetadata(Model model, BanyanDBStorageConfig config, D
523523
Kind.STREAM,
524524
model.getDownsampling(),
525525
config.getRecordsBrowserErrorLog());
526-
case RECORDS_NORMAL:
527-
return new SchemaMetadata(BanyanDB.StreamGroup.RECORDS_NORMAL.getName(),
526+
case RECORDS:
527+
return new SchemaMetadata(BanyanDB.StreamGroup.RECORDS.getName(),
528528
model.getName(),
529529
Kind.STREAM,
530530
model.getDownsampling(),
@@ -543,7 +543,7 @@ public SchemaMetadata parseMetadata(Model model, BanyanDBStorageConfig config, D
543543

544544
switch (model.getDownsampling()) {
545545
case Minute:
546-
return new SchemaMetadata(BanyanDB.MeasureGroup.METRICS_MIN.getName(),
546+
return new SchemaMetadata(BanyanDB.MeasureGroup.METRICS_MINUTE.getName(),
547547
model.getName(),
548548
Kind.MEASURE,
549549
model.getDownsampling(),

0 commit comments

Comments
 (0)