This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch update_license
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/update_license by this push:
new f46aeb1 replace org.json by alibaba.fastjson
f46aeb1 is described below
commit f46aeb17e5b8734eb4887f7940b2d1eb1ca06cff
Author: qiaojialin <[email protected]>
AuthorDate: Wed Mar 13 10:44:37 2019 +0800
replace org.json by alibaba.fastjson
---
License | 4 +-
.../controller/DatabaseConnectController.java | 41 +++++++++----------
.../db/engine/filenode/FileNodeProcessor.java | 4 --
.../memcontrol/BufferwriteFileSizeControlTest.java | 8 ----
.../memcontrol/BufferwriteMetaSizeControlTest.java | 8 ----
pom.xml | 1 -
tsfile/pom.xml | 6 +--
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 +-
.../iotdb/tsfile/write/schema/FileSchema.java | 3 +-
.../iotdb/tsfile/write/schema/JsonConverter.java | 23 +++++------
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 19 ++++-----
.../apache/iotdb/tsfile/utils/FileGenerator.java | 19 ++++-----
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 17 ++++----
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 19 ++++-----
.../org/apache/iotdb/tsfile/write/PerfTest.java | 13 +++---
.../iotdb/tsfile/write/ReadPageInMemTest.java | 13 +++---
.../org/apache/iotdb/tsfile/write/WriteTest.java | 27 +++++++------
.../write/schema/converter/JsonConverterTest.java | 46 ++++++++++++----------
18 files changed, 133 insertions(+), 142 deletions(-)
diff --git a/License b/License
index f18d55f..61fa7d2 100644
--- a/License
+++ b/License
@@ -203,8 +203,7 @@
------------------------------------------------------------------------------------
This product bundles various third-party components under other open source
licenses.
-This section summarizes those components and their licenses. See licenses/
-for text of these licenses.
+This section summarizes those components and their licenses.
Apache Software Foundation License 2.0
@@ -230,7 +229,6 @@ org.apache.commons:commons-collections4
org.apache.commons:commons-lang3
org.apache.thrift:libthrift
org.xerial.snappy:snappy-java
-classworlds:classworlds
------------------------------------------------------------------------------------
This product bundles various third-party components under other open source
licenses.
diff --git
a/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java
b/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java
index 3b31e5b..4045c8b 100644
---
a/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java
+++
b/grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java
@@ -30,12 +30,14 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import org.apache.iotdb.web.grafana.service.DatabaseConnectService;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +76,7 @@ public class DatabaseConnectController {
@ResponseBody
public String metricFindQuery(HttpServletRequest request,
HttpServletResponse response) {
Map<Integer, String> target = new HashMap<>();
+ JSONObject jsonObject = new JSONObject();
response.setStatus(200);
List<String> columnsName = new ArrayList<>();
try {
@@ -82,12 +85,10 @@ public class DatabaseConnectController {
logger.error("Failed to get metadata", e);
}
Collections.sort(columnsName);
- int cnt = 0;
- for (String columnName : columnsName) {
- target.put(cnt++, columnName);
+ for (int i = 0; i < columnsName.size(); i++) {
+ jsonObject.put( i + "", columnsName.get(i));
}
- JSONObject ojb = new JSONObject(target);
- return ojb.toString();
+ return jsonObject.toString();
}
/**
@@ -107,9 +108,9 @@ public class DatabaseConnectController {
Pair<ZonedDateTime, ZonedDateTime> timeRange =
getTimeFromAndTo(jsonObject);
JSONArray array = (JSONArray) jsonObject.get("targets"); // []
JSONArray result = new JSONArray();
- for (int i = 0; i < array.length(); i++) {
+ for (int i = 0; i < array.size(); i++) {
JSONObject object = (JSONObject) array.get(i); // {}
- if (object.isNull(targetStr)) {
+ if (!object.containsKey(targetStr)) {
return "[]";
}
String target = (String) object.get(targetStr);
@@ -121,7 +122,7 @@ public class DatabaseConnectController {
} else if (type.equals("timeserie")) {
setJsonTimeseries(obj, target, timeRange);
}
- result.put(i, obj);
+ result.add(i, obj);
}
logger.info("query finished");
return result.toString();
@@ -148,18 +149,18 @@ public class DatabaseConnectController {
JSONObject column = new JSONObject();
column.put("text", "Time");
column.put("type", "time");
- columns.put(column);
+ columns.add(column);
column = new JSONObject();
column.put("text", "Number");
column.put("type", "number");
- columns.put(column);
+ columns.add(column);
obj.put("columns", columns);
JSONArray values = new JSONArray();
for (TimeValues tv : timeValues) {
JSONArray value = new JSONArray();
- value.put(tv.getTime());
- value.put(tv.getValue());
- values.put(value);
+ value.add(tv.getTime());
+ value.add(tv.getValue());
+ values.add(value);
}
obj.put("values", values);
}
@@ -174,9 +175,9 @@ public class DatabaseConnectController {
long time = tv.getTime();
float value = tv.getValue();
JSONArray jsonArray = new JSONArray();
- jsonArray.put(value);
- jsonArray.put(time);
- dataPoints.put(jsonArray);
+ jsonArray.add(value);
+ jsonArray.add(time);
+ dataPoints.add(jsonArray);
}
obj.put("datapoints", dataPoints);
}
@@ -196,7 +197,7 @@ public class DatabaseConnectController {
while ((line = br.readLine()) != null) {
sb.append(line);
}
- return new JSONObject(sb.toString());
+ return JSON.parseObject(sb.toString());
} catch (IOException e) {
logger.error("getRequestBodyJson failed", e);
}
diff --git
a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index 0d43be8..793f362 100644
---
a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++
b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -76,7 +76,6 @@ import org.apache.iotdb.db.monitor.StatMonitor;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.factory.SeriesReaderFactory;
import org.apache.iotdb.db.query.reader.IReader;
-import org.apache.iotdb.db.utils.FileSchemaUtils;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.db.utils.QueryUtils;
import org.apache.iotdb.db.utils.TimeValuePair;
@@ -98,11 +97,8 @@ import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.apache.iotdb.tsfile.write.schema.JsonConverter;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
index fc307d3..9a2393c 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteFileSizeControlTest.java
@@ -24,9 +24,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.Directories;
@@ -38,19 +36,13 @@ import
org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
import org.apache.iotdb.db.engine.bufferwrite.FileNodeConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
-import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.utils.FileSchemaUtils;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
-import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
index 62ef909..926f2cb 100644
---
a/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
+++
b/iotdb/src/test/java/org/apache/iotdb/db/engine/memcontrol/BufferwriteMetaSizeControlTest.java
@@ -24,9 +24,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.Directories;
@@ -38,19 +36,13 @@ import
org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
import org.apache.iotdb.db.engine.bufferwrite.FileNodeConstants;
import org.apache.iotdb.db.engine.version.SysTimeVersionController;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
-import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.utils.FileSchemaUtils;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
-import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/pom.xml b/pom.xml
index ee1c5e0..b62d949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
<junit.version>4.12</junit.version>
<slf4j.version>1.7.12</slf4j.version>
<logback.version>1.1.11</logback.version>
- <json.version>20140107</json.version>
<joda.version>2.9.9</joda.version>
<spark.version>2.0.1</spark.version>
<common.io.version>2.5</common.io.version>
diff --git a/tsfile/pom.xml b/tsfile/pom.xml
index 5749bc5..9a9e5c1 100644
--- a/tsfile/pom.xml
+++ b/tsfile/pom.xml
@@ -42,9 +42,9 @@
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${json.version}</version>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.31</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
index 497f67d..c66b1e6 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
@@ -22,12 +22,13 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.exception.write.NoMeasurementException;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.footer.ChunkGroupFooter;
-import org.apache.iotdb.tsfile.file.header.PageHeader;
import org.apache.iotdb.tsfile.write.chunk.ChunkGroupWriterImpl;
import org.apache.iotdb.tsfile.write.chunk.IChunkGroupWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
@@ -36,7 +37,6 @@ import org.apache.iotdb.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.write.schema.JsonConverter;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java
index 2aa4d4a..03e05fd 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java
@@ -20,9 +20,10 @@ package org.apache.iotdb.tsfile.write.schema;
import java.util.HashMap;
import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.exception.write.InvalidJsonSchemaException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.json.JSONObject;
/**
* FileSchema stores the schema of the measurements and devices that exist in
this file. All
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
index b091336..1156e4a 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
@@ -20,6 +20,9 @@ package org.apache.iotdb.tsfile.write.schema;
import java.util.HashMap;
import java.util.Map;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
import org.apache.iotdb.tsfile.encoding.encoder.TSEncodingBuilder;
@@ -27,8 +30,6 @@ import
org.apache.iotdb.tsfile.exception.write.InvalidJsonSchemaException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,7 +85,7 @@ public class JsonConverter {
JSONObject jsonSchema)
throws InvalidJsonSchemaException {
Map<String, MeasurementSchema> result = new HashMap<>();
- if (!jsonSchema.has(JsonFormatConstant.JSON_SCHEMA)) {
+ if (!jsonSchema.containsKey(JsonFormatConstant.JSON_SCHEMA)) {
throw new InvalidJsonSchemaException("missing fields:" +
JsonFormatConstant.JSON_SCHEMA);
}
@@ -95,7 +96,7 @@ public class JsonConverter {
* { "measurement_id": "s2", "data_type": "INT64", "encoding": "TS_2DIFF"
}... ]
*/
JSONArray schemaArray =
jsonSchema.getJSONArray(JsonFormatConstant.JSON_SCHEMA);
- for (int i = 0; i < schemaArray.length(); i++) {
+ for (int i = 0; i < schemaArray.size(); i++) {
MeasurementSchema mdescriptor =
convertJsonToMeasurementSchema(schemaArray.getJSONObject(i));
result.put(mdescriptor.getMeasurementId(), mdescriptor);
}
@@ -113,10 +114,10 @@ public class JsonConverter {
* @return converted MeasurementSchema
*/
public static MeasurementSchema convertJsonToMeasurementSchema(JSONObject
measurementObj) {
- if (!measurementObj.has(JsonFormatConstant.MEASUREMENT_UID) &&
!measurementObj
- .has(JsonFormatConstant.DATA_TYPE)
- && !measurementObj.has(JsonFormatConstant.MEASUREMENT_ENCODING)
- && !measurementObj.has(JsonFormatConstant.COMPRESS_TYPE)) {
+ if (!measurementObj.containsKey(JsonFormatConstant.MEASUREMENT_UID) &&
!measurementObj
+ .containsKey(JsonFormatConstant.DATA_TYPE)
+ && !measurementObj.containsKey(JsonFormatConstant.MEASUREMENT_ENCODING)
+ && !measurementObj.containsKey(JsonFormatConstant.COMPRESS_TYPE)) {
LOG.warn(
"The format of given json is error. Give up to register this
measurement. Given json:{}",
measurementObj);
@@ -129,7 +130,7 @@ public class JsonConverter {
// get encoding information
TSEncoding encoding = TSEncoding
.valueOf(measurementObj.getString(JsonFormatConstant.MEASUREMENT_ENCODING));
- CompressionType compressionType =
measurementObj.has(JsonFormatConstant.COMPRESS_TYPE)
+ CompressionType compressionType =
measurementObj.containsKey(JsonFormatConstant.COMPRESS_TYPE)
?
CompressionType.valueOf(measurementObj.getString(JsonFormatConstant.COMPRESS_TYPE))
: CompressionType.valueOf(TSFileConfig.compressor);
// all information of one series
@@ -151,7 +152,7 @@ public class JsonConverter {
* function for converting chunk group size from jsonSchema.
*/
public static long convertJsonToChunkGroupSize(JSONObject jsonSchema) {
- if (jsonSchema.has(JsonFormatConstant.ROW_GROUP_SIZE)) {
+ if (jsonSchema.containsKey(JsonFormatConstant.ROW_GROUP_SIZE)) {
return jsonSchema.getLong(JsonFormatConstant.ROW_GROUP_SIZE);
}
return 128L * 1024 * 1024;
@@ -170,7 +171,7 @@ public class JsonConverter {
JSONArray jsonSchema = new JSONArray();
for (MeasurementSchema measurementSchema :
fileSchema.getAllMeasurementSchema().values()) {
- jsonSchema.put(convertMeasurementSchemaToJson(measurementSchema));
+ jsonSchema.add(convertMeasurementSchemaToJson(measurementSchema));
}
ret.put(JsonFormatConstant.JSON_SCHEMA, jsonSchema);
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
index 7df56d3..21e5d18 100755
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
@@ -23,6 +23,9 @@ import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Scanner;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -35,8 +38,6 @@ import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -206,13 +207,13 @@ public class TsFileGeneratorForSeriesReaderByTimestamp {
s7.put(JsonFormatConstant.MEASUREMENT_ENCODING, TSEncoding.RLE.toString());
JSONArray measureGroup1 = new JSONArray();
- measureGroup1.put(s1);
- measureGroup1.put(s2);
- measureGroup1.put(s3);
- measureGroup1.put(s4);
- measureGroup1.put(s5);
- measureGroup1.put(s6);
- measureGroup1.put(s7);
+ measureGroup1.add(s1);
+ measureGroup1.add(s2);
+ measureGroup1.add(s3);
+ measureGroup1.add(s4);
+ measureGroup1.add(s5);
+ measureGroup1.add(s6);
+ measureGroup1.add(s7);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
index ecdfd23..f35f704 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
@@ -23,6 +23,9 @@ import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Scanner;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -32,8 +35,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -203,13 +204,13 @@ public class FileGenerator {
s7.put(JsonFormatConstant.MEASUREMENT_ENCODING, TSEncoding.RLE.toString());
JSONArray measureGroup1 = new JSONArray();
- measureGroup1.put(s1);
- measureGroup1.put(s2);
- measureGroup1.put(s3);
- measureGroup1.put(s4);
- measureGroup1.put(s5);
- measureGroup1.put(s6);
- measureGroup1.put(s7);
+ measureGroup1.add(s1);
+ measureGroup1.add(s2);
+ measureGroup1.add(s3);
+ measureGroup1.add(s4);
+ measureGroup1.add(s5);
+ measureGroup1.add(s6);
+ measureGroup1.add(s7);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
index 80f5cfc..a2b3dc2 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
@@ -21,6 +21,9 @@ package org.apache.iotdb.tsfile.utils;
import static org.junit.Assert.assertEquals;
import java.util.List;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -30,8 +33,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.Before;
import org.junit.Test;
@@ -72,12 +73,12 @@ public class RecordUtilsTest {
s6.put(JsonFormatConstant.DATA_TYPE, TSDataType.TEXT.toString());
s6.put(JsonFormatConstant.MEASUREMENT_ENCODING,
TSEncoding.PLAIN.toString());
JSONArray columnGroup1 = new JSONArray();
- columnGroup1.put(s1);
- columnGroup1.put(s2);
- columnGroup1.put(s3);
- columnGroup1.put(s4);
- columnGroup1.put(s5);
- columnGroup1.put(s6);
+ columnGroup1.add(s1);
+ columnGroup1.add(s2);
+ columnGroup1.add(s3);
+ columnGroup1.add(s4);
+ columnGroup1.add(s5);
+ columnGroup1.add(s6);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.JSON_SCHEMA, columnGroup1);
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
index f9c4f5e..064f1cc 100755
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
@@ -24,6 +24,9 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.Collections;
import java.util.Scanner;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -36,8 +39,6 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.write.schema.SchemaBuilder;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.Assert;
import org.junit.Ignore;
import org.slf4j.Logger;
@@ -198,13 +199,13 @@ public class TsFileGeneratorForTest {
s7.put(JsonFormatConstant.MEASUREMENT_ENCODING, TSEncoding.RLE.toString());
JSONArray measureGroup1 = new JSONArray();
- measureGroup1.put(s1);
- measureGroup1.put(s2);
- measureGroup1.put(s3);
- measureGroup1.put(s4);
- measureGroup1.put(s5);
- measureGroup1.put(s6);
- measureGroup1.put(s7);
+ measureGroup1.add(s1);
+ measureGroup1.add(s2);
+ measureGroup1.add(s3);
+ measureGroup1.add(s4);
+ measureGroup1.add(s5);
+ measureGroup1.add(s6);
+ measureGroup1.add(s7);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
index f41e73e..f4a97be 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
@@ -26,6 +26,9 @@ import java.io.FileWriter;
import java.io.IOException;
import java.util.Random;
import java.util.Scanner;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -37,8 +40,6 @@ import org.apache.iotdb.tsfile.utils.FileUtils.Unit;
import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -191,10 +192,10 @@ public class PerfTest {
s4.put(JsonFormatConstant.DATA_TYPE, TSDataType.TEXT.toString());
s4.put(JsonFormatConstant.MEASUREMENT_ENCODING,
TSEncoding.PLAIN.toString());
JSONArray measureGroup1 = new JSONArray();
- measureGroup1.put(s1);
- measureGroup1.put(s2);
- measureGroup1.put(s3);
- measureGroup1.put(s4);
+ measureGroup1.add(s1);
+ measureGroup1.add(s2);
+ measureGroup1.add(s3);
+ measureGroup1.add(s4);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
index 4b2b338..b8cbf8e 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
@@ -22,6 +22,9 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -30,8 +33,6 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -73,10 +74,10 @@ public class ReadPageInMemTest {
s4.put(JsonFormatConstant.MEASUREMENT_ENCODING, conf.valueEncoder);
JSONArray measureGroup = new JSONArray();
- measureGroup.put(s1);
- measureGroup.put(s2);
- measureGroup.put(s3);
- measureGroup.put(s4);
+ measureGroup.add(s1);
+ measureGroup.add(s2);
+ measureGroup.add(s3);
+ measureGroup.add(s4);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
index 34077a8..010e8d9 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
@@ -21,11 +21,13 @@ package org.apache.iotdb.tsfile.write;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
import java.util.Random;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -36,9 +38,6 @@ import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.utils.StringContainer;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -98,10 +97,12 @@ public class WriteTest {
if (errorFile.exists()) {
errorFile.delete();
}
- JSONObject emptySchema = new JSONObject("{\"delta_type\":
\"test_type\",\"properties\": {\n"
+
+ JSONObject emptySchema = JSON.parseObject("{\"delta_type\":
\"test_type\",\"properties\": {\n"
+ "\"key1\": \"value1\",\n" + "\"key2\": \"value2\"\n" +
"},\"schema\": [],}");
- measurementArray = new JSONObject(new JSONTokener(new FileReader(new
File(schemaFile))))
- .getJSONArray(JsonFormatConstant.JSON_SCHEMA);
+ InputStream inputStream = new FileInputStream(schemaFile);
+ String jsonStr = IOUtils.toString(inputStream, "utf8");
+ measurementArray =
JSON.parseObject(jsonStr).getJSONArray(JsonFormatConstant.JSON_SCHEMA);
schema = new FileSchema(emptySchema);
LOG.info(schema.toString());
tsFileWriter = new TsFileWriter(file, schema, conf);
@@ -194,7 +195,7 @@ public class WriteTest {
long startTime = System.currentTimeMillis();
String[] strings;
// add all measurement except the last one at before writing
- for (int i = 0; i < measurementArray.length() - 1; i++) {
+ for (int i = 0; i < measurementArray.size() - 1; i++) {
tsFileWriter.addMeasurementByJson((JSONObject) measurementArray.get(i));
}
while (true) {
@@ -209,7 +210,7 @@ public class WriteTest {
}
if (lineCount == ROW_COUNT / 2) {
tsFileWriter
- .addMeasurementByJson((JSONObject)
measurementArray.get(measurementArray.length() - 1));
+ .addMeasurementByJson((JSONObject)
measurementArray.get(measurementArray.size() - 1));
}
strings = getNextRecord(lineCount, stageState);
for (String str : strings) {
@@ -220,7 +221,7 @@ public class WriteTest {
lineCount++;
}
// test duplicate measurement adding
- JSONObject dupMeasure = (JSONObject)
measurementArray.get(measurementArray.length() - 1);
+ JSONObject dupMeasure = (JSONObject)
measurementArray.get(measurementArray.size() - 1);
try {
tsFileWriter.addMeasurementByJson(dupMeasure);
} catch (WriteProcessException e) {
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
index 02d599c..5325e41 100755
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
@@ -22,22 +22,22 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
+import java.io.*;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
import org.apache.iotdb.tsfile.exception.write.InvalidJsonSchemaException;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.write.schema.JsonConverter;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
import org.junit.Test;
/**
@@ -50,8 +50,10 @@ public class JsonConverterTest {
String path = "src/test/resources/test_schema.json";
JSONObject obj = null;
try {
- obj = new JSONObject(new JSONTokener(new FileReader(new File(path))));
- } catch (JSONException | FileNotFoundException e) {
+ InputStream inputStream = new FileInputStream(path);
+ String jsonStr = IOUtils.toString(inputStream, "utf8");
+ obj = JSON.parseObject(jsonStr);
+ } catch (JSONException | IOException e) {
e.printStackTrace();
fail();
}
@@ -75,28 +77,30 @@ public class JsonConverterTest {
String path = "src/test/resources/test_schema.json";
JSONObject srcObj = null;
try {
- srcObj = new JSONObject(new JSONTokener(new FileReader(new File(path))));
- } catch (JSONException | FileNotFoundException e) {
+ InputStream inputStream = new FileInputStream(path);
+ String jsonStr = IOUtils.toString(inputStream, "utf8");
+ srcObj = JSON.parseObject(jsonStr);
+ } catch (JSONException | IOException e) {
e.printStackTrace();
fail();
}
FileSchema fileSchema = new FileSchema(srcObj);
JSONObject descObj = JsonConverter.converterFileSchemaToJson(fileSchema);
// check schema
- assertTrue(descObj.has(JsonFormatConstant.JSON_SCHEMA));
+ assertTrue(descObj.containsKey(JsonFormatConstant.JSON_SCHEMA));
JSONArray srcSchemaArray =
srcObj.getJSONArray(JsonFormatConstant.JSON_SCHEMA);
JSONArray descSchemaArray =
descObj.getJSONArray(JsonFormatConstant.JSON_SCHEMA);
- assertEquals(srcSchemaArray.length(), descSchemaArray.length());
+ assertEquals(srcSchemaArray.size(), descSchemaArray.size());
Map<String, JSONObject> descSchemaMap = new HashMap<>();
- for (int i = 0; i < descSchemaArray.length(); i++) {
+ for (int i = 0; i < descSchemaArray.size(); i++) {
JSONObject descMeasureObj = descSchemaArray.getJSONObject(i);
- assertTrue(descMeasureObj.has(JsonFormatConstant.MEASUREMENT_UID));
+
assertTrue(descMeasureObj.containsKey(JsonFormatConstant.MEASUREMENT_UID));
descSchemaMap
.put(descMeasureObj.getString(JsonFormatConstant.MEASUREMENT_UID),
descMeasureObj);
}
- for (int i = 0; i < srcSchemaArray.length(); i++) {
+ for (int i = 0; i < srcSchemaArray.size(); i++) {
JSONObject srcMeasureObj = srcSchemaArray.getJSONObject(i);
- assertTrue(srcMeasureObj.has(JsonFormatConstant.MEASUREMENT_UID));
+
assertTrue(srcMeasureObj.containsKey(JsonFormatConstant.MEASUREMENT_UID));
String measureUID =
srcMeasureObj.getString(JsonFormatConstant.MEASUREMENT_UID);
assertTrue(descSchemaMap.containsKey(measureUID));
checkJsonObjectEqual(srcMeasureObj, descSchemaMap.get(measureUID));
@@ -114,10 +118,10 @@ public class JsonConverterTest {
private void checkJsonObjectEqual(JSONObject obj1, JSONObject obj2) {
assertEquals(obj1.keySet().size(), obj2.keySet().size());
obj1.keySet().forEach(k -> {
- String key = (String) k;
- assertTrue(obj2.has(key));
- assertTrue(obj2.has(key));
- assertEquals(obj1.get((String) k).toString(), obj2.get((String)
k).toString());
+ String key = k;
+ assertTrue(obj2.containsKey(key));
+ assertTrue(obj2.containsKey(key));
+ assertEquals(obj1.get(k).toString(), obj2.get(k).toString());
});
}
