简柏林 / thingskit · Commits

Commit 5dc541eabf3a19522cbb0a522468731d1650cd49

Authored by Volodymyr Babak
1 parent 09e90b30

Misc fixes

Inline Side-by-side
Showing 3 changed files with 13 additions and 32 deletions
... ... @@ -114,8 +114,8 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
114 114 } catch (IOException e) {
115 115 e.printStackTrace();
116 116 }
117   - this.startTs = entityView.getStartTs() != 0L ? entityView.getStartTs() : 0L;
118   - this.endTs = entityView.getEndTs() != 0L ? entityView.getEndTs() : 0L;
  117 + this.startTs = entityView.getStartTs();
  118 + this.endTs = entityView.getEndTs();
119 119 this.searchText = entityView.getSearchText();
120 120 this.additionalInfo = entityView.getAdditionalInfo();
121 121 }
... ...
... ... @@ -64,7 +64,7 @@ public class BaseTimeseriesService implements TimeseriesService {
64 64 EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId);
65 65 List<ReadTsKvQuery> filteredQueries =
66 66 queries.stream()
67   - .filter(query -> entityView.getKeys().getTimeseries().contains(query.getKey()))
  67 + .filter(query -> entityView.getKeys().getTimeseries().isEmpty() || entityView.getKeys().getTimeseries().contains(query.getKey()))
68 68 .collect(Collectors.toList());
69 69 return timeseriesDao.findAllAsync(entityView.getEntityId(), updateQueriesForEntityView(entityView, filteredQueries));
70 70 }
... ... @@ -79,7 +79,9 @@ public class BaseTimeseriesService implements TimeseriesService {
79 79 if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
80 80 EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId);
81 81 List<String> filteredKeys = new ArrayList<>(keys);
82   - filteredKeys.retainAll(entityView.getKeys().getTimeseries());
  82 + if (!entityView.getKeys().getTimeseries().isEmpty()) {
  83 + filteredKeys.retainAll(entityView.getKeys().getTimeseries());
  84 + }
83 85 List<ReadTsKvQuery> queries =
84 86 filteredKeys.stream()
85 87 .map(key -> new BaseReadTsKvQuery(key, entityView.getStartTs(), entityView.getEndTs(), 1, "ASC"))
... ... @@ -100,11 +102,6 @@ public class BaseTimeseriesService implements TimeseriesService {
100 102 @Override
101 103 public ListenableFuture<List<Void>> save(EntityId entityId, TsKvEntry tsKvEntry) {
102 104 validate(entityId);
103   - try {
104   - checkForNonEntityView(entityId);
105   - } catch (Exception e) {
106   - e.printStackTrace();
107   - }
108 105 if (tsKvEntry == null) {
109 106 throw new IncorrectParameterException("Key value entry can't be null");
110 107 }
... ... @@ -115,11 +112,6 @@ public class BaseTimeseriesService implements TimeseriesService {
115 112
116 113 @Override
117 114 public ListenableFuture<List<Void>> save(EntityId entityId, List<TsKvEntry> tsKvEntries, long ttl) {
118   - try {
119   - checkForNonEntityView(entityId);
120   - } catch (Exception e) {
121   - e.printStackTrace();
122   - }
123 115 List<ListenableFuture<Void>> futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size() * INSERTS_PER_ENTRY);
124 116 for (TsKvEntry tsKvEntry : tsKvEntries) {
125 117 if (tsKvEntry == null) {
... ... @@ -131,10 +123,8 @@ public class BaseTimeseriesService implements TimeseriesService {
131 123 }
132 124
133 125 private void saveAndRegisterFutures(List<ListenableFuture<Void>> futures, EntityId entityId, TsKvEntry tsKvEntry, long ttl) {
134   - try {
135   - checkForNonEntityView(entityId);
136   - } catch (Exception e) {
137   - e.printStackTrace();
  126 + if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
  127 + throw new IncorrectParameterException("Telemetry data can't be stored for entity view. Only read only");
138 128 }
139 129 futures.add(timeseriesDao.savePartition(entityId, tsKvEntry.getTs(), tsKvEntry.getKey(), ttl));
140 130 futures.add(timeseriesDao.saveLatest(entityId, tsKvEntry));
... ... @@ -145,7 +135,9 @@ public class BaseTimeseriesService implements TimeseriesService {
145 135 return queries.stream().map(query -> {
146 136 long startTs = entityView.getStartTs() == 0 ? query.getStartTs() : entityView.getStartTs();
147 137 long endTs = entityView.getEndTs() == 0 ? query.getEndTs() : entityView.getEndTs();
148   - return updateQuery(startTs, endTs, query);
  138 +
  139 + return startTs <= query.getStartTs() && endTs >= query.getEndTs() ? query :
  140 + new BaseReadTsKvQuery(query.getKey(), startTs, endTs, query.getInterval(), query.getLimit(), query.getAggregation());
149 141 }).collect(Collectors.toList());
150 142 }
151 143
... ... @@ -187,15 +179,4 @@ public class BaseTimeseriesService implements TimeseriesService {
187 179 throw new IncorrectParameterException("Incorrect DeleteTsKvQuery. Key can't be empty");
188 180 }
189 181 }
190   -
191   - private ReadTsKvQuery updateQuery(Long startTs, Long endTs, ReadTsKvQuery query) {
192   - return startTs <= query.getStartTs() && endTs >= query.getEndTs() ? query :
193   - new BaseReadTsKvQuery(query.getKey(), startTs, endTs, query.getInterval(), query.getLimit(), query.getAggregation());
194   - }
195   -
196   - private static void checkForNonEntityView(EntityId entityId) throws Exception {
197   - if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
198   - throw new Exception("Entity-views were read only");
199   - }
200   - }
201 182 }
... ...
... ... @@ -85,11 +85,11 @@ export default function EntityViewDirective($compile, $templateCache, $filter, t
85 85
86 86 function updateMinMaxDates() {
87 87 if (scope.endTs) {
88   - scope.maxStartTs = angular.copy(new Date(scope.endTs.getTime() - 1000));
  88 + scope.maxStartTs = angular.copy(new Date(scope.endTs.getTime()));
89 89 scope.entityView.endTs = scope.endTs.getTime();
90 90 }
91 91 if (scope.startTs) {
92   - scope.minEndTs = angular.copy(new Date(scope.startTs.getTime() + 1000));
  92 + scope.minEndTs = angular.copy(new Date(scope.startTs.getTime()));
93 93 scope.entityView.startTs = scope.startTs.getTime();
94 94 }
95 95 }
... ...