Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB32CE3B9 for ; Wed, 19 Dec 2012 13:09:50 +0000 (UTC) Received: (qmail 90631 invoked by uid 500); 19 Dec 2012 13:09:50 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 90591 invoked by uid 500); 19 Dec 2012 13:09:50 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 90562 invoked by uid 99); 19 Dec 2012 13:09:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 13:09:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 13:09:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CFA112388906; Wed, 19 Dec 2012 13:09:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423854 - in /activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb: LevelDBClient.scala LevelDBStore.scala Date: Wed, 19 Dec 2012 13:09:27 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121219130927.CFA112388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Wed Dec 19 13:09:26 2012 New Revision: 1423854 URL: http://svn.apache.org/viewvc?rev=1423854&view=rev Log: fix leveldb variant of org.apache.activemq.bugs.AMQ2584Test - add rudimentary size calculation to leveldb Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala?rev=1423854&r1=1423853&r2=1423854&view=diff ============================================================================== --- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala (original) +++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala Wed Dec 19 13:09:26 2012 @@ -436,6 +436,8 @@ class LevelDBClient(store: LevelDBStore) def tempIndexFile = directory / ("temp"+INDEX_SUFFIX) def snapshotIndexFile(id:Long) = create_sequence_file(directory,id, INDEX_SUFFIX) + def size: Long = logRefs.size * store.logSize + def createLog: RecordLog = { new RecordLog(logDirectory, LOG_SUFFIX) } Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala?rev=1423854&r1=1423853&r2=1423854&view=diff ============================================================================== --- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala (original) +++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala Wed Dec 19 13:09:26 2012 @@ -528,7 +528,7 @@ class LevelDBStore extends LockableServi } def size: Long = { - return 0 + return db.client.size } def checkpoint(sync: Boolean): Unit = db.checkpoint(sync)