Skip to content

Commit 9857256

Browse files
committed
[opt](headless)Model update should not delete/update metrics/dimensions, use dedicated metric/dimension management.
1 parent d695bed commit 9857256

2 files changed

Lines changed: 2 additions & 59 deletions

File tree

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -116,29 +116,11 @@ public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId,
116116
.collect(Collectors.toMap(DimensionResp::getBizName, a -> a, (k1, k2) -> k1));
117117

118118
List<DimensionReq> dimensionToInsert = Lists.newArrayList();
119-
List<DimensionReq> dimensionToUpdate = Lists.newArrayList();
120-
List<Long> dimensionToDelete = Lists.newArrayList();
121119

122120
// look for which dimension need to insert, update, delete
123-
dimensionReqs.stream().forEach(dimension -> {
121+
dimensionReqs.forEach(dimension -> {
124122
if (!bizNameMap.containsKey(dimension.getBizName())) {
125123
dimensionToInsert.add(dimension);
126-
} else {
127-
DimensionResp dimensionRespByBizName = bizNameMap.get(dimension.getBizName());
128-
if (null != dimensionRespByBizName && isChange(dimension, dimensionRespByBizName)) {
129-
dimension.setId(dimensionRespByBizName.getId());
130-
dimension.updatedBy(user.getName());
131-
dimensionToUpdate.add(dimension);
132-
}
133-
}
134-
});
135-
136-
// the bizNames from alter dimensions
137-
List<String> bizNames =
138-
dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
139-
bizNameMap.keySet().forEach(bizNameInDb -> {
140-
if (!bizNames.contains(bizNameInDb)) {
141-
dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId());
142124
}
143125
});
144126

@@ -147,16 +129,6 @@ public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId,
147129
createDimensionBatch(dimensionToInsert, user);
148130
}
149131

150-
// update
151-
if (!CollectionUtils.isEmpty(dimensionToUpdate)) {
152-
updateDimensionBatch(dimensionToUpdate, user);
153-
}
154-
155-
// delete
156-
if (!CollectionUtils.isEmpty(dimensionToDelete)) {
157-
deleteDimensionBatch(dimensionToDelete, user);
158-
}
159-
160132
}
161133

162134
@Override

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -157,28 +157,9 @@ public void alterMetricBatch(List<MetricReq> metricReqs, Long modelId, User user
157157
.collect(Collectors.toMap(MetricResp::getBizName, a -> a, (k1, k2) -> k1));
158158

159159
List<MetricReq> metricToInsert = Lists.newArrayList();
160-
List<MetricReq> metricToUpdate = Lists.newArrayList();
161-
List<Long> metricToDelete = Lists.newArrayList();
162-
163-
metricReqs.stream().forEach(metric -> {
160+
metricReqs.forEach(metric -> {
164161
if (!bizNameMap.containsKey(metric.getBizName())) {
165162
metricToInsert.add(metric);
166-
} else {
167-
MetricResp metricRespByBizName = bizNameMap.get(metric.getBizName());
168-
if (null != metricRespByBizName && isChange(metric, metricRespByBizName)) {
169-
metric.setId(metricRespByBizName.getId());
170-
metric.updatedBy(user.getName());
171-
metricToUpdate.add(metric);
172-
}
173-
}
174-
});
175-
176-
// the bizNames from alter dimensions
177-
List<String> bizNames =
178-
metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
179-
bizNameMap.keySet().forEach(bizNameInDb -> {
180-
if (!bizNames.contains(bizNameInDb)) {
181-
metricToDelete.add(bizNameMap.get(bizNameInDb).getId());
182163
}
183164
});
184165

@@ -187,16 +168,6 @@ public void alterMetricBatch(List<MetricReq> metricReqs, Long modelId, User user
187168
createMetricBatch(metricToInsert, user);
188169
}
189170

190-
// update
191-
if (!CollectionUtils.isEmpty(metricToUpdate)) {
192-
updateMetricBatch(metricToUpdate, user);
193-
}
194-
195-
// delete
196-
if (!CollectionUtils.isEmpty(metricToDelete)) {
197-
deleteMetricBatch(metricToDelete, user);
198-
}
199-
200171
}
201172

202173
@Override

0 commit comments

Comments
 (0)