Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD7BC19524 for ; Thu, 7 Apr 2016 21:09:31 +0000 (UTC) Received: (qmail 34843 invoked by uid 500); 7 Apr 2016 21:09:24 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 34744 invoked by uid 500); 7 Apr 2016 21:09:24 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 31844 invoked by uid 99); 7 Apr 2016 21:09:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 21:09:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96AD2E05E1; Thu, 7 Apr 2016 21:09:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misty@apache.org To: commits@hbase.apache.org Date: Thu, 07 Apr 2016 21:09:53 -0000 Message-Id: <8357eaec5d4646ad872da4507e0277a1@git.apache.org> In-Reply-To: <592eed912fa444b2bf66179534e9c962@git.apache.org> References: <592eed912fa444b2bf66179534e9c962@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [33/51] [partial] hbase-site git commit: Published site at ac8cd373ebe81ed24cab6737154c6902c05ff059. http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b0a04862/devapidocs/org/apache/hadoop/hbase/class-use/Server.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html index b8c4832..f8195eb 100644 --- a/devapidocs/org/apache/hadoop/hbase/class-use/Server.html +++ b/devapidocs/org/apache/hadoop/hbase/class-use/Server.html @@ -166,13 +166,13 @@ -private Server -ZKSplitLogManagerCoordination.server  - - protected Server ZkCoordinatedStateManager.server  + +private Server +ZKSplitLogManagerCoordination.server  + @@ -184,11 +184,11 @@ - + - +
ServerZkCoordinatedStateManager.getServer() BaseCoordinatedStateManager.getServer() 
ServerBaseCoordinatedStateManager.getServer() ZkCoordinatedStateManager.getServer() 
@@ -201,11 +201,11 @@ void -ZkCoordinatedStateManager.initialize(Server server)  +BaseCoordinatedStateManager.initialize(Server server)  void -BaseCoordinatedStateManager.initialize(Server server)  +ZkCoordinatedStateManager.initialize(Server server)  @@ -328,28 +328,28 @@ ServerManager.master  -(package private) Server -MasterFileSystem.master  - - private Server ActiveMasterManager.master  + +(package private) Server +MasterFileSystem.master  + private Server -CatalogJanitor.server  +RegionStateStore.server  -private Server -RegionStateStore.server  +protected Server +BulkAssigner.server  private Server -SplitLogManager.server  +CatalogJanitor.server  -protected Server -BulkAssigner.server  +private Server +SplitLogManager.server  @@ -514,23 +514,23 @@ private Server -SplitTransactionImpl.server  +LogRoller.server  private Server -SplitTransactionImpl.DaughterOpener.server  +RegionMergeTransactionImpl.server  private Server -HeapMemoryManager.server  +SplitTransactionImpl.server  private Server -RegionMergeTransactionImpl.server  +SplitTransactionImpl.DaughterOpener.server  private Server -LogRoller.server  +HeapMemoryManager.server  @@ -543,11 +543,13 @@ Server -SplitTransactionImpl.getServer()  +SplitTransaction.getServer() +
Get the Server running the transaction or rollback
+ Server -SplitTransaction.getServer() +RegionMergeTransaction.getServer()
Get the Server running the transaction or rollback
@@ -557,9 +559,7 @@ Server -RegionMergeTransaction.getServer() -
Get the Server running the transaction or rollback
- +SplitTransactionImpl.getServer()  @@ -595,11 +595,6 @@ PairOfSameType<Region> -SplitTransactionImpl.execute(Server server, - RegionServerServices services)  - - -PairOfSameType<Region> SplitTransaction.execute(Server server, RegionServerServices services)
Deprecated.  @@ -607,11 +602,6 @@
- -Region -RegionMergeTransactionImpl.execute(Server server, - RegionServerServices services)  - Region RegionMergeTransaction.execute(Server server, @@ -622,19 +612,31 @@ -PairOfSameType<Region> -SplitTransactionImpl.execute(Server server, - RegionServerServices services, - User user)  +Region +RegionMergeTransactionImpl.execute(Server server, + RegionServerServices services)  PairOfSameType<Region> +SplitTransactionImpl.execute(Server server, + RegionServerServices services)  + + +PairOfSameType<Region> SplitTransaction.execute(Server server, RegionServerServices services, User user)
Run the transaction.
+ +Region +RegionMergeTransaction.execute(Server server, + RegionServerServices services, + User user) +
Run the transaction.
+ + Region RegionMergeTransactionImpl.execute(Server server, @@ -642,12 +644,10 @@ User user)  -Region -RegionMergeTransaction.execute(Server server, +PairOfSameType<Region> +SplitTransactionImpl.execute(Server server, RegionServerServices services, - User user) -
Run the transaction.
- + User user)  void @@ -684,11 +684,6 @@ boolean -SplitTransactionImpl.rollback(Server server, - RegionServerServices services)  - - -boolean SplitTransaction.rollback(Server server, RegionServerServices services)
Deprecated.  @@ -696,11 +691,6 @@
- -boolean -RegionMergeTransactionImpl.rollback(Server server, - RegionServerServices services)  - boolean RegionMergeTransaction.rollback(Server server, @@ -712,18 +702,30 @@ boolean -SplitTransactionImpl.rollback(Server server, - RegionServerServices services, - User user)  +RegionMergeTransactionImpl.rollback(Server server, + RegionServerServices services)  boolean +SplitTransactionImpl.rollback(Server server, + RegionServerServices services)  + + +boolean SplitTransaction.rollback(Server server, RegionServerServices services, User user)
Roll back a failed transaction
+ +boolean +RegionMergeTransaction.rollback(Server server, + RegionServerServices services, + User user) +
Roll back a failed transaction
+ + boolean RegionMergeTransactionImpl.rollback(Server server, @@ -732,11 +734,9 @@ boolean -RegionMergeTransaction.rollback(Server server, +SplitTransactionImpl.rollback(Server server, RegionServerServices services, - User user) -
Roll back a failed transaction
- + User user)  void @@ -753,14 +753,14 @@ User user)  -PairOfSameType<Region> -SplitTransactionImpl.stepsBeforePONR(Server server, +HRegion +RegionMergeTransactionImpl.stepsBeforePONR(Server server, RegionServerServices services, boolean testing)  -HRegion -RegionMergeTransactionImpl.stepsBeforePONR(Server server, +PairOfSameType<Region> +SplitTransactionImpl.stepsBeforePONR(Server server, RegionServerServices services, boolean testing)