[WIP] Feature/use last timestamp #91
Conversation
|
@MojioMS Please solve the conflicts and tell me when this PR is ready to merge. |
| // Get stored lastUsedTimestamp, if it is set: | ||
| if (isUseLastTimestamp) { | ||
| lastLine = dataFile.getFirstLineWithData(); | ||
| // TODO Problem gelöst, dass immer auf die erste Zeile mit Daten zurückgesetzt werden muss? |
There was a problem hiding this comment.
@MojioMS: Please remove german comments!
| @@ -342,6 +349,11 @@ public void importData(final DataFile dataFile) | |||
| LOG.error("No measured value columns found in configuration"); | |||
| return; | |||
| } | |||
| // Get stored lastUsedTimestamp, if it is set: | |||
There was a problem hiding this comment.
@MojioMS This comments seems misleading as the next line is setting the lastLine value and not lastUsedTimestamp! Please update the comment or fix the bug.
| @@ -396,6 +408,11 @@ public void importData(final DataFile dataFile) | |||
| if (!timeSeriesRepository.isEmpty()) { | |||
| insertTimeSeries(timeSeriesRepository); | |||
| } | |||
| if (isUseLastTimestamp | |||
There was a problem hiding this comment.
@MojioMS Synchronize with condition of if statement in line 438. Please extract private boolean method with speaking name that replaces the condition in both statements.
| } | ||
| // store lastUsedTimestamp in configuration/station? | ||
| } else { | ||
| // abort Insertion |
There was a problem hiding this comment.
@MojioMS please add a log message here why the observation is skipped.
| @@ -1309,4 +1344,24 @@ public void setLastLine(final int lastLine) { | |||
| this.lastLine = lastLine; | |||
| } | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
@MojioMS please remove this javadoc.
| return lastUsedTimestamp; | ||
| } | ||
|
|
||
| /** |
There was a problem hiding this comment.
@MojioMS please remove this javadoc.
| // read already inserted UsedLastTimeStamp | ||
| LOG.debug("Read already inserted LastUsedTimeStamp from file '{}'.", | ||
| timeStampFile.getCanonicalPath()); | ||
| String storedTimeStamp = null; |
There was a problem hiding this comment.
@MojioMS remove this line and declare the variable in line 239.
| @@ -320,7 +320,20 @@ public boolean isSosTransactional() { | |||
| } | |||
| return false; | |||
| } | |||
|
|
|||
|
|
|||
| /** | |||
…/sos-importer into feature/UseLastTimestamp
integration of usedLastTimeStamp