This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch fix_redo in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 23c3c6fe972c81c07b0e558718d6e05152a56ff7 Author: qiaojialin <[email protected]> AuthorDate: Tue May 19 18:24:51 2020 +0800 fix wal corrupt --- grafana/pom.xml | 2 +- jdbc/pom.xml | 2 +- pom.xml | 6 +++--- .../java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java | 8 ++++---- service-rpc/pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/grafana/pom.xml b/grafana/pom.xml index 44a6bc7..ee0becc 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -165,7 +165,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/spring.schemas</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass>${start-class}</mainClass> </transformer> diff --git a/jdbc/pom.xml b/jdbc/pom.xml index d4dc02f..33efe38 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -126,7 +126,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> diff --git a/pom.xml b/pom.xml index dc87064..8184d83 100644 --- a/pom.xml +++ b/pom.xml @@ -533,7 +533,7 @@ <id>enforce-version-convergence</id> <configuration> <rules> - <dependencyConvergence /> + <dependencyConvergence/> </rules> </configuration> <goals> @@ -579,7 +579,7 @@ </requireJavaVersion> <!-- Disabled for now as it breaks the ability to build single modules --> <!--reactorModuleConvergence/--> - <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" /> + <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/> </rules> </configuration> </execution> @@ -727,7 +727,7 @@ <instrumentation> <ignoreTrivial>true</ignoreTrivial> </instrumentation> - <check /> + <check/> </configuration> <executions> <execution> diff --git a/server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java b/server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java index 1179556..d4c6738 100644 --- a/server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java +++ b/server/src/main/java/org/apache/iotdb/db/writelog/io/SingleFileLogReader.java @@ -87,15 +87,15 @@ public class SingleFileLogReader implements ILogReader { + "file: " + "%d Calculated: %d.", idx, checkSum, checkSummer.getValue())); } - } catch (IOException e) { + + batchLogReader = new BatchLogReader(ByteBuffer.wrap(buffer)); + fileCorrupted = fileCorrupted || batchLogReader.isFileCorrupted(); + } catch (Exception e) { logger.error("Cannot read more PhysicalPlans from {} because", filepath, e); fileCorrupted = true; return false; } - batchLogReader = new BatchLogReader(ByteBuffer.wrap(buffer)); - fileCorrupted = fileCorrupted || batchLogReader.isFileCorrupted(); - return true; } diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index e158022..8b0cd32 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -148,7 +148,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> <pluginExecution>
