[GitHub] mynameborat commented on a change in pull request #915: Consolidating offset read and write for store-offsets and side-inputs, maintaining backward compatbility

[GitBox]

mynameborat commented on a change in pull request #915: Consolidating offset 
read and write for store-offsets and side-inputs, maintaining backward 
compatbility
URL: https://github.com/apache/samza/pull/915#discussion_r256068006
 
 

 ##########
 File path: 
samza-core/src/main/java/org/apache/samza/storage/StorageManagerUtil.java
 ##########
 @@ -129,26 +173,35 @@ public static boolean storeExists(File storeDir) {
    * Read and return the contents of the offset file.
    *
    * @param storagePartitionDir the base directory of the store
-   * @param offsetFileName name of the offset file
    * @return the content of the offset file if it exists for the store, null 
otherwise.
    */
-  public static String readOffsetFile(File storagePartitionDir, String 
offsetFileName) {
-    String offset = null;
-    File offsetFileRef = new File(storagePartitionDir, offsetFileName);
+  public static Map<SystemStreamPartition, String> readOffsetFile(File 
storagePartitionDir, Set<SystemStreamPartition> storeSSPs) {
+    Map<SystemStreamPartition, String> offsets = null;
+    String fileContents;
+    File offsetFileRef = new File(storagePartitionDir, OFFSET_FILE_NAME);
     String storePath = storagePartitionDir.getPath();
 
     if (offsetFileRef.exists()) {
       LOG.info("Found offset file in storage partition directory: {}", 
storePath);
       try {
-        offset = FileUtil.readWithChecksum(offsetFileRef);
+        fileContents = FileUtil.readWithChecksum(offsetFileRef);
+        try {
+          offsets = OBJECT_MAPPER.readValue(fileContents, 
OFFSETS_TYPE_REFERENCE);
+        } catch (JsonParseException | JsonMappingException e) {
+          LOG.info("Exception in json-parsing offset file {} {}, reading as 
string offset-value", storagePartitionDir.toPath(), OFFSET_FILE_NAME);
+          offsets = (storeSSPs.size() == 1) ? 
storeSSPs.stream().collect(Collectors.toMap(x -> x, y -> fileContents)) : null;
+        } catch (IOException e) {
+          LOG.info("Exception in json-parsing offset file {} {}, reading as 
string offset-value", storagePartitionDir.toPath(), OFFSET_FILE_NAME);
+          offsets = (storeSSPs.size() == 1) ? 
storeSSPs.stream().collect(Collectors.toMap(x -> x, y -> fileContents)) : null;
 
 Review comment:
   If the contents are not proper json, wouldn't we get JsonParseException? I 
was referring to IOException block since that would mean either we couldn't 
read the file successfully or the file was not found. FileNotFoundException 
extends IOException.
   
   It is sufficient to have only two catch blocks one for json parse failures 
and another to catch all other failure scenarios.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services