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 02a4ae6 clean hadoop and spark
02a4ae6 is described below
commit 02a4ae63d7ef710e71c26216bf503f50fd4fec70
Author: qiaojialin <[email protected]>
AuthorDate: Wed Mar 13 15:05:44 2019 +0800
clean hadoop and spark
---
License | 2 +-
.../org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java | 3 ++-
.../org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java | 3 ++-
.../iotdb/tsfile/hadoop/example/TsFileHelper.java | 13 +++++++------
.../java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java | 17 +++++++++--------
.../Eclipse Public License 1.0 (EPL-1.0) | 0
.../Eclipse Public License version 2.0 (EPL-2.0) | 0
... Lesser General Public License version 2.1(LGPL-2.1) | 0
{licenses-binary => licenses}/The 2-Clause BSD License | 0
{licenses-binary => licenses}/The 3-Clause BSD License | 0
{licenses-binary => licenses}/The MIT License | 0
pom.xml | 8 ++++----
spark/pom.xml | 5 -----
.../java/org/apache/iotdb/tsfile/io/CreateTSFile.java | 15 ++++++++-------
14 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/License b/License
index b8bd8b9..02bf089 100644
--- a/License
+++ b/License
@@ -225,7 +225,7 @@
iotdb/src/main/java/org/apache/iotdb/db/sql/parse/ParseUtils.java
================================================================
The binary distribution of this product bundles these dependencies under the
-following license. See licenses-binary/ for text of these licenses.
+following license. See licenses/ for text of these licenses.
Apache Software Foundation License 2.0
--------------------------------------
diff --git
a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java
b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java
index 86b4dbf..9a501d0 100644
--- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java
+++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;
+
+import com.alibaba.fastjson.JSONObject;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapreduce.Job;
@@ -26,7 +28,6 @@ import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java
b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java
index f13004f..346d8c9 100644
--- a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java
+++ b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;
+
+import com.alibaba.fastjson.JSONObject;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.NullWritable;
@@ -29,7 +31,6 @@ import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.write.exception.InvalidJsonSchemaException;
import org.apache.iotdb.tsfile.write.exception.WriteProcessException;
import org.apache.iotdb.tsfile.write.schema.FileSchema;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
index bff859f..d648029 100644
---
a/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
+++
b/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
@@ -21,6 +21,9 @@ package org.apache.iotdb.tsfile.hadoop.example;
import java.io.File;
import java.io.FileNotFoundException;
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.read.TsRandomAccessLocalFileReader;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.write.exception.WriteProcessException;
-import org.json.JSONArray;
-import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,10 +106,10 @@ public class TsFileHelper {
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/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
index 77d0eda..a80f3cd 100644
--- a/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
+++ b/hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
@@ -21,6 +21,9 @@ package org.apache.iotdb.tsfile.hadoop;
import java.io.File;
import java.io.FileNotFoundException;
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.read.TsRandomAccessLocalFileReader;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.write.exception.WriteProcessException;
-import org.json.JSONArray;
-import org.json.JSONObject;
public class TsFileTestHelper {
@@ -115,12 +116,12 @@ public class TsFileTestHelper {
s6.put(JsonFormatConstant.MEASUREMENT_ENCODING, conf.valueEncoder);
JSONArray measureGroup = new JSONArray();
- measureGroup.put(s1);
- measureGroup.put(s2);
- measureGroup.put(s3);
- measureGroup.put(s4);
- measureGroup.put(s5);
- measureGroup.put(s6);
+ measureGroup.add(s1);
+ measureGroup.add(s2);
+ measureGroup.add(s3);
+ measureGroup.add(s4);
+ measureGroup.add(s5);
+ measureGroup.add(s6);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
diff --git a/licenses-binary/Eclipse Public License 1.0 (EPL-1.0)
b/licenses/Eclipse Public License 1.0 (EPL-1.0)
similarity index 100%
rename from licenses-binary/Eclipse Public License 1.0 (EPL-1.0)
rename to licenses/Eclipse Public License 1.0 (EPL-1.0)
diff --git a/licenses-binary/Eclipse Public License version 2.0 (EPL-2.0)
b/licenses/Eclipse Public License version 2.0 (EPL-2.0)
similarity index 100%
rename from licenses-binary/Eclipse Public License version 2.0 (EPL-2.0)
rename to licenses/Eclipse Public License version 2.0 (EPL-2.0)
diff --git a/licenses-binary/GNU Lesser General Public License version
2.1(LGPL-2.1) b/licenses/GNU Lesser General Public License version 2.1(LGPL-2.1)
similarity index 100%
rename from licenses-binary/GNU Lesser General Public License version
2.1(LGPL-2.1)
rename to licenses/GNU Lesser General Public License version 2.1(LGPL-2.1)
diff --git a/licenses-binary/The 2-Clause BSD License b/licenses/The 2-Clause
BSD License
similarity index 100%
rename from licenses-binary/The 2-Clause BSD License
rename to licenses/The 2-Clause BSD License
diff --git a/licenses-binary/The 3-Clause BSD License b/licenses/The 3-Clause
BSD License
similarity index 100%
rename from licenses-binary/The 3-Clause BSD License
rename to licenses/The 3-Clause BSD License
diff --git a/licenses-binary/The MIT License b/licenses/The MIT License
similarity index 100%
rename from licenses-binary/The MIT License
rename to licenses/The MIT License
diff --git a/pom.xml b/pom.xml
index 4057bb1..e211627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,8 @@
<module>service-rpc</module>
<module>iotdb-cli</module>
<module>example</module>
- <!-- <module>hadoop</module> -->
- <!-- <module>spark</module> -->
+ <!--<module>hadoop</module>-->
+ <!--<module>spark</module>-->
</modules>
<build>
<pluginManagement>
@@ -177,8 +177,8 @@
<exclude>**/*.iml</exclude>
<!-- Runtime log -->
<exclude>**/*.log</exclude>
- <!-- licenses-binary -->
- <exclude>licenses-binary/*</exclude>
+ <!-- licenses -->
+ <exclude>licenses/*</exclude>
<!-- generated by Github -->
<exclude>.github/**</exclude>
<!--Checkstyle files -->
diff --git a/spark/pom.xml b/spark/pom.xml
index f064753..86346bf 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -32,11 +32,6 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20170516</version>
- </dependency>
- <dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
<version>${project.version}</version>
diff --git a/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java
b/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java
index 8fce7d1..ee417b7 100755
--- a/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java
+++ b/spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java
@@ -19,6 +19,9 @@
package org.apache.iotdb.tsfile.io;
import java.io.File;
+
+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;
@@ -26,8 +29,6 @@ import
org.apache.iotdb.tsfile.common.utils.TsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
-import org.json.JSONArray;
-import org.json.JSONObject;
/**
* create a TSFile for test
@@ -111,11 +112,11 @@ public class CreateTSFile {
TSEncoding.PLAIN.toString());
JSONArray measureGroup = new JSONArray();
- measureGroup.put(s1);
- measureGroup.put(s2);
- measureGroup.put(s3);
- measureGroup.put(s4);
- measureGroup.put(s5);
+ measureGroup.add(s1);
+ measureGroup.add(s2);
+ measureGroup.add(s3);
+ measureGroup.add(s4);
+ measureGroup.add(s5);
JSONObject jsonSchema = new JSONObject();
jsonSchema.put(JsonFormatConstant.DELTA_TYPE, "test_type");
