change groupid

pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>cn.edu.thu</groupId>
+	<groupId>cn.edu.tsinghua</groupId>
 	<artifactId>IoTDB</artifactId>
 	<version>0.0.1</version>
 	<packaging>jar</packaging>

src/main/antlr3/cn/edu/tsinghua/iotdb/sql/parse/TSLexer.g

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

src/main/antlr3/cn/edu/tsinghua/iotdb/sql/parse/TSParser.g

@@ -69,7 +69,7 @@ TOK_DESCRIBE;
 
 
 @header {
-package cn.edu.thu.tsfiledb.sql.parse;
+package cn.edu.tsinghua.iotdb.sql.parse;
 
 import java.util.Arrays;
 import java.util.Collection;

src/main/java/cn/edu/tsinghua/iotdb/auth/AuthException.java

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

src/main/java/cn/edu/tsinghua/iotdb/auth/AuthRuntimeException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth;
+package cn.edu.tsinghua.iotdb.auth;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/AuthorityChecker.java

@@ -1,14 +1,14 @@
-package cn.edu.thu.tsfiledb.auth;
+package cn.edu.tsinghua.iotdb.auth;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.dao.Authorizer;
+import cn.edu.tsinghua.iotdb.auth.model.Permission;
+import cn.edu.tsinghua.iotdb.qp.logical.Operator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.dao.Authorizer;
-import cn.edu.thu.tsfiledb.auth.model.Permission;
-import cn.edu.thu.tsfiledb.qp.logical.Operator.OperatorType;
 import cn.edu.tsinghua.tsfile.timeseries.read.qp.Path;
 
 public class AuthorityChecker {
@@ -16,7 +16,7 @@ public class AuthorityChecker {
     private static final String SUPER_USER = "root";
     private static final Logger logger = LoggerFactory.getLogger(AuthorityChecker.class);
 
-    public static boolean check(String username, List<Path> paths, OperatorType type) {
+    public static boolean check(String username, List<Path> paths, Operator.OperatorType type) {
         if (SUPER_USER.equals(username)) {
             return true;
         }
@@ -61,7 +61,7 @@ public class AuthorityChecker {
         return false;
     }
 
-    private static int translateToPermissionId(OperatorType type) {
+    private static int translateToPermissionId(Operator.OperatorType type) {
         switch (type) {
             case METADATA:
                 return Permission.CREATE;

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/AuthDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -6,11 +6,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import cn.edu.thu.tsfiledb.auth.model.Role;
-import cn.edu.thu.tsfiledb.auth.model.RolePermission;
-import cn.edu.thu.tsfiledb.auth.model.User;
-import cn.edu.thu.tsfiledb.auth.model.UserPermission;
-import cn.edu.thu.tsfiledb.auth.model.UserRoleRel;
+import cn.edu.tsinghua.iotdb.auth.model.Role;
+import cn.edu.tsinghua.iotdb.auth.model.RolePermission;
+import cn.edu.tsinghua.iotdb.auth.model.User;
+import cn.edu.tsinghua.iotdb.auth.model.UserPermission;
+import cn.edu.tsinghua.iotdb.auth.model.UserRoleRel;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/AuthDaoWrap.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.Statement;
 import java.util.ArrayList;
@@ -6,12 +6,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import cn.edu.thu.tsfiledb.auth.AuthException;
-import cn.edu.thu.tsfiledb.auth.model.Role;
-import cn.edu.thu.tsfiledb.auth.model.RolePermission;
-import cn.edu.thu.tsfiledb.auth.model.User;
-import cn.edu.thu.tsfiledb.auth.model.UserPermission;
-import cn.edu.thu.tsfiledb.auth.model.UserRoleRel;
+import cn.edu.tsinghua.iotdb.auth.AuthException;
+import cn.edu.tsinghua.iotdb.auth.model.Role;
+import cn.edu.tsinghua.iotdb.auth.model.RolePermission;
+import cn.edu.tsinghua.iotdb.auth.model.User;
+import cn.edu.tsinghua.iotdb.auth.model.UserPermission;
+import cn.edu.tsinghua.iotdb.auth.model.UserRoleRel;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/Authorizer.java

@@ -1,10 +1,10 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.util.Set;
 
-import cn.edu.thu.tsfiledb.auth.AuthException;
-import cn.edu.thu.tsfiledb.auth.model.Role;
-import cn.edu.thu.tsfiledb.auth.model.User;
+import cn.edu.tsinghua.iotdb.auth.AuthException;
+import cn.edu.tsinghua.iotdb.auth.model.Role;
+import cn.edu.tsinghua.iotdb.auth.model.User;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/DBDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,14 +10,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.AuthException;
-import cn.edu.thu.tsfiledb.auth.AuthRuntimeException;
-import cn.edu.thu.tsfiledb.conf.TsFileDBConstant;
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.auth.AuthException;
+import cn.edu.tsinghua.iotdb.auth.AuthRuntimeException;
+import cn.edu.tsinghua.iotdb.conf.TsFileDBConstant;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/DBDaoInitException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 public class DBDaoInitException extends Exception{
 	private static final long serialVersionUID = -6713356921416511616L;

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/DerbyUtil.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.io.OutputStream;
 

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/InitTable.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/RoleDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -6,12 +6,12 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.model.DBContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.AuthRuntimeException;
-import cn.edu.thu.tsfiledb.auth.model.DBContext;
-import cn.edu.thu.tsfiledb.auth.model.Role;
+import cn.edu.tsinghua.iotdb.auth.AuthRuntimeException;
+import cn.edu.tsinghua.iotdb.auth.model.Role;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/RolePermissionDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -6,12 +6,12 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.model.DBContext;
+import cn.edu.tsinghua.iotdb.auth.model.RolePermission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.AuthRuntimeException;
-import cn.edu.thu.tsfiledb.auth.model.DBContext;
-import cn.edu.thu.tsfiledb.auth.model.RolePermission;
+import cn.edu.tsinghua.iotdb.auth.AuthRuntimeException;
 
 
 /**

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/UserDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -6,12 +6,12 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.model.DBContext;
+import cn.edu.tsinghua.iotdb.auth.model.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.AuthRuntimeException;
-import cn.edu.thu.tsfiledb.auth.model.DBContext;
-import cn.edu.thu.tsfiledb.auth.model.User;
+import cn.edu.tsinghua.iotdb.auth.AuthRuntimeException;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/UserPermissionDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -6,13 +6,12 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.AuthRuntimeException;
+import cn.edu.tsinghua.iotdb.auth.model.DBContext;
+import cn.edu.tsinghua.iotdb.auth.model.UserPermission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.AuthRuntimeException;
-import cn.edu.thu.tsfiledb.auth.model.DBContext;
-import cn.edu.thu.tsfiledb.auth.model.UserPermission;
-
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/dao/UserRoleRelDao.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.dao;
+package cn.edu.tsinghua.iotdb.auth.dao;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -6,11 +6,11 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.auth.model.DBContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.auth.model.DBContext;
-import cn.edu.thu.tsfiledb.auth.model.UserRoleRel;
+import cn.edu.tsinghua.iotdb.auth.model.UserRoleRel;
 
 
 /**

src/main/java/cn/edu/tsinghua/iotdb/auth/model/DBContext.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/Permission.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/Role.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/RolePermission.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/User.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/UserPermission.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/auth/model/UserRoleRel.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.auth.model;
+package cn.edu.tsinghua.iotdb.auth.model;
 
 /**
  * @author liukun

src/main/java/cn/edu/tsinghua/iotdb/client/AbstractClient.java

@@ -1,8 +1,8 @@
-package cn.edu.thu.tsfiledb.client;
+package cn.edu.tsinghua.iotdb.client;
 
-import cn.edu.thu.tsfiledb.conf.TsFileDBConstant;
-import cn.edu.thu.tsfiledb.exception.ArgsErrorException;
-import cn.edu.thu.tsfiledb.tool.ImportCsv;
+import cn.edu.tsinghua.iotdb.conf.TsFileDBConstant;
+import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
+import cn.edu.tsinghua.iotdb.tool.ImportCsv;
 
 import cn.edu.tsinghua.iotdb.jdbc.TsfileConnection;
 import org.apache.commons.cli.CommandLine;

src/main/java/cn/edu/tsinghua/iotdb/client/Client.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.client;
+package cn.edu.tsinghua.iotdb.client;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -15,7 +15,7 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-import cn.edu.thu.tsfiledb.exception.ArgsErrorException;
+import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
 import jline.console.ConsoleReader;
 import jline.console.completer.Completer;
 

src/main/java/cn/edu/tsinghua/iotdb/client/Utils.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.client;
+package cn.edu.tsinghua.iotdb.client;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -11,7 +11,7 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import cn.edu.thu.tsfiledb.metadata.ColumnSchema;
+import cn.edu.tsinghua.iotdb.metadata.ColumnSchema;
 import cn.edu.tsinghua.iotdb.jdbc.thrift.TSColumnSchema;
 import cn.edu.tsinghua.iotdb.jdbc.thrift.TSDynamicOneColumnData;
 import cn.edu.tsinghua.iotdb.jdbc.thrift.TSQueryDataSet;

src/main/java/cn/edu/tsinghua/iotdb/client/WinClient.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.client;
+package cn.edu.tsinghua.iotdb.client;
 
 import java.io.Console;
 import java.sql.DriverManager;
@@ -14,7 +14,7 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-import cn.edu.thu.tsfiledb.exception.ArgsErrorException;
+import cn.edu.tsinghua.iotdb.exception.ArgsErrorException;
 
 public class WinClient extends AbstractClient {
 

src/main/java/cn/edu/tsinghua/iotdb/conf/TsFileDBConstant.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.conf;
+package cn.edu.tsinghua.iotdb.conf;
 
 public class TsFileDBConstant {
     public static final String ENV_FILE_NAME = "iotdb-env";

src/main/java/cn/edu/tsinghua/iotdb/conf/TsfileDBConfig.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.conf;
+package cn.edu.tsinghua.iotdb.conf;
 
 import java.io.File;
 

src/main/java/cn/edu/tsinghua/iotdb/conf/TsfileDBDescriptor.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.conf;
+package cn.edu.tsinghua.iotdb.conf;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/Action.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.bufferwrite;
+package cn.edu.tsinghua.iotdb.engine.bufferwrite;
 
 /**
  * @author kangrong

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/BufferWriteIOWriter.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.bufferwrite;
+package cn.edu.tsinghua.iotdb.engine.bufferwrite;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/BufferWriteIndex.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.bufferwrite;
+package cn.edu.tsinghua.iotdb.engine.bufferwrite;
 
 import cn.edu.tsinghua.tsfile.timeseries.read.query.DynamicOneColumnData;
 import cn.edu.tsinghua.tsfile.timeseries.write.record.TSRecord;

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/BufferWriteProcessor.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.bufferwrite;
+package cn.edu.tsinghua.iotdb.engine.bufferwrite;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -16,20 +16,20 @@ import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.engine.exception.BufferWriteProcessorException;
+import cn.edu.tsinghua.iotdb.metadata.ColumnSchema;
+import cn.edu.tsinghua.iotdb.metadata.MManager;
+import cn.edu.tsinghua.iotdb.sys.writelog.WriteLogManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.conf.TsfileDBConfig;
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
-import cn.edu.thu.tsfiledb.engine.exception.BufferWriteProcessorException;
-import cn.edu.thu.tsfiledb.engine.lru.LRUProcessor;
-import cn.edu.thu.tsfiledb.engine.utils.FlushState;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
-import cn.edu.thu.tsfiledb.metadata.ColumnSchema;
-import cn.edu.thu.tsfiledb.metadata.MManager;
-import cn.edu.thu.tsfiledb.sys.writelog.WriteLogManager;
+import cn.edu.tsinghua.iotdb.conf.TsfileDBConfig;
+import cn.edu.tsinghua.iotdb.engine.lru.LRUProcessor;
+import cn.edu.tsinghua.iotdb.engine.utils.FlushState;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
 import cn.edu.tsinghua.tsfile.common.constant.JsonFormatConstant;

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/FileNodeConstants.java

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

src/main/java/cn/edu/tsinghua/iotdb/engine/bufferwrite/MemoryBufferWriteIndexImpl.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.bufferwrite;
+package cn.edu.tsinghua.iotdb.engine.bufferwrite;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/BufferWriteProcessorException.java

@@ -1,6 +1,6 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 
 public class BufferWriteProcessorException extends ProcessorException {

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/FileNodeManagerException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
 public class FileNodeManagerException extends LRUManagerException {
 

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/FileNodeProcessorException.java

@@ -1,6 +1,6 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 
 public class FileNodeProcessorException extends ProcessorException {

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/LRUManagerException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
 public class LRUManagerException extends Exception {
 

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/OverflowProcessorException.java

@@ -1,6 +1,6 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 
 public class OverflowProcessorException extends ProcessorException {

src/main/java/cn/edu/tsinghua/iotdb/engine/exception/ProcessorRuntimException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.exception;
+package cn.edu.tsinghua.iotdb.engine.exception;
 
 public class ProcessorRuntimException extends RuntimeException {
 

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/FileNodeManager.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,26 +10,26 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import cn.edu.tsinghua.iotdb.conf.TsfileDBConfig;
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.Action;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.BufferWriteProcessor;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.FileNodeConstants;
+import cn.edu.tsinghua.iotdb.engine.exception.BufferWriteProcessorException;
+import cn.edu.tsinghua.iotdb.engine.exception.FileNodeManagerException;
+import cn.edu.tsinghua.iotdb.engine.exception.LRUManagerException;
+import cn.edu.tsinghua.iotdb.engine.exception.OverflowProcessorException;
+import cn.edu.tsinghua.iotdb.engine.lru.LRUManager;
+import cn.edu.tsinghua.iotdb.engine.overflow.io.OverflowProcessor;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.metadata.MManager;
+import cn.edu.tsinghua.iotdb.sys.writelog.WriteLogManager;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.conf.TsfileDBConfig;
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.Action;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.BufferWriteProcessor;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.FileNodeConstants;
-import cn.edu.thu.tsfiledb.engine.exception.BufferWriteProcessorException;
-import cn.edu.thu.tsfiledb.engine.exception.FileNodeManagerException;
-import cn.edu.thu.tsfiledb.engine.exception.FileNodeProcessorException;
-import cn.edu.thu.tsfiledb.engine.exception.LRUManagerException;
-import cn.edu.thu.tsfiledb.engine.exception.OverflowProcessorException;
-import cn.edu.thu.tsfiledb.engine.lru.LRUManager;
-import cn.edu.thu.tsfiledb.engine.overflow.io.OverflowProcessor;
-import cn.edu.thu.tsfiledb.exception.ErrorDebugException;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
-import cn.edu.thu.tsfiledb.metadata.MManager;
-import cn.edu.thu.tsfiledb.sys.writelog.WriteLogManager;
+import cn.edu.tsinghua.iotdb.engine.exception.FileNodeProcessorException;
+import cn.edu.tsinghua.iotdb.exception.ErrorDebugException;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/FileNodeProcessor.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -13,25 +13,25 @@ import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import cn.edu.tsinghua.iotdb.conf.TsfileDBConfig;
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.Action;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.BufferWriteProcessor;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.FileNodeConstants;
+import cn.edu.tsinghua.iotdb.engine.exception.BufferWriteProcessorException;
+import cn.edu.tsinghua.iotdb.engine.exception.FileNodeProcessorException;
+import cn.edu.tsinghua.iotdb.engine.exception.OverflowProcessorException;
+import cn.edu.tsinghua.iotdb.engine.lru.LRUProcessor;
+import cn.edu.tsinghua.iotdb.engine.overflow.io.OverflowProcessor;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.metadata.ColumnSchema;
+import cn.edu.tsinghua.iotdb.metadata.MManager;
+import cn.edu.tsinghua.iotdb.query.engine.QueryForMerge;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.conf.TsfileDBConfig;
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.Action;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.BufferWriteProcessor;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.FileNodeConstants;
-import cn.edu.thu.tsfiledb.engine.exception.BufferWriteProcessorException;
-import cn.edu.thu.tsfiledb.engine.exception.FileNodeProcessorException;
-import cn.edu.thu.tsfiledb.engine.exception.OverflowProcessorException;
-import cn.edu.thu.tsfiledb.engine.lru.LRUProcessor;
-import cn.edu.thu.tsfiledb.engine.overflow.io.OverflowProcessor;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
-import cn.edu.thu.tsfiledb.metadata.ColumnSchema;
-import cn.edu.thu.tsfiledb.metadata.MManager;
-import cn.edu.thu.tsfiledb.query.engine.QueryForMerge;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
 import cn.edu.tsinghua.tsfile.common.constant.JsonFormatConstant;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/FileNodeProcessorStatus.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 public enum FileNodeProcessorStatus {
 	NONE, MERGING_WRITE, WAITING

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/FileNodeProcessorStore.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/FilterUtilsForOverflow.java

@@ -1,10 +1,10 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
-import cn.edu.thu.tsfiledb.metadata.MManager;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.metadata.MManager;
 import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
 import cn.edu.tsinghua.tsfile.timeseries.filter.definition.CrossSeriesFilterExpression;
 import cn.edu.tsinghua.tsfile.timeseries.filter.definition.FilterExpression;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/IntervalFileNode.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.Serializable;
 import java.util.HashMap;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/OverflowChangeType.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 /**
  * if a file is not changed by overflow, it's in NO_CHANGE;<br>

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/QueryStructure.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.ByteArrayInputStream;
 import java.util.List;

src/main/java/cn/edu/tsinghua/iotdb/engine/filenode/SerializeUtil.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.filenode;
+package cn.edu.tsinghua.iotdb.engine.filenode;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/cn/edu/tsinghua/iotdb/engine/lru/LRUManager.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.lru;
+package cn.edu.tsinghua.iotdb.engine.lru;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,13 +9,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
+import cn.edu.tsinghua.iotdb.metadata.MManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.exception.LRUManagerException;
-import cn.edu.thu.tsfiledb.engine.filenode.FileNodeProcessor;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
-import cn.edu.thu.tsfiledb.metadata.MManager;
+import cn.edu.tsinghua.iotdb.engine.exception.LRUManagerException;
+import cn.edu.tsinghua.iotdb.engine.filenode.FileNodeProcessor;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 
 /**

src/main/java/cn/edu/tsinghua/iotdb/engine/lru/LRUProcessor.java

@@ -1,15 +1,15 @@
-package cn.edu.thu.tsfiledb.engine.lru;
+package cn.edu.tsinghua.iotdb.engine.lru;
 
 import java.io.IOException;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.BufferWriteProcessor;
+import cn.edu.tsinghua.iotdb.engine.overflow.io.OverflowProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.bufferwrite.BufferWriteProcessor;
-import cn.edu.thu.tsfiledb.engine.filenode.FileNodeProcessor;
-import cn.edu.thu.tsfiledb.engine.overflow.io.OverflowProcessor;
+import cn.edu.tsinghua.iotdb.engine.filenode.FileNodeProcessor;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 
 /**

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/IIntervalTreeOperator.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow;
+package cn.edu.tsinghua.iotdb.engine.overflow;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/IntervalTreeOperation.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow;
+package cn.edu.tsinghua.iotdb.engine.overflow;
 
 
 import java.io.IOException;
@@ -7,16 +7,16 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.engine.overflow.index.CrossRelation;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.OverflowOpType;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TimePair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.overflow.index.CrossRelation;
-import cn.edu.thu.tsfiledb.engine.overflow.index.IntervalRelation;
-import cn.edu.thu.tsfiledb.engine.overflow.index.IntervalTree;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.MergeStatus;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.OverflowOpType;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TimePair;
-import cn.edu.thu.tsfiledb.exception.UnSupportedOverflowOpTypeException;
+import cn.edu.tsinghua.iotdb.engine.overflow.index.IntervalRelation;
+import cn.edu.tsinghua.iotdb.engine.overflow.index.IntervalTree;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.MergeStatus;
+import cn.edu.tsinghua.iotdb.exception.UnSupportedOverflowOpTypeException;
 import cn.edu.tsinghua.tsfile.common.exception.UnSupportedDataTypeException;
 import cn.edu.tsinghua.tsfile.common.utils.Binary;
 import cn.edu.tsinghua.tsfile.common.utils.BytesUtils;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/index/CrossRelation.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.index;
+package cn.edu.tsinghua.iotdb.engine.overflow.index;
 
 /**
  * An enum represent the cross relation between two time pairs.

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/index/IntervalRelation.java

@@ -1,9 +1,7 @@
-package cn.edu.thu.tsfiledb.engine.overflow.index;
+package cn.edu.tsinghua.iotdb.engine.overflow.index;
 
 
-import static cn.edu.thu.tsfiledb.engine.overflow.index.CrossRelation.*;
-
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TimePair;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TimePair;
 
 /**
  * This class is used to determine the relation between two time pairs.
@@ -21,25 +19,25 @@ public class IntervalRelation {
      */
     private static CrossRelation getCrossRelation(TimePair left, TimePair right) {
         if (right.s <= left.s && right.e >= left.e) { // right covers left | right equals left
-            return RCOVERSL;
+            return CrossRelation.RCOVERSL;
         } else if (right.s >= left.s && right.e <= left.e) {  // left covers right
-            return LCOVERSR;
+            return CrossRelation.LCOVERSR;
         } else if (right.s > left.s) {    // left first cross
-            return LFIRSTCROSS;
+            return CrossRelation.LFIRSTCROSS;
         } else {    // right first cross
-            return RFIRSTCROSS;
+            return CrossRelation.RFIRSTCROSS;
         }
     }
 
     private static CrossRelation getCrossRelation(long s1, long e1, long s2, long e2) {
         if (s2 <= s1 && e2 >= e1) { // right covers left | right equals left
-            return RCOVERSL;
+            return CrossRelation.RCOVERSL;
         } else if (s2 >= s1 && e2 <= e1) {  // left covers right
-            return LCOVERSR;
+            return CrossRelation.LCOVERSR;
         } else if (s2 > s1) {    // left first cross
-            return LFIRSTCROSS;
+            return CrossRelation.LFIRSTCROSS;
         } else {    // right first cross
-            return RFIRSTCROSS;
+            return CrossRelation.RFIRSTCROSS;
         }
     }
 
@@ -51,18 +49,18 @@ public class IntervalRelation {
 
     public static CrossRelation getRelation(TimePair left, TimePair right) {
         if (left.e < right.s) {    // left first
-            return LFIRST;
+            return CrossRelation.LFIRST;
         } else if (right.e < left.s) { // right first
-            return RFIRST;
+            return CrossRelation.RFIRST;
         } else
             return getCrossRelation(left, right);
     }
 
     public static CrossRelation getRelation(long s1, long e1, long s2, long e2) {
         if (e1 < s2) {    // left first
-            return LFIRST;
+            return CrossRelation.LFIRST;
         } else if (e2 < s1) { // right first
-            return RFIRST;
+            return CrossRelation.RFIRST;
         } else
             return getCrossRelation(s1, e1, s2, e2);
     }

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/index/IntervalTree.java

@@ -1,16 +1,16 @@
-package cn.edu.thu.tsfiledb.engine.overflow.index;
+package cn.edu.tsinghua.iotdb.engine.overflow.index;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.OverflowOpType;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TimePair;
+import cn.edu.tsinghua.iotdb.exception.OverflowWrongParameterException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.overflow.utils.OverflowOpType;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TimePair;
-import cn.edu.thu.tsfiledb.exception.OverflowWrongParameterException;
 import cn.edu.tsinghua.tsfile.common.exception.UnSupportedDataTypeException;
 import cn.edu.tsinghua.tsfile.common.utils.Binary;
 import cn.edu.tsinghua.tsfile.common.utils.BytesUtils;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/index/TreeNode.java

@@ -1,9 +1,9 @@
-package cn.edu.thu.tsfiledb.engine.overflow.index;
+package cn.edu.tsinghua.iotdb.engine.overflow.index;
 
 
 import java.util.Random;
 
-import cn.edu.thu.tsfiledb.engine.overflow.utils.OverflowOpType;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.OverflowOpType;
 
 /**
  * Used for IntervalTree (Treap Data Structure).

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/io/OverflowFileIO.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.io;
+package cn.edu.tsinghua.iotdb.engine.overflow.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -12,16 +12,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.FileNodeConstants;
+import cn.edu.tsinghua.iotdb.engine.overflow.IIntervalTreeOperator;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFFileMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFRowGroupListMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFSeriesListMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.bufferwrite.FileNodeConstants;
-import cn.edu.thu.tsfiledb.engine.overflow.IIntervalTreeOperator;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFFileMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFRowGroupListMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFSeriesListMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.OverflowReadWriteThriftFormatUtils;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TSFileMetaDataConverter;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.OverflowReadWriteThriftFormatUtils;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TSFileMetaDataConverter;
 import cn.edu.tsinghua.tsfile.common.utils.BytesUtils;
 import cn.edu.tsinghua.tsfile.file.metadata.TSDigest;
 import cn.edu.tsinghua.tsfile.file.metadata.TimeSeriesChunkMetaData;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/io/OverflowProcessor.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.io;
+package cn.edu.tsinghua.iotdb.engine.overflow.io;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -8,21 +8,21 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.FileNodeConstants;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TimePair;
+import cn.edu.tsinghua.iotdb.sys.writelog.WriteLogManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.conf.TsfileDBConfig;
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.Action;
-import cn.edu.thu.tsfiledb.engine.bufferwrite.FileNodeConstants;
-import cn.edu.thu.tsfiledb.engine.exception.OverflowProcessorException;
-import cn.edu.thu.tsfiledb.engine.lru.LRUProcessor;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFFileMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.OverflowReadWriteThriftFormatUtils;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TSFileMetaDataConverter;
-import cn.edu.thu.tsfiledb.engine.overflow.utils.TimePair;
-import cn.edu.thu.tsfiledb.engine.utils.FlushState;
-import cn.edu.thu.tsfiledb.sys.writelog.WriteLogManager;
+import cn.edu.tsinghua.iotdb.conf.TsfileDBConfig;
+import cn.edu.tsinghua.iotdb.engine.bufferwrite.Action;
+import cn.edu.tsinghua.iotdb.engine.exception.OverflowProcessorException;
+import cn.edu.tsinghua.iotdb.engine.lru.LRUProcessor;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFFileMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.OverflowReadWriteThriftFormatUtils;
+import cn.edu.tsinghua.iotdb.engine.overflow.utils.TSFileMetaDataConverter;
+import cn.edu.tsinghua.iotdb.engine.utils.FlushState;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 import cn.edu.tsinghua.tsfile.common.utils.BytesUtils;
@@ -199,7 +199,7 @@ public class OverflowProcessor extends LRUProcessor {
 			}
 			int off = 0;
 			int len = buff.length - off;
-			cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata thriftfileMetadata = null;
+			cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata thriftfileMetadata = null;
 			try {
 				do {
 					int num = fileInputStream.read(buff, off, len);

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/io/OverflowReadWriter.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.io;
+package cn.edu.tsinghua.iotdb.engine.overflow.io;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/io/OverflowSeriesImpl.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.io;
+package cn.edu.tsinghua.iotdb.engine.overflow.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,12 +7,12 @@ import java.util.List;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import cn.edu.tsinghua.iotdb.engine.overflow.IIntervalTreeOperator;
+import cn.edu.tsinghua.iotdb.engine.overflow.IntervalTreeOperation;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFSeriesListMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.overflow.IIntervalTreeOperator;
-import cn.edu.thu.tsfiledb.engine.overflow.IntervalTreeOperation;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFSeriesListMetadata;
 import cn.edu.tsinghua.tsfile.compress.Compressor;
 import cn.edu.tsinghua.tsfile.file.metadata.TimeSeriesChunkMetaData;
 import cn.edu.tsinghua.tsfile.file.metadata.enums.CompressionTypeName;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/io/OverflowSupport.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.io;
+package cn.edu.tsinghua.iotdb.engine.overflow.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -10,9 +10,9 @@ import java.util.Map.Entry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFFileMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFRowGroupListMetadata;
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFSeriesListMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFFileMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFRowGroupListMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFSeriesListMetadata;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileConfig;
 import cn.edu.tsinghua.tsfile.common.conf.TSFileDescriptor;
 import cn.edu.tsinghua.tsfile.compress.Compressor;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/metadata/OFFileMetadata.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.metadata;
+package cn.edu.tsinghua.iotdb.engine.overflow.metadata;
 
 
 import java.util.ArrayList;
@@ -17,7 +17,7 @@ import cn.edu.tsinghua.tsfile.file.metadata.converter.IConverter;
  * @author liukun
  *
  */
-public class OFFileMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata> {
+public class OFFileMetadata implements IConverter<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata> {
 	private static final Logger LOGGER = LoggerFactory.getLogger(OFFileMetadata.class);
 
 	private long lastFooterOffset;
@@ -49,16 +49,16 @@ public class OFFileMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.ove
 	}
 
 	@Override
-	public cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata convertToThrift() {
+	public cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata convertToThrift() {
 		try {
-			List<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata> ofRowGroupList = null;
+			List<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata> ofRowGroupList = null;
 			if (rowGroupLists != null) {
-				ofRowGroupList = new ArrayList<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata>();
+				ofRowGroupList = new ArrayList<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata>();
 				for (OFRowGroupListMetadata rowGroupListMetaData : rowGroupLists) {
 					ofRowGroupList.add(rowGroupListMetaData.convertToThrift());
 				}
 			}
-			cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata metaData = new cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata(
+			cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata metaData = new cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata(
 					ofRowGroupList, lastFooterOffset);
 			return metaData;
 		} catch (Exception e) {
@@ -70,10 +70,10 @@ public class OFFileMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.ove
 
 	
 	@Override
-	public void convertToTSF(cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata metadata) {
+	public void convertToTSF(cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata metadata) {
 		try {
 			lastFooterOffset = metadata.getLast_footer_offset();
-			List<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata> list = metadata.getDeltaObject_metadata();
+			List<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata> list = metadata.getDeltaObject_metadata();
 			if (list == null) {
 				rowGroupLists = null;
 			} else {
@@ -81,7 +81,7 @@ public class OFFileMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.ove
 					rowGroupLists = new ArrayList<OFRowGroupListMetadata>();
 				}
 				rowGroupLists.clear();
-				for (cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata formatSeries : list) {
+				for (cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata formatSeries : list) {
 					OFRowGroupListMetadata ofRowgroupListMetaData = new OFRowGroupListMetadata();
 					ofRowgroupListMetaData.convertToTSF(formatSeries);
 					rowGroupLists.add(ofRowgroupListMetaData);

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/metadata/OFRowGroupListMetadata.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.metadata;
+package cn.edu.tsinghua.iotdb.engine.overflow.metadata;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,7 +16,7 @@ import cn.edu.tsinghua.tsfile.file.metadata.converter.IConverter;
  * @author liukun
  *
  */
-public class OFRowGroupListMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata> {
+public class OFRowGroupListMetadata implements IConverter<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata> {
 	private static final Logger LOGGER = LoggerFactory.getLogger(OFRowGroupListMetadata.class);
 
 	private String deltaObjectId;
@@ -65,16 +65,16 @@ public class OFRowGroupListMetadata implements IConverter<cn.edu.thu.tsfiledb.en
 	}
 
 	@Override
-	public cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata convertToThrift() {
+	public cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata convertToThrift() {
 		try {
-			List<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata> fmSeriesList = null;
+			List<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata> fmSeriesList = null;
 			if (seriesLists != null) {
-				fmSeriesList = new ArrayList<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata>();
+				fmSeriesList = new ArrayList<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata>();
 				for (OFSeriesListMetadata sensorListMetaData : seriesLists) {
 					fmSeriesList.add(sensorListMetaData.convertToThrift());
 				}
 			}
-			cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata metaData = new cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata(
+			cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata metaData = new cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata(
 					fmSeriesList, deltaObjectId);
 			return metaData;
 		} catch (Exception e) {
@@ -85,10 +85,10 @@ public class OFRowGroupListMetadata implements IConverter<cn.edu.thu.tsfiledb.en
 	}
 
 	@Override
-	public void convertToTSF(cn.edu.thu.tsfiledb.engine.overflow.thrift.OFRowGroupListMetadata metadata) {
+	public void convertToTSF(cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFRowGroupListMetadata metadata) {
 		try {
 			deltaObjectId = metadata.getDeltaObject_id();
-			List<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata> list = metadata.getMeasurement_metadata();
+			List<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata> list = metadata.getMeasurement_metadata();
 			if (list == null) {
 				seriesLists = null;
 			} else {
@@ -96,7 +96,7 @@ public class OFRowGroupListMetadata implements IConverter<cn.edu.thu.tsfiledb.en
 					seriesLists = new ArrayList<OFSeriesListMetadata>();
 				}
 				seriesLists.clear();
-				for (cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata formatSeries : list) {
+				for (cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata formatSeries : list) {
 					OFSeriesListMetadata seriesListMetaData = new OFSeriesListMetadata();
 					seriesListMetaData.convertToTSF(formatSeries);
 					seriesLists.add(seriesListMetaData);

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/metadata/OFSeriesListMetadata.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.metadata;
+package cn.edu.tsinghua.iotdb.engine.overflow.metadata;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,7 +17,7 @@ import cn.edu.tsinghua.tsfile.file.metadata.converter.IConverter;
  * @author liukun
  *
  */
-public class OFSeriesListMetadata implements IConverter<cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata> {
+public class OFSeriesListMetadata implements IConverter<cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata> {
 	private static final Logger LOGGER = LoggerFactory.getLogger(OFSeriesListMetadata.class);
 
 	private String measurementId;
@@ -62,7 +62,7 @@ public class OFSeriesListMetadata implements IConverter<cn.edu.thu.tsfiledb.engi
 	}
 
 	@Override
-	public cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata convertToThrift() {
+	public cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata convertToThrift() {
 		try {
 			List<cn.edu.tsinghua.tsfile.format.TimeSeriesChunkMetaData> tsc_metadata = null;
 			if (timeSeriesList != null) {
@@ -71,7 +71,7 @@ public class OFSeriesListMetadata implements IConverter<cn.edu.thu.tsfiledb.engi
 					tsc_metadata.add(timeSeriesMetaData.convertToThrift());
 				}
 			}
-			cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata metaData = new cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata(
+			cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata metaData = new cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata(
 					tsc_metadata, measurementId);
 			return metaData;
 		} catch (Exception e) {
@@ -82,7 +82,7 @@ public class OFSeriesListMetadata implements IConverter<cn.edu.thu.tsfiledb.engi
 	}
 
 	@Override
-	public void convertToTSF(cn.edu.thu.tsfiledb.engine.overflow.thrift.OFSeriesListMetadata metadata) {
+	public void convertToTSF(cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFSeriesListMetadata metadata) {
 		try {
 			measurementId = metadata.getMeasurement_id();
 			List<cn.edu.tsinghua.tsfile.format.TimeSeriesChunkMetaData> timeSeriesChunkMetaDatalist = metadata

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/thrift/OFFileMetadata.java

@@ -4,7 +4,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package cn.edu.thu.tsfiledb.engine.overflow.thrift;
+package cn.edu.tsinghua.iotdb.engine.overflow.thrift;
 
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
@@ -12,26 +12,16 @@ import org.apache.thrift.scheme.StandardScheme;
 
 import org.apache.thrift.scheme.TupleScheme;
 import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
+
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.EnumSet;
 import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
 import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 @Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2017-3-16")

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/thrift/OFRowGroupListMetadata.java

@@ -4,7 +4,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package cn.edu.thu.tsfiledb.engine.overflow.thrift;
+package cn.edu.tsinghua.iotdb.engine.overflow.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
 @javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-03-16")

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/thrift/OFSeriesListMetadata.java

@@ -4,7 +4,7 @@
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
-package cn.edu.thu.tsfiledb.engine.overflow.thrift;
+package cn.edu.tsinghua.iotdb.engine.overflow.thrift;
 
 import cn.edu.tsinghua.tsfile.format.TimeSeriesChunkMetaData;
 

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/utils/MergeStatus.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.utils;
+package cn.edu.tsinghua.iotdb.engine.overflow.utils;
 
 /**
  * Used for IntervalTreeOperation.queryMemory() and IntervalTreeOperation.queryFileBlock(); </br>

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/utils/OverflowOpType.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.utils;
+package cn.edu.tsinghua.iotdb.engine.overflow.utils;
 
 /**
  * Include three types: INSERT,UPDATE,DELETE;

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/utils/OverflowReadWriteThriftFormatUtils.java

@@ -1,10 +1,10 @@
-package cn.edu.thu.tsfiledb.engine.overflow.utils;
+package cn.edu.tsinghua.iotdb.engine.overflow.utils;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata;
+import cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata;
 import cn.edu.tsinghua.tsfile.file.utils.ReadWriteThriftFormatUtils;
 
 

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/utils/TSFileMetaDataConverter.java

@@ -1,10 +1,9 @@
-package cn.edu.thu.tsfiledb.engine.overflow.utils;
+package cn.edu.tsinghua.iotdb.engine.overflow.utils;
 
+import cn.edu.tsinghua.iotdb.engine.overflow.metadata.OFFileMetadata;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.edu.thu.tsfiledb.engine.overflow.metadata.OFFileMetadata;
-
 /**
  * @Description converter for file metadata
  * @author XuYi xuyi556677@163.com
@@ -21,7 +20,7 @@ public class TSFileMetaDataConverter {
    * @param ofFileMetaData - overflow file metadata in thrift format
    * @return OFFileMetadata - overflow file metadata in tsfile format
    */
-  public OFFileMetadata toOFFileMetadata(cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata ofFileMetaDataThrift) {
+  public OFFileMetadata toOFFileMetadata(cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata ofFileMetaDataThrift) {
 	  OFFileMetadata ofFileMetadata = new OFFileMetadata();
       try {
     	  ofFileMetadata.convertToTSF(ofFileMetaDataThrift);
@@ -42,7 +41,7 @@ public class TSFileMetaDataConverter {
    * @return org.corp.tsfile.format.OFFileMetaData - overflow file metadata in thrift format
    * @throws
    */
-  public cn.edu.thu.tsfiledb.engine.overflow.thrift.OFFileMetadata toThriftOFFileMetadata(int currentVersion,
+  public cn.edu.tsinghua.iotdb.engine.overflow.thrift.OFFileMetadata toThriftOFFileMetadata(int currentVersion,
                                                                                             OFFileMetadata ofFileMetadata) {
       try {
           return ofFileMetadata.convertToThrift();

src/main/java/cn/edu/tsinghua/iotdb/engine/overflow/utils/TimePair.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.overflow.utils;
+package cn.edu.tsinghua.iotdb.engine.overflow.utils;
 
 
 import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;

src/main/java/cn/edu/tsinghua/iotdb/engine/utils/FlushState.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.engine.utils;
+package cn.edu.tsinghua.iotdb.engine.utils;
 
 /**
  * This class is used to represent the state of flush. It's can be used in the

src/main/java/cn/edu/tsinghua/iotdb/exception/ArgsErrorException.java

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

src/main/java/cn/edu/tsinghua/iotdb/exception/BufferWriteProcessorException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 

src/main/java/cn/edu/tsinghua/iotdb/exception/DeltaEngineRunningException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  *

src/main/java/cn/edu/tsinghua/iotdb/exception/ErrorDebugException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  * @author kangrong

src/main/java/cn/edu/tsinghua/iotdb/exception/FileNodeManagerException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 public class FileNodeManagerException extends LRUManagerException {
 

src/main/java/cn/edu/tsinghua/iotdb/exception/FileNodeNotExistException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  * Throw this exception when the file node processor is not exists

src/main/java/cn/edu/tsinghua/iotdb/exception/FileNodeProcessorException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 

src/main/java/cn/edu/tsinghua/iotdb/exception/LRUManagerException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 public class LRUManagerException extends Exception {
 

src/main/java/cn/edu/tsinghua/iotdb/exception/MetadataArgsErrorException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  * If query metadata constructs schema but passes illegal parameters to

src/main/java/cn/edu/tsinghua/iotdb/exception/NotConsistentException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 public class NotConsistentException extends Exception{
 	

src/main/java/cn/edu/tsinghua/iotdb/exception/OverflowProcessorException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 import cn.edu.tsinghua.tsfile.common.exception.ProcessorException;
 

src/main/java/cn/edu/tsinghua/iotdb/exception/OverflowWrongParameterException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  * Used for IntervalTree pass wrong parameters. </br>

src/main/java/cn/edu/tsinghua/iotdb/exception/PathErrorException.java

@@ -1,6 +1,6 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
-import cn.edu.thu.tsfiledb.qp.exception.QueryProcessorException;
+import cn.edu.tsinghua.iotdb.qp.exception.QueryProcessorException;
 
 public class PathErrorException extends QueryProcessorException {
 

src/main/java/cn/edu/tsinghua/iotdb/exception/ProcessorRuntimException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 
 /**

src/main/java/cn/edu/tsinghua/iotdb/exception/StartupException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 public class StartupException extends Exception{
     private static final long serialVersionUID = -8591716406230730147L;

src/main/java/cn/edu/tsinghua/iotdb/exception/UnSupportedOverflowOpTypeException.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.exception;
+package cn.edu.tsinghua.iotdb.exception;
 
 /**
  * OverflowOpType could only be INSERT, UPDATE, DELETE.

src/main/java/cn/edu/tsinghua/iotdb/metadata/ColumnSchema.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.io.Serializable;
 import java.util.HashMap;

src/main/java/cn/edu/tsinghua/iotdb/metadata/MGraph.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -6,8 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import cn.edu.thu.tsfiledb.exception.MetadataArgsErrorException;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.MetadataArgsErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 
 /**
  * Metadata Graph consists of one {@code MTree} and several {@code PTree}

src/main/java/cn/edu/tsinghua/iotdb/metadata/MManager.java

@@ -1,29 +1,24 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import cn.edu.thu.tsfiledb.conf.TsfileDBDescriptor;
-import cn.edu.thu.tsfiledb.exception.MetadataArgsErrorException;
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.conf.TsfileDBDescriptor;
+import cn.edu.tsinghua.iotdb.exception.MetadataArgsErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
 import cn.edu.tsinghua.tsfile.timeseries.read.qp.Path;
 

src/main/java/cn/edu/tsinghua/iotdb/metadata/MNode.java

@@ -1,4 +1,4 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.io.Serializable;
 import java.util.LinkedHashMap;

src/main/java/cn/edu/tsinghua/iotdb/metadata/MTree.java

@@ -1,10 +1,10 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 import cn.edu.tsinghua.tsfile.file.metadata.enums.TSDataType;
 import cn.edu.tsinghua.tsfile.file.metadata.enums.TSEncoding;
 

src/main/java/cn/edu/tsinghua/iotdb/metadata/Metadata.java

@@ -1,9 +1,9 @@
-package cn.edu.thu.tsfiledb.metadata;
+package cn.edu.tsinghua.iotdb.metadata;
 
 import java.util.List;
 import java.util.Map;
 
-import cn.edu.thu.tsfiledb.exception.PathErrorException;
+import cn.edu.tsinghua.iotdb.exception.PathErrorException;
 
 /**
  * This class stores all the metadata info for every deltaObject and every