Skip to content

Commit 25afa31

Browse files
committed
IGNITE-28408 Fix comments
1 parent eb3e34c commit 25afa31

3 files changed

Lines changed: 5 additions & 18 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/processors/performancestatistics/FilePerformanceStatisticsReader.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static java.nio.ByteOrder.nativeOrder;
5151
import static java.nio.file.Files.walkFileTree;
5252
import static java.nio.file.StandardOpenOption.READ;
53+
import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
5354
import static org.apache.ignite.internal.processors.performancestatistics.FilePerformanceStatisticsWriter.FILE_FORMAT_VERSION;
5455
import static org.apache.ignite.internal.processors.performancestatistics.OperationType.CACHE_START;
5556
import static org.apache.ignite.internal.processors.performancestatistics.OperationType.CHECKPOINT;
@@ -239,20 +240,18 @@ private boolean deserialize(ByteBuffer buf, UUID nodeId, boolean firstRecord) th
239240
short ver = buf.getShort();
240241
String ignVer = null;
241242

242-
if (ver == FILE_FORMAT_VERSION) {
243+
if (ver > LEGACY_FILE_FORMAT_VERSION_1) {
243244
ForwardableString verStr = readString(buf);
244245

245246
if (verStr == null)
246247
return false;
247248

248249
ignVer = verStr.str;
249250
}
250-
else if (ver != LEGACY_FILE_FORMAT_VERSION_1)
251-
throw new IgniteException("Unsupported file format version [fileVer=" + ver + ", currentVer=" +
252-
FILE_FORMAT_VERSION + ']');
253251

254-
for (PerformanceStatisticsHandler hnd : curHnd)
255-
hnd.version(nodeId, ignVer);
252+
if (ver != FILE_FORMAT_VERSION && ver != LEGACY_FILE_FORMAT_VERSION_1)
253+
throw new IgniteException("Unsupported file format version [fileVer=" + ver + ", fileIgniteVer=" + ignVer
254+
+ ", currentFileVer=" + FILE_FORMAT_VERSION + ", currentIgniteVer=" + VER_STR + ']');
256255

257256
return true;
258257
}

modules/core/src/main/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsHandler.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@
2929
* performance analysis.
3030
*/
3131
public interface PerformanceStatisticsHandler {
32-
/**
33-
* @param nodeId Node id.
34-
* @param ignVer Ignite version stored in file header, if present.
35-
*/
36-
default void version(UUID nodeId, @Nullable String ignVer) {
37-
// No-op.
38-
}
39-
4032
/**
4133
* @param nodeId Node id.
4234
* @param cacheId Cache id.

modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/ForwardReadQueryPropertyTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ public void testStringForwardRead() throws Exception {
7171
Map<String, String> actualProps = new HashMap<>();
7272

7373
new FilePerformanceStatisticsReader(BUFFER_SIZE, new TestHandler() {
74-
@Override public void version(UUID nodeId, String ignVer) {
75-
assertEquals(ForwardReadQueryPropertyTest.this.fileFormatVer == LEGACY_FILE_FORMAT_VERSION_1 ? null : VER_STR, ignVer);
76-
}
77-
7874
@Override public void queryProperty(UUID nodeId, GridCacheQueryType type, UUID qryNodeId, long id, String name, String val) {
7975
assertNotNull(name);
8076
assertNotNull(val);

0 commit comments

Comments
 (0)