diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java
index 8efa64db9b9ecc278bc117751e2beb999b8555a2..5965e5380a847a126fc64639a4fbbb00d3954dc6 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/DefaultAnalyzerFactory.java
@@ -6,35 +6,28 @@ import com.dianping.cat.consumer.problem.ProblemAnalyzer;
import com.dianping.cat.consumer.transaction.TransactionAnalyzer;
import com.dianping.cat.message.spi.MessageAnalyzer;
import com.site.lookup.ContainerHolder;
-import com.site.lookup.annotation.Inject;
/**
* @author yong.you
* @since Jan 5, 2012
*/
public class DefaultAnalyzerFactory extends ContainerHolder implements AnalyzerFactory {
- @Inject
- private boolean m_local;
-
@Override
public MessageAnalyzer create(String name, long start, long duration, long extraTime) {
if (name.equals("problem")) {
ProblemAnalyzer analyzer = lookup(ProblemAnalyzer.class);
analyzer.setAnalyzerInfo(start, duration, extraTime);
- analyzer.setLocal(m_local);
return analyzer;
} else if (name.equals("transaction")) {
TransactionAnalyzer analyzer = lookup(TransactionAnalyzer.class);
analyzer.setAnalyzerInfo(start, duration, extraTime);
- analyzer.setLocal(m_local);
return analyzer;
} else if (name.equals("event")) {
EventAnalyzer analyzer = lookup(EventAnalyzer.class);
analyzer.setAnalyzerInfo(start, duration, extraTime);
- analyzer.setLocal(m_local);
return analyzer;
} else if (name.equals("ip")) {
IpAnalyzer analyzer = lookup(IpAnalyzer.class);
@@ -49,15 +42,4 @@ public class DefaultAnalyzerFactory extends ContainerHolder implements AnalyzerF
public void release(Object component) {
super.release(component);
}
-
- /**
- * Set local mode. In local mode, all reports and log-views will only be
- * stored in local disk, no reports or log-views will be stored in HDFS or
- * MySQL.
- *
- * @param local
- */
- public void setLocal(boolean local) {
- m_local = local;
- }
}
diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
index b6e801384470ac2c2372804ebc24721822e77a8b..b2fc22d7e63aeedbe9a278859ac6ec85f9a42b51 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/build/ComponentsConfigurator.java
@@ -26,10 +26,8 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
@Override
public List defineComponents() {
List all = new ArrayList();
- String defaultLocalMode = "true";
- all.add(C(AnalyzerFactory.class, DefaultAnalyzerFactory.class) //
- .config(E("local").value(property("local", defaultLocalMode))));
+ all.add(C(AnalyzerFactory.class, DefaultAnalyzerFactory.class));
all.add(C(MessageConsumer.class, "realtime", RealtimeConsumer.class) //
.req(AnalyzerFactory.class).config(E("consumerId").value("realtime") //
diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
index 1e6a30f5c854e7f24b54dbeb14c0d3c6a44143bc..76497af99078be4ba5d7e40212985d1225866fda 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/event/EventAnalyzer.java
@@ -48,30 +48,19 @@ public class EventAnalyzer extends AbstractMessageAnalyzer implemen
private long m_duration;
- private boolean m_local;
-
void closeMessageBuckets() {
Date timestamp = new Date(m_startTime);
for (String domain : m_reports.keySet()) {
- Bucket localBucket = null;
- Bucket remoteBucket = null;
+ Bucket logviewBucket = null;
try {
- localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "remote");
- }
+ logviewBucket = m_bucketManager.getLogviewBucket(new Date(m_startTime), domain);
} catch (Exception e) {
- m_logger.error(String.format("Error when getting message bucket of %s!", timestamp), e);
+ m_logger.error(String.format("Error when getting logview bucket of %s!", timestamp), e);
} finally {
- if (localBucket != null) {
- m_bucketManager.closeBucket(localBucket);
- }
-
- if (remoteBucket != null) {
- m_bucketManager.closeBucket(remoteBucket);
+ if (logviewBucket != null) {
+ m_bucketManager.closeBucket(logviewBucket);
}
}
}
@@ -128,22 +117,22 @@ public class EventAnalyzer extends AbstractMessageAnalyzer implemen
void loadReports() {
Date timestamp = new Date(m_startTime);
DefaultXmlParser parser = new DefaultXmlParser();
- Bucket bucket = null;
+ Bucket reportBucket = null;
try {
- bucket = m_bucketManager.getReportBucket(timestamp, "event", "local");
+ reportBucket = m_bucketManager.getReportBucket(timestamp, "event");
- for (String id : bucket.getIdsByPrefix("")) {
- String xml = bucket.findById(id);
+ for (String id : reportBucket.getIdsByPrefix("")) {
+ String xml = reportBucket.findById(id);
EventReport report = parser.parse(xml);
m_reports.put(report.getDomain(), report);
}
} catch (Exception e) {
- m_logger.error(String.format("Error when loading transacion reports of %s!", timestamp), e);
+ m_logger.error(String.format("Error when loading event reports of %s!", timestamp), e);
} finally {
- if (bucket != null) {
- m_bucketManager.closeBucket(bucket);
+ if (reportBucket != null) {
+ m_bucketManager.closeBucket(reportBucket);
}
}
}
@@ -254,10 +243,6 @@ public class EventAnalyzer extends AbstractMessageAnalyzer implemen
loadReports();
}
- public void setLocal(boolean local) {
- m_local = local;
- }
-
@Override
protected void store(List reports) {
if (reports == null || reports.size() == 0) {
@@ -273,47 +258,28 @@ public class EventAnalyzer extends AbstractMessageAnalyzer implemen
String domain = tree.getDomain();
try {
- Bucket localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
-
- localBucket.storeById(messageId, tree);
-
- if (!m_local) {
- Bucket remoteBucket = m_bucketManager
- .getMessageBucket(new Date(m_startTime), domain, "remote");
+ Bucket logviewBucket = m_bucketManager.getLogviewBucket(new Date(m_startTime), domain);
- remoteBucket.storeById(messageId, tree);
- }
+ logviewBucket.storeById(messageId, tree);
} catch (IOException e) {
- m_logger.error("Error when storing message for event analyzer!", e);
+ m_logger.error("Error when storing logview for event analyzer!", e);
}
}
void storeReports(Collection reports) {
Date timestamp = new Date(m_startTime);
DefaultXmlBuilder builder = new DefaultXmlBuilder(true);
- Bucket localBucket = null;
- Bucket remoteBucket = null;
+ Bucket reportBucket = null;
Transaction t = Cat.getProducer().newTransaction("Checkpoint", getClass().getSimpleName());
try {
- localBucket = m_bucketManager.getReportBucket(timestamp, "event", "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getReportBucket(timestamp, "event", "remote");
- }
-
- // delete old one, not append mode
- localBucket.deleteAndCreate();
+ reportBucket = m_bucketManager.getReportBucket(timestamp, "event");
for (EventReport report : reports) {
String xml = builder.buildXml(report);
String domain = report.getDomain();
- localBucket.storeById(domain, xml);
-
- if (!m_local) {
- remoteBucket.storeById(domain, xml);
- }
+ reportBucket.storeById(domain, xml);
}
t.setStatus(Message.SUCCESS);
@@ -324,12 +290,8 @@ public class EventAnalyzer extends AbstractMessageAnalyzer implemen
} finally {
t.complete();
- if (localBucket != null) {
- m_bucketManager.closeBucket(localBucket);
- }
-
- if (remoteBucket != null) {
- m_bucketManager.closeBucket(remoteBucket);
+ if (reportBucket != null) {
+ m_bucketManager.closeBucket(reportBucket);
}
}
}
diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
index d0b1fa8e15e6be51854de777ad4a0db1699c2b67..869f3622fbe77172e3864f196bbe8a711aa8a15c 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/problem/ProblemAnalyzer.java
@@ -48,30 +48,19 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
private long m_duration;
- private boolean m_local;
-
void closeMessageBuckets() {
Date timestamp = new Date(m_startTime);
for (String domain : m_reports.keySet()) {
- Bucket localBucket = null;
- Bucket remoteBucket = null;
+ Bucket logviewBucket = null;
try {
- localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "remote");
- }
+ logviewBucket = m_bucketManager.getLogviewBucket(new Date(m_startTime), domain);
} catch (Exception e) {
- m_logger.error(String.format("Error when getting message bucket of %s!", timestamp), e);
+ m_logger.error(String.format("Error when getting logview bucket of %s!", timestamp), e);
} finally {
- if (localBucket != null) {
- m_bucketManager.closeBucket(localBucket);
- }
-
- if (remoteBucket != null) {
- m_bucketManager.closeBucket(remoteBucket);
+ if (logviewBucket != null) {
+ m_bucketManager.closeBucket(logviewBucket);
}
}
}
@@ -145,7 +134,7 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
Bucket bucket = null;
try {
- bucket = m_bucketManager.getReportBucket(timestamp, "problem", "local");
+ bucket = m_bucketManager.getReportBucket(timestamp, "problem");
for (String id : bucket.getIdsByPrefix("")) {
String xml = bucket.findById(id);
@@ -195,10 +184,6 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
loadReports();
}
- public void setLocal(boolean local) {
- m_local = local;
- }
-
@Override
protected void store(List reports) {
if (reports == null || reports.size() == 0) {
@@ -214,16 +199,9 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
String domain = tree.getDomain();
try {
- Bucket localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
-
- localBucket.storeById(messageId, tree);
+ Bucket logviewBucket = m_bucketManager.getLogviewBucket(new Date(m_startTime), domain);
- if (!m_local) {
- Bucket remoteBucket = m_bucketManager
- .getMessageBucket(new Date(m_startTime), domain, "remote");
-
- remoteBucket.storeById(messageId, tree);
- }
+ logviewBucket.storeById(messageId, tree);
} catch (Exception e) {
m_logger.error("Error when storing message for problem analyzer!", e);
}
@@ -232,29 +210,20 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
void storeReports(Collection reports) {
Date timestamp = new Date(m_startTime);
DefaultXmlBuilder builder = new DefaultXmlBuilder(true);
- Bucket localBucket = null;
- Bucket remoteBucket = null;
+ Bucket reportBucket = null;
Transaction t = Cat.getProducer().newTransaction("Checkpoint", getClass().getSimpleName());
try {
- localBucket = m_bucketManager.getReportBucket(timestamp, "problem", "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getReportBucket(timestamp, "problem", "remote");
- }
+ reportBucket = m_bucketManager.getReportBucket(timestamp, "problem");
// delete old one, not append mode
- localBucket.deleteAndCreate();
+ reportBucket.deleteAndCreate();
for (ProblemReport report : reports) {
String xml = builder.buildXml(report);
String domain = report.getDomain();
- localBucket.storeById(domain, xml);
-
- if (!m_local) {
- remoteBucket.storeById(domain, xml);
- }
+ reportBucket.storeById(domain, xml);
}
t.setStatus(Message.SUCCESS);
@@ -265,12 +234,8 @@ public class ProblemAnalyzer extends AbstractMessageAnalyzer impl
} finally {
t.complete();
- if (localBucket != null) {
- m_bucketManager.closeBucket(localBucket);
- }
-
- if (remoteBucket != null) {
- m_bucketManager.closeBucket(remoteBucket);
+ if (reportBucket != null) {
+ m_bucketManager.closeBucket(reportBucket);
}
}
}
diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
index 7ae5fc8c57972cb155e0600f2d2e332d9b8dd51d..6e994ee0714ca520fe0ea906743dc938ed084af0 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
@@ -48,30 +48,19 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer localBucket = null;
- Bucket remoteBucket = null;
+ Bucket logviewBucket = null;
try {
- localBucket = m_bucketManager.getMessageBucket(timestamp, domain, "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getMessageBucket(timestamp, domain, "remote");
- }
+ logviewBucket = m_bucketManager.getLogviewBucket(timestamp, domain);
} catch (Exception e) {
- m_logger.error(String.format("Error when getting message bucket of %s!", timestamp), e);
+ m_logger.error(String.format("Error when getting logview bucket of %s!", timestamp), e);
} finally {
- if (localBucket != null) {
- m_bucketManager.closeBucket(localBucket);
- }
-
- if (remoteBucket != null) {
- m_bucketManager.closeBucket(remoteBucket);
+ if (logviewBucket != null) {
+ m_bucketManager.closeBucket(logviewBucket);
}
}
}
@@ -132,7 +121,7 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer bucket = null;
try {
- bucket = m_bucketManager.getReportBucket(timestamp, "transaction", "local");
+ bucket = m_bucketManager.getReportBucket(timestamp, "transaction");
for (String id : bucket.getIdsByPrefix("")) {
String xml = bucket.findById(id);
@@ -267,10 +256,6 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer reports) {
if (reports == null || reports.size() == 0) {
@@ -286,18 +271,11 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer localBucket = m_bucketManager.getMessageBucket(new Date(m_startTime), domain, "local");
-
- localBucket.storeById(messageId, tree);
-
- if (!m_local) {
- Bucket remoteBucket = m_bucketManager
- .getMessageBucket(new Date(m_startTime), domain, "remote");
+ Bucket logviewBucket = m_bucketManager.getLogviewBucket(new Date(m_startTime), domain);
- remoteBucket.storeById(messageId, tree);
- }
+ logviewBucket.storeById(messageId, tree);
} catch (IOException e) {
- m_logger.error("Error when storing message for transaction analyzer!", e);
+ m_logger.error("Error when storing logview for transaction analyzer!", e);
}
}
@@ -305,28 +283,16 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer localBucket = null;
- Bucket remoteBucket = null;
+ Bucket reportBucket = null;
try {
- localBucket = m_bucketManager.getReportBucket(timestamp, "transaction", "local");
-
- if (!m_local) {
- remoteBucket = m_bucketManager.getReportBucket(timestamp, "transaction", "remote");
- }
-
- // delete old one, not append mode
- localBucket.deleteAndCreate();
+ reportBucket = m_bucketManager.getReportBucket(timestamp, "transaction");
for (TransactionReport report : reports) {
String xml = builder.buildXml(report);
String domain = report.getDomain();
- localBucket.storeById(domain, xml);
-
- if (!m_local) {
- remoteBucket.storeById(domain, xml);
- }
+ reportBucket.storeById(domain, xml);
}
t.setStatus(Message.SUCCESS);
@@ -337,12 +303,8 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer
com.dianping.cat.consumer.AnalyzerFactory
com.dianping.cat.consumer.DefaultAnalyzerFactory
-
- true
-
com.dianping.cat.message.spi.MessageConsumer
diff --git a/cat-core/src/main/java/com/dianping/cat/storage/BucketManager.java b/cat-core/src/main/java/com/dianping/cat/storage/BucketManager.java
index 238a3c45a9df69199c1664be5bc4c95071a90ed5..155a87be079a31289f1915af32e6f5233d03f6f4 100644
--- a/cat-core/src/main/java/com/dianping/cat/storage/BucketManager.java
+++ b/cat-core/src/main/java/com/dianping/cat/storage/BucketManager.java
@@ -8,7 +8,9 @@ import com.dianping.cat.message.spi.MessageTree;
public interface BucketManager {
public void closeBucket(Bucket> bucket);
- public Bucket getMessageBucket(Date timestamp, String domain, String namespace) throws IOException;
+ public Bucket getLogviewBucket(Date timestamp, String domain) throws IOException;
- public Bucket getReportBucket(Date timestamp, String name, String namespace) throws IOException;
+ public Bucket getMessageBucket(Date timestamp, String domain) throws IOException;
+
+ public Bucket getReportBucket(Date timestamp, String name) throws IOException;
}
diff --git a/cat-core/src/main/java/com/dianping/cat/storage/internal/DefaultBucketManager.java b/cat-core/src/main/java/com/dianping/cat/storage/internal/DefaultBucketManager.java
index aea8aeff784ec156220f8923372be1d69a491246..3b4310d218808d36797c1281ea838cf812ddfa0d 100644
--- a/cat-core/src/main/java/com/dianping/cat/storage/internal/DefaultBucketManager.java
+++ b/cat-core/src/main/java/com/dianping/cat/storage/internal/DefaultBucketManager.java
@@ -90,13 +90,18 @@ public class DefaultBucketManager extends ContainerHolder implements BucketManag
}
@Override
- public Bucket getMessageBucket(Date timestamp, String domain, String namespace) throws IOException {
- return getBucket(MessageTree.class, timestamp, domain, namespace);
+ public Bucket getLogviewBucket(Date timestamp, String domain) throws IOException {
+ return getBucket(MessageTree.class, timestamp, domain, "logview");
}
@Override
- public Bucket getReportBucket(Date timestamp, String name, String namespace) throws IOException {
- return getBucket(String.class, timestamp, name, namespace);
+ public Bucket getMessageBucket(Date timestamp, String domain) throws IOException {
+ return getBucket(MessageTree.class, timestamp, domain, "message");
+ }
+
+ @Override
+ public Bucket getReportBucket(Date timestamp, String name) throws IOException {
+ return getBucket(String.class, timestamp, name, "report");
}
static class Entry {
diff --git a/cat-core/src/main/java/com/dianping/cat/storage/message/LocalLogviewBucket.java b/cat-core/src/main/java/com/dianping/cat/storage/message/LocalLogviewBucket.java
index 3b18e2fb7e591f0cb884bde3119b3bff33c35ffa..5a8d74e4f3b8ced427aa6bf6855f78cd8243bc5d 100644
--- a/cat-core/src/main/java/com/dianping/cat/storage/message/LocalLogviewBucket.java
+++ b/cat-core/src/main/java/com/dianping/cat/storage/message/LocalLogviewBucket.java
@@ -241,14 +241,9 @@ public class LocalLogviewBucket implements Bucket, LogEnabled {
}
protected List prepareTags(MessageTree tree) {
- List tags = new ArrayList();
+ List tags = new ArrayList(1);
tags.add("t:" + tree.getThreadId());
- tags.add("r:" + tree.getMessageId());
-
- if (tree.getSessionToken() != null) {
- tags.add("s:" + tree.getSessionToken());
- }
return tags;
}
@@ -259,14 +254,11 @@ public class LocalLogviewBucket implements Bucket, LogEnabled {
@Override
public boolean storeById(String id, MessageTree tree) throws IOException {
- m_writeLock.lock();
-
if (m_idToOffsets.containsKey(id)) {
return false;
}
List tags = prepareTags(tree);
-
ChannelBuffer buf = ChannelBuffers.dynamicBuffer(8192);
m_codec.encode(tree, buf);
@@ -274,6 +266,8 @@ public class LocalLogviewBucket implements Bucket, LogEnabled {
int length = buf.readInt();
byte[] num = String.valueOf(length).getBytes("utf-8");
+ m_writeLock.lock();
+
try {
m_writeDataFile.write(num);
m_writeDataFile.write('\n');
diff --git a/cat-core/src/main/java/com/dianping/cat/storage/report/LocalReportBucket.java b/cat-core/src/main/java/com/dianping/cat/storage/report/LocalReportBucket.java
index 9d9849d347e9b2e6cbe47dbf3775b05928b509b1..5ba7af87928f180c8d208cb12c81fc2a534199dd 100644
--- a/cat-core/src/main/java/com/dianping/cat/storage/report/LocalReportBucket.java
+++ b/cat-core/src/main/java/com/dianping/cat/storage/report/LocalReportBucket.java
@@ -158,7 +158,7 @@ public class LocalReportBucket implements Bucket, LogEnabled {
@Override
public Collection getIdsByPrefix(String tag) {
- throw new UnsupportedOperationException("Not supported by local logview bucket!");
+ return m_idToOffsets.keySet();
}
@Override
@@ -221,8 +221,6 @@ public class LocalReportBucket implements Bucket, LogEnabled {
@Override
public boolean storeById(String id, String report) throws IOException {
- m_writeLock.lock();
-
if (m_idToOffsets.containsKey(id)) {
return false;
}
@@ -231,6 +229,8 @@ public class LocalReportBucket implements Bucket, LogEnabled {
int length = content.length;
byte[] num = String.valueOf(length).getBytes("utf-8");
+ m_writeLock.lock();
+
try {
m_writeDataFile.write(num);
m_writeDataFile.write('\n');
diff --git a/cat-core/src/test/java/com/dianping/cat/storage/BucketConcurrentTest.java b/cat-core/src/test/java/com/dianping/cat/storage/BucketConcurrentTest.java
index eb5816974bb8da4a76ebddb977264ba557a8ed2f..ac4d7804ba3a833f964ef58f61d0489c0a15e43c 100644
--- a/cat-core/src/test/java/com/dianping/cat/storage/BucketConcurrentTest.java
+++ b/cat-core/src/test/java/com/dianping/cat/storage/BucketConcurrentTest.java
@@ -50,7 +50,7 @@ public class BucketConcurrentTest extends ComponentTestCase {
public void testMessageBucket() throws Exception {
Date timestamp = new Date();
BucketManager manager = lookup(BucketManager.class);
- final Bucket bucket = manager.getMessageBucket(timestamp, "concurrent/message", "local");
+ final Bucket bucket = manager.getLogviewBucket(timestamp, "concurrent/message");
ExecutorService pool = Executors.newFixedThreadPool(10);
for (int p = 0; p < 10; p++) {
@@ -115,7 +115,7 @@ public class BucketConcurrentTest extends ComponentTestCase {
public void testStringBucket() throws Exception {
Date timestamp = new Date();
BucketManager manager = lookup(BucketManager.class);
- final Bucket bucket = manager.getReportBucket(timestamp, "concurrent/data", "local");
+ final Bucket bucket = manager.getReportBucket(timestamp, "concurrent/data");
ExecutorService pool = Executors.newFixedThreadPool(10);
for (int p = 0; p < 10; p++) {
@@ -143,7 +143,7 @@ public class BucketConcurrentTest extends ComponentTestCase {
pool.awaitTermination(5000, TimeUnit.MILLISECONDS);
- final Bucket bucket2 = manager.getReportBucket(timestamp, "concurrent/data", "local");
+ final Bucket bucket2 = manager.getReportBucket(timestamp, "concurrent/data");
for (int p = 0; p < 10; p++) {
final int num = p;
diff --git a/cat-core/src/test/java/com/dianping/cat/storage/BucketManagerTest.java b/cat-core/src/test/java/com/dianping/cat/storage/BucketManagerTest.java
index e241c04c20bc23aeb178b3a2401a6590b1939f8a..88f53c0429057a88a8e73ba8bb6be8e56f99f7eb 100644
--- a/cat-core/src/test/java/com/dianping/cat/storage/BucketManagerTest.java
+++ b/cat-core/src/test/java/com/dianping/cat/storage/BucketManagerTest.java
@@ -17,10 +17,10 @@ public class BucketManagerTest extends ComponentTestCase {
public void test() throws Exception {
Date timestamp = new Date();
BucketManager manager = lookup(BucketManager.class);
- Bucket bucket1 = manager.getMessageBucket(timestamp, "test/path1", "local");
- Bucket bucket2 = manager.getMessageBucket(timestamp, "test/path2", "local");
- Bucket bucket3 = manager.getMessageBucket(timestamp, "test/path1", "local");
- Bucket bucket4 = manager.getMessageBucket(timestamp, "test/path2", "local");
+ Bucket bucket1 = manager.getLogviewBucket(timestamp, "test/path1");
+ Bucket bucket2 = manager.getLogviewBucket(timestamp, "test/path2");
+ Bucket bucket3 = manager.getLogviewBucket(timestamp, "test/path1");
+ Bucket bucket4 = manager.getLogviewBucket(timestamp, "test/path2");
Assert.assertEquals(bucket1, bucket3);
Assert.assertEquals(bucket2, bucket4);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/event/HistoricalEventService.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/event/HistoricalEventService.java
index b40259c7f5d844ac66e375862eb0ff27442bb029..0aed07c5e77f42607c57706f187f81694b418ea6 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/event/HistoricalEventService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/event/HistoricalEventService.java
@@ -26,7 +26,7 @@ public class HistoricalEventService extends BaseHistoricalModelService bucket = null;
try {
- bucket = m_bucketManager.getReportBucket(new Date(date), getName(), "remote");
+ bucket = m_bucketManager.getReportBucket(new Date(date), getName());
List xmls = bucket.findAllById(domain);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HistoricalLogViewService.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HistoricalLogViewService.java
index b6c51feba2042b29d825d5e021a5a3a3d285996e..22f3d3a99abd2be7b590a8049ba2f3fdad066510 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HistoricalLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/HistoricalLogViewService.java
@@ -32,7 +32,7 @@ public class HistoricalLogViewService extends BaseHistoricalModelService
String tag = request.getProperty("tag");
MessageId id = MessageId.parse(messageId);
Date timestamp = new Date(id.getTimestamp());
- Bucket bucket = m_bucketManager.getMessageBucket(timestamp, id.getDomain(), "remote");
+ Bucket bucket = m_bucketManager.getLogviewBucket(timestamp, id.getDomain());
MessageTree tree = null;
if (tag != null && direction != null) {
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java
index 3b693dc7e2fe9899c5a67be37f3182e3d0cb7b84..917e1f82727d7565a7670b8a400d533c3066ef7b 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/logview/LocalLogViewService.java
@@ -34,7 +34,7 @@ public class LocalLogViewService extends BaseLocalModelService {
String tag = request.getProperty("tag");
MessageId id = MessageId.parse(messageId);
Date timestamp = new Date(id.getTimestamp());
- Bucket bucket = m_bucketManager.getMessageBucket(timestamp, id.getDomain(), "local");
+ Bucket bucket = m_bucketManager.getLogviewBucket(timestamp, id.getDomain());
MessageTree tree = null;
if (tag != null && direction != null) {
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HistoricalProblemService.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HistoricalProblemService.java
index 9bf4b4809dff6991b0f640d1b438057097560a69..de349d6d57709a4ec9ab5a1b3b5a38ced2fc1b88 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HistoricalProblemService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/problem/HistoricalProblemService.java
@@ -27,7 +27,7 @@ public class HistoricalProblemService extends BaseHistoricalModelService bucket = null;
try {
- bucket = m_bucketManager.getReportBucket(new Date(date), getName(), "remote");
+ bucket = m_bucketManager.getReportBucket(new Date(date), getName());
List xmls = bucket.findAllById(domain);
diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HistoricalTransactionService.java b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HistoricalTransactionService.java
index 920500e4423120895d15f16d84ad1e52af73bf9a..b41229f7c05278a5aef83350bb37fcf743e5d28a 100755
--- a/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HistoricalTransactionService.java
+++ b/cat-home/src/main/java/com/dianping/cat/report/page/model/transaction/HistoricalTransactionService.java
@@ -26,7 +26,7 @@ public class HistoricalTransactionService extends BaseHistoricalModelService bucket = null;
try {
- bucket = m_bucketManager.getReportBucket(new Date(date), getName(), "remote");
+ bucket = m_bucketManager.getReportBucket(new Date(date), getName());
List xmls = bucket.findAllById(domain);