You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2011/09/05 19:39:03 UTC
svn commit: r1165369 [1/9] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/main/java/org/apache/bookkeeper/clie...
Author: fpj
Date: Mon Sep 5 17:38:57 2011
New Revision: 1165369
URL: http://svn.apache.org/viewvc?rev=1165369&view=rev
Log:
BOOKKEEPER-26: Indentation is all messed up in the BookKeeper code (ivank via fpj)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/TestClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptor.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerEntryPage.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/AsyncCallback.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BKException.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/CRC32DigestManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DigestManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DistributionSchedule.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerCreateOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerDeleteOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerOpenOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerRecoveryOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/MacDigestManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedOp.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RoundRobinDistributionSchedule.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/SyncCounter.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieProtocol.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServer.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookkeeperInternalCallbacks.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/NIOServerFactory.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/tools/BookKeeperTools.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/Main.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/MathUtils.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/OrderedSafeExecutor.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/SafeRunnable.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/StringUtils.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/api/MessageHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/api/Publisher.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/api/Subscriber.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkUtils.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkWorker.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/HedwigBenchmark.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/data/MessageConsumeData.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/data/PubSubData.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/data/TopicSubscriber.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/exceptions/ServerRedirectLoopException.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/exceptions/TooManyServerRedirectsException.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ClientChannelPipelineFactory.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClient.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/ssl/SslContextFactory.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/conf/AbstractConfiguration.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/Callback.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/CallbackUtils.java
zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/client/AppTest.java
zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/exceptions/PubSubException.java
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/protocol/PubSubProtocol.java
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/protoextensions/MessageIdUtils.java
zookeeper/bookkeeper/trunk/hedwig-protocol/src/main/java/org/apache/hedwig/protoextensions/SubscriptionStateUtils.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookkeeperBenchmark.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/UnexpectedError.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/DeliveryManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/BaseHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/ChannelDisconnectListener.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/ConsumeHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/Handler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/PublishHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerPipelineFactory.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheKey.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/PersistRequest.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/PersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/PersistenceManagerWithRangeScan.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/RangeScanRequest.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ScanCallback.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ScanRequest.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ChannelTracker.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConfiguration.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/HedwigHubClientFactory.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/HedwigHubSubscriber.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MessageFilter.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/SubscriptionEventListener.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/SubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/ZkSubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/TopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/TrivialOwnAllTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/SafeAsynBKCallback.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/SafeAsyncZKCallback.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/HelperMethods.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/StubDeliveryManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/StubPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/StubScanCallback.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManagerBlackBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/StubSubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestZkSubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/StubTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/ZooKeeperTestBase.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Sep 5 17:38:57 2011
@@ -54,6 +54,8 @@ IMPROVEMENTS:
BOOKKEEPER-28: Create useful startup scripts for bookkeeper and hedwig (ivank)
+ BOOKKEEPER-26: Indentation is all messed up in the BookKeeper code (ivank via fpj)
+
hedwig-client/
BOOKKEEPER-44: Reuse publish channel to default server to avoid too many connect requests to default server when lots of producers came in same time (Sijie Guo via breed)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/MySqlClient.java Mon Sep 5 17:38:57 2011
@@ -33,104 +33,104 @@ import org.apache.log4j.Logger;
import org.apache.zookeeper.KeeperException;
public class MySqlClient {
- static Logger LOG = Logger.getLogger(MySqlClient.class);
+ static Logger LOG = Logger.getLogger(MySqlClient.class);
- BookKeeper x;
- LedgerHandle lh;
- Integer entryId;
- HashMap<Integer, Integer> map;
-
- FileOutputStream fStream;
- FileOutputStream fStreamLocal;
- long start, lastId;
- Connection con;
- Statement stmt;
-
-
- public MySqlClient(String hostport, String user, String pass)
- throws ClassNotFoundException {
- entryId = 0;
- map = new HashMap<Integer, Integer>();
- Class.forName("com.mysql.jdbc.Driver");
- // database is named "bookkeeper"
- String url = "jdbc:mysql://" + hostport + "/bookkeeper";
- try {
- con = DriverManager.getConnection(url, user, pass);
- stmt = con.createStatement();
- // drop table and recreate it
- stmt.execute("DROP TABLE IF EXISTS data;");
- stmt.execute("create table data(transaction_id bigint PRIMARY KEY AUTO_INCREMENT, content TEXT);");
- LOG.info("Database initialization terminated");
- } catch (SQLException e) {
-
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- public void closeHandle() throws KeeperException, InterruptedException, SQLException{
- con.close();
- }
- /**
- * First parameter is an integer defining the length of the message
- * Second parameter is the number of writes
- * Third parameter is host:port
- * Fourth parameter is username
- * Fifth parameter is password
- * @param args
- * @throws ClassNotFoundException
- * @throws SQLException
- */
- public static void main(String[] args) throws ClassNotFoundException, SQLException {
- int lenght = Integer.parseInt(args[1]);
- StringBuilder sb = new StringBuilder();
- while(lenght-- > 0){
- sb.append('a');
- }
- try {
- MySqlClient c = new MySqlClient(args[2], args[3], args[4]);
- c.writeSameEntryBatch(sb.toString().getBytes(), Integer.parseInt(args[0]));
- c.writeSameEntry(sb.toString().getBytes(), Integer.parseInt(args[0]));
- c.closeHandle();
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (KeeperException e) {
- e.printStackTrace();
- }
-
- }
-
- /**
- * Adds data entry to the DB
- * @param data the entry to be written, given as a byte array
- * @param times the number of times the entry should be written on the DB */
- void writeSameEntryBatch(byte[] data, int times) throws InterruptedException, SQLException{
- start = System.currentTimeMillis();
- int count = times;
- String content = new String(data);
- System.out.println("Data: " + content + ", " + data.length);
- while(count-- > 0){
- stmt.addBatch("insert into data(content) values(\"" + content + "\");");
- }
- LOG.info("Finished writing batch SQL command in ms: " + (System.currentTimeMillis() - start));
- start = System.currentTimeMillis();
- stmt.executeBatch();
- System.out.println("Finished " + times + " writes in ms: " + (System.currentTimeMillis() - start));
- LOG.info("Ended computation");
- }
-
- void writeSameEntry(byte[] data, int times) throws InterruptedException, SQLException{
- start = System.currentTimeMillis();
- int count = times;
- String content = new String(data);
- System.out.println("Data: " + content + ", " + data.length);
- while(count-- > 0){
- stmt.executeUpdate("insert into data(content) values(\"" + content + "\");");
- }
- System.out.println("Finished " + times + " writes in ms: " + (System.currentTimeMillis() - start));
- LOG.info("Ended computation");
- }
+ BookKeeper x;
+ LedgerHandle lh;
+ Integer entryId;
+ HashMap<Integer, Integer> map;
+
+ FileOutputStream fStream;
+ FileOutputStream fStreamLocal;
+ long start, lastId;
+ Connection con;
+ Statement stmt;
+
+
+ public MySqlClient(String hostport, String user, String pass)
+ throws ClassNotFoundException {
+ entryId = 0;
+ map = new HashMap<Integer, Integer>();
+ Class.forName("com.mysql.jdbc.Driver");
+ // database is named "bookkeeper"
+ String url = "jdbc:mysql://" + hostport + "/bookkeeper";
+ try {
+ con = DriverManager.getConnection(url, user, pass);
+ stmt = con.createStatement();
+ // drop table and recreate it
+ stmt.execute("DROP TABLE IF EXISTS data;");
+ stmt.execute("create table data(transaction_id bigint PRIMARY KEY AUTO_INCREMENT, content TEXT);");
+ LOG.info("Database initialization terminated");
+ } catch (SQLException e) {
+
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void closeHandle() throws KeeperException, InterruptedException, SQLException {
+ con.close();
+ }
+ /**
+ * First parameter is an integer defining the length of the message
+ * Second parameter is the number of writes
+ * Third parameter is host:port
+ * Fourth parameter is username
+ * Fifth parameter is password
+ * @param args
+ * @throws ClassNotFoundException
+ * @throws SQLException
+ */
+ public static void main(String[] args) throws ClassNotFoundException, SQLException {
+ int lenght = Integer.parseInt(args[1]);
+ StringBuilder sb = new StringBuilder();
+ while(lenght-- > 0) {
+ sb.append('a');
+ }
+ try {
+ MySqlClient c = new MySqlClient(args[2], args[3], args[4]);
+ c.writeSameEntryBatch(sb.toString().getBytes(), Integer.parseInt(args[0]));
+ c.writeSameEntry(sb.toString().getBytes(), Integer.parseInt(args[0]));
+ c.closeHandle();
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (KeeperException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * Adds data entry to the DB
+ * @param data the entry to be written, given as a byte array
+ * @param times the number of times the entry should be written on the DB */
+ void writeSameEntryBatch(byte[] data, int times) throws InterruptedException, SQLException {
+ start = System.currentTimeMillis();
+ int count = times;
+ String content = new String(data);
+ System.out.println("Data: " + content + ", " + data.length);
+ while(count-- > 0) {
+ stmt.addBatch("insert into data(content) values(\"" + content + "\");");
+ }
+ LOG.info("Finished writing batch SQL command in ms: " + (System.currentTimeMillis() - start));
+ start = System.currentTimeMillis();
+ stmt.executeBatch();
+ System.out.println("Finished " + times + " writes in ms: " + (System.currentTimeMillis() - start));
+ LOG.info("Ended computation");
+ }
+
+ void writeSameEntry(byte[] data, int times) throws InterruptedException, SQLException {
+ start = System.currentTimeMillis();
+ int count = times;
+ String content = new String(data);
+ System.out.println("Data: " + content + ", " + data.length);
+ while(count-- > 0) {
+ stmt.executeUpdate("insert into data(content) values(\"" + content + "\");");
+ }
+ System.out.println("Finished " + times + " writes in ms: " + (System.currentTimeMillis() - start));
+ LOG.info("Ended computation");
+ }
-}
\ No newline at end of file
+}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/TestClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/TestClient.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/TestClient.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/TestClient.java Mon Sep 5 17:38:57 2011
@@ -1,6 +1,6 @@
package org.apache.bookkeeper.benchmark;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.bookkeeper.benchmark;
* 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.
- *
+ *
*/
@@ -41,71 +41,71 @@ import org.apache.zookeeper.KeeperExcept
/**
* This is a simple test program to compare the performance of writing to
* BookKeeper and to the local file system.
- *
+ *
*/
-public class TestClient
- implements AddCallback, ReadCallback{
+public class TestClient
+ implements AddCallback, ReadCallback {
private static final Logger LOG = Logger.getLogger(TestClient.class);
-
+
BookKeeper x;
LedgerHandle lh;
Integer entryId;
HashMap<Integer, Integer> map;
-
+
FileOutputStream fStream;
FileOutputStream fStreamLocal;
long start, lastId;
-
+
public TestClient() {
entryId = 0;
map = new HashMap<Integer, Integer>();
}
-
- public TestClient(String servers) throws KeeperException, IOException, InterruptedException{
+
+ public TestClient(String servers) throws KeeperException, IOException, InterruptedException {
this();
x = new BookKeeper(servers);
- try{
- lh = x.createLedger(DigestType.MAC, new byte[] {'a', 'b'});
+ try {
+ lh = x.createLedger(DigestType.MAC, new byte[] {'a', 'b'});
} catch (BKException e) {
LOG.error(e.toString());
}
}
-
+
public TestClient(String servers, int ensSize, int qSize)
- throws KeeperException, IOException, InterruptedException{
+ throws KeeperException, IOException, InterruptedException {
this();
x = new BookKeeper(servers);
- try{
- lh = x.createLedger(ensSize, qSize, DigestType.MAC, new byte[] {'a', 'b'});
+ try {
+ lh = x.createLedger(ensSize, qSize, DigestType.MAC, new byte[] {'a', 'b'});
} catch (BKException e) {
LOG.error(e.toString());
}
}
-
+
public TestClient(FileOutputStream fStream)
- throws FileNotFoundException {
+ throws FileNotFoundException {
this.fStream = fStream;
this.fStreamLocal = new FileOutputStream("./local.log");
}
-
-
- public Integer getFreshEntryId(int val){
+
+
+ public Integer getFreshEntryId(int val) {
++this.entryId;
synchronized (map) {
map.put(this.entryId, val);
}
return this.entryId;
}
-
- public boolean removeEntryId(Integer id){
+
+ public boolean removeEntryId(Integer id) {
boolean retVal = false;
synchronized (map) {
- map.remove(id);
- retVal = true;
-
+ map.remove(id);
+ retVal = true;
+
if(map.size() == 0) map.notifyAll();
- else{
+ else {
if(map.size() < 4)
LOG.error(map.toString());
}
@@ -113,32 +113,32 @@ public class TestClient
return retVal;
}
- public void closeHandle() throws KeeperException, InterruptedException{
+ public void closeHandle() throws KeeperException, InterruptedException {
lh.close();
}
/**
* First says if entries should be written to BookKeeper (0) or to the local
- * disk (1). Second parameter is an integer defining the length of a ledger entry.
+ * disk (1). Second parameter is an integer defining the length of a ledger entry.
* Third parameter is the number of writes.
- *
+ *
* @param args
*/
public static void main(String[] args) {
-
+
int lenght = Integer.parseInt(args[1]);
StringBuilder sb = new StringBuilder();
- while(lenght-- > 0){
+ while(lenght-- > 0) {
sb.append('a');
}
-
+
Integer selection = Integer.parseInt(args[0]);
- switch(selection){
- case 0:
+ switch(selection) {
+ case 0:
StringBuilder servers_sb = new StringBuilder();
- for (int i = 4; i < args.length; i++){
+ for (int i = 4; i < args.length; i++) {
servers_sb.append(args[i] + " ");
}
-
+
String servers = servers_sb.toString().trim().replace(' ', ',');
try {
TestClient c = new TestClient(servers, Integer.parseInt(args[3]), Integer.parseInt(args[4]));
@@ -156,11 +156,11 @@ public class TestClient
}
break;
case 1:
-
- try{
+
+ try {
TestClient c = new TestClient(new FileOutputStream(args[2]));
c.writeSameEntryBatchFS(sb.toString().getBytes(), Integer.parseInt(args[3]));
- } catch(FileNotFoundException e){
+ } catch(FileNotFoundException e) {
LOG.error(e);
}
break;
@@ -169,27 +169,27 @@ public class TestClient
}
}
- void writeSameEntryBatch(byte[] data, int times) throws InterruptedException{
+ void writeSameEntryBatch(byte[] data, int times) throws InterruptedException {
start = System.currentTimeMillis();
int count = times;
LOG.debug("Data: " + new String(data) + ", " + data.length);
- while(count-- > 0){
+ while(count-- > 0) {
lh.asyncAddEntry(data, this, this.getFreshEntryId(2));
}
- LOG.debug("Finished " + times + " async writes in ms: " + (System.currentTimeMillis() - start));
+ LOG.debug("Finished " + times + " async writes in ms: " + (System.currentTimeMillis() - start));
synchronized (map) {
if(map.size() != 0)
map.wait();
}
LOG.debug("Finished processing in ms: " + (System.currentTimeMillis() - start));
-
+
LOG.debug("Ended computation");
}
-
- void writeConsecutiveEntriesBatch(int times) throws InterruptedException{
+
+ void writeConsecutiveEntriesBatch(int times) throws InterruptedException {
start = System.currentTimeMillis();
int count = times;
- while(count-- > 0){
+ while(count-- > 0) {
byte[] write = new byte[2];
int j = count%100;
int k = (count+1)%100;
@@ -197,52 +197,52 @@ public class TestClient
write[1] = (byte) k;
lh.asyncAddEntry(write, this, this.getFreshEntryId(2));
}
- LOG.debug("Finished " + times + " async writes in ms: " + (System.currentTimeMillis() - start));
+ LOG.debug("Finished " + times + " async writes in ms: " + (System.currentTimeMillis() - start));
synchronized (map) {
if(map.size() != 0)
map.wait();
}
LOG.debug("Finished processing writes (ms): " + (System.currentTimeMillis() - start));
-
+
Integer mon = Integer.valueOf(0);
- synchronized(mon){
- lh.asyncReadEntries(1, times - 1, this, mon);
- mon.wait();
- }
+ synchronized(mon) {
+ lh.asyncReadEntries(1, times - 1, this, mon);
+ mon.wait();
+ }
LOG.error("Ended computation");
}
void writeSameEntryBatchFS(byte[] data, int times) {
int count = times;
LOG.debug("Data: " + data.length + ", " + times);
- try{
+ try {
start = System.currentTimeMillis();
- while(count-- > 0){
+ while(count-- > 0) {
fStream.write(data);
fStreamLocal.write(data);
fStream.flush();
}
fStream.close();
System.out.println("Finished processing writes (ms): " + (System.currentTimeMillis() - start));
- } catch(IOException e){
+ } catch(IOException e) {
LOG.error(e);
}
}
-
-
+
+
@Override
public void addComplete(int rc, LedgerHandle lh, long entryId, Object ctx) {
this.removeEntryId((Integer) ctx);
}
-
+
@Override
- public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq, Object ctx){
+ public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq, Object ctx) {
System.out.println("Read callback: " + rc);
- while(seq.hasMoreElements()){
+ while(seq.hasMoreElements()) {
LedgerEntry le = seq.nextElement();
LOG.debug(new String(le.getEntry()));
}
- synchronized(ctx){
+ synchronized(ctx) {
ctx.notify();
}
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java Mon Sep 5 17:38:57 2011
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.
- *
+ *
*/
package org.apache.bookkeeper.bookie;
@@ -57,7 +57,7 @@ import org.apache.zookeeper.ZooDefs.Ids;
public class Bookie extends Thread {
HashMap<Long, LedgerDescriptor> ledgers = new HashMap<Long, LedgerDescriptor>();
static Logger LOG = Logger.getLogger(Bookie.class);
-
+
final File journalDirectory;
final File ledgerDirectories[];
@@ -209,7 +209,7 @@ public class Bookie extends Thread {
LOG.debug("I'm starting a bookie with journal directory " + journalDirectory.getName());
start();
syncThread.start();
- // set running here.
+ // set running here.
// since bookie server use running as a flag to tell bookie server whether it is alive
// if setting it in bookie thread, the watcher might run before bookie thread.
running = true;
@@ -231,7 +231,7 @@ public class Bookie extends Thread {
// Create the ZK ephemeral node for this Bookie.
try {
zk.create(BOOKIE_REGISTRATION_PATH + InetAddress.getLocalHost().getHostAddress() + ":" + port, new byte[0],
- Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
+ Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
} catch (Exception e) {
LOG.fatal("ZK exception registering ephemeral Znode for Bookie!", e);
// Throw an IOException back up. This will cause the Bookie
@@ -240,10 +240,10 @@ public class Bookie extends Thread {
throw new IOException(e);
}
}
-
- /**
+
+ /**
* Create a new zookeeper client to zk cluster.
- *
+ *
* <p>
* Bookie Server just used zk client when syncing ledgers for garbage collection.
* So when zk client is expired, it means this bookie server is not available in
@@ -262,35 +262,35 @@ public class Bookie extends Thread {
* @return zk client instance
*/
private ZooKeeper newZookeeper(final String zkServers,
- final int sessionTimeout) throws IOException {
+ final int sessionTimeout) throws IOException {
ZooKeeper newZk = new ZooKeeper(zkServers, sessionTimeout,
- new Watcher() {
- @Override
- public void process(WatchedEvent event) {
- // handle session disconnects and expires
- if (event.getType()
- .equals(Watcher.Event.EventType.None)) {
- if (event.getState().equals(
- Watcher.Event.KeeperState.Disconnected)) {
- LOG.warn("ZK client has been disconnected to the ZK server!");
- } else if (event.getState().equals(
- Watcher.Event.KeeperState.SyncConnected)) {
- LOG.info("ZK client has been reconnected to the ZK server!");
- }
- }
- // Check for expired connection.
- if (event.getState().equals(
- Watcher.Event.KeeperState.Expired)) {
- LOG.error("ZK client connection to the ZK server has expired!");
- isZkExpired = true;
- try {
- shutdown();
- } catch (InterruptedException ie) {
- System.exit(-1);
- }
- }
+ new Watcher() {
+ @Override
+ public void process(WatchedEvent event) {
+ // handle session disconnects and expires
+ if (event.getType()
+ .equals(Watcher.Event.EventType.None)) {
+ if (event.getState().equals(
+ Watcher.Event.KeeperState.Disconnected)) {
+ LOG.warn("ZK client has been disconnected to the ZK server!");
+ } else if (event.getState().equals(
+ Watcher.Event.KeeperState.SyncConnected)) {
+ LOG.info("ZK client has been reconnected to the ZK server!");
}
- });
+ }
+ // Check for expired connection.
+ if (event.getState().equals(
+ Watcher.Event.KeeperState.Expired)) {
+ LOG.error("ZK client connection to the ZK server has expired!");
+ isZkExpired = true;
+ try {
+ shutdown();
+ } catch (InterruptedException ie) {
+ System.exit(-1);
+ }
+ }
+ }
+ });
isZkExpired = false;
return newZk;
}
@@ -323,12 +323,12 @@ public class Bookie extends Thread {
handle = createHandle(ledgerId, readonly);
ledgers.put(ledgerId, handle);
handle.setMasterKey(ByteBuffer.wrap(masterKey));
- }
+ }
handle.incRef();
}
return handle;
}
-
+
private LedgerDescriptor getHandle(long ledgerId, boolean readonly) throws IOException {
LedgerDescriptor handle = null;
synchronized (ledgers) {
@@ -339,20 +339,20 @@ public class Bookie extends Thread {
}
handle = createHandle(ledgerId, readonly);
ledgers.put(ledgerId, handle);
- }
+ }
handle.incRef();
}
return handle;
}
-
+
private LedgerDescriptor createHandle(long ledgerId, boolean readOnly) throws IOException {
return new LedgerDescriptor(ledgerId, entryLogger, ledgerCache);
}
-
+
static class QueueEntry {
- QueueEntry(ByteBuffer entry, long ledgerId, long entryId,
- WriteCallback cb, Object ctx) {
+ QueueEntry(ByteBuffer entry, long ledgerId, long entryId,
+ WriteCallback cb, Object ctx) {
this.entry = entry.duplicate();
this.cb = cb;
this.ctx = ctx;
@@ -361,9 +361,9 @@ public class Bookie extends Thread {
}
ByteBuffer entry;
-
+
long ledgerId;
-
+
long entryId;
WriteCallback cb;
@@ -374,9 +374,9 @@ public class Bookie extends Thread {
LinkedBlockingQueue<QueueEntry> queue = new LinkedBlockingQueue<QueueEntry>();
public final static long preAllocSize = 4*1024*1024;
-
+
public final static ByteBuffer zeros = ByteBuffer.allocate(512);
-
+
class LastLogMark {
long txnLogId;
long txnLogPosition;
@@ -433,13 +433,13 @@ public class Bookie extends Thread {
}
}
}
-
+
private LastLogMark lastLogMark = new LastLogMark(0, 0);
-
- public boolean isRunning(){
+
+ public boolean isRunning() {
return running;
}
-
+
@Override
public void run() {
LinkedList<QueueEntry> toFlush = new LinkedList<QueueEntry>();
@@ -510,7 +510,7 @@ public class Bookie extends Thread {
public synchronized void shutdown() throws InterruptedException {
if (!running) { // avoid shutdown twice
- return;
+ return;
}
// Shutdown the ZK client
if(zk != null) zk.close();
@@ -526,13 +526,13 @@ public class Bookie extends Thread {
// setting running to false here, so watch thread in bookie server know it only after bookie shut down
running = false;
}
-
+
public void addEntry(ByteBuffer entry, WriteCallback cb, Object ctx, byte[] masterKey)
throws IOException, BookieException {
long ledgerId = entry.getLong();
LedgerDescriptor handle = getHandle(ledgerId, false, masterKey);
-
- if(!handle.cmpMasterKey(ByteBuffer.wrap(masterKey))){
+
+ if(!handle.cmpMasterKey(ByteBuffer.wrap(masterKey))) {
throw BookieException.create(BookieException.Code.UnauthorizedAccessException);
}
try {
@@ -588,7 +588,7 @@ public class Bookie extends Thread {
* @throws InterruptedException
*/
public static void main(String[] args) throws IOException,
- InterruptedException, BookieException {
+ InterruptedException, BookieException {
Bookie b = new Bookie(5000, null, new File("/tmp"), new File[] { new File("/tmp") });
CounterCallback cb = new CounterCallback();
long start = System.currentTimeMillis();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieException.java Mon Sep 5 17:38:57 2011
@@ -1,7 +1,7 @@
package org.apache.bookkeeper.bookie;
/*
- *
+ *
* 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
@@ -9,55 +9,55 @@ package org.apache.bookkeeper.bookie;
* 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.
- *
+ *
*/
-
-
- import java.lang.Exception;
-
- @SuppressWarnings("serial")
+
+
+import java.lang.Exception;
+
+@SuppressWarnings("serial")
public abstract class BookieException extends Exception {
private int code;
- public BookieException(int code){
+ public BookieException(int code) {
this.code = code;
}
-
- public static BookieException create(int code){
- switch(code){
+
+ public static BookieException create(int code) {
+ switch(code) {
case Code.UnauthorizedAccessException:
return new BookieUnauthorizedAccessException();
default:
return new BookieIllegalOpException();
}
}
-
+
public interface Code {
int OK = 0;
int UnauthorizedAccessException = -1;
-
+
int IllegalOpException = -100;
}
-
- public void setCode(int code){
+
+ public void setCode(int code) {
this.code = code;
}
-
- public int getCode(){
+
+ public int getCode() {
return this.code;
}
-
- public String getMessage(int code){
- switch(code){
+
+ public String getMessage(int code) {
+ switch(code) {
case Code.OK:
return "No problem";
case Code.UnauthorizedAccessException:
@@ -66,16 +66,16 @@ public abstract class BookieException ex
return "Invalid operation";
}
}
-
+
public static class BookieUnauthorizedAccessException extends BookieException {
- public BookieUnauthorizedAccessException(){
+ public BookieUnauthorizedAccessException() {
super(Code.UnauthorizedAccessException);
- }
+ }
}
-
+
public static class BookieIllegalOpException extends BookieException {
- public BookieIllegalOpException(){
+ public BookieIllegalOpException() {
super(Code.UnauthorizedAccessException);
- }
+ }
}
-}
\ No newline at end of file
+}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BufferedChannel.java Mon Sep 5 17:38:57 2011
@@ -28,7 +28,7 @@ import java.nio.channels.FileChannel;
/**
* Provides a buffering layer in front of a FileChannel.
*/
-public class BufferedChannel
+public class BufferedChannel
{
ByteBuffer writeBuffer;
ByteBuffer readBuffer;
@@ -43,10 +43,10 @@ public class BufferedChannel
position = bc.position();
writeBufferStartPosition = position;
}
-/* public void close() throws IOException {
- bc.close();
- }
-*/
+ /* public void close() throws IOException {
+ bc.close();
+ }
+ */
// public boolean isOpen() {
// return bc.isOpen();
// }
@@ -75,22 +75,22 @@ public class BufferedChannel
position += copied;
return copied;
}
-
+
public long position() {
return position;
}
-
+
/**
* Retrieve the current size of the underlying FileChannel
- *
+ *
* @return FileChannel size measured in bytes
- *
+ *
* @throws IOException if some I/O error occurs reading the FileChannel
*/
public long size() throws IOException {
return bc.size();
}
-
+
public void flush(boolean sync) throws IOException {
synchronized(this) {
if (writeBuffer == null) {
@@ -116,7 +116,7 @@ public class BufferedChannel
}
int rc = buff.remaining();
while(buff.remaining() > 0) {
- // check if it is in the write buffer
+ // check if it is in the write buffer
if (writeBuffer != null && writeBufferStartPosition <= pos) {
long positionInBuffer = pos - writeBufferStartPosition;
long bytesToCopy = writeBuffer.position()-positionInBuffer;
@@ -143,7 +143,7 @@ public class BufferedChannel
src.limit((int) (positionInBuffer+bytesToCopy));
buff.put(src);
pos += bytesToCopy;
- // let's read it
+ // let's read it
} else {
readBufferStartPosition = pos;
readBuffer.clear();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLogger.java Mon Sep 5 17:38:57 2011
@@ -85,7 +85,7 @@ public class EntryLogger {
// This is the thread that garbage collects the entry logs that do not
// contain any active ledgers in them.
GarbageCollectorThread gcThread = new GarbageCollectorThread();
- // This is how often we want to run the Garbage Collector Thread (in milliseconds).
+ // This is how often we want to run the Garbage Collector Thread (in milliseconds).
// This should be passed as a System property. Default it to 1000 ms (1sec).
final static int gcWaitTime = Integer.getInteger("gcWaitTime", 1000);
@@ -113,7 +113,7 @@ public class EntryLogger {
// Start the Garbage Collector thread to prune unneeded entry logs.
gcThread.start();
}
-
+
/**
* Maps entry log files to open channels.
*/
@@ -152,10 +152,10 @@ public class EntryLogger {
public void processResult(int rc, String path, Object ctx) {
if (rc != Code.OK.intValue()) {
LOG.error("ZK error syncing the ledgers node when getting children: ", KeeperException
- .create(KeeperException.Code.get(rc), path));
+ .create(KeeperException.Code.get(rc), path));
return;
}
- // Sync has completed successfully so now we can poll ZK
+ // Sync has completed successfully so now we can poll ZK
// and read in the latest set of active ledger nodes.
List<String> ledgerNodes;
try {
@@ -194,7 +194,7 @@ public class EntryLogger {
// Remove any active ledgers that don't exist in ZK.
for (Long ledger : curActiveLedgers.keySet()) {
if (!allActiveLedgers.contains(ledger)) {
- // Remove it from the current active ledgers set and also from all
+ // Remove it from the current active ledgers set and also from all
// LedgerCache data references to the ledger, i.e. the physical ledger index file.
LOG.info("Removing a non-active/deleted ledger: " + ledger);
curActiveLedgers.remove(ledger);
@@ -223,7 +223,7 @@ public class EntryLogger {
entryLogFile = findFile(entryLogId);
} catch (FileNotFoundException e) {
LOG.error("Trying to delete an entryLog file that could not be found: "
- + entryLogId + ".log");
+ + entryLogId + ".log");
continue;
}
entryLogFile.delete();
@@ -236,7 +236,7 @@ public class EntryLogger {
}
}
}
-
+
/**
* Creates a new log file with the given id.
*/
@@ -275,7 +275,7 @@ public class EntryLogger {
}
}
}
-
+
/**
* reads id from the "lastId" file in the given directory.
*/
@@ -301,11 +301,11 @@ public class EntryLogger {
}
}
}
-
+
private void openNewChannel() throws IOException {
createLogId(++logId);
}
-
+
synchronized void flush() throws IOException {
if (logChannel != null) {
logChannel.flush(true);
@@ -325,7 +325,7 @@ public class EntryLogger {
somethingWritten = true;
return (logId << 32L) | pos;
}
-
+
byte[] readEntry(long ledgerId, long entryId, long location) throws IOException {
long entryLogId = location >> 32L;
long pos = location & 0xffffffffL;
@@ -348,7 +348,7 @@ public class EntryLogger {
// entrySize does not include the ledgerId
if (entrySize > 1024*1024) {
LOG.error("Sanity check failed for entry size of " + entrySize + " at location " + pos + " in " + entryLogId);
-
+
}
byte data[] = new byte[entrySize];
ByteBuffer buff = ByteBuffer.wrap(data);
@@ -365,10 +365,10 @@ public class EntryLogger {
if (thisEntryId != entryId) {
throw new IOException("problem found in " + entryLogId + "@" + entryId + " at position + " + pos + " entry is " + thisEntryId + " not " + entryId);
}
-
+
return data;
}
-
+
private BufferedChannel getChannelForLogId(long entryLogId) throws IOException {
BufferedChannel fc = channels.get(entryLogId);
if (fc != null) {
@@ -381,7 +381,7 @@ public class EntryLogger {
newFc.position(newFc.size());
synchronized (channels) {
fc = channels.get(entryLogId);
- if (fc != null){
+ if (fc != null) {
newFc.close();
return fc;
}
@@ -400,7 +400,7 @@ public class EntryLogger {
}
throw new FileNotFoundException("No file for log " + Long.toHexString(logId));
}
-
+
synchronized public boolean testAndClearSomethingWritten() {
try {
return somethingWritten;
@@ -452,14 +452,14 @@ public class EntryLogger {
int entrySize = sizeBuff.getInt();
if (entrySize > 1024 * 1024) {
LOG.error("Sanity check failed for entry size of " + entrySize + " at location " + pos + " in "
- + entryLogId);
+ + entryLogId);
}
byte data[] = new byte[entrySize];
ByteBuffer buff = ByteBuffer.wrap(data);
int rc = bc.read(buff, pos);
if (rc != data.length) {
throw new IOException("Short read for entryLog " + entryLogId + "@" + pos + "(" + rc + "!="
- + data.length + ")");
+ + data.length + ")");
}
buff.flip();
long ledgerId = buff.getLong();
@@ -475,7 +475,7 @@ public class EntryLogger {
/**
* Shutdown method to gracefully stop all threads spawned in this class and exit.
- *
+ *
* @throws InterruptedException if there is an exception stopping threads.
*/
public void shutdown() throws InterruptedException {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java Mon Sep 5 17:38:57 2011
@@ -105,7 +105,7 @@ class FileInfo {
synchronized public void use() {
useCount++;
}
-
+
synchronized public void release() {
useCount--;
if (isClosed && useCount == 0) {
@@ -116,7 +116,7 @@ class FileInfo {
}
}
}
-
+
/**
* Getter to a handle on the actual ledger index file.
* This is used when we are deleting a ledger and want to physically remove the index file.
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java Mon Sep 5 17:38:57 2011
@@ -45,7 +45,7 @@ import org.apache.log4j.Logger;
*/
public class LedgerCache {
private final static Logger LOG = Logger.getLogger(LedgerDescriptor.class);
-
+
final File ledgerDirectories[];
public LedgerCache(File ledgerDirectories[]) {
@@ -57,16 +57,16 @@ public class LedgerCache {
* the list of potentially clean ledgers
*/
LinkedList<Long> cleanLedgers = new LinkedList<Long>();
-
+
/**
* the list of potentially dirty ledgers
*/
LinkedList<Long> dirtyLedgers = new LinkedList<Long>();
-
+
HashMap<Long, FileInfo> fileInfoCache = new HashMap<Long, FileInfo>();
-
+
LinkedList<Long> openLedgers = new LinkedList<Long>();
-
+
// Stores the set of active (non-deleted) ledgers.
ConcurrentMap<Long, Boolean> activeLedgers = new ConcurrentHashMap<Long, Boolean>();
@@ -77,7 +77,7 @@ public class LedgerCache {
}
LOG.info("openFileLimit is " + OPEN_FILE_LIMIT);
}
-
+
// allocate half of the memory to the page cache
private static int pageLimit = (int)((Runtime.getRuntime().maxMemory() / 3) / LedgerEntryPage.PAGE_SIZE);
static {
@@ -90,7 +90,7 @@ public class LedgerCache {
// The number of pages that have actually been used
private int pageCount = 0;
HashMap<Long, HashMap<Long,LedgerEntryPage>> pages = new HashMap<Long, HashMap<Long,LedgerEntryPage>>();
-
+
private void putIntoTable(HashMap<Long, HashMap<Long,LedgerEntryPage>> table, LedgerEntryPage lep) {
HashMap<Long, LedgerEntryPage> map = table.get(lep.getLedger());
if (map == null) {
@@ -99,7 +99,7 @@ public class LedgerCache {
}
map.put(lep.getFirstEntry(), lep);
}
-
+
private static LedgerEntryPage getFromTable(HashMap<Long, HashMap<Long,LedgerEntryPage>> table, Long ledger, Long firstEntry) {
HashMap<Long, LedgerEntryPage> map = table.get(ledger);
if (map != null) {
@@ -107,8 +107,8 @@ public class LedgerCache {
}
return null;
}
-
- synchronized private LedgerEntryPage getLedgerEntryPage(Long ledger, Long firstEntry, boolean onlyDirty) {
+
+ synchronized private LedgerEntryPage getLedgerEntryPage(Long ledger, Long firstEntry, boolean onlyDirty) {
LedgerEntryPage lep = getFromTable(pages, ledger, firstEntry);
try {
if (onlyDirty && lep.isClean()) {
@@ -122,7 +122,7 @@ public class LedgerCache {
}
}
- public void putEntryOffset(long ledger, long entry, long offset) throws IOException {
+ public void putEntryOffset(long ledger, long entry, long offset) throws IOException {
int offsetInPage = (int) (entry%LedgerEntryPage.ENTRIES_PER_PAGES);
// find the id of the first entry of the page that has the entry
// we are looking for
@@ -142,7 +142,7 @@ public class LedgerCache {
return;
}
}
-
+
public long getEntryOffset(long ledger, long entry) throws IOException {
int offsetInPage = (int) (entry%LedgerEntryPage.ENTRIES_PER_PAGES);
// find the id of the first entry of the page that has the entry
@@ -156,7 +156,7 @@ public class LedgerCache {
putIntoTable(pages, lep);
}
updatePage(lep);
-
+
}
return lep.getOffset(offsetInPage*8);
} finally {
@@ -165,7 +165,7 @@ public class LedgerCache {
}
}
}
-
+
static final private String getLedgerName(long ledgerId) {
int parent = (int) (ledgerId & 0xff);
int grandParent = (int) ((ledgerId & 0xff00) >> 8);
@@ -178,7 +178,7 @@ public class LedgerCache {
sb.append(".idx");
return sb.toString();
}
-
+
static final private void checkParents(File f) throws IOException {
File parent = f.getParentFile();
if (parent.exists()) {
@@ -188,7 +188,7 @@ public class LedgerCache {
throw new IOException("Counldn't mkdirs for " + parent);
}
}
-
+
static final private Random rand = new Random();
static final private File pickDirs(File dirs[]) {
@@ -304,7 +304,8 @@ public class LedgerCache {
@Override
public int compare(LedgerEntryPage o1, LedgerEntryPage o2) {
return (int)(o1.getFirstEntry()-o2.getFirstEntry());
- }});
+ }
+ });
ArrayList<Integer> versions = new ArrayList<Integer>(entries.size());
fi = getFileInfo(l, true);
int start = 0;
@@ -354,10 +355,10 @@ public class LedgerCache {
}
}
}
-
+
private void writeBuffers(Long ledger,
- List<LedgerEntryPage> entries, FileInfo fi,
- int start, int count) throws IOException {
+ List<LedgerEntryPage> entries, FileInfo fi,
+ int start, int count) throws IOException {
if (LOG.isTraceEnabled()) {
LOG.trace("Writing " + count + " buffers of " + Long.toHexString(ledger));
}
@@ -401,7 +402,7 @@ public class LedgerCache {
return lep;
}
}
-
+
outerLoop:
while(true) {
synchronized(cleanLedgers) {
@@ -461,7 +462,7 @@ public class LedgerCache {
}
}
}
-
+
return lastEntry;
}
@@ -484,7 +485,7 @@ public class LedgerCache {
if (!index.isFile() || !index.getName().endsWith(".idx")) {
continue;
}
- // We've found a ledger index file. The file name is the
+ // We've found a ledger index file. The file name is the
// HexString representation of the ledgerId.
String ledgerIdInHex = index.getName().substring(0, index.getName().length() - 4);
activeLedgers.put(Long.parseLong(ledgerIdInHex, 16), true);
@@ -498,7 +499,7 @@ public class LedgerCache {
LOG.debug("Active ledgers found: " + activeLedgers);
}
}
-
+
/**
* This method is called whenever a ledger is deleted by the BookKeeper Client
* and we want to remove all relevant data for it stored in the LedgerCache.
@@ -514,8 +515,8 @@ public class LedgerCache {
// Remove it from the activeLedgers set
activeLedgers.remove(ledgerId);
- // Now remove it from all the other lists and maps.
- // These data structures need to be synchronized first before removing entries.
+ // Now remove it from all the other lists and maps.
+ // These data structures need to be synchronized first before removing entries.
synchronized(this) {
pages.remove(ledgerId);
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptor.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptor.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptor.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDescriptor.java Mon Sep 5 17:38:57 2011
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.
- *
+ *
*/
package org.apache.bookkeeper.bookie;
@@ -41,17 +41,17 @@ public class LedgerDescriptor {
this.entryLogger = entryLogger;
this.ledgerCache = ledgerCache;
}
-
+
private ByteBuffer masterKey = null;
-
- void setMasterKey(ByteBuffer masterKey){
+
+ void setMasterKey(ByteBuffer masterKey) {
this.masterKey = masterKey;
}
-
- boolean cmpMasterKey(ByteBuffer masterKey){
+
+ boolean cmpMasterKey(ByteBuffer masterKey) {
return this.masterKey.equals(masterKey);
}
-
+
private long ledgerId;
EntryLogger entryLogger;
private int refCnt;
@@ -71,13 +71,13 @@ public class LedgerDescriptor {
}
long entryId = entry.getLong();
entry.rewind();
-
+
/*
* Log the entry
*/
long pos = entryLogger.addEntry(ledgerId, entry);
-
-
+
+
/*
* Set offset of entry id to be the current ledger position
*/
@@ -121,7 +121,7 @@ public class LedgerDescriptor {
}
entryId = lastEntry;
}
-
+
offset = ledgerCache.getEntryOffset(ledgerId, entryId);
if (offset == 0) {
throw new Bookie.NoEntryException(ledgerId, entryId);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerEntryPage.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerEntryPage.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerEntryPage.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerEntryPage.java Mon Sep 5 17:38:57 2011
@@ -38,7 +38,7 @@ public class LedgerEntryPage {
private boolean pinned = false;
private int useCount;
private int version;
-
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/AsyncCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/AsyncCallback.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/AsyncCallback.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/AsyncCallback.java Mon Sep 5 17:38:57 2011
@@ -9,9 +9,9 @@ import java.util.Enumeration;
* 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
@@ -20,120 +20,120 @@ import java.util.Enumeration;
*/
public interface AsyncCallback {
- public interface AddCallback {
- /**
- * Callback declaration
- *
- * @param rc
- * return code
- * @param ledgerId
- * ledger identifier
- * @param entryId
- * entry identifier
- * @param ctx
- * control object
- */
- void addComplete(int rc, LedgerHandle lh, long entryId, Object ctx);
- }
-
- public interface CloseCallback {
- /**
- * Callback definition
- *
- * @param rc
- * return code
- * @param ledgerId
- * ledger identifier
- * @param ctx
- * control object
- */
- void closeComplete(int rc, LedgerHandle lh, Object ctx);
- }
-
- public interface CreateCallback {
- /**
- * Declaration of callback method
- *
- * @param rc
- * return status
- * @param lh
- * ledger handle
- * @param ctx
- * control object
- */
-
- void createComplete(int rc, LedgerHandle lh, Object ctx);
- }
-
- public interface OpenCallback {
- /**
- * Callback for asynchronous call to open ledger
- *
- * @param rc
- * Return code
- * @param lh
- * ledger handle
- * @param ctx
- * control object
- */
-
- public void openComplete(int rc, LedgerHandle lh, Object ctx);
-
- }
-
- public interface ReadCallback {
- /**
- * Callback declaration
- *
- * @param rc
- * return code
- * @param ledgerId
- * ledger identifier
- * @param seq
- * sequence of entries
- * @param ctx
- * control object
- */
-
- void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq,
- Object ctx);
- }
-
- public interface DeleteCallback {
- /**
- * Callback definition for delete operations
- *
- * @param rc
- * return code
- * @param ctx
- * control object
- */
- void deleteComplete(int rc, Object ctx);
- }
-
- public interface RecoverCallback {
- /**
- * Callback definition for bookie recover operations
- *
- * @param rc
- * return code
- * @param ctx
- * control object
- */
- void recoverComplete(int rc, Object ctx);
- }
-
- public interface ReadLastConfirmedCallback {
- /**
- * Callback definition for bookie recover operations
- *
- * @param rc
- * return code
- * @param ctx
- * control object
- */
- void readLastConfirmedComplete(int rc, long lastConfirmed, Object ctx);
+ public interface AddCallback {
+ /**
+ * Callback declaration
+ *
+ * @param rc
+ * return code
+ * @param ledgerId
+ * ledger identifier
+ * @param entryId
+ * entry identifier
+ * @param ctx
+ * control object
+ */
+ void addComplete(int rc, LedgerHandle lh, long entryId, Object ctx);
}
-
+
+ public interface CloseCallback {
+ /**
+ * Callback definition
+ *
+ * @param rc
+ * return code
+ * @param ledgerId
+ * ledger identifier
+ * @param ctx
+ * control object
+ */
+ void closeComplete(int rc, LedgerHandle lh, Object ctx);
+ }
+
+ public interface CreateCallback {
+ /**
+ * Declaration of callback method
+ *
+ * @param rc
+ * return status
+ * @param lh
+ * ledger handle
+ * @param ctx
+ * control object
+ */
+
+ void createComplete(int rc, LedgerHandle lh, Object ctx);
+ }
+
+ public interface OpenCallback {
+ /**
+ * Callback for asynchronous call to open ledger
+ *
+ * @param rc
+ * Return code
+ * @param lh
+ * ledger handle
+ * @param ctx
+ * control object
+ */
+
+ public void openComplete(int rc, LedgerHandle lh, Object ctx);
+
+ }
+
+ public interface ReadCallback {
+ /**
+ * Callback declaration
+ *
+ * @param rc
+ * return code
+ * @param ledgerId
+ * ledger identifier
+ * @param seq
+ * sequence of entries
+ * @param ctx
+ * control object
+ */
+
+ void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq,
+ Object ctx);
+ }
+
+ public interface DeleteCallback {
+ /**
+ * Callback definition for delete operations
+ *
+ * @param rc
+ * return code
+ * @param ctx
+ * control object
+ */
+ void deleteComplete(int rc, Object ctx);
+ }
+
+ public interface RecoverCallback {
+ /**
+ * Callback definition for bookie recover operations
+ *
+ * @param rc
+ * return code
+ * @param ctx
+ * control object
+ */
+ void recoverComplete(int rc, Object ctx);
+ }
+
+ public interface ReadLastConfirmedCallback {
+ /**
+ * Callback definition for bookie recover operations
+ *
+ * @param rc
+ * return code
+ * @param ctx
+ * control object
+ */
+ void readLastConfirmedComplete(int rc, long lastConfirmed, Object ctx);
+ }
+
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BKException.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BKException.java?rev=1165369&r1=1165368&r2=1165369&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BKException.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BKException.java Mon Sep 5 17:38:57 2011
@@ -1,7 +1,7 @@
package org.apache.bookkeeper.client;
/*
- *
+ *
* 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
@@ -9,23 +9,23 @@ package org.apache.bookkeeper.client;
* 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.
- *
+ *
*/
import java.lang.Exception;
/**
* Class the enumerates all the possible error conditions
- *
+ *
*/
@SuppressWarnings("serial")
@@ -100,7 +100,7 @@ public abstract class BKException extend
int NoSuchEntryException = -13;
int IncorrectParameterException = -14;
int InterruptedException = -15;
-
+
int IllegalOpException = -100;
}
@@ -234,13 +234,13 @@ public abstract class BKException extend
super(Code.LedgerClosedException);
}
}
-
+
public static class BKIncorrectParameterException extends BKException {
public BKIncorrectParameterException() {
super(Code.IncorrectParameterException);
}
}
-
+
public static class BKInterruptedException extends BKException {
public BKInterruptedException() {
super(Code.InterruptedException);