Author: dkulp
Date: Fri Jul 8 19:28:58 2011
New Revision: 1144436
URL: http://svn.apache.org/viewvc?rev=1144436&view=rev
Log:
Merged revisions 1087620,1091082 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1087620 | davsclaus | 2011-04-01 04:10:22 -0400 (Fri, 01 Apr 2011) | 1 line
CAMEL-3826: Added test.
........
r1091082 | davsclaus | 2011-04-11 10:15:07 -0400 (Mon, 11 Apr 2011) | 1 line
CAMEL-3826: Fixed issue with hawtdb filestore keep growing when using it with
the aggregator.
........
Added:
camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/BigPayload.java
- copied unchanged from r1087620,
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/BigPayload.java
camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
- copied, changed from r1087620,
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 19:28:58 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090960-1090969,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
+/camel/trunk:1083696,1083723-1083724,1084150,1085277,1085543,1085549,1085905,1085909,1086165,1086231,1087005,1087276,1087612,1087620,1087856,1088583,1088916-1088917,1089275,1089348,1090166,1090960-1090969,1091082,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1094147,1094156,1095405,1095469,1095471,1095475-1095476,1096346,1097909,1097912,1097978,1098630,1099417,1100975,1102162,1102181,1104076,1124497,1127744,1127988,1131411,1134252,1134501,1135223,1135364,1136290,1138285,1139163,1140096-1140102,1141783,1143925,1144248,1144324
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java?rev=1144436&r1=1144435&r2=1144436&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
Fri Jul 8 19:28:58 2011
@@ -114,7 +114,9 @@ public class HawtDBAggregationRepository
Buffer rc = hawtDBFile.execute(new Work<Buffer>() {
public Buffer execute(Transaction tx) {
SortedIndex<Buffer, Buffer> index =
hawtDBFile.getRepositoryIndex(tx, repositoryName, true);
- return index.put(keyBuffer, exchangeBuffer);
+ Buffer buffer = index.put(keyBuffer, exchangeBuffer);
+ LOG.trace("Added key index {}", keyBuffer);
+ return buffer;
}
@Override
@@ -147,7 +149,9 @@ public class HawtDBAggregationRepository
if (index == null) {
return null;
}
- return index.get(keyBuffer);
+ Buffer buffer = index.get(keyBuffer);
+ LOG.trace("Getting key index {}", keyBuffer);
+ return buffer;
}
@Override
@@ -180,11 +184,13 @@ public class HawtDBAggregationRepository
public Buffer execute(Transaction tx) {
SortedIndex<Buffer, Buffer> index =
hawtDBFile.getRepositoryIndex(tx, repositoryName, true);
// remove from the in progress index
- index.remove(keyBuffer);
+ Buffer buffer = index.remove(keyBuffer);
+ LOG.trace("Removed key index {} -> {}", keyBuffer, buffer);
// and add it to the confirmed index
SortedIndex<Buffer, Buffer> indexCompleted =
hawtDBFile.getRepositoryIndex(tx, getRepositoryNameCompleted(), true);
indexCompleted.put(confirmKeyBuffer, exchangeBuffer);
+ LOG.trace("Added confirm index {}", confirmKeyBuffer);
return null;
}
@@ -208,7 +214,9 @@ public class HawtDBAggregationRepository
hawtDBFile.execute(new Work<Buffer>() {
public Buffer execute(Transaction tx) {
SortedIndex<Buffer, Buffer> indexCompleted =
hawtDBFile.getRepositoryIndex(tx, getRepositoryNameCompleted(), true);
- return indexCompleted.remove(confirmKeyBuffer);
+ Buffer buffer = indexCompleted.remove(confirmKeyBuffer);
+ LOG.trace("Removed confirm index {} -> {}",
confirmKeyBuffer, buffer);
+ return buffer;
}
@Override
Modified:
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java?rev=1144436&r1=1144435&r2=1144436&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBFile.java
Fri Jul 8 19:28:58 2011
@@ -50,10 +50,14 @@ public class HawtDBFile extends TxPageFi
static {
ROOT_INDEXES_FACTORY.setKeyCodec(StringCodec.INSTANCE);
ROOT_INDEXES_FACTORY.setValueCodec(IntegerCodec.INSTANCE);
- ROOT_INDEXES_FACTORY.setDeferredEncoding(true);
+ //ROOT_INDEXES_FACTORY.setDeferredEncoding(true);
+ // TODO: use false due CAMEL-3826 until root cause is fixed in hawtdb
+ ROOT_INDEXES_FACTORY.setDeferredEncoding(false);
INDEX_FACTORY.setKeyCodec(BufferCodec.INSTANCE);
INDEX_FACTORY.setValueCodec(BufferCodec.INSTANCE);
- INDEX_FACTORY.setDeferredEncoding(true);
+ //INDEX_FACTORY.setDeferredEncoding(true);
+ // TODO: use false due CAMEL-3826 until root cause is fixed in hawtdb
+ INDEX_FACTORY.setDeferredEncoding(false);
}
public HawtDBFile() {
Copied:
camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
(from r1087620,
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java?p2=camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java&p1=camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java&r1=1087620&r2=1144436&rev=1144436&view=diff
==============================================================================
---
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBBigPayloadTest.java
Fri Jul 8 19:28:58 2011
@@ -27,9 +27,8 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- * Test issue with hawtdb file store not growing large
+ * Test issue with hawtdb file store growing to large
*/
-@Ignore("Work in progress")
public class HawtDBBigPayloadTest extends CamelTestSupport {
private static final long TIME = 60 * 1000;
@@ -55,7 +54,8 @@ public class HawtDBBigPayloadTest extend
assertTrue(file + " should exists", file.exists());
long size = file.length();
log.info(file + " size is " + size);
- assertTrue(file + " should not be so big in size, was: " + size, size
< 32 * 1024 * 1024);
+ // should be about 32mb, so we say 34 just in case
+ assertTrue(file + " should not be so big in size, was: " + size, size
< 34 * 1024 * 1024);
}
@Override
