added shard count to home page
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8757962a Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8757962a Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8757962a Branch: refs/heads/master Commit: 8757962a20928ddcb2f39a5441385fe5fcdb58e9 Parents: 7237024 Author: gbarton <[email protected]> Authored: Thu Aug 23 22:58:46 2012 -0400 Committer: gbarton <[email protected]> Committed: Thu Aug 23 22:58:46 2012 -0400 ---------------------------------------------------------------------- src/blur-gui/src/main/webapps/controller/home.jsp | 5 +++-- .../src/main/webapps/controller/metrics.jsp | 7 ++++--- .../blur/testsuite/CreateInsertQueryRepeating.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8757962a/src/blur-gui/src/main/webapps/controller/home.jsp ---------------------------------------------------------------------- diff --git a/src/blur-gui/src/main/webapps/controller/home.jsp b/src/blur-gui/src/main/webapps/controller/home.jsp index e9b5583..6d47063 100644 --- a/src/blur-gui/src/main/webapps/controller/home.jsp +++ b/src/blur-gui/src/main/webapps/controller/home.jsp @@ -20,7 +20,8 @@ List<String> tables = client.tableListByCluster(cluster); for (String table : tables) { try { - ret += row(cluster, tableLink(table,cluster), client.describe(table).isEnabled?"yes":"no"); + TableDescriptor td = client.describe(table); + ret += row(cluster, tableLink(table,cluster), td.shardCount+"", td.isEnabled?"yes":"no"); } catch (BlurException e) { ret += row(3, "<font color=FF0000>Error describing table: " + table + "</font>"); @@ -101,7 +102,7 @@ <hr /> <br /> <h2>Tables</h2> - <%=table(getTables(client),"Cluster Name","Table Name","Enabled")%> + <%=table(getTables(client),"Cluster Name","Table Name","Shards","Enabled")%> <hr /> <br /> <h2>Configs</h2> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8757962a/src/blur-gui/src/main/webapps/controller/metrics.jsp ---------------------------------------------------------------------- diff --git a/src/blur-gui/src/main/webapps/controller/metrics.jsp b/src/blur-gui/src/main/webapps/controller/metrics.jsp index 1e4dfdb..28ccdcf 100644 --- a/src/blur-gui/src/main/webapps/controller/metrics.jsp +++ b/src/blur-gui/src/main/webapps/controller/metrics.jsp @@ -25,11 +25,15 @@ <script> //decimal formatter var df = d3.format("4d"); + var methodCalls; //basic printout d3.json("metrics", function(json) { + methodCalls = json["methodCalls"]; + delete json["methodCalls"]; + var topLevelMetrics = d3.entries(json); var columns = ["stat", "value"]; @@ -62,9 +66,6 @@ .enter() .append("td") .text(function(d) { return d.value; }); - - - //alert(json); arr = []; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8757962a/src/blur-testsuite/src/main/java/com/nearinfinity/blur/testsuite/CreateInsertQueryRepeating.java ---------------------------------------------------------------------- diff --git a/src/blur-testsuite/src/main/java/com/nearinfinity/blur/testsuite/CreateInsertQueryRepeating.java b/src/blur-testsuite/src/main/java/com/nearinfinity/blur/testsuite/CreateInsertQueryRepeating.java index 7907dd3..70824d1 100644 --- a/src/blur-testsuite/src/main/java/com/nearinfinity/blur/testsuite/CreateInsertQueryRepeating.java +++ b/src/blur-testsuite/src/main/java/com/nearinfinity/blur/testsuite/CreateInsertQueryRepeating.java @@ -106,7 +106,7 @@ public class CreateInsertQueryRepeating { createTable(client, "test1", cluster); System.out.println("Starting load"); - loadupTable(client, "test1", 1000); + loadupTable(client, "test1", 10); System.out.println("Finshed load"); System.out.println("query time!");
