hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject svn commit: r1525138 [6/6] - in /hbase/branches/0.96: ./ hbase-assembly/src/main/assembly/ hbase-examples/ hbase-server/ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ hbase-s...
Date Fri, 20 Sep 2013 20:43:48 GMT
Added: hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/jquery.min.js
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/jquery.min.js?rev=1525138&view=auto
==============================================================================
--- hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/jquery.min.js
(added)
+++ hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/jquery.min.js
Fri Sep 20 20:43:45 2013
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */

[... 3 lines stripped ...]
Copied: hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/tab.js
(from r1525121, hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/tab.js?p2=hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/tab.js&p1=hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java
(original)
+++ hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/static/js/tab.js Fri
Sep 20 20:43:45 2013
@@ -1,4 +1,6 @@
 /*
+ * Copyright The Apache Software Foundation
+ *
  * 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
@@ -16,34 +18,21 @@
  * limitations under the License.
  */
 
-package org.apache.hadoop.hbase.thrift;
-
-public interface IncrementCoalescerMBean {
-  int getQueueSize();
-
-  int getMaxQueueSize();
-
-  void setMaxQueueSize(int newSize);
-
-  long getPoolCompletedTaskCount();
-
-  long getPoolTaskCount();
-
-  int getPoolLargestPoolSize();
-
-  int getCorePoolSize();
-
-  void setCorePoolSize(int newCoreSize);
-
-  int getMaxPoolSize();
-
-  void setMaxPoolSize(int newMaxSize);
-
-  long getFailedIncrements();
-
-  long getSuccessfulCoalescings();
-
-  long getTotalIncrements();
-
-  long getCountersMapSize();
-}
+$(document).ready(
+  function(){
+    var prefix = "tab_";
+	$('.tabbable .nav-pills a').click(function (e) {
+        e.preventDefault();
+        location.hash = $(e.target).attr('href').substr(1).replace(prefix, "");
+        $(this).tab('show');
+    });
+            
+    if (location.hash !== '') {
+      var tabItem = $('a[href="' + location.hash.replace("#", "#"+prefix) + '"]');
+      tabItem.tab('show');
+      $(document).scrollTop(0);  
+      return false;  
+    }
+    return true;
+  }
+);
\ No newline at end of file

Copied: hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/index.html
(from r1525121, hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/index.html?p2=hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/index.html&p1=hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/IncrementCoalescerMBean.java
(original)
+++ hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/index.html Fri
Sep 20 20:43:45 2013
@@ -1,4 +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
@@ -15,35 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-package org.apache.hadoop.hbase.thrift;
-
-public interface IncrementCoalescerMBean {
-  int getQueueSize();
-
-  int getMaxQueueSize();
-
-  void setMaxQueueSize(int newSize);
-
-  long getPoolCompletedTaskCount();
-
-  long getPoolTaskCount();
-
-  int getPoolLargestPoolSize();
-
-  int getCorePoolSize();
-
-  void setCorePoolSize(int newCoreSize);
-
-  int getMaxPoolSize();
-
-  void setMaxPoolSize(int newMaxSize);
-
-  long getFailedIncrements();
-
-  long getSuccessfulCoalescings();
-
-  long getTotalIncrements();
-
-  long getCountersMapSize();
-}
+-->
+<meta HTTP-EQUIV="REFRESH" content="0;url=/thrift.jsp"/>

Added: hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp?rev=1525138&view=auto
==============================================================================
--- hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp (added)
+++ hbase/branches/0.96/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp Fri
Sep 20 20:43:45 2013
@@ -0,0 +1,137 @@
+<%--
+/**
+ * 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
+ * regarding copyright ownership.  The ASF 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 License for the specific language governing permissions and
+ * limitations under the License.
+ */
+--%>
+<%@ page contentType="text/html;charset=UTF-8"
+  import="org.apache.hadoop.conf.Configuration"
+  import="org.apache.hadoop.hbase.HBaseConfiguration"
+  import="org.apache.hadoop.hbase.util.VersionInfo"
+  import="java.util.Date"
+%>
+
+<%
+Configuration conf = (Configuration)getServletContext().getAttribute("hbase.conf");
+long startcode = conf.getLong("startcode", System.currentTimeMillis());
+String listenPort = conf.get("hbase.regionserver.thrift.port", "9090");
+String serverInfo = listenPort + "," + String.valueOf(startcode);
+String implType = conf.get("hbase.regionserver.thrift.server.type", "threadpool");
+String compact = conf.get("hbase.regionserver.thrift.compact", "false");
+String framed = conf.get("hbase.regionserver.thrift.framed", "false");
+%>
+<!--[if IE]>
+<!DOCTYPE html>
+<![endif]-->
+<?xml version="1.0" encoding="UTF-8" ?>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>HBase Thrift Server: <%= listenPort %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+
+    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/static/css/bootstrap-theme.min.css" rel="stylesheet">
+    <link href="/static/css/hbase.css" rel="stylesheet">
+  </head>
+
+  <body>
+  <div class="navbar  navbar-fixed-top navbar-default">
+      <div class="container">
+          <div class="navbar-header">
+              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+                  <span class="icon-bar"></span>
+              </button>
+              <a class="navbar-brand" href="/thrift.jsp"><img src="/static/hbase_logo_small.png"
alt="HBase Logo"/></a>
+          </div>
+          <div class="collapse navbar-collapse">
+              <ul class="nav navbar-nav">
+                <li class="active"><a href="/">Home</a></li>
+                <li><a href="/logs/">Local logs</a></li>
+                <li><a href="/logLevel">Log Level</a></li>
+                <li><a href="/jmx">Metrics Dump</a></li>
+                <% if (HBaseConfiguration.isShowConfInServlet()) { %>
+                <li><a href="/conf">HBase Configuration</a></li>
+                <% } %>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
+<div class="container">
+    <div class="row inner_header">
+        <div class="page-header">
+            <h1>ThriftServer <small><%= listenPort %></small></h1>
+        </div>
+    </div>
+    <div class="row">
+
+    <section>
+    <h2>Software Attributes</h2>
+    <table id="attributes_table" class="table table-striped">
+        <tr>
+            <th>Attribute Name</th>
+            <th>Value</th>
+            <th>Description</th>
+        </tr>
+        <tr>
+            <td>HBase Version</td>
+            <td><%= VersionInfo.getVersion() %>, r<%= VersionInfo.getRevision()
%></td>
+            <td>HBase version and revision</td>
+        </tr>
+        <tr>
+            <td>HBase Compiled</td>
+            <td><%= VersionInfo.getDate() %>, <%= VersionInfo.getUser() %></td>
+            <td>When HBase version was compiled and by whom</td>
+        </tr>
+        <tr>
+            <td>Thrift Server Start Time</td>
+            <td><%= new Date(startcode) %></td>
+            <td>Date stamp of when this Thrift server was started</td>
+        </tr>
+        <tr>
+            <td>Thrift Impl Type</td>
+            <td><%= implType %></td>
+            <td>Thrift RPC engine implementation type chosen by this Thrift server</td>
+        </tr>
+        <tr>
+            <td>Compact Protocol</td>
+            <td><%= compact %></td>
+            <td>Thrift RPC engine uses compact protocol</td>
+        </tr>
+        <tr>
+            <td>Framed Transport</td>
+            <td><%= framed %></td>
+            <td>Thrift RPC engine uses framed transport</td>
+        </tr>
+    </table>
+    </section>
+    </div>
+    <div class="row">
+        <section>
+            <a href="http://wiki.apache.org/hadoop/Hbase/ThriftApi">Apache HBase Wiki
on Thrift</a>
+        </section>
+    </div>
+</div>
+<script src="/static/js/jquery.min.js" type="text/javascript"></script>
+<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="/static/js/tab.js" type="text/javascript"></script>
+</body>
+</html>

Copied: hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
(from r1525121, hbase/branches/0.96/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift?p2=hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift&p1=hbase/branches/0.96/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Copied: hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
(from r1525121, hbase/branches/0.96/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift?p2=hbase/branches/0.96/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift&p1=hbase/branches/0.96/hbase-server/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Copied: hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java
(from r1525121, hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java?p2=hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java&p1=hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Copied: hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
(from r1525121, hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java?p2=hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java&p1=hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Copied: hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
(from r1525121, hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java?p2=hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java&p1=hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Copied: hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
(from r1525121, hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java)
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java?p2=hbase/branches/0.96/hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java&p1=hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java&r1=1525121&r2=1525138&rev=1525138&view=diff
==============================================================================
    (empty)

Modified: hbase/branches/0.96/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/pom.xml?rev=1525138&r1=1525137&r2=1525138&view=diff
==============================================================================
--- hbase/branches/0.96/pom.xml (original)
+++ hbase/branches/0.96/pom.xml Fri Sep 20 20:43:45 2013
@@ -50,6 +50,7 @@
   <url>http://hbase.apache.org</url>
   <modules>
     <module>hbase-server</module>
+    <module>hbase-thrift</module>
     <module>hbase-protocol</module>
     <module>hbase-client</module>
     <module>hbase-hadoop-compat</module>
@@ -979,6 +980,18 @@
         <scope>test</scope>
       </dependency>
       <dependency>
+        <artifactId>hbase-thrift</artifactId>
+        <groupId>org.apache.hbase</groupId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <artifactId>hbase-thrift</artifactId>
+        <groupId>org.apache.hbase</groupId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-prefix-tree</artifactId>
         <version>${project.version}</version>



Mime
View raw message