Repository: incubator-rocketmq Updated Branches: refs/heads/develop 203cb30a9 -> 7e37799e8
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/7e37799e/release-client.xml ---------------------------------------------------------------------- diff --git a/release-client.xml b/release-client.xml deleted file mode 100644 index 332f0de..0000000 --- a/release-client.xml +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<assembly> - <id>client</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>dir</format> - <format>tar.gz</format> - </formats> - <fileSets> - <fileSet> - <includes> - <include>DISCLAIMER</include> - <include>README.md</include> - </includes> - </fileSet> - </fileSets> - - <files> - <file> - <source>LICENSE-BIN</source> - <destName>LICENSE</destName> - </file> - <file> - <source>NOTICE-BIN</source> - <destName>NOTICE</destName> - </file> - </files> - - <moduleSets> - <moduleSet> - <includes> - <include>org.apache.rocketmq:rocketmq-client</include> - </includes> - <binaries> - <outputDirectory>./</outputDirectory> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputDirectory>./</outputDirectory> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - </moduleSets> -</assembly> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/7e37799e/release.xml ---------------------------------------------------------------------- diff --git a/release.xml b/release.xml deleted file mode 100644 index 1fdf8c9..0000000 --- a/release.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<assembly> - <id>all</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>dir</format> - <format>tar.gz</format> - </formats> - <fileSets> - <fileSet> - <includes> - <include>bin/*</include> - <include>conf/**</include> - <include>benchmark/*</include> - <include>DISCLAIMER</include> - <include>README.md</include> - </includes> - </fileSet> - </fileSets> - - <files> - <file> - <source>LICENSE-BIN</source> - <destName>LICENSE</destName> - </file> - <file> - <source>NOTICE-BIN</source> - <destName>NOTICE</destName> - </file> - </files> - - <moduleSets> - <moduleSet> - <includes> - <include>org.apache.rocketmq:rocketmq-broker</include> - <include>org.apache.rocketmq:rocketmq-tools</include> - <include>org.apache.rocketmq:rocketmq-client</include> - <include>org.apache.rocketmq:rocketmq-namesrv</include> - <include>org.apache.rocketmq:rocketmq-filtersrv</include> - <include>org.apache.rocketmq:rocketmq-example</include> - </includes> - <binaries> - <outputDirectory>lib/</outputDirectory> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputDirectory>lib/</outputDirectory> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - </moduleSets> -</assembly> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/7e37799e/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java index eeb3598..919c637 100644 --- a/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java +++ b/store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java @@ -130,9 +130,7 @@ public class ConsumeQueue { MappedFile mappedFile = this.mappedFileQueue.getMappedFileByTime(timestamp); if (mappedFile != null) { long offset = 0; - int low = - minLogicOffset > mappedFile.getFileFromOffset() ? (int) (minLogicOffset - mappedFile - .getFileFromOffset()) : 0; + int low = minLogicOffset > mappedFile.getFileFromOffset() ? (int) (minLogicOffset - mappedFile.getFileFromOffset()) : 0; int high = 0; int midOffset = -1, targetOffset = -1, leftOffset = -1, rightOffset = -1; long leftIndexValue = -1L, rightIndexValue = -1L; @@ -302,7 +300,6 @@ public class ConsumeQueue { SelectMappedBufferResult result = mappedFile.selectMappedBuffer(0); if (result != null) { try { - for (int i = 0; i < result.getSize(); i += ConsumeQueue.CQ_STORE_UNIT_SIZE) { long offsetPy = result.getByteBuffer().getLong(); result.getByteBuffer().getInt(); @@ -310,13 +307,13 @@ public class ConsumeQueue { if (offsetPy >= phyMinOffset) { this.minLogicOffset = result.getMappedFile().getFileFromOffset() + i; - log.info("compute logics min offset: " + this.getMinOffsetInQueue() + ", topic: " - + this.topic + ", queueId: " + this.queueId); + log.info("Compute logical min offset: {}, topic: {}, queueId: {}", + this.getMinOffsetInQueue(), this.topic, this.queueId); break; } } } catch (Exception e) { - e.printStackTrace(); + log.error("Exception thrown when correctMinOffset", e); } finally { result.release(); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/7e37799e/store/src/main/java/org/apache/rocketmq/store/MappedFile.java ---------------------------------------------------------------------- diff --git a/store/src/main/java/org/apache/rocketmq/store/MappedFile.java b/store/src/main/java/org/apache/rocketmq/store/MappedFile.java index 5cb72ce..550e578 100644 --- a/store/src/main/java/org/apache/rocketmq/store/MappedFile.java +++ b/store/src/main/java/org/apache/rocketmq/store/MappedFile.java @@ -402,7 +402,7 @@ public class MappedFile extends ReferenceResource { public boolean cleanup(final long currentRef) { if (this.isAvailable()) { log.error("this file[REF:" + currentRef + "] " + this.fileName - + " have not shutdown, stop unmaping."); + + " have not shutdown, stop unmapping."); return false; }
