avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1640181 - in /avro/branches/branch-1.7: ./ lang/java/avro/src/main/java/org/apache/avro/file/ lang/java/tools/src/main/java/org/apache/avro/tool/ lang/java/tools/src/test/java/org/apache/avro/tool/
Date Mon, 17 Nov 2014 16:08:43 GMT
Author: tomwhite
Date: Mon Nov 17 16:08:43 2014
New Revision: 1640181

URL: http://svn.apache.org/r1640181
Log:
Merge -r 1640178:1640179 from trunk to branch. Fixes: AVRO-1596. AVRO-834. Java: Data File
corruption recovery tool. Contributed by scottcarey and tomwhite.

Added:
    avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
      - copied unchanged from r1640179, avro/trunk/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
    avro/branches/branch-1.7/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileRepairTool.java
      - copied unchanged from r1640179, avro/trunk/lang/java/tools/src/test/java/org/apache/avro/tool/TestDataFileRepairTool.java
Modified:
    avro/branches/branch-1.7/CHANGES.txt
    avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
    avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java

Modified: avro/branches/branch-1.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.7/CHANGES.txt?rev=1640181&r1=1640180&r2=1640181&view=diff
==============================================================================
--- avro/branches/branch-1.7/CHANGES.txt (original)
+++ avro/branches/branch-1.7/CHANGES.txt Mon Nov 17 16:08:43 2014
@@ -6,6 +6,9 @@ Trunk (not yet released)
 
     AVRO-1555.  C#: Add support for RPC over HTTP. (Dmitry Kovalev via cutting)
 
+    AVRO-834. Java: Data File corruption recovery tool.
+    (scottcarey and tomwhite)
+
   OPTIMIZATIONS
 
   IMPROVEMENTS
@@ -23,6 +26,9 @@ Trunk (not yet released)
     AVRO-1489. Java: Avro fails to build with OpenJDK 8. (Ricardo Arguello via
     tomwhite)
 
+	AVRO-1596. Java: Cannot read past corrupted block in Avro data file.
+	(tomwhite)
+
 Avro 1.7.7 (23 July 2014)
 
   NEW FEATURES

Modified: avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java?rev=1640181&r1=1640180&r2=1640181&view=diff
==============================================================================
--- avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
(original)
+++ avro/branches/branch-1.7/lang/java/avro/src/main/java/org/apache/avro/file/DataFileStream.java
Mon Nov 17 16:08:43 2014
@@ -251,6 +251,9 @@ public class DataFileStream<D> implement
   /** Expert: Return the count of items in the current block. */
   public long getBlockCount() { return blockCount; }
 
+  /** Expert: Return the size in bytes (uncompressed) of the current block. */
+  public long getBlockSize() { return blockSize; }
+
   protected void blockFinished() throws IOException {
     // nothing for the stream impl
   }

Modified: avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java?rev=1640181&r1=1640180&r2=1640181&view=diff
==============================================================================
--- avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java
(original)
+++ avro/branches/branch-1.7/lang/java/tools/src/main/java/org/apache/avro/tool/Main.java
Mon Nov 17 16:08:43 2014
@@ -45,6 +45,7 @@ public class Main {
         new DataFileWriteTool(),
         new DataFileGetMetaTool(),
         new DataFileGetSchemaTool(),
+        new DataFileRepairTool(),
         new IdlTool(),
         new IdlToSchemataTool(),
         new RecodecTool(),



Mime
View raw message