Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: accumulo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1295306 - in /incubator/accumulo/trunk: ./
 src/packages/deb/accumulo-native/postinst src/server/
 src/server/src/main/resources/web/vis.xml
Date: Wed, 29 Feb 2012 22:02:54 -0000
To: accumulo-commits@incubator.apache.org
From: vines@apache.org
Message-Id: <20120229220254.C7A6D238889B@eris.apache.org>

Author: vines
Date: Wed Feb 29 22:02:54 2012
New Revision: 1295306

URL: http://svn.apache.org/viewvc?rev=1295306&view=rev
Log:
Merging ACCUMULO-435 and ACCUMULO-431


Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst
    incubator/accumulo/trunk/src/server/   (props changed)
    incubator/accumulo/trunk/src/server/src/main/resources/web/vis.xml

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 22:02:54 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-1295271
+/incubator/accumulo/branches/1.4:1201902-1295305

Modified: incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst?rev=1295306&r1=1295305&r2=1295306&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst (original)
+++ incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst Wed Feb 29 22:02:54 2012
@@ -16,7 +16,11 @@
 # limitations under the License.
 
 # postinst script for Apache Accumulo native libraries
-export JAVA_HOME=/usr/lib/jvm/default-java
+JAVA_HOME=/usr/lib/jvm/default-java
+if [ ! -d $JAVA_HOME ]; then 
+  export JAVA_HOME=/usr/lib/jvm/java-6-openjdk;
+fi
+export JAVA_HOME
+echo $JAVA_HOME
 cd /usr/lib/accumulo/src/server/src/main/c++
 make
-

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 22:02:54 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3.5rc/src/server:1209938
 /incubator/accumulo/branches/1.3/src/server: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
-/incubator/accumulo/branches/1.4/src/server:1201902-1295271
+/incubator/accumulo/branches/1.3.5rc/src/server:1209938
+/incubator/accumulo/branches/1.4/src/server:1201902-1295305

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=1295306&r1=1295305&r2=1295306&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 Wed Feb 29 22:02:54 2012
@@ -22,11 +22,10 @@ var speedStatType = 1; // index into sta
 var colorStatType = 0; // index into statName
 var maxStatValue = [numCores, 1000, 10000]; // initial values that are system-dependent will increase based on observed values
 var significance = [100,1,1]; // values will be converted by floor(this*value)/this
-var maxObservedSpeed = maxStatValue[speedStatType];
-var maxObservedColor = maxStatValue[colorStatType];
 
 // size and spacing variables
 var numDots = 0; // number of dots to draw
+var numLive = 0;
 var dotSpacing = 10; // spacing between centers of dots (radius)
 var dotPadding = 0.5; // dot padding
 var minDotRadius = 3; // min dot radius
@@ -39,8 +38,7 @@ var ids = new Array(numDots); // server 
 var extras = new Array(numDots); // info from which color and motion is derived
 var mousedDot = 0; // the dot currently under the mouse
 
-var speed = new Array(numDots); // between 0 (motionless) and maxObservedSpeed (fastest)
-var colors = new Array(numDots); // dot colors between 0 and maxObservedColor, -1 for dead node
+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'];
 
 var nullColor = '#F5F8FA';
@@ -94,7 +92,7 @@ function handleNewData() {
   var badinfo = xmlhttp.responseXML.getElementsByTagName('badTabletServer');
   var idinfo = xmlhttp.responseXML.getElementsByTagName('server');
   
-  var statValues = new Array(3);
+  var statValues = new Array(statName.length);
   for (i=0; i < idinfo.length; i++) {
     var info = idinfo[i].attributes[0].nodeValue;
     var extra = '<br>';
@@ -104,14 +102,16 @@ function handleNewData() {
         maxStatValue[j] = statValues[j];
       extra = extra + ' ' + statName[j] + ': ' + statValues[j];
     }
-    setDotInfo(statValues[colorStatType],statValues[speedStatType],info,extra,i);
+    setStats(statValues,i);
+    setDotInfo(info,extra,i);
   }
+  numLive = idinfo.length;
   
   for (i=idinfo.length,j=0; j < deadinfo.length; i++,j++) {
-    setDotInfo(-1,-1,deadinfo[j].attributes[0].nodeValue,'',i);
+    setDotInfo(deadinfo[j].attributes[0].nodeValue,'',i);
   }
   for (i=idinfo.length+deadinfo.length,j=0; j < badinfo.length; i++,j++) {
-    setDotInfo(-1,-1,badinfo[j].attributes[0].nodeValue,'',i);
+    setDotInfo(badinfo[j].attributes[0].nodeValue,'',i);
   }
   if (numDots != idinfo.length + deadinfo.length + badinfo.length)
     drawGrid();
@@ -119,23 +119,20 @@ function handleNewData() {
   xmlReturned = true;
 }
 
-function setDotInfo(color,rate,id,extra,index) {
-  if (maxObservedColor < color) {
-    maxObservedColor = color;
-  }
-  if (maxObservedSpeed < rate) {
-    maxObservedSpeed = rate;
-  }
-  if (index >= colors.length) {
-    colors.push(color);
-    speed.push(rate);
+function setStats(statValues,index) {
+  if (index >= allStats.length)
+    allStats.push(new Array(statValues.length));
+  for (j=0; j < statValues.length; j++)
+    allStats[index][j] = statValues[j];
+}
+
+function setDotInfo(id,extra,index) {
+  if (index >= ids.length) {
     ids.push(id);
     extras.push(extra);
     dotSize.push(maxDotRadius);
     dotSizeGrowing.push(false);
   } else {
-    colors[index] = color;
-    speed[index] = rate;
     ids[index] = id;
     extras[index] = extra;
     // keep existing size and direction
@@ -156,36 +153,38 @@ function drawDots(){
   var height = Math.ceil(numDots/width);
   var x;
   var y;
+  var sizeChange;
   for (i=0; i < numDots; i++) {
     if (Math.floor(dotSize[i]) > maxDotRadius) {
       // check for resize by the user
       dotSize[i] = maxDotRadius;
-    } else if (speed[i]<=0) {
+    } else if (i >= numLive || allStats[i][speedStatType]<=0) {
       // if not changing size, increase to max radius
       if (dotSize[i] < maxDotRadius)
         dotSize[i] = dotSize[i] + 1;
       if (dotSize[i] > maxDotRadius)
         dotSize[i] = maxDotRadius;
     } else {
+      sizeChange = allStats[i][speedStatType]/maxStatValue[speedStatType];
       if (dotSizeGrowing[i]) {
-        dotSize[i] = dotSize[i] + speed[i]/maxObservedSpeed;
-        if (dotSize[i] + speed[i]/maxObservedSpeed > maxDotRadius) {
+        dotSize[i] = dotSize[i] + sizeChange;
+        if (dotSize[i] + sizeChange > maxDotRadius) {
           dotSizeGrowing[i] = false;
         }
       }
       else {
-        dotSize[i] = dotSize[i] - speed[i]/maxObservedSpeed;
-        if (dotSize[i] - speed[i]/maxObservedSpeed < minDotRadius) {
+        dotSize[i] = dotSize[i] - sizeChange;
+        if (dotSize[i] - sizeChange < minDotRadius) {
           dotSizeGrowing[i] = true;
         }
       }
     }
     x = i % width;
     y = Math.floor(i / width);
-    if (colors[i]==-1)
+    if (i >= numLive)
       strokeDot(x,y,maxDotRadius-1,deadColor);
     else
-      drawDot(x,y,Math.floor(dotSize[i]),getColor(colors[i]));
+      drawDot(x,y,Math.floor(dotSize[i]),getColor(allStats[i][colorStatType],maxStatValue[colorStatType]));
   }
   if (mousedDot < numDots)
     document.getElementById('vishoverinfo').innerHTML=ids[mousedDot]+extras[mousedDot];
@@ -224,8 +223,8 @@ function strokeDot(i,j,r,c) {
 }
 
 // translate color between 0 and maxObservedColor into an html color code
-function getColor(c) {
-  return colorPalette[Math.round((colorPalette.length-1)*c/maxObservedColor)];
+function getColor(c,maxc) {
+  return colorPalette[Math.round((colorPalette.length-1)*c/maxc)];
 }
 
 function strokeCircle(x,y,r,c) {
@@ -303,7 +302,6 @@ function setSize(obj) {
 // callback for motion selection
 function setMotion(obj) {
   speedStatType = obj.selectedIndex;
-  maxObservedSpeed = maxStatValue[speedStatType];
   drawGrid();
   setState();
 }
@@ -311,7 +309,6 @@ function setMotion(obj) {
 // callback for color selection
 function setColor(obj) {
   colorStatType = obj.selectedIndex;
-  maxObservedColor = maxStatValue[colorStatType];
   drawGrid();
   setState();
 }