This is an automated email from the ASF dual-hosted git repository.
geniuspig pushed a change to branch http
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 5d83973 Merge branch 'master' into http
add 54dbf87 merge metrics to rest api.
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/metrics/MetricsSystem.java | 123 ++++
.../db/metrics/{server => }/ServerArgument.java | 624 ++++++++++-----------
.../iotdb/db/metrics/{server => }/SqlArgument.java | 156 +++---
.../apache/iotdb/db/metrics/server/JettyUtil.java | 87 ---
.../iotdb/db/metrics/server/MetricsSystem.java | 69 ---
.../iotdb/db/metrics/server/QueryServlet.java | 59 --
.../apache/iotdb/db/metrics/sink/ConsoleSink.java | 48 --
.../iotdb/db/metrics/sink/JsonServletSink.java | 50 --
.../org/apache/iotdb/db/metrics/sink/Sink.java | 29 -
.../apache/iotdb/db/metrics/source/JvmSource.java | 48 --
.../iotdb/db/metrics/source/MetricsSource.java | 74 ---
.../org/apache/iotdb/db/metrics/source/Source.java | 25 -
.../apache/iotdb/db/metrics/ui/MetricsPage.java | 145 -----
.../apache/iotdb/db/metrics/ui/MetricsWebUI.java | 51 --
.../iotdb/db/rest/controller/RestController.java | 39 +-
.../org/apache/iotdb/db/rest/util/RestUtil.java | 15 +-
.../apache/iotdb/db/service/MetricsService.java | 18 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
.../src/main/resources/iotdb/ui/static/index.html | 79 ---
.../main/resources/iotdb/ui/static/iotdb-logo.png | Bin 1768 -> 0 bytes
.../src/main/resources/iotdb/ui/static/webui.css | 194 -------
23 files changed, 572 insertions(+), 1379 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/MetricsSystem.java
rename server/src/main/java/org/apache/iotdb/db/metrics/{server =>
}/ServerArgument.java (93%)
rename server/src/main/java/org/apache/iotdb/db/metrics/{server =>
}/SqlArgument.java (94%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/server/JettyUtil.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/server/MetricsSystem.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/server/QueryServlet.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/sink/ConsoleSink.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/sink/JsonServletSink.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/sink/Sink.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/source/JvmSource.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/source/MetricsSource.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/source/Source.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsPage.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metrics/ui/MetricsWebUI.java
delete mode 100644 server/src/main/resources/iotdb/ui/static/index.html
delete mode 100644 server/src/main/resources/iotdb/ui/static/iotdb-logo.png
delete mode 100644 server/src/main/resources/iotdb/ui/static/webui.css
