You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@accumulo.apache.org by GitBox <gi...@apache.org> on 2017/12/20 16:49:19 UTC
[GitHub] bfach10 closed pull request #346: ACCUMULO-4746 Fluent API for Mutation
bfach10 closed pull request #346: ACCUMULO-4746 Fluent API for Mutation
URL: https://github.com/apache/accumulo/pull/346
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 d32ccf5e3b..b38862b572 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 @@
// 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 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 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 78fdbadd8a..165bf86cfc 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 @@
// 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 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 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 d15104611a..cacd3424a5 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 @@
// 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 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 TableInformation(String tableName, Table.ID tableId, String tableState) {
*/
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 59908ec51b..50f9bff6af 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 @@
// 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 CurrentOperations() {}
*
* @param name
* Table name
- * @param ID
+ * @param tableId
* Table ID
* @param tablet
* Tablet string
@@ -71,10 +71,10 @@ public 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;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services