Changeset 4664

Timestamp:

2011-02-09 09:17:39 (2 years ago)

Author:

evert

Message:

Removed the Reason from the WalProcessingException? since the RecordLockedException? is thrown as a separate exception.

Location:

trunk/cr/repository

Files:

• api/src/main/java/org/lilyproject/repository/api/WalProcessingException.java (modified) (2 diffs)
• impl/src/main/java/org/lilyproject/repository/avro/AvroConverter.java (modified) (3 diffs)
• impl/src/main/java/org/lilyproject/repository/impl/HBaseRepository.java (modified) (2 diffs)

trunk/cr/repository/api/src/main/java/org/lilyproject/repository/api/WalProcessingException.java

@@ -1 +1 @@
 package org.lilyproject.repository.api;
 
-import java.io.IOException;
 
 public class WalProcessingException extends RepositoryException {
-    private final Reason reason;
     private final RecordId recordId;
 
-    public enum Reason {
-        LOCKED, PROCESSING_FAILURE, OTHER
-    }
-    public WalProcessingException(Reason reason, RecordId recordId) {
-        this.reason = reason;
+    public WalProcessingException(RecordId recordId) {
         this.recordId = recordId;
     }
 
-    public WalProcessingException(Reason reason, RecordId recordId, String message) {
+    public WalProcessingException(RecordId recordId, String message) {
         super(message);
-        this.reason = reason;
         this.recordId = recordId;
     }
 
-    public WalProcessingException(Reason reason, RecordId recordId, Throwable cause) {
+    public WalProcessingException(RecordId recordId, Throwable cause) {
         super(cause);
-        this.reason = reason;
         this.recordId = recordId;
     }
 
-    public WalProcessingException(Reason reason, RecordId recordId, String message, Throwable cause) {
+    public WalProcessingException(RecordId recordId, String message, Throwable cause) {
         super(message, cause);
-        this.reason = reason;
         this.recordId = recordId;
-    }
-    
-
-    public Reason getReason() {
-        return reason;
     }
     
@@ -43 +29 @@
     
     public String getMessage() {
-        return "Wal failed to process messages for record '" + recordId + "', reason="+reason.name() + ", " + super.getMessage();
+        return "Wal failed to process messages for record '" + recordId + "', " + super.getMessage();
     }
 }

trunk/cr/repository/impl/src/main/java/org/lilyproject/repository/avro/AvroConverter.java

@@ -29 +29 @@
 import org.apache.avro.util.Utf8;
 import org.lilyproject.repository.api.*;
-import org.lilyproject.repository.api.WalProcessingException.Reason;
 import org.lilyproject.repository.impl.IdRecordImpl;
 
@@ -570 +569 @@
     public AvroWalProcessingException convert(WalProcessingException exception) {
         AvroWalProcessingException avroException = new AvroWalProcessingException();
-        avroException.reason = exception.getReason().name();
         avroException.recordId = convert(exception.getRecordId());
         avroException.message = exception.getMessage();
@@ -622 +620 @@
     public WalProcessingException convert(AvroWalProcessingException avroException) {
         RecordId recordId = avroException.recordId == null ? null : convertAvroRecordId(avroException.recordId);
-        Reason reason = avroException.reason == null ? null : Reason.valueOf(convert(avroException.reason));
-        WalProcessingException exception = new WalProcessingException(reason, recordId, convert(avroException.message));
+        WalProcessingException exception = new WalProcessingException(recordId, convert(avroException.message));
         restoreCauses(avroException.remoteCauses, exception);
         return exception;

trunk/cr/repository/impl/src/main/java/org/lilyproject/repository/impl/HBaseRepository.java

@@ -33 +33 @@
 import org.lilyproject.hbaseext.ContainsValueComparator;
 import org.lilyproject.repository.api.*;
-import org.lilyproject.repository.api.WalProcessingException.Reason;
 import org.lilyproject.repository.impl.RepositoryMetrics.Action;
 import org.lilyproject.repository.impl.primitivevaluetype.BlobValueType;
@@ -1318 +1317 @@
                 }
                 if (!(wal.getMessages(rowKey).isEmpty())) {
-                    throw new WalProcessingException(Reason.PROCESSING_FAILURE, recordId);
+                    throw new WalProcessingException(recordId, "Not all messages were processed");
                 }
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                throw new WalProcessingException(Reason.OTHER, recordId, e);
+                throw new WalProcessingException(recordId, e);
             }
         } catch (RowLogException e) {
-            throw new WalProcessingException(Reason.OTHER, recordId, e);
+            throw new WalProcessingException(recordId, e);
         }
     }