adjust removeBefore logic in big array

bulldog2011 · bulldog2011 · commit 727dc0a036cb · 2013-03-19T18:29:33.000+08:00
diff --git a/src/main/java/com/leansoft/bigqueue/BigArrayImpl.java b/src/main/java/com/leansoft/bigqueue/BigArrayImpl.java
@@ -227,13 +227,13 @@ public void removeBefore(long timestamp) throws IOException {
 			arrayWriteLock.lock();
 			long firstIndexPageIndex = this.indexPageFactory.getFirstPageIndexBefore(timestamp);
 			if (firstIndexPageIndex >= 0) {
-				long nextIndexPageIndex = firstIndexPageIndex;
-				if (nextIndexPageIndex == Long.MAX_VALUE) { //wrap
-					nextIndexPageIndex = 0L;
-				} else {
-					nextIndexPageIndex++;
-				}
-				long toRemoveBeforeIndex = Calculator.mul(nextIndexPageIndex, INDEX_ITEMS_PER_PAGE_BITS);
+//				long nextIndexPageIndex = firstIndexPageIndex;
+//				if (nextIndexPageIndex == Long.MAX_VALUE) { //wrap
+//					nextIndexPageIndex = 0L;
+//				} else {
+//					nextIndexPageIndex++;
+//				}
+				long toRemoveBeforeIndex = Calculator.mul(firstIndexPageIndex, INDEX_ITEMS_PER_PAGE_BITS);
 				removeBeforeIndex(toRemoveBeforeIndex);
 			}
 		} catch (IndexOutOfBoundsException ex) {
diff --git a/src/main/java/com/leansoft/bigqueue/page/MappedPageFactoryImpl.java b/src/main/java/com/leansoft/bigqueue/page/MappedPageFactoryImpl.java
@@ -186,9 +186,7 @@ public void deletePage(long index) throws IOException {
 			}
 		}
 		if (deleted) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Page file " + fileName + " was just deleted.");
-			}
+			logger.info("Page file " + fileName + " was just deleted.");
 		} else {
 			logger.warn("fail to delete file " + fileName + " after max " + maxRound + " rounds of try, you may delete it manually.");
 		}
diff --git a/src/test/java/com/leansoft/bigqueue/FanOutQueueTest.java b/src/test/java/com/leansoft/bigqueue/FanOutQueueTest.java
@@ -225,7 +225,15 @@ public void removeBeforeTest() throws IOException {
 		
 		foQueue.removeBefore(timestamp);
 		
-		assertTrue(foQueue.size(fid) == 1024 * 1024);
+		timestamp = System.currentTimeMillis();
+		String randomString3 = TestUtil.randomString(32);
+		for(int i = 0; i < 1024 * 1024; i++) {
+			foQueue.enqueue(randomString3.getBytes());
+		}
+		
+		foQueue.removeBefore(timestamp);
+		
+		assertTrue(foQueue.size(fid) == 2 * 1024 * 1024);
 		assertEquals(randomString2, new String(foQueue.peek(fid)));
 	}
 	
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -12,18 +12,8 @@
 # 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.
-log4j.rootLogger=INFO,stdout
+log4j.rootLogger=WARN,stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%C.java:%L)%n
-
-#log4j.logger.bigqueue.request.logger=DEBUG
-log4j.logger.org.apache.zookeeper=WARN
-log4j.logger.com.github.zkclient=WARN
-#log4j.logger.com.leansoft.bigqueue.producer=DEBUG
-#log4j.logger.com.leansoft.bigqueue.log.Log=DEBUG
-#log4j.logger.com.leansoft.bigqueue=DEBUG
-#log4j.logger.com.leansoft.bigqueue.log=DEBUG
-#log4j.logger.com.leansoft.bigqueue.consumer.ZookeeperConsumerConnector=DEBUG
-#log4j.logger.com.leansoft.bigqueue.producer.ProducerPool=DEBUG
+log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%C.java:%L)%n

Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,7 @@ public void deletePage(long index) throws IOException {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`if (deleted) {`
`189`		`- if (logger.isDebugEnabled()) {`
`190`		`- logger.debug("Page file " + fileName + " was just deleted.");`
`191`		`- }`
	`189`	`+ logger.info("Page file " + fileName + " was just deleted.");`
`192`	`190`	`} else {`
`193`	`191`	`logger.warn("fail to delete file " + fileName + " after max " + maxRound + " rounds of try, you may delete it manually.");`
`194`	`192`	`}`