This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new e189bfd ACCUMULO-4745 Fix broken links in monitor from Table.ID
change (#326)
e189bfd is described below
commit e189bfd30ed94831a9698aa4c0dbeda95f178fde
Author: Benjamin F <32075798+bfac...@users.noreply.github.com>
AuthorDate: Mon Dec 4 15:43:02 2017 -0500
ACCUMULO-4745 Fix broken links in monitor from Table.ID change (#326)
---
.../accumulo/monitor/rest/problems/ProblemDetailInformation.java | 8 ++++----
.../accumulo/monitor/rest/problems/ProblemSummaryInformation.java | 8 ++++----
.../org/apache/accumulo/monitor/rest/tables/TableInformation.java | 6 +++---
.../apache/accumulo/monitor/rest/tservers/CurrentOperations.java | 8 ++++----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
index d32ccf5..b38862b 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemDetailInformation.java
@@ -29,7 +29,7 @@ public class ProblemDetailInformation {
// Variable names become JSON keys
public String tableName;
- public Table.ID tableID;
+ public String tableID;
public String type;
public String server;
@@ -44,7 +44,7 @@ public class ProblemDetailInformation {
*
* @param tableName
* Table name of the problem
- * @param tableID
+ * @param tableId
* Table ID of the problem
* @param type
* Type of problem
@@ -57,9 +57,9 @@ public class ProblemDetailInformation {
* @param exception
* Exception of the problem
*/
- public ProblemDetailInformation(String tableName, Table.ID tableID, String
type, String server, Long time, String resource, String exception) {
+ public ProblemDetailInformation(String tableName, Table.ID tableId, String
type, String server, Long time, String resource, String exception) {
this.tableName = tableName;
- this.tableID = tableID;
+ this.tableID = tableId.canonicalID();
this.type = type;
this.server = server;
this.time = time;
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
index 78fdbad..165bf86 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/problems/ProblemSummaryInformation.java
@@ -29,7 +29,7 @@ public class ProblemSummaryInformation {
// Variable names become JSON keys
public String tableName;
- public Table.ID tableID;
+ public String tableID;
public Integer fileRead;
public Integer fileWrite;
@@ -42,7 +42,7 @@ public class ProblemSummaryInformation {
*
* @param tableName
* Name of the table with a problem
- * @param tableID
+ * @param tableId
* ID of the table with a problem
* @param fileRead
* Number of files read
@@ -51,9 +51,9 @@ public class ProblemSummaryInformation {
* @param tableLoad
* Number of table loads
*/
- public ProblemSummaryInformation(String tableName, Table.ID tableID, Integer
fileRead, Integer fileWrite, Integer tableLoad) {
+ public ProblemSummaryInformation(String tableName, Table.ID tableId, Integer
fileRead, Integer fileWrite, Integer tableLoad) {
this.tableName = tableName;
- this.tableID = tableID;
+ this.tableID = tableId.canonicalID();
this.fileRead = fileRead;
this.fileWrite = fileWrite;
this.tableLoad = tableLoad;
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
index d151046..cacd342 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java
@@ -30,7 +30,7 @@ public class TableInformation {
// Variable names become JSON keys
public String tablename;
- public Table.ID tableId;
+ public String tableId;
public String tableState;
public int tablets;
@@ -75,7 +75,7 @@ public class TableInformation {
*/
public TableInformation(String tableName, Table.ID tableId, String
tableState) {
this.tablename = tableName;
- this.tableId = tableId;
+ this.tableId = tableId.canonicalID();
this.tableState = tableState;
}
@@ -95,7 +95,7 @@ public class TableInformation {
*/
public TableInformation(String tableName, Table.ID tableId, TableInfo info,
Double holdTime, String tableState) {
this.tablename = tableName;
- this.tableId = tableId;
+ this.tableId = tableId.canonicalID();
this.tablets = info.tablets;
this.offlineTablets = info.tablets - info.onlineTablets;
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
index 59908ec..50f9bff 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java
@@ -30,7 +30,7 @@ public class CurrentOperations {
// Variable names become JSON keys
public String name;
public String tablet;
- public Table.ID tableID;
+ public String tableID;
public long entries;
public double ingest;
public double query;
@@ -48,7 +48,7 @@ public class CurrentOperations {
*
* @param name
* Table name
- * @param ID
+ * @param tableId
* Table ID
* @param tablet
* Tablet string
@@ -71,10 +71,10 @@ public class CurrentOperations {
* @param majorAvgES
* Major compaction average ES
*/
- public CurrentOperations(String name, Table.ID ID, String tablet, long
entries, double ingest, double query, Double minorAvg, Double minorStdDev,
+ public CurrentOperations(String name, Table.ID tableId, String tablet, long
entries, double ingest, double query, Double minorAvg, Double minorStdDev,
Double minorAvgES, Double majorAvg, Double majorStdDev, Double
majorAvgES) {
this.name = name;
- this.tableID = ID;
+ this.tableID = tableId.canonicalID();
this.tablet = tablet;
this.entries = entries;
this.ingest = ingest;
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].
