jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename package name from cn.edu.tsinghua to org.apache.iotdb (#578)

This commit is contained in:
Xiangdong Huang 2019-01-12 13:45:02 +08:00 committed by XuYi
parent 22fe7d3172
commit 2dd4727df1
783 changed files with 4640 additions and 4156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Readme.md
View File

@ -56,6 +56,9 @@ Then you can build IoTDB using Maven in current folder:
mvn clean package -Dmaven.test.skip=true
```
(__NOTICE:__ Remember that you have to use -Dmaven.test.skip=true before you run tests, it is because some IT (integration test) requires jars in iotdb-cli/cli/lib/, and the folder is empty before you run `mvn package`. After that, you can run `mvn test` as long as you do not run `mvn clean`. For more details, see: [How to test IoTDB
](https://github.com/thulab/iotdb/wiki/How-to-test-IoTDB) )
If successful, you will see the the following text in the terminal:
```

2
grafana/conf/application.properties
View File

@ -1,6 +1,6 @@
spring.datasource.url = jdbc:iotdb://127.0.0.1:6667/
spring.datasource.username = root
spring.datasource.password = root
spring.datasource.driver-class-name=cn.edu.tsinghua.iotdb.jdbc.IoTDBDriver
spring.datasource.driver-class-name=org.apache.iotdb.jdbc.IoTDBDriver
server.port = 8888

6
grafana/pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>root</artifactId>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -23,7 +23,7 @@
<description>Grafana data source connector for IoTDB</description>
<properties>
<start-class>cn.edu.tsinghua.web.TsfileWebDemoApplication</start-class>
<start-class>org.apache.iotdb.web.grafana.TsfileWebDemoApplication</start-class>
<spring-boot.version>1.5.4.RELEASE</spring-boot.version>
<spring.version>4.3.9.RELEASE</spring.version>
@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>

2
grafana/readme.md
View File

@ -44,7 +44,7 @@ Edit `application.properties`
spring.datasource.url = jdbc:iotdb://127.0.0.1:6667/
spring.datasource.username = root
spring.datasource.password = root
spring.datasource.driver-class-name=cn.edu.tsinghua.iotdb.jdbc.TsfileDriver
spring.datasource.driver-class-name=org.apache.iotdb.jdbc.TsfileDriver
server.port = 8888
```

2
grafana/readme_zh.md
View File

@ -33,7 +33,7 @@ cd grafana
spring.datasource.url = jdbc:iotdb://127.0.0.1:6667/
spring.datasource.username = root
spring.datasource.password = root
spring.datasource.driver-class-name=cn.edu.tsinghua.iotdb.jdbc.TsfileDriver
spring.datasource.driver-class-name=org.apache.iotdb.jdbc.TsfileDriver
server.port = 8888
```

2
grafana/src/main/java/cn/edu/tsinghua/web/TsfileWebDemoApplication.java → grafana/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.web;
package org.apache.iotdb.web.grafana;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
grafana/src/main/java/cn/edu/tsinghua/web/bean/TimeValues.java → grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.web.bean;
package org.apache.iotdb.web.grafana.bean;
/**
* Created by dell on 2017/7/18.

2
grafana/src/main/java/cn/edu/tsinghua/web/conf/MyConfiguration.java → grafana/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.web.conf;
package org.apache.iotdb.web.grafana.conf;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

9
grafana/src/main/java/cn/edu/tsinghua/web/controller/DBConnectController.java → grafana/src/main/java/org/apache/iotdb/web/grafana/controller/DBConnectController.java
View File

@ -1,8 +1,7 @@
package cn.edu.tsinghua.web.controller;
package org.apache.iotdb.web.grafana.controller;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.web.bean.TimeValues;
import cn.edu.tsinghua.web.service.DBConnectService;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import org.json.JSONArray;
import org.json.JSONException;
@ -37,7 +36,7 @@ public class DBConnectController {
private static final Logger logger = LoggerFactory.getLogger(DBConnectController.class);
@Autowired
private DBConnectService DBConnectService;
private org.apache.iotdb.web.grafana.service.DBConnectService DBConnectService;
@RequestMapping(value = "/", method = RequestMethod.GET)
@ResponseStatus(value = HttpStatus.OK)

6
grafana/src/main/java/cn/edu/tsinghua/web/dao/BasicDao.java → grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java
View File

@ -1,7 +1,7 @@
package cn.edu.tsinghua.web.dao;
package org.apache.iotdb.web.grafana.dao;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.web.bean.TimeValues;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import java.time.ZonedDateTime;
import java.util.List;

8
grafana/src/main/java/cn/edu/tsinghua/web/dao/impl/BasicDaoImpl.java → grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
View File

@ -1,8 +1,8 @@
package cn.edu.tsinghua.web.dao.impl;
package org.apache.iotdb.web.grafana.dao.impl;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.web.bean.TimeValues;
import cn.edu.tsinghua.web.dao.BasicDao;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import org.apache.iotdb.web.grafana.dao.BasicDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

6
grafana/src/main/java/cn/edu/tsinghua/web/service/DBConnectService.java → grafana/src/main/java/org/apache/iotdb/web/grafana/service/DBConnectService.java
View File

@ -1,7 +1,7 @@
package cn.edu.tsinghua.web.service;
package org.apache.iotdb.web.grafana.service;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.web.bean.TimeValues;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import java.time.ZonedDateTime;
import java.util.List;

10
grafana/src/main/java/cn/edu/tsinghua/web/service/impl/DBConnectServiceImpl.java → grafana/src/main/java/org/apache/iotdb/web/grafana/service/impl/DBConnectServiceImpl.java
View File

@ -1,9 +1,9 @@
package cn.edu.tsinghua.web.service.impl;
package org.apache.iotdb.web.grafana.service.impl;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.web.bean.TimeValues;
import cn.edu.tsinghua.web.dao.BasicDao;
import cn.edu.tsinghua.web.service.DBConnectService;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.web.grafana.bean.TimeValues;
import org.apache.iotdb.web.grafana.dao.BasicDao;
import org.apache.iotdb.web.grafana.service.DBConnectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
hadoop/pom.xml
View File

@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>root</artifactId>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>cn.edu.thu.tsfile</groupId>
<groupId>org.apache.iotdb.tsfile</groupId>
<artifactId>hadoop</artifactId>
<packaging>jar</packaging>
@ -23,7 +23,7 @@
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
<version>${project.version}</version>
</dependency>

2
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFHadoopException.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFHadoopException.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
/**
* @author liukun

8
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFInputFormat.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputFormat.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;
import java.util.ArrayList;
@ -23,9 +23,9 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.edu.thu.tsfile.hadoop.io.HDFSInputStream;
import cn.edu.tsinghua.tsfile.file.metadata.RowGroupMetaData;
import cn.edu.tsinghua.tsfile.read.FileReader;
import org.apache.iotdb.tsfile.hadoop.io.HDFSInputStream;
import org.apache.iotdb.tsfile.file.metadata.RowGroupMetaData;
import org.apache.iotdb.tsfile.read.FileReader;
/**
* @author liukun

10
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFInputSplit.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFInputSplit.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.DataInput;
import java.io.DataOutput;
@ -12,10 +12,10 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.InputSplit;
import cn.edu.tsinghua.tsfile.file.metadata.RowGroupMetaData;
import cn.edu.tsinghua.tsfile.file.metadata.TsRowGroupBlockMetaData;
import cn.edu.tsinghua.tsfile.file.utils.ReadWriteThriftFormatUtils;
import cn.edu.tsinghua.tsfile.format.RowGroupBlockMetaData;
import org.apache.iotdb.tsfile.file.metadata.RowGroupMetaData;
import org.apache.iotdb.tsfile.file.metadata.TsRowGroupBlockMetaData;
import org.apache.iotdb.tsfile.file.utils.ReadWriteThriftFormatUtils;
import org.apache.iotdb.tsfile.format.RowGroupBlockMetaData;
/**
* This is tsfile <code>InputSplit</code>.<br>

2
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFOutputFormat.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFOutputFormat.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;

16
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFRecordReader.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordReader.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;
import java.util.ArrayList;
@ -23,13 +23,13 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.edu.thu.tsfile.hadoop.io.HDFSInputStream;
import cn.edu.tsinghua.tsfile.file.metadata.RowGroupMetaData;
import cn.edu.tsinghua.tsfile.file.metadata.TimeSeriesChunkMetaData;
import cn.edu.tsinghua.tsfile.read.query.HadoopQueryEngine;
import cn.edu.tsinghua.tsfile.read.query.QueryDataSet;
import cn.edu.tsinghua.tsfile.read.support.Field;
import cn.edu.tsinghua.tsfile.read.support.RowRecord;
import org.apache.iotdb.tsfile.hadoop.io.HDFSInputStream;
import org.apache.iotdb.tsfile.file.metadata.RowGroupMetaData;
import org.apache.iotdb.tsfile.file.metadata.TimeSeriesChunkMetaData;
import org.apache.iotdb.tsfile.read.query.HadoopQueryEngine;
import org.apache.iotdb.tsfile.read.query.QueryDataSet;
import org.apache.iotdb.tsfile.read.support.Field;
import org.apache.iotdb.tsfile.read.support.RowRecord;
/**
* @author liukun

12
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSFRecordWriter.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSFRecordWriter.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.IOException;
@ -11,11 +11,11 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.edu.thu.tsfile.hadoop.io.HDFSOutputStream;
import cn.edu.tsinghua.tsfile.timeseries.basis.TsFile;
import cn.edu.tsinghua.tsfile.write.exception.InvalidJsonSchemaException;
import cn.edu.tsinghua.tsfile.write.exception.WriteProcessException;
import cn.edu.tsinghua.tsfile.write.schema.FileSchema;
import org.apache.iotdb.tsfile.hadoop.io.HDFSOutputStream;
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;
public class TSFRecordWriter extends RecordWriter<NullWritable, TSRow> {

4
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/TSRow.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.DataInput;
import java.io.DataOutput;
@ -6,7 +6,7 @@ import java.io.IOException;
import org.apache.hadoop.io.Writable;
import cn.edu.tsinghua.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.TSRecord;
public class TSRow implements Writable {

8
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/example/TSFMRReadExample.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TSFMRReadExample.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop.example;
package org.apache.iotdb.tsfile.hadoop.example;
import java.io.IOException;
import java.net.URISyntaxException;
@ -13,9 +13,9 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.hadoop.mapreduce.Reducer;
import cn.edu.thu.tsfile.hadoop.TSFHadoopException;
import cn.edu.thu.tsfile.hadoop.TSFInputFormat;
import cn.edu.thu.tsfile.hadoop.TSFOutputFormat;
import org.apache.iotdb.tsfile.hadoop.TSFHadoopException;
import org.apache.iotdb.tsfile.hadoop.TSFInputFormat;
import org.apache.iotdb.tsfile.hadoop.TSFOutputFormat;
/**
* One example for reading TsFile with MapReduce.

20
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/example/TsFileHelper.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop.example;
package org.apache.iotdb.tsfile.hadoop.example;
import java.io.File;
import java.io.FileNotFoundException;
@ -9,15 +9,15 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
import cn.edu.tsinghua.tsfile.common.constant.JsonFormatConstant;
import cn.edu.tsinghua.tsfile.common.utils.ITsRandomAccessFileWriter;
import cn.edu.tsinghua.tsfile.common.utils.TsRandomAccessFileWriter;
import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
import cn.edu.tsinghua.tsfile.timeseries.basis.TsFile;
import cn.edu.tsinghua.tsfile.read.TsRandomAccessLocalFileReader;
import cn.edu.tsinghua.tsfile.write.exception.WriteProcessException;
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.common.utils.ITsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.common.utils.TsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.read.TsRandomAccessLocalFileReader;
import org.apache.iotdb.tsfile.write.exception.WriteProcessException;
public class TsFileHelper {

4
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/io/HDFSInputStream.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop.io;
package org.apache.iotdb.tsfile.hadoop.io;
import java.io.IOException;
@ -8,7 +8,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import cn.edu.tsinghua.tsfile.common.utils.ITsRandomAccessFileReader;
import org.apache.iotdb.tsfile.common.utils.ITsRandomAccessFileReader;
/**
* This class is used to wrap the {@link}FSDataInputStream and implement the

4
hadoop/src/main/java/cn/edu/thu/tsfile/hadoop/io/HDFSOutputStream.java → hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop.io;
package org.apache.iotdb.tsfile.hadoop.io;
import java.io.IOException;
import java.io.OutputStream;
@ -8,7 +8,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import cn.edu.tsinghua.tsfile.common.utils.ITsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.common.utils.ITsRandomAccessFileWriter;
/**
* This class is used to wrap the {@link}FSDataOutputStream and implement the

6
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@ -7,8 +7,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import cn.edu.thu.tsfile.hadoop.io.HDFSInputStream;
import cn.edu.thu.tsfile.hadoop.io.HDFSOutputStream;
import org.apache.iotdb.tsfile.hadoop.io.HDFSInputStream;
import org.apache.iotdb.tsfile.hadoop.io.HDFSOutputStream;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

8
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFHadoopTest.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -22,9 +22,9 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import cn.edu.tsinghua.tsfile.common.utils.ITsRandomAccessFileReader;
import cn.edu.tsinghua.tsfile.timeseries.basis.TsFile;
import cn.edu.tsinghua.tsfile.read.TsRandomAccessLocalFileReader;
import org.apache.iotdb.tsfile.common.utils.ITsRandomAccessFileReader;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.read.TsRandomAccessLocalFileReader;
public class TSFHadoopTest {

8
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TSFInputSplitTest.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -14,11 +14,11 @@ import org.apache.hadoop.io.DataOutputBuffer;
import org.junit.Before;
import org.junit.Test;
import cn.edu.tsinghua.tsfile.file.metadata.RowGroupMetaData;
import cn.edu.tsinghua.tsfile.file.metadata.TimeSeriesChunkMetaData;
import org.apache.iotdb.tsfile.file.metadata.RowGroupMetaData;
import org.apache.iotdb.tsfile.file.metadata.TimeSeriesChunkMetaData;
/**
* Test the {@link cn.edu.thu.tsfile.hadoop.TSFInputSplit}
* Test the {@link org.apache.iotdb.tsfile.hadoop.TSFInputSplit}
* Assert the readFields function and write function is right
*
* @author liukun

20
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
View File

@ -1,4 +1,4 @@
package cn.edu.thu.tsfile.hadoop;
package org.apache.iotdb.tsfile.hadoop;
import java.io.File;
import java.io.FileNotFoundException;
@ -7,15 +7,15 @@ import java.io.IOException;
import org.json.JSONArray;
import org.json.JSONObject;
import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
import cn.edu.tsinghua.tsfile.common.constant.JsonFormatConstant;
import cn.edu.tsinghua.tsfile.common.utils.ITsRandomAccessFileWriter;
import cn.edu.tsinghua.tsfile.common.utils.TsRandomAccessFileWriter;
import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
import cn.edu.tsinghua.tsfile.timeseries.basis.TsFile;
import cn.edu.tsinghua.tsfile.read.TsRandomAccessLocalFileReader;
import cn.edu.tsinghua.tsfile.write.exception.WriteProcessException;
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.common.utils.ITsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.common.utils.TsRandomAccessFileWriter;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.timeseries.basis.TsFile;
import org.apache.iotdb.tsfile.read.TsRandomAccessLocalFileReader;
import org.apache.iotdb.tsfile.write.exception.WriteProcessException;
public class TsFileTestHelper {

2
iotdb-cli/cli/bin/export-csv.bat
View File

@ -6,7 +6,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=cn.edu.tsinghua.iotdb.tool.ExportCsv
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.tool.ExportCsv
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------

2
iotdb-cli/cli/bin/export-csv.sh
View File

@ -25,7 +25,7 @@ for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=cn.edu.tsinghua.iotdb.tool.ExportCsv
MAIN_CLASS=org.apache.iotdb.db.tool.ExportCsv
"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
exit $?

2
iotdb-cli/cli/bin/import-csv.bat
View File

@ -6,7 +6,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=cn.edu.tsinghua.iotdb.tool.ImportCsv
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.tool.ImportCsv
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------

2
iotdb-cli/cli/bin/import-csv.sh
View File

@ -25,7 +25,7 @@ for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=cn.edu.tsinghua.iotdb.tool.ImportCsv
MAIN_CLASS=org.apache.iotdb.db.tool.ImportCsv
"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -cp "$CLASSPATH" "$MAIN_CLASS" "$@"
exit $?

2
iotdb-cli/cli/bin/start-client.bat
View File

@ -9,7 +9,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=cn.edu.tsinghua.iotdb.client.Client
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.cli.client.Client
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------

2
iotdb-cli/cli/bin/start-client.sh
View File

@ -9,7 +9,7 @@ if [ -z "${IOTDB_HOME}" ]; then
fi
MAIN_CLASS=cn.edu.tsinghua.iotdb.client.Client
MAIN_CLASS=org.apache.iotdb.cli.client.Client
CLASSPATH=""

4
iotdb-cli/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>root</artifactId>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -22,7 +22,7 @@
<dependencies>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>0.8.0-SNAPSHOT</version>
</dependency>

15
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/client/AbstractClient.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/client/AbstractClient.java
View File

@ -1,17 +1,16 @@
package cn.edu.tsinghua.iotdb.client;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBDatabaseMetadata;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBMetadataResultSet;
import cn.edu.tsinghua.iotdb.tool.ImportCsv;
import cn.edu.tsinghua.service.rpc.thrift.ServerProperties;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
package org.apache.iotdb.cli.client;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.cli.tool.ImportCsv;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.iotdb.jdbc.IoTDBDatabaseMetadata;
import org.apache.iotdb.jdbc.IoTDBMetadataResultSet;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.thrift.TException;
import java.sql.ResultSet;

30
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/client/Client.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/client/Client.java
View File

@ -1,23 +1,19 @@
package cn.edu.tsinghua.iotdb.client;
package org.apache.iotdb.cli.client;
import jline.console.ConsoleReader;
import jline.console.completer.ArgumentCompleter;
import jline.console.completer.Completer;
import jline.console.completer.StringsCompleter;
import org.apache.commons.cli.*;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.Config;
import jline.console.completer.ArgumentCompleter;
import jline.console.completer.StringsCompleter;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import jline.console.ConsoleReader;
import jline.console.completer.Completer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class Client extends AbstractClient {

17
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/client/WinClient.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/client/WinClient.java
View File

@ -1,9 +1,4 @@
package cn.edu.tsinghua.iotdb.client;
import java.io.Console;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Scanner;
package org.apache.iotdb.cli.client;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@ -11,10 +6,14 @@ import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.Config;
import java.io.Console;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Scanner;
public class WinClient extends AbstractClient {

2
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/exception/ArgsErrorException.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/exception/ArgsErrorException.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.exception;
package org.apache.iotdb.cli.exception;
public class ArgsErrorException extends Exception{

19
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/tool/AbstractCsvTool.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/AbstractCsvTool.java
View File

@ -1,16 +1,15 @@
package cn.edu.tsinghua.iotdb.tool;
package org.apache.iotdb.cli.tool;
import jline.console.ConsoleReader;
import org.apache.commons.cli.CommandLine;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.iotdb.jdbc.IoTDBSQLException;
import org.apache.thrift.TException;
import java.io.IOException;
import java.time.ZoneId;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBSQLException;
import org.apache.commons.cli.CommandLine;
import org.apache.thrift.TException;
import jline.console.ConsoleReader;
public abstract class AbstractCsvTool {
protected static final String HOST_ARGS = "h";
protected static final String HOST_NAME = "host";
@ -43,7 +42,7 @@ public abstract class AbstractCsvTool {
protected static String timeZoneID;
protected static String timeFormat;
// protected static final String JDBC_DRIVER = "cn.edu.thu.tsfiledb.jdbc.TsfileDriver";
// protected static final String JDBC_DRIVER = "case hu.tsfiledb.jdbc.TsfileDriver";
protected static final String DEFAULT_TIME_FORMAT = "ISO8601";

2
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/tool/CsvTestDataGen.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/CsvTestDataGen.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.tool;
package org.apache.iotdb.cli.tool;
import java.io.BufferedWriter;
import java.io.File;

8
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/tool/ExportCsv.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ExportCsv.java
View File

@ -1,8 +1,8 @@
package cn.edu.tsinghua.iotdb.tool;
package org.apache.iotdb.cli.tool;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.Config;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.iotdb.jdbc.Config;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;

33
iotdb-cli/src/main/java/cn/edu/tsinghua/iotdb/tool/ImportCsv.java → iotdb-cli/src/main/java/org/apache/iotdb/cli/tool/ImportCsv.java
View File

@ -1,4 +1,18 @@
package cn.edu.tsinghua.iotdb.tool;
package org.apache.iotdb.cli.tool;
import jline.console.ConsoleReader;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.thrift.TException;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@ -18,23 +32,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.Config;
import cn.edu.tsinghua.iotdb.jdbc.Constant;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.io.FileUtils;
import org.apache.thrift.TException;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import jline.console.ConsoleReader;
/**
* CSV File To IoTDB
*

18
iotdb-cli/src/test/java/cn/edu/tsinghua/iotdb/client/AbstractClientTest.java → iotdb-cli/src/test/java/org/apache/iotdb/cli/client/AbstractClientTest.java
View File

@ -1,23 +1,23 @@
package cn.edu.tsinghua.iotdb.client;
import static org.junit.Assert.*;
import static org.mockito.Mockito.when;
package org.apache.iotdb.cli.client;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.iotdb.cli.client.AbstractClient.OPERATION_RESULT;
import org.apache.iotdb.cli.exception.ArgsErrorException;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.iotdb.jdbc.IoTDBDatabaseMetadata;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import cn.edu.tsinghua.iotdb.client.AbstractClient.OPERATION_RESULT;
import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBConnection;
import cn.edu.tsinghua.iotdb.jdbc.IoTDBDatabaseMetadata;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
public class AbstractClientTest {

10
iotdb-cli/src/test/java/cn/edu/tsinghua/iotdb/client/StartClientScriptTest.java → iotdb-cli/src/test/java/org/apache/iotdb/cli/client/StartClientScriptTest.java
View File

@ -1,6 +1,8 @@
package cn.edu.tsinghua.iotdb.client;
package org.apache.iotdb.cli.client;
import static org.junit.Assert.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.BufferedReader;
import java.io.File;
@ -9,9 +11,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class StartClientScriptTest {

2
iotdb-cli/src/test/resources/logback.xml
View File

@ -92,7 +92,7 @@
</filter>
</appender>
<!--<logger name="cn.edu.tsinghua.tsfile.write.chunk.ChunkWriterImpl level="debug" />-->
<!--<logger name="org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl level="debug" />-->
<root level="ERROR">
<appender-ref ref="FILEERROR" />

2
iotdb/iotdb/bin/start-postBackClient.bat
View File

@ -10,7 +10,7 @@ set IOTDB_CONF=%IOTDB_HOME%\conf
set IOTDB_LOGS=%IOTDB_HOME%\logs
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=cn.edu.tsinghua.iotdb.postback.sender.FileSenderImpl
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.postback.sender.FileSenderImpl
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------

2
iotdb/iotdb/bin/start-postBackClient.sh
View File

@ -28,7 +28,7 @@ for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
MAIN_CLASS=cn.edu.tsinghua.iotdb.postback.sender.FileSenderImpl
MAIN_CLASS=org.apache.iotdb.db.postback.sender.FileSenderImpl
"$JAVA" -DIOTDB_HOME=${IOTDB_HOME} -DTSFILE_HOME=${IOTDB_HOME} -DIOTDB_CONF=${IOTDB_CONF} -Dlogback.configurationFile=${IOTDB_CONF}/logback.xml $IOTDB_DERBY_OPTS $IOTDB_JMX_OPTS -Dname=postBackClient -cp "$CLASSPATH" "$MAIN_CLASS"

2
iotdb/iotdb/bin/start-server.bat
View File

@ -38,7 +38,7 @@ IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
echo "can't find %IOTDB_CONF%\iotdb-env.bat"
)
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=cn.edu.tsinghua.iotdb.service.IoTDB
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.db.service.IoTDB
if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------

2
iotdb/iotdb/bin/start-server.sh
View File

@ -37,7 +37,7 @@ CLASSPATH=""
for f in ${IOTDB_HOME}/lib/*.jar; do
CLASSPATH=${CLASSPATH}":"$f
done
classname=cn.edu.tsinghua.iotdb.service.IoTDB
classname=org.apache.iotdb.db.service.IoTDB
launch_service()
{

2
iotdb/iotdb/conf/iotdb-engine.properties
View File

@ -49,7 +49,7 @@ flush_wal_period_in_ms=10
# mult_dir_strategy
# The strategy is used to choose a directory from tsfile_dir for the system to store a new tsfile.
# System provides three strategies to choose from, or user can create his own strategy by extending cn.edu.tsinghua.iotdb.conf.directories.strategy.DirectoryStrategy.
# System provides three strategies to choose from, or user can create his own strategy by extending org.apache.iotdb.db.conf.directories.strategy.DirectoryStrategy.
# The info of the three strategies are as follows:
# 1. SequenceStrategy: the system will choose the directory in sequence.
# 2. MaxDiskUsableSpaceFirstStrategy: the system will choose the directory whose disk has the maximum space.

2
iotdb/iotdb/conf/iotdb-env.sh
View File

@ -107,7 +107,7 @@ else
IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT "
fi
IOTDB_DERBY_OPTS="-Dderby.stream.error.field=cn.edu.tsinghua.iotdb.auth.dao.DerbyUtil.DEV_NULL"
IOTDB_DERBY_OPTS="-Dderby.stream.error.field=org.apache.iotdb.db.auth.dao.DerbyUtil.DEV_NULL"
IOTDB_JMX_OPTS="$IOTDB_JMX_OPTS -Xloggc:${IOTDB_HOME}/gc.log -XX:+PrintGCDateStamps -XX:+PrintGCDetails"

4
iotdb/iotdb/conf/logback.xml
View File

@ -98,8 +98,8 @@
</appender>
<logger name="cn.edu.tsinghua.iotdb.service" level="info" />
<logger name="cn.edu.tsinghua.iotdb.conf" level="info" />
<logger name="org.apache.iotdb.db.service" level="info" />
<logger name="org.apache.iotdb.db.conf" level="info" />
<root level="info">
<appender-ref ref="FILEDEBUG" />
<appender-ref ref="FILEINFO" />

10
iotdb/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>root</artifactId>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@ -23,17 +23,17 @@
<dependencies>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@ -60,7 +60,7 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>cn.edu.tsinghua</groupId>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
</exclusion>
</exclusions>

2
iotdb/src/main/antlr3/cn/edu/tsinghua/iotdb/sql/parse/TSLexer.g → iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g
View File

@ -1,7 +1,7 @@
lexer grammar TSLexer;
@lexer::header {
package cn.edu.tsinghua.iotdb.sql.parse;
package org.apache.iotdb.db.sql.parse;
}

2
iotdb/src/main/antlr3/cn/edu/tsinghua/iotdb/sql/parse/TSParser.g → iotdb/src/main/antlr3/org/apache/iotdb/db/sql/parse/TSParser.g
View File

@ -83,7 +83,7 @@ TOK_DESCRIBE;
@header {
package cn.edu.tsinghua.iotdb.sql.parse;
package org.apache.iotdb.db.sql.parse;
import java.util.Arrays;
import java.util.Collection;

11
iotdb/src/main/java/cn/edu/tsinghua/iotdb/qp/strategy/optimizer/IFilterOptimizer.java
View File

@ -1,11 +0,0 @@
package cn.edu.tsinghua.iotdb.qp.strategy.optimizer;
import cn.edu.tsinghua.iotdb.exception.qp.QueryProcessorException;
import cn.edu.tsinghua.iotdb.qp.logical.crud.FilterOperator;
/**
* provide a filter operator, optimize it.
*/
public interface IFilterOptimizer {
FilterOperator optimize(FilterOperator filter) throws QueryProcessorException;
}

12
iotdb/src/main/java/cn/edu/tsinghua/iotdb/qp/strategy/optimizer/ILogicalOptimizer.java
View File

@ -1,12 +0,0 @@
package cn.edu.tsinghua.iotdb.qp.strategy.optimizer;
import cn.edu.tsinghua.iotdb.exception.qp.LogicalOptimizeException;
import cn.edu.tsinghua.iotdb.qp.logical.Operator;
/**
* provide a context, transform it for optimization.
*/
public interface ILogicalOptimizer {
Operator transform(Operator operator) throws LogicalOptimizeException;
}

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/query/component/job/QueryJobContext.java
View File

@ -1,5 +0,0 @@
package cn.edu.tsinghua.iotdb.query.component.job;
public class QueryJobContext {
}

11
iotdb/src/main/java/cn/edu/tsinghua/iotdb/query/component/job/QueryJobDispatcher.java
View File

@ -1,11 +0,0 @@
package cn.edu.tsinghua.iotdb.query.component.job;
import cn.edu.tsinghua.iotdb.query.component.executor.QueryJobExecutor;
import cn.edu.tsinghua.iotdb.query.component.job.QueryJob;
public interface QueryJobDispatcher {
QueryJobExecutor dispatch(QueryJob queryJob);
}

9
iotdb/src/main/java/cn/edu/tsinghua/iotdb/service/IoTDBMBean.java
View File

@ -1,9 +0,0 @@
package cn.edu.tsinghua.iotdb.service;
import java.io.IOException;
import cn.edu.tsinghua.iotdb.exception.FileNodeManagerException;
public interface IoTDBMBean {
void stop() throws FileNodeManagerException, IOException;
}

8
iotdb/src/main/java/cn/edu/tsinghua/iotdb/writelog/replay/LogReplayer.java
View File

@ -1,8 +0,0 @@
package cn.edu.tsinghua.iotdb.writelog.replay;
import cn.edu.tsinghua.iotdb.exception.ProcessorException;
import cn.edu.tsinghua.iotdb.qp.physical.PhysicalPlan;
public interface LogReplayer {
void replay(PhysicalPlan plan) throws ProcessorException;
}

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/AuthException.java → iotdb/src/main/java/org/apache/iotdb/db/auth/AuthException.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.auth;
package org.apache.iotdb.db.auth;
/**
* The exception for authority model

18
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/AuthorityChecker.java → iotdb/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
View File

@ -1,11 +1,15 @@
package cn.edu.tsinghua.iotdb.auth;
package org.apache.iotdb.db.auth;
import cn.edu.tsinghua.iotdb.auth.authorizer.IAuthorizer;
import cn.edu.tsinghua.iotdb.auth.authorizer.LocalFileAuthorizer;
import cn.edu.tsinghua.iotdb.auth.entity.PrivilegeType;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.qp.logical.Operator;
import cn.edu.tsinghua.tsfile.read.common.Path;
import org.apache.iotdb.db.auth.authorizer.IAuthorizer;
import org.apache.iotdb.db.auth.authorizer.LocalFileAuthorizer;
import org.apache.iotdb.db.auth.entity.PrivilegeType;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.qp.logical.Operator;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.db.auth.authorizer.IAuthorizer;
import org.apache.iotdb.db.auth.authorizer.LocalFileAuthorizer;
import org.apache.iotdb.db.auth.entity.PrivilegeType;
import org.apache.iotdb.db.qp.logical.Operator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/Role/BasicRoleManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/Role/BasicRoleManager.java
View File

@ -1,9 +1,9 @@
package cn.edu.tsinghua.iotdb.auth.Role;
package org.apache.iotdb.db.auth.Role;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import cn.edu.tsinghua.iotdb.concurrent.HashLock;
import cn.edu.tsinghua.iotdb.utils.AuthUtils;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.concurrent.HashLock;
import org.apache.iotdb.db.utils.AuthUtils;
import java.io.IOException;
import java.util.*;

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/Role/IRoleAccessor.java → iotdb/src/main/java/org/apache/iotdb/db/auth/Role/IRoleAccessor.java
View File

@ -1,6 +1,7 @@
package cn.edu.tsinghua.iotdb.auth.Role;
package org.apache.iotdb.db.auth.Role;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.auth.entity.Role;
import java.io.IOException;
import java.util.List;

7
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/Role/IRoleManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/Role/IRoleManager.java
View File

@ -1,7 +1,8 @@
package cn.edu.tsinghua.iotdb.auth.Role;
package org.apache.iotdb.db.auth.Role;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.auth.entity.Role;
import java.util.List;

13
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/Role/LocalFileRoleAccessor.java → iotdb/src/main/java/org/apache/iotdb/db/auth/Role/LocalFileRoleAccessor.java
View File

@ -1,9 +1,12 @@
package cn.edu.tsinghua.iotdb.auth.Role;
package org.apache.iotdb.db.auth.Role;
import cn.edu.tsinghua.iotdb.auth.entity.PathPrivilege;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.utils.IOUtils;
import org.apache.iotdb.db.auth.entity.PathPrivilege;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.utils.IOUtils;
import org.apache.iotdb.db.auth.entity.PathPrivilege;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.utils.IOUtils;
import java.io.*;
import java.nio.ByteBuffer;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/Role/LocalFileRoleManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/Role/LocalFileRoleManager.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.auth.Role;
package org.apache.iotdb.db.auth.Role;
public class LocalFileRoleManager extends BasicRoleManager {

24
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/authorizer/BasicAuthorizer.java → iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/BasicAuthorizer.java
View File

@ -1,16 +1,16 @@
package cn.edu.tsinghua.iotdb.auth.authorizer;
package org.apache.iotdb.db.auth.authorizer;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.Role.IRoleManager;
import cn.edu.tsinghua.iotdb.auth.entity.PrivilegeType;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import cn.edu.tsinghua.iotdb.auth.entity.User;
import cn.edu.tsinghua.iotdb.auth.user.IUserManager;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.exception.StartupException;
import cn.edu.tsinghua.iotdb.service.IService;
import cn.edu.tsinghua.iotdb.service.ServiceType;
import cn.edu.tsinghua.iotdb.utils.AuthUtils;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.Role.IRoleManager;
import org.apache.iotdb.db.auth.entity.PrivilegeType;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.auth.user.IUserManager;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.exception.StartupException;
import org.apache.iotdb.db.service.IService;
import org.apache.iotdb.db.service.ServiceType;
import org.apache.iotdb.db.utils.AuthUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/authorizer/IAuthorizer.java → iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/IAuthorizer.java
View File

@ -1,7 +1,7 @@
package cn.edu.tsinghua.iotdb.auth.authorizer;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.entity.Role;
import cn.edu.tsinghua.iotdb.auth.entity.User;
package org.apache.iotdb.db.auth.authorizer;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.entity.Role;
import org.apache.iotdb.db.auth.entity.User;
import java.util.List;
import java.util.Set;

12
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/authorizer/LocalFileAuthorizer.java → iotdb/src/main/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizer.java
View File

@ -1,10 +1,10 @@
package cn.edu.tsinghua.iotdb.auth.authorizer;
package org.apache.iotdb.db.auth.authorizer;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.Role.LocalFileRoleManager;
import cn.edu.tsinghua.iotdb.auth.user.LocalFileUserManager;
import cn.edu.tsinghua.iotdb.conf.IoTDBConfig;
import cn.edu.tsinghua.iotdb.conf.IoTDBDescriptor;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.Role.LocalFileRoleManager;
import org.apache.iotdb.db.auth.user.LocalFileUserManager;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/entity/PathPrivilege.java → iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PathPrivilege.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.auth.entity;
package org.apache.iotdb.db.auth.entity;
import java.util.Comparator;
import java.util.HashSet;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/entity/PrivilegeType.java → iotdb/src/main/java/org/apache/iotdb/db/auth/entity/PrivilegeType.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.auth.entity;
package org.apache.iotdb.db.auth.entity;
/**
* This enum class contains all available privileges in IoTDB.

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/entity/Role.java → iotdb/src/main/java/org/apache/iotdb/db/auth/entity/Role.java
View File

@ -1,6 +1,7 @@
package cn.edu.tsinghua.iotdb.auth.entity;
package org.apache.iotdb.db.auth.entity;
import cn.edu.tsinghua.iotdb.utils.AuthUtils;
import org.apache.iotdb.db.utils.AuthUtils;
import org.apache.iotdb.db.utils.AuthUtils;
import java.util.*;

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/entity/User.java → iotdb/src/main/java/org/apache/iotdb/db/auth/entity/User.java
View File

@ -1,6 +1,7 @@
package cn.edu.tsinghua.iotdb.auth.entity;
package org.apache.iotdb.db.auth.entity;
import cn.edu.tsinghua.iotdb.utils.AuthUtils;
import org.apache.iotdb.db.utils.AuthUtils;
import org.apache.iotdb.db.utils.AuthUtils;
import java.util.*;

12
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/user/BasicUserManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/user/BasicUserManager.java
View File

@ -1,10 +1,10 @@
package cn.edu.tsinghua.iotdb.auth.user;
package org.apache.iotdb.db.auth.user;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.entity.User;
import cn.edu.tsinghua.iotdb.concurrent.HashLock;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.utils.AuthUtils;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.concurrent.HashLock;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.utils.AuthUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/user/IUserAccessor.java → iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserAccessor.java
View File

@ -1,6 +1,7 @@
package cn.edu.tsinghua.iotdb.auth.user;
package org.apache.iotdb.db.auth.user;
import cn.edu.tsinghua.iotdb.auth.entity.User;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.auth.entity.User;
import java.io.IOException;
import java.util.List;

7
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/user/IUserManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/user/IUserManager.java
View File

@ -1,7 +1,8 @@
package cn.edu.tsinghua.iotdb.auth.user;
package org.apache.iotdb.db.auth.user;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import cn.edu.tsinghua.iotdb.auth.entity.User;
import org.apache.iotdb.db.auth.AuthException;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.auth.entity.User;
import java.util.List;

13
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/user/LocalFileUserAccessor.java → iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserAccessor.java
View File

@ -1,9 +1,12 @@
package cn.edu.tsinghua.iotdb.auth.user;
package org.apache.iotdb.db.auth.user;
import cn.edu.tsinghua.iotdb.auth.entity.PathPrivilege;
import cn.edu.tsinghua.iotdb.auth.entity.User;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.utils.IOUtils;
import org.apache.iotdb.db.auth.entity.PathPrivilege;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.utils.IOUtils;
import org.apache.iotdb.db.auth.entity.PathPrivilege;
import org.apache.iotdb.db.auth.entity.User;
import org.apache.iotdb.db.utils.IOUtils;
import java.io.*;
import java.nio.ByteBuffer;

4
iotdb/src/main/java/cn/edu/tsinghua/iotdb/auth/user/LocalFileUserManager.java → iotdb/src/main/java/org/apache/iotdb/db/auth/user/LocalFileUserManager.java
View File

@ -1,6 +1,6 @@
package cn.edu.tsinghua.iotdb.auth.user;
package org.apache.iotdb.db.auth.user;
import cn.edu.tsinghua.iotdb.auth.AuthException;
import org.apache.iotdb.db.auth.AuthException;
public class LocalFileUserManager extends BasicUserManager {
public LocalFileUserManager(String userDirPath) throws AuthException {

3
iotdb/src/main/java/cn/edu/tsinghua/iotdb/concurrent/HashLock.java → iotdb/src/main/java/org/apache/iotdb/db/concurrent/HashLock.java
View File

@ -1,6 +1,5 @@
package cn.edu.tsinghua.iotdb.concurrent;
package org.apache.iotdb.db.concurrent;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/concurrent/IoTDBDefaultThreadExceptionHandler.java → iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBDefaultThreadExceptionHandler.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.concurrent;
package org.apache.iotdb.db.concurrent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/concurrent/IoTDBThreadPoolFactory.java → iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTDBThreadPoolFactory.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.concurrent;
package org.apache.iotdb.db.concurrent;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/concurrent/IoTThreadFactory.java → iotdb/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.concurrent;
package org.apache.iotdb.db.concurrent;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/concurrent/ThreadName.java → iotdb/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.concurrent;
package org.apache.iotdb.db.concurrent;
public enum ThreadName {
JDBC_SERVICE("JDBC-ServerServiceImpl"),

8
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/IoTDBConfig.java → iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
View File

@ -1,4 +1,6 @@
package cn.edu.tsinghua.iotdb.conf;
package org.apache.iotdb.db.conf;
import org.apache.iotdb.db.metadata.MManager;
import java.io.File;
import java.time.ZoneId;
@ -11,7 +13,7 @@ public class IoTDBConfig {
public static final String default_data_dir = "data";
public static final String default_sys_dir = "system";
public static final String default_tsfile_dir = "settled";
public static final String mult_dir_strategy_prefix = "cn.edu.tsinghua.iotdb.conf.directories.strategy.";
public static final String mult_dir_strategy_prefix = "org.apache.iotdb.db.conf.directories.strategy.";
public static final String default_mult_dir_strategy = "MaxDiskUsableSpaceFirstStrategy";
/**
@ -236,7 +238,7 @@ public class IoTDBConfig {
public int externalSortThreshold = 50;
/**
* Cache size of {@code checkAndGetDataTypeCache} in {@link cn.edu.tsinghua.iotdb.metadata.MManager}
* Cache size of {@code checkAndGetDataTypeCache} in {@link MManager}
*/
public int mManagerCacheSize = 400000;

4
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/IoTDBConstant.java → iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.conf;
package org.apache.iotdb.db.conf;
public class IoTDBConstant {
public static final String ENV_FILE_NAME = "iotdb-env";
@ -11,7 +11,7 @@ public class IoTDBConstant {
public static final String SERVER_RMI_ID = "java.rmi.server.randomIDs";
public static final String RMI_SERVER_HOST_NAME = "java.rmi.server.hostname";
public static final String JMX_REMOTE_RMI_PORT = "com.sun.management.jmxremote.rmi.port";
public static final String IOTDB_PACKAGE = "cn.edu.tsinghua.iotdb.service";
public static final String IOTDB_PACKAGE = "org.apache.iotdb.service";
public static final String JMX_TYPE = "type";
public static final long GB = 1024 * 1024 * 1024L;

6
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/IoTDBDescriptor.java → iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.conf;
package org.apache.iotdb.db.conf;
import java.io.File;
import java.io.FileInputStream;
@ -6,10 +6,10 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.Properties;
import cn.edu.tsinghua.iotdb.engine.memcontrol.BasicMemController;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/Directories.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/Directories.java
View File

@ -1,12 +1,11 @@
package cn.edu.tsinghua.iotdb.conf.directories;
package org.apache.iotdb.db.conf.directories;
import cn.edu.tsinghua.iotdb.conf.IoTDBDescriptor;
import cn.edu.tsinghua.iotdb.conf.directories.strategy.DirectoryStrategy;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.strategy.DirectoryStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.*;
/**

5
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/strategy/DirectoryStrategy.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
View File

@ -1,11 +1,8 @@
package cn.edu.tsinghua.iotdb.conf.directories.strategy;
package org.apache.iotdb.db.conf.directories.strategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MaxDiskUsableSpaceFirstStrategy.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.conf.directories.strategy;
package org.apache.iotdb.db.conf.directories.strategy;
import java.io.File;
import java.util.ArrayList;

4
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinDirOccupiedSpaceFirstStrategy.java
View File

@ -1,6 +1,5 @@
package cn.edu.tsinghua.iotdb.conf.directories.strategy;
package org.apache.iotdb.db.conf.directories.strategy;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@ -8,7 +7,6 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.logging.Logger;
public class MinDirOccupiedSpaceFirstStrategy extends DirectoryStrategy {

4
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/MinFolderOccupiedSpaceFirstStrategy.java
View File

@ -1,6 +1,5 @@
package cn.edu.tsinghua.iotdb.conf.directories.strategy;
package org.apache.iotdb.db.conf.directories.strategy;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
@ -8,7 +7,6 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.logging.Logger;
public class MinFolderOccupiedSpaceFirstStrategy extends DirectoryStrategy {

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/conf/directories/strategy/SequenceStrategy.java → iotdb/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.conf.directories.strategy;
package org.apache.iotdb.db.conf.directories.strategy;
import java.util.List;

10
iotdb/src/main/java/cn/edu/tsinghua/iotdb/engine/Processor.java → iotdb/src/main/java/org/apache/iotdb/db/engine/Processor.java
View File

@ -1,8 +1,10 @@
package cn.edu.tsinghua.iotdb.engine;
package org.apache.iotdb.db.engine;
import cn.edu.tsinghua.iotdb.engine.bufferwrite.BufferWriteProcessor;
import cn.edu.tsinghua.iotdb.engine.filenode.FileNodeProcessor;
import cn.edu.tsinghua.iotdb.exception.ProcessorException;
import org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
import org.apache.iotdb.db.engine.filenode.FileNodeProcessor;
import org.apache.iotdb.db.exception.ProcessorException;
import org.apache.iotdb.db.engine.bufferwrite.BufferWriteProcessor;
import org.apache.iotdb.db.engine.filenode.FileNodeProcessor;
import java.io.IOException;
import java.util.concurrent.locks.ReadWriteLock;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/Action.java → iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/Action.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.engine.bufferwrite;
package org.apache.iotdb.db.engine.bufferwrite;
/**
* @author kangrong

53
iotdb/src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/BufferWriteProcessor.java → iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/BufferWriteProcessor.java
View File

@ -1,29 +1,32 @@
package cn.edu.tsinghua.iotdb.engine.bufferwrite;
package org.apache.iotdb.db.engine.bufferwrite;
import cn.edu.tsinghua.iotdb.conf.IoTDBConstant;
import cn.edu.tsinghua.iotdb.conf.IoTDBConfig;
import cn.edu.tsinghua.iotdb.conf.IoTDBDescriptor;
import cn.edu.tsinghua.iotdb.engine.Processor;
import cn.edu.tsinghua.iotdb.engine.filenode.FileNodeManager;
import cn.edu.tsinghua.iotdb.engine.memcontrol.BasicMemController;
import cn.edu.tsinghua.iotdb.engine.memtable.IMemTable;
import cn.edu.tsinghua.iotdb.engine.memtable.MemSeriesLazyMerger;
import cn.edu.tsinghua.iotdb.engine.memtable.MemTableFlushUtil;
import cn.edu.tsinghua.iotdb.engine.memtable.PrimitiveMemTable;
import cn.edu.tsinghua.iotdb.engine.pool.FlushManager;
import cn.edu.tsinghua.iotdb.engine.querycontext.ReadOnlyMemChunk;
import cn.edu.tsinghua.iotdb.engine.utils.FlushStatus;
import cn.edu.tsinghua.iotdb.exception.BufferWriteProcessorException;
import cn.edu.tsinghua.iotdb.utils.MemUtils;
import cn.edu.tsinghua.iotdb.writelog.manager.MultiFileLogNodeManager;
import cn.edu.tsinghua.iotdb.writelog.node.WriteLogNode;
import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
import cn.edu.tsinghua.tsfile.file.metadata.ChunkMetaData;
import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
import cn.edu.tsinghua.tsfile.utils.Pair;
import cn.edu.tsinghua.tsfile.write.record.TSRecord;
import cn.edu.tsinghua.tsfile.write.record.datapoint.DataPoint;
import cn.edu.tsinghua.tsfile.write.schema.FileSchema;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.Processor;
import org.apache.iotdb.db.engine.filenode.FileNodeManager;
import org.apache.iotdb.db.engine.memcontrol.BasicMemController;
import org.apache.iotdb.db.engine.memtable.IMemTable;
import org.apache.iotdb.db.engine.memtable.MemSeriesLazyMerger;
import org.apache.iotdb.db.engine.memtable.MemTableFlushUtil;
import org.apache.iotdb.db.engine.memtable.PrimitiveMemTable;
import org.apache.iotdb.db.engine.pool.FlushManager;
import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk;
import org.apache.iotdb.db.engine.utils.FlushStatus;
import org.apache.iotdb.db.exception.BufferWriteProcessorException;
import org.apache.iotdb.db.utils.MemUtils;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.apache.iotdb.db.writelog.node.WriteLogNode;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetaData;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Pair;
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.apache.iotdb.db.exception.BufferWriteProcessorException;
import org.apache.iotdb.db.writelog.manager.MultiFileLogNodeManager;
import org.apache.iotdb.db.writelog.node.WriteLogNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
iotdb/src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/FileNodeConstants.java → iotdb/src/main/java/org/apache/iotdb/db/engine/bufferwrite/FileNodeConstants.java
View File

@ -1,4 +1,4 @@
package cn.edu.tsinghua.iotdb.engine.bufferwrite;
package org.apache.iotdb.db.engine.bufferwrite;
/**
* Constants for using in bufferwrite, overflow and filenode

Some files were not shown because too many files have changed in this diff Show More