You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/11/15 04:36:37 UTC
[incubator-iotdb] 06/06: add ut
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_show_info
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit dd89ef7c17962bd9934cdc2cbc4e4c0a77b20f9d
Author: lta <li...@163.com>
AuthorDate: Fri Nov 15 12:36:07 2019 +0800
add ut
---
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 ++---
.../qp/executor/AbstractQueryProcessExecutor.java | 30 +++++++++++-----------
.../org/apache/iotdb/db/service/TSServiceImpl.java | 4 +--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 8591c93..ace0a75 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -55,9 +55,9 @@ public class IoTDBConstant {
public static final int MIN_SUPPORTED_JDK_VERSION = 8;
// show info
- public static final String ITEM = "item";
- public static final String PARAMETER = "parameter";
- public static final String VALUE = "value(B)";
+ public static final String ITEM = " item";
+ public static final String PARAMETER = " parameter";
+ public static final String VALUE = "value";
public static final String ROLE = "role";
public static final String USER = "user";
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java b/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
index 8877860..70c760e 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/executor/AbstractQueryProcessExecutor.java
@@ -134,25 +134,25 @@ public abstract class AbstractQueryProcessExecutor implements IQueryProcessExecu
paths.add(new Path(VALUE));
List<TSDataType> dataTypes = new ArrayList<>();
dataTypes.add(TSDataType.TEXT);
- dataTypes.add(TSDataType.INT64);
+ dataTypes.add(TSDataType.TEXT);
ListDataSet listDataSet = new ListDataSet(paths, dataTypes);
int timestamp = 0;
addRowRecordForShowQuery(listDataSet, timestamp++, "memtable size threshold",
- IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold());
+ IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold() + "B");
addRowRecordForShowQuery(listDataSet, timestamp++, "memtable number",
- IoTDBDescriptor.getInstance().getConfig().getMaxMemtableNumber());
+ IoTDBDescriptor.getInstance().getConfig().getMaxMemtableNumber() + "B");
addRowRecordForShowQuery(listDataSet, timestamp++, "tsfile size threshold",
- IoTDBDescriptor.getInstance().getConfig().getTsFileSizeThreshold());
+ IoTDBDescriptor.getInstance().getConfig().getTsFileSizeThreshold() + "B");
addRowRecordForShowQuery(listDataSet, timestamp++, "compression ratio",
- (long) CompressionRatio.getInstance().getRatio());
+ Double.toString(CompressionRatio.getInstance().getRatio()));
addRowRecordForShowQuery(listDataSet, timestamp++, "storage group number",
- MManager.getInstance().getAllStorageGroupNames().size());
+ Integer.toString( MManager.getInstance().getAllStorageGroupNames().size()));
addRowRecordForShowQuery(listDataSet, timestamp++, "timeseries number",
- IoTDBConfigDynamicAdapter.getInstance().getTotalTimeseries());
+ Integer.toString(IoTDBConfigDynamicAdapter.getInstance().getTotalTimeseries()));
addRowRecordForShowQuery(listDataSet, timestamp++,
"maximal timeseries number among storage groups",
- MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups());
+ Long.toString(MManager.getInstance().getMaximalSeriesNumberAmongStorageGroups()));
return listDataSet;
}
@@ -162,26 +162,26 @@ public abstract class AbstractQueryProcessExecutor implements IQueryProcessExecu
paths.add(new Path(VALUE));
List<TSDataType> dataTypes = new ArrayList<>();
dataTypes.add(TSDataType.TEXT);
- dataTypes.add(TSDataType.INT64);
+ dataTypes.add(TSDataType.TEXT);
ListDataSet listDataSet = new ListDataSet(paths, dataTypes);
int timestamp = 0;
addRowRecordForShowQuery(listDataSet, timestamp++, "total number of flush tasks",
- FlushTaskPoolManager.getInstance().getTotalTasks());
+ Integer.toString(FlushTaskPoolManager.getInstance().getTotalTasks()));
addRowRecordForShowQuery(listDataSet, timestamp++, "number of working flush tasks",
- FlushTaskPoolManager.getInstance().getWorkingTasksNumber());
+ Integer.toString(FlushTaskPoolManager.getInstance().getWorkingTasksNumber()));
addRowRecordForShowQuery(listDataSet, timestamp++, "number of waiting flush tasks",
- FlushTaskPoolManager.getInstance().getWaitingTasksNumber());
+ Integer.toString(FlushTaskPoolManager.getInstance().getWaitingTasksNumber()));
return listDataSet;
}
private void addRowRecordForShowQuery(ListDataSet listDataSet, int timestamp, String item,
- long value) {
+ String value) {
RowRecord rowRecord = new RowRecord(timestamp);
Field itemField = new Field(TSDataType.TEXT);
itemField.setBinaryV(new Binary(item));
- Field valueField = new Field(TSDataType.INT64);
- valueField.setLongV(value);
+ Field valueField = new Field(TSDataType.TEXT);
+ valueField.setBinaryV(new Binary(value));
rowRecord.addField(itemField);
rowRecord.addField(valueField);
listDataSet.putRecord(rowRecord);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index d5449c4..b2201b9 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -746,7 +746,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
columns.add(ITEM);
columns.add(VALUE);
columnTypes.add(TSDataType.TEXT.toString());
- columnTypes.add(TSDataType.INT64.toString());
+ columnTypes.add(TSDataType.TEXT.toString());
resp.setColumns(columns);
resp.setDataTypeList(columnTypes);
return resp;
@@ -761,7 +761,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
columns.add(PARAMETER);
columns.add(VALUE);
columnTypes.add(TSDataType.TEXT.toString());
- columnTypes.add(TSDataType.INT64.toString());
+ columnTypes.add(TSDataType.TEXT.toString());
resp.setColumns(columns);
resp.setDataTypeList(columnTypes);
return resp;