Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2CC395CB for ; Mon, 12 Mar 2012 22:21:09 +0000 (UTC) Received: (qmail 21481 invoked by uid 500); 12 Mar 2012 22:21:09 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 21462 invoked by uid 500); 12 Mar 2012 22:21:09 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 21455 invoked by uid 99); 12 Mar 2012 22:21:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 22:21:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2012 22:21:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 21AD32388980; Mon, 12 Mar 2012 22:20:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1299904 - in /incubator/accumulo/trunk: ./ CHANGES src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java src/server/src/main/resources/web/vis.xml Date: Mon, 12 Mar 2012 22:20:44 -0000 To: accumulo-commits@incubator.apache.org From: billie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120312222045.21AD32388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: billie Date: Mon Mar 12 22:20:44 2012 New Revision: 1299904 URL: http://svn.apache.org/viewvc?rev=1299904&view=rev Log: ACCUMULO-453 ACCUMULO-145 merged to trunk Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/CHANGES incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Mar 12 22:20:44 2012 @@ -1,3 +1,3 @@ /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 /incubator/accumulo/branches/1.3.5rc:1209938 -/incubator/accumulo/branches/1.4:1201902-1299791 +/incubator/accumulo/branches/1.4:1201902-1299899 Modified: incubator/accumulo/trunk/CHANGES URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/CHANGES?rev=1299904&r1=1299903&r2=1299904&view=diff ============================================================================== --- incubator/accumulo/trunk/CHANGES (original) +++ incubator/accumulo/trunk/CHANGES Mon Mar 12 22:20:44 2012 @@ -1,39 +1 @@ -Release notes for Apache Accumulo 1.3.5 - -Fixed prior to incubation: - - * massive renaming to package name "org.apache.accumulo" - * moved default HDFS location to /accumulo - * moved default ZooKeeper root to /accumulo - * eliminated many deprecated methods - * removed massive globbing from the accumulo garbage collector - * fixed slow tablet assignment if the master started with an initial empty list of tablet servers - * fixed logic loading custom table load balancers - * start-here did not set the master goal state - * fixed error in 1.2 -> 1.3 upgrade - -Fixed in incubation: - - ACCUMULO-4 Remove jfreechart dependency - ACCUMULO-5 Log recovery fails with IllegalStateException - ACCUMULO-7 tablet is both assigned and hosted - ACCUMULO-8 Resolve libthrift-0.3 dependency for Accumulo 1.3 branch - ACCUMULO-16 Master uses wrong path to remove tserver lock from zookeeper - ACCUMULO-26 thrift.sh does not point to the correct directories - ACCUMULO-28 make tserver client timeout configurable - ACCUMULO-32 Clean up bin dir - ACCUMULO-38 Add svnignores for eclipse specific files/folders - ACCUMULO-41 Conform to a uniform style - ACCUMULO-42 Apply apache license to code - ACCUMULO-46 Fix functional tests - ACCUMULO-47 create a script to allow current users to upgrade to the new name - ACCUMULO-51 Fix references to thrift jar - ACCUMULO-52 Empty bulk imported files hang around forever - ACCUMULO-61 Add files generated by c++ code to svn ignore - ACCUMULO-62 Random walk logging config wrong - ACCUMULO-63 Unable to build git mirror - ACCUMULO-65 missing minor compaction files under heavy namenode load - ACCUMULO-91 importDirectory doesn't verify input is dir & doesn't send absolute paths servers - ACCUMULO-93 listscans in the shell attempts to contact tablet servers that do not hold locks - ACCUMULO-94 createMultiTableBatchWriter has arguments inconsistent with createTableBatchWriter - ACCUMULO-95 MockConnector does not implement createMultiTableBatchWriter +Release notes for Apache Accumulo 1.5.0 Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java?rev=1299904&r1=1299903&r2=1299904&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java (original) +++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java Mon Mar 12 22:20:44 2012 @@ -186,10 +186,12 @@ public class VisServlet extends BasicSer sb.append("\n"); sb.append("  (hover for info, click for details)"); sb.append("\n\n"); + sb.append("
\n"); // floating info box sb.append("
\n\n"); // canvas sb.append("
Browser does not support canvas.\n\n"); + sb.append("
\n"); sb.append("\n\n"); } Modified: incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml?rev=1299904&r1=1299903&r2=1299904&view=diff ============================================================================== --- incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml (original) +++ incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml Mon Mar 12 22:20:44 2012 @@ -28,7 +28,7 @@ var maxDotRadius = dotSpacing - dotPaddi var dotSize = new Array(numDots); // current sizes var dotSizeGrowing = new Array(numDots); // true when dot size is growing, false when shrinking var ids = new Array(numDots); // server ids -var mousedDot = 0; // the dot currently under the mouse +var mousedDot = -1; // the dot currently under the mouse var allStats = new Array(numDots); var colorPalette = ['#0000CC', '#0014B8', '#0029A3', '#003D8F', '#00527A', '#006666', '#007A52', '#008F3D', '#00A329', '#00B814', '#00CC00', '#14D100', '#29D600', '#3DDB00', '#52E000', '#66E600', '#7AEB00', '#8FF000', '#A3F500', '#B8FA00', '#CCFF00', '#CCFF00', '#CCF200', '#CCE600', '#CCD900', '#CCCC00', '#CCBF00', '#CCB200', '#CCA600', '#CC9900', '#CC8C00', '#CC8000', '#CC7300', '#CC6600', '#CC5900', '#CC4C00', '#CC4000', '#CC3300', '#CC2600', '#CC1A00', '#CC0D00', '#CC0000']; @@ -42,9 +42,10 @@ var canvas = document.getElementById('vi var context = canvas.getContext('2d'); // mouse handling for server information display -canvas.addEventListener('mouseover', showId, false); -canvas.addEventListener('mousemove', showId, false); -canvas.addEventListener('mouseout', hideId, false); +document.getElementById('hoverable').addEventListener('mouseover', showId, false); +document.getElementById('hoverable').addEventListener('mousemove', showId, false); +document.getElementById('hoverable').addEventListener('mouseout', hideId, false); +document.getElementById('vishoverinfo').addEventListener('click', goToServer, false); canvas.addEventListener('click', goToServer, false); // initialize settings based on request parameters @@ -238,7 +239,7 @@ function drawDots() { else drawDot(x,y,Math.floor(dotSize[i]),getColor(getStat(i,colorStatType))); } - if (mousedDot < numDots) + if (mousedDot >= 0 && mousedDot < numDots) document.getElementById('vishoverinfo').innerHTML=getInfo(mousedDot); } @@ -388,7 +389,7 @@ function showId(e) { var rely = y - canvas.offsetTop - main.offsetTop; var width = Math.ceil(Math.sqrt(numDots)); mousedDot = Math.floor(relx/(dotSpacing*2)) + width*Math.floor(rely/(dotSpacing*2)); - if (relx < (width*dotSpacing*2) && mousedDot < numDots) { + if (relx < (width*dotSpacing*2) && mousedDot >= 0 && mousedDot < numDots) { document.getElementById('vishoverinfo').style.left=relx+canvas.offsetLeft; document.getElementById('vishoverinfo').style.top=Math.max(0,rely+canvas.offsetTop-70); document.getElementById('vishoverinfo').style.visibility='visible'; @@ -405,7 +406,7 @@ function setState() { // go to server page on click function goToServer(e) { - if (mousedDot < numDots) + if (mousedDot >= 0 && mousedDot < numDots) window.location = serverurl + ids[mousedDot][0]; }