You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/11/10 22:18:41 UTC
[1/7] accumulo git commit: ACCUMULO-1480 Added dropdown with
namespaces
Repository: accumulo
Updated Branches:
refs/heads/master b5d7c1807 -> e2d21fc92
ACCUMULO-1480 Added dropdown with namespaces
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4a4ad694
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4a4ad694
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4a4ad694
Branch: refs/heads/master
Commit: 4a4ad69426f5c22f65f3e542ccc3b30e4cd409fa
Parents: 1351991
Author: Luis Tavarez <ze...@outlook.com>
Authored: Fri Oct 21 15:10:14 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Fri Oct 21 15:10:14 2016 -0400
----------------------------------------------------------------------
.../monitor/servlets/TablesServlet.java | 4 ++++
.../org/apache/accumulo/monitor/util/Table.java | 22 ++++++++++++++++++++
2 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a4ad694/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index c1751d8..acb8c21 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.impl.Namespaces;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.impl.KeyExtent;
@@ -139,6 +140,9 @@ public class TablesServlet extends BasicServlet {
tableList.addRow(row);
}
+ SortedMap<String,String> namespaces = Namespaces.getNameToIdMap(Monitor.getContext().getInstance());
+ tableList.setNamespaces(namespaces);
+
tableList.generate(req, sb);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4a4ad694/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index e7bc30b..0d7d1e4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -18,6 +18,7 @@ package org.apache.accumulo.monitor.util;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.SortedMap;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +35,8 @@ public class Table {
private ArrayList<TableRow> rows;
private boolean hasBegunAddingRows = false;
+ private SortedMap<String,String> namespaces;
+
public Table(String tableName, String caption) {
this(tableName, caption, null);
}
@@ -179,6 +182,13 @@ public class Table {
}
if (showLegend && numLegends > 0)
sb.append("</dl></div>\n");
+
+ if (namespaces != null) {
+ sb.append("<div class='left show'><dl>\n");
+ doDropdownMenu(sb, namespaces);
+ sb.append("</dl></div>\n");
+ }
+
sb.append("</caption>\n");
sb.append("<tr>");
boolean first = true;
@@ -227,4 +237,16 @@ public class Table {
sb.append("</tr>\n");
}
+ private static void doDropdownMenu(StringBuilder sb, SortedMap<String,String> namespaces) {
+ sb.append("<select>\n");
+ sb.append("<option value='All'>All</option>\n");
+ for (String key : namespaces.keySet()) {
+ sb.append("<option value=\"").append(key).append("\">").append(key).append("</option>\n");
+ }
+ sb.append("</select>\n");
+ }
+
+ public void setNamespaces(SortedMap<String,String> namespaces) {
+ this.namespaces = namespaces;
+ }
}
[2/7] accumulo git commit: ACCUMULO-1480 Added cookie read and write
for the namespaces
Posted by ct...@apache.org.
ACCUMULO-1480 Added cookie read and write for the namespaces
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ca9d31d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ca9d31d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ca9d31d
Branch: refs/heads/master
Commit: 3ca9d31d9e9083f5837a795fba090310f30f0a74
Parents: 4a4ad69
Author: Luis Tavarez <ze...@outlook.com>
Authored: Mon Oct 24 16:18:14 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Mon Oct 24 16:18:14 2016 -0400
----------------------------------------------------------------------
.../monitor/servlets/OperationServlet.java | 15 ++++
.../monitor/servlets/TablesServlet.java | 19 ++++-
.../org/apache/accumulo/monitor/util/Table.java | 73 +++++++++++++++++---
3 files changed, 94 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ca9d31d/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/OperationServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/OperationServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/OperationServlet.java
index 1d468c0..b6952bb 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/OperationServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/OperationServlet.java
@@ -190,4 +190,19 @@ public class OperationServlet extends BasicServlet {
return Collections.emptyList();
}
}
+
+ public static class NamespaceOperation implements WebOperation {
+ @Override
+ public List<Cookie> execute(HttpServletRequest req, Logger log) throws Exception {
+ String page = req.getParameter("page");
+ String table = req.getParameter("table");
+ String selected = req.getParameter("selected");
+ if (table == null || page == null || selected == null)
+ return Collections.emptyList();
+ page = BasicServlet.encode(page);
+ table = BasicServlet.encode(table);
+ selected = BasicServlet.encode(selected);
+ return Collections.singletonList(new Cookie("namespaceDropdown." + page + "." + table + "." + "selected", selected));
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ca9d31d/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index acb8c21..361cf7d 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -23,6 +23,7 @@ import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.function.Predicate;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -116,8 +117,13 @@ public class TablesServlet extends BasicServlet {
Map<String,Double> compactingByTable = TableInfoUtil.summarizeTableStats(Monitor.getMmi());
TableManager tableManager = TableManager.getInstance();
+ //String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "." + "selected");
+
+ //Tables.getNameToIdMap(Monitor.getContext().getInstance()).entrySet().stream().filter(matchesNamespace("accumulo")).forEach(tableName_tableId -> { String tableName = tableName_tableId.getKey();
+ // Change this from here
for (Entry<String,String> tableName_tableId : Tables.getNameToIdMap(Monitor.getContext().getInstance()).entrySet()) {
String tableName = tableName_tableId.getKey();
+ // to here
String tableId = tableName_tableId.getValue();
TableInfo tableInfo = tableStats.get(tableName);
Double holdTime = compactingByTable.get(tableId);
@@ -138,6 +144,7 @@ public class TablesServlet extends BasicServlet {
row.add(tableInfo);
row.add(tableInfo);
tableList.addRow(row);
+ //});
}
SortedMap<String,String> namespaces = Namespaces.getNameToIdMap(Monitor.getContext().getInstance());
@@ -145,8 +152,16 @@ public class TablesServlet extends BasicServlet {
tableList.generate(req, sb);
}
-
- private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
+
+ private static Predicate<Entry<String, String>> matchesNamespace(String namespace) {
+ return new Predicate<Entry<String,String>>() {
+ public boolean test(Entry<String,String> t) {
+ return t.getKey().startsWith(namespace + ".");
+ };
+ };
+ }
+
+ private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
String displayName = Tables.getPrintableTableNameFromId(tidToNameMap, tableId);
Instance instance = Monitor.getContext().getInstance();
TreeSet<String> locs = new TreeSet<>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3ca9d31d/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index 0d7d1e4..3f6b904 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -182,11 +182,55 @@ public class Table {
}
if (showLegend && numLegends > 0)
sb.append("</dl></div>\n");
+ ArrayList<TableRow> newRows = new ArrayList<>();
if (namespaces != null) {
+
+ String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "."
+ + "selected");
+ if (namespace != null) {
+ sb.append("<p>Selected is ").append(namespace).append("</p>");
+
+ // Once this is implemented on the TablesServlet, delete it from here
+
+ for (TableRow row : rows) {
+ boolean first = true;
+ for (int i = 0; i < row.size(); ++i) {
+ if (first) {
+ try {
+ String tableNameStr = columns.get(i).getCellType().format(row.get(i));
+ if (namespace.equals("All")) {
+
+ newRows.add(row);
+ } else {
+ if (tableNameStr.contains(".")) {
+
+ if (tableNameStr.contains(namespace + ".")) {
+
+ newRows.add(row);
+ }
+ } else if (namespace.equals("DEFAULT")) {
+
+ newRows.add(row);
+ }
+
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Unable to process column " + i, ex);
+ }
+ first = false;
+ }
+ }
+ }
+
+ } else {
+ newRows = rows;
+ }
sb.append("<div class='left show'><dl>\n");
- doDropdownMenu(sb, namespaces);
+ doDropdownMenu(redir, page, tableName, sb, namespaces);
sb.append("</dl></div>\n");
+ } else {
+ newRows = rows;
}
sb.append("</caption>\n");
@@ -199,13 +243,13 @@ public class Table {
}
sb.append("</tr>\n");
// don't sort if no columns are sortable or if there aren't enough rows
- if (rows.size() > 1 && sortCol > -1) {
- Collections.sort(rows, TableRow.getComparator(sortCol, columns.get(sortCol).getCellType()));
+ if (newRows.size() > 1 && sortCol > -1) {
+ Collections.sort(newRows, TableRow.getComparator(sortCol, columns.get(sortCol).getCellType()));
if (!sortAscending)
- Collections.reverse(rows);
+ Collections.reverse(newRows);
}
boolean highlight = true;
- for (TableRow row : rows) {
+ for (TableRow row : newRows) {
for (int i = 0; i < row.size(); ++i) {
try {
row.set(i, columns.get(i).getCellType().format(row.get(i)));
@@ -216,7 +260,7 @@ public class Table {
row(sb, highlight, columns, row);
highlight = !highlight;
}
- if (rows.isEmpty())
+ if (newRows.isEmpty())
sb.append("<tr><td class='center' colspan='").append(columns.size()).append("'><i>Empty</i></td></tr>\n");
sb.append("</table>\n</div>\n\n");
}
@@ -237,13 +281,20 @@ public class Table {
sb.append("</tr>\n");
}
- private static void doDropdownMenu(StringBuilder sb, SortedMap<String,String> namespaces) {
- sb.append("<select>\n");
- sb.append("<option value='All'>All</option>\n");
+ private static void doDropdownMenu(String redir, String page, String tableName, StringBuilder sb, SortedMap<String,String> namespaces) {
+
+ String namespaceUrl = String.format("/op?action=namespace&redir=%s&page=%s&table=%s&selected=", redir, page, tableName);
+
+ sb.append("<ul>\n");
+ sb.append("<li><a href=\"").append(namespaceUrl).append("All\">All</a></li>");
for (String key : namespaces.keySet()) {
- sb.append("<option value=\"").append(key).append("\">").append(key).append("</option>\n");
+ if (key.equals("")) {
+ sb.append("<li><a href=\"").append(namespaceUrl).append("DEFAULT\">DEFAULT</a></li>");
+ } else {
+ sb.append("<li><a href=\"").append(namespaceUrl).append(key).append("\">").append(key).append("</a></li>");
+ }
}
- sb.append("</select>\n");
+ sb.append("</ul>\n");
}
public void setNamespaces(SortedMap<String,String> namespaces) {
[7/7] accumulo git commit: Merge branch 'pr-175'
Posted by ct...@apache.org.
Merge branch 'pr-175'
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e2d21fc9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2d21fc9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e2d21fc9
Branch: refs/heads/master
Commit: e2d21fc9267a9335539daa3f94d30ced78726622
Parents: b5d7c18 0f2d022
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Nov 10 16:51:47 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Nov 10 16:52:01 2016 -0500
----------------------------------------------------------------------
.../monitor/servlets/MasterServlet.java | 3 ++
.../monitor/servlets/OperationServlet.java | 15 ++++++
.../monitor/servlets/TablesServlet.java | 32 ++++++++++++-
.../org/apache/accumulo/monitor/util/Table.java | 49 +++++++++++++++++++-
.../monitor/src/main/resources/web/screen.css | 37 +++++++++++++++
5 files changed, 132 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/7] accumulo git commit: ACCUMULO-1480 Added horizontal line for
Master Server
Posted by ct...@apache.org.
ACCUMULO-1480 Added horizontal line for Master Server
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61ed26fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61ed26fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61ed26fe
Branch: refs/heads/master
Commit: 61ed26fe502a24212c2df15cbf1966f2123ca604
Parents: a22a884
Author: Luis Tavarez <ze...@outlook.com>
Authored: Fri Oct 28 13:03:41 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Fri Oct 28 13:03:41 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/monitor/servlets/MasterServlet.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61ed26fe/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
index dbec270..bfd9648 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/MasterServlet.java
@@ -67,6 +67,9 @@ public class MasterServlet extends BasicServlet {
TablesServlet.doProblemsBanner(sb);
doMasterStatus(req, sb);
doRecoveryList(req, sb);
+ sb.append("<br />\n");
+ sb.append("<hr />\n");
+ sb.append("<br />\n");
TablesServlet.doTableList(req, sb, tidToNameMap);
}
[6/7] accumulo git commit: ACCUMULO-1480 Added header for namespaces
and changed name for All and Default options
Posted by ct...@apache.org.
ACCUMULO-1480 Added header for namespaces and changed name for All and Default options
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f2d0222
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f2d0222
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f2d0222
Branch: refs/heads/master
Commit: 0f2d022252e647fd922800a2a807337320a6e0fd
Parents: f7a5c15
Author: Luis Tavarez <ze...@outlook.com>
Authored: Mon Oct 31 12:56:26 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Mon Oct 31 12:56:26 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/monitor/util/Table.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f2d0222/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index 1979a9c..79259ac 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -155,6 +155,8 @@ public class Table {
if (namespace == null) {
namespace = "*";
}
+ sb.append("<div class=\"table-caption\">Namespaces</div>\n");
+ sb.append("<hr />\n");
sb.append("<div class='left show'><dl>\n");
doDropdownMenu(redir, page, tableName, sb, namespaces, namespace);
sb.append("</dl></div>\n");
@@ -252,10 +254,12 @@ public class Table {
String namespaceUrl = String.format("/op?action=namespace&redir=%s&page=%s&table=%s&selected=", redir, page, tableName);
sb.append("<ul id=\"namespaces\">\n");
- sb.append("<li><a ").append(namespace.equals("*") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append("*\">*</a></li>");
+ sb.append("<li><a ").append(namespace.equals("*") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl)
+ .append("*\">* (All Tables)</a></li>");
for (String key : namespaces.keySet()) {
if (key.equals("")) {
- sb.append("<li><a ").append(namespace.equals("-") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append("-\">-</a></li>");
+ sb.append("<li><a ").append(namespace.equals("-") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl)
+ .append("-\">- (DEFAULT)</a></li>");
} else {
sb.append("<li><a ").append(namespace.equals(key) ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append(key).append("\">")
.append(key).append("</a></li>");
[3/7] accumulo git commit: ACCUMULO-1480 Added vertical tabs,
fixed filtering code
Posted by ct...@apache.org.
ACCUMULO-1480 Added vertical tabs, fixed filtering code
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a22a8842
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a22a8842
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a22a8842
Branch: refs/heads/master
Commit: a22a88423675dd433a8c3ac582d60328a4fd821e
Parents: 3ca9d31
Author: Luis Tavarez <ze...@outlook.com>
Authored: Wed Oct 26 15:09:41 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Wed Oct 26 15:09:41 2016 -0400
----------------------------------------------------------------------
.../monitor/servlets/TablesServlet.java | 45 ++++++----
.../org/apache/accumulo/monitor/util/Table.java | 92 +++++++-------------
.../monitor/src/main/resources/web/screen.css | 37 ++++++++
3 files changed, 94 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a22a8842/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index 361cf7d..d8528f1 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -117,13 +117,18 @@ public class TablesServlet extends BasicServlet {
Map<String,Double> compactingByTable = TableInfoUtil.summarizeTableStats(Monitor.getMmi());
TableManager tableManager = TableManager.getInstance();
- //String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "." + "selected");
-
- //Tables.getNameToIdMap(Monitor.getContext().getInstance()).entrySet().stream().filter(matchesNamespace("accumulo")).forEach(tableName_tableId -> { String tableName = tableName_tableId.getKey();
- // Change this from here
- for (Entry<String,String> tableName_tableId : Tables.getNameToIdMap(Monitor.getContext().getInstance()).entrySet()) {
+ String page = req.getRequestURI();
+
+ String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode("tableList") + "."
+ + "selected");
+
+ if (namespace == null) {
+ namespace = "*";
+ }
+
+ Tables.getNameToIdMap(Monitor.getContext().getInstance()).entrySet().stream().filter(matchesNamespace(namespace)).forEach(tableName_tableId -> {
+
String tableName = tableName_tableId.getKey();
- // to here
String tableId = tableName_tableId.getValue();
TableInfo tableInfo = tableStats.get(tableName);
Double holdTime = compactingByTable.get(tableId);
@@ -144,24 +149,28 @@ public class TablesServlet extends BasicServlet {
row.add(tableInfo);
row.add(tableInfo);
tableList.addRow(row);
- //});
- }
+ });
SortedMap<String,String> namespaces = Namespaces.getNameToIdMap(Monitor.getContext().getInstance());
tableList.setNamespaces(namespaces);
tableList.generate(req, sb);
}
-
- private static Predicate<Entry<String, String>> matchesNamespace(String namespace) {
- return new Predicate<Entry<String,String>>() {
- public boolean test(Entry<String,String> t) {
- return t.getKey().startsWith(namespace + ".");
- };
- };
- }
-
- private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
+
+ private static Predicate<Entry<String,String>> matchesNamespace(String namespace) {
+ return new Predicate<Entry<String,String>>() {
+ public boolean test(Entry<String,String> t) {
+ if (namespace.equals("*")) {
+ return true;
+ } else if (namespace.equals("-")) {
+ return !t.getKey().contains(".");
+ }
+ return t.getKey().startsWith(namespace + ".");
+ };
+ };
+ }
+
+ private void doTableDetails(HttpServletRequest req, StringBuilder sb, Map<String,String> tidToNameMap, String tableId) {
String displayName = Tables.getPrintableTableNameFromId(tidToNameMap, tableId);
Instance instance = Monitor.getContext().getInstance();
TreeSet<String> locs = new TreeSet<>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a22a8842/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
index 3f6b904..1979a9c 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/util/Table.java
@@ -146,7 +146,24 @@ public class Table {
showLegend = showStr != null && Boolean.parseBoolean(showStr);
}
- sb.append("<div>\n");
+ String redir = BasicServlet.currentPage(req);
+
+ if (namespaces != null) {
+ sb.append("<div id=\"filters\">\n");
+ String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "."
+ + "selected");
+ if (namespace == null) {
+ namespace = "*";
+ }
+ sb.append("<div class='left show'><dl>\n");
+ doDropdownMenu(redir, page, tableName, sb, namespaces, namespace);
+ sb.append("</dl></div>\n");
+ sb.append("</div>\n");
+ sb.append("<div id=\"tables\">\n");
+ } else {
+ sb.append("<div>\n");
+ }
+
sb.append("<a name='").append(tableName).append("'> </a>\n");
sb.append("<table id='").append(tableName).append("' class='sortable'>\n");
sb.append("<caption");
@@ -158,7 +175,6 @@ public class Table {
if (subcaption != null && !subcaption.isEmpty())
sb.append("<span class='table-subcaption'>").append(subcaption).append("</span><br />\n");
- String redir = BasicServlet.currentPage(req);
if (numLegends > 0) {
String legendUrl = String.format("/op?action=toggleLegend&redir=%s&page=%s&table=%s&show=%s", redir, page, tableName, !showLegend);
sb.append("<a href='").append(legendUrl).append("'>").append(showLegend ? "Hide" : "Show").append(" Legend</a>\n");
@@ -182,56 +198,6 @@ public class Table {
}
if (showLegend && numLegends > 0)
sb.append("</dl></div>\n");
- ArrayList<TableRow> newRows = new ArrayList<>();
-
- if (namespaces != null) {
-
- String namespace = BasicServlet.getCookieValue(req, "namespaceDropdown." + BasicServlet.encode(page) + "." + BasicServlet.encode(tableName) + "."
- + "selected");
- if (namespace != null) {
- sb.append("<p>Selected is ").append(namespace).append("</p>");
-
- // Once this is implemented on the TablesServlet, delete it from here
-
- for (TableRow row : rows) {
- boolean first = true;
- for (int i = 0; i < row.size(); ++i) {
- if (first) {
- try {
- String tableNameStr = columns.get(i).getCellType().format(row.get(i));
- if (namespace.equals("All")) {
-
- newRows.add(row);
- } else {
- if (tableNameStr.contains(".")) {
-
- if (tableNameStr.contains(namespace + ".")) {
-
- newRows.add(row);
- }
- } else if (namespace.equals("DEFAULT")) {
-
- newRows.add(row);
- }
-
- }
- } catch (Exception ex) {
- throw new RuntimeException("Unable to process column " + i, ex);
- }
- first = false;
- }
- }
- }
-
- } else {
- newRows = rows;
- }
- sb.append("<div class='left show'><dl>\n");
- doDropdownMenu(redir, page, tableName, sb, namespaces);
- sb.append("</dl></div>\n");
- } else {
- newRows = rows;
- }
sb.append("</caption>\n");
sb.append("<tr>");
@@ -243,13 +209,13 @@ public class Table {
}
sb.append("</tr>\n");
// don't sort if no columns are sortable or if there aren't enough rows
- if (newRows.size() > 1 && sortCol > -1) {
- Collections.sort(newRows, TableRow.getComparator(sortCol, columns.get(sortCol).getCellType()));
+ if (rows.size() > 1 && sortCol > -1) {
+ Collections.sort(rows, TableRow.getComparator(sortCol, columns.get(sortCol).getCellType()));
if (!sortAscending)
- Collections.reverse(newRows);
+ Collections.reverse(rows);
}
boolean highlight = true;
- for (TableRow row : newRows) {
+ for (TableRow row : rows) {
for (int i = 0; i < row.size(); ++i) {
try {
row.set(i, columns.get(i).getCellType().format(row.get(i)));
@@ -260,7 +226,7 @@ public class Table {
row(sb, highlight, columns, row);
highlight = !highlight;
}
- if (newRows.isEmpty())
+ if (rows.isEmpty())
sb.append("<tr><td class='center' colspan='").append(columns.size()).append("'><i>Empty</i></td></tr>\n");
sb.append("</table>\n</div>\n\n");
}
@@ -281,20 +247,22 @@ public class Table {
sb.append("</tr>\n");
}
- private static void doDropdownMenu(String redir, String page, String tableName, StringBuilder sb, SortedMap<String,String> namespaces) {
+ private static void doDropdownMenu(String redir, String page, String tableName, StringBuilder sb, SortedMap<String,String> namespaces, String namespace) {
String namespaceUrl = String.format("/op?action=namespace&redir=%s&page=%s&table=%s&selected=", redir, page, tableName);
- sb.append("<ul>\n");
- sb.append("<li><a href=\"").append(namespaceUrl).append("All\">All</a></li>");
+ sb.append("<ul id=\"namespaces\">\n");
+ sb.append("<li><a ").append(namespace.equals("*") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append("*\">*</a></li>");
for (String key : namespaces.keySet()) {
if (key.equals("")) {
- sb.append("<li><a href=\"").append(namespaceUrl).append("DEFAULT\">DEFAULT</a></li>");
+ sb.append("<li><a ").append(namespace.equals("-") ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append("-\">-</a></li>");
} else {
- sb.append("<li><a href=\"").append(namespaceUrl).append(key).append("\">").append(key).append("</a></li>");
+ sb.append("<li><a ").append(namespace.equals(key) ? "class=\"active\" " : "").append("href=\"").append(namespaceUrl).append(key).append("\">")
+ .append(key).append("</a></li>");
}
}
sb.append("</ul>\n");
+
}
public void setNamespaces(SortedMap<String,String> namespaces) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a22a8842/server/monitor/src/main/resources/web/screen.css
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/resources/web/screen.css b/server/monitor/src/main/resources/web/screen.css
index 7aa49a0..694cd1b 100644
--- a/server/monitor/src/main/resources/web/screen.css
+++ b/server/monitor/src/main/resources/web/screen.css
@@ -390,3 +390,40 @@ pre.logevent {
text-align: left;
color: red;
}
+
+#filters {
+ overflow-y: scroll;
+ height: 100%;
+ width: 200px;
+ float: left;
+}
+
+#tables {
+ overflow-y: scroll;
+ height: 100%;
+ margin-left: 205px;
+}
+
+#namespaces {
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+ background-color: #FFF;
+}
+
+#namespaces li a {
+ display: block;
+ color: black;
+ text-align: center;
+ padding: 14px 16px;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+#namespaces li a:hover:not(.active) {
+ background-color: #eee;
+}
+
+.active {
+ background-color: #cef4b5;
+}
[5/7] accumulo git commit: ACCUMULO-1480 Fixed style error
Posted by ct...@apache.org.
ACCUMULO-1480 Fixed style error
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7a5c157
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7a5c157
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7a5c157
Branch: refs/heads/master
Commit: f7a5c15767ccf62f5b6fdc9cfa2f5d8ba3081e26
Parents: 61ed26f
Author: Luis Tavarez <ze...@outlook.com>
Authored: Mon Oct 31 10:39:50 2016 -0400
Committer: Luis Tavarez <ze...@outlook.com>
Committed: Mon Oct 31 10:39:50 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/monitor/servlets/TablesServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f7a5c157/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
index d8528f1..814887f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/TablesServlet.java
@@ -166,7 +166,7 @@ public class TablesServlet extends BasicServlet {
return !t.getKey().contains(".");
}
return t.getKey().startsWith(namespace + ".");
- };
+ }
};
}