You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/04/13 08:01:10 UTC
[incubator-iotdb] 01/01: Merge branch 'separate_file_version' into
cluster_data_snapshot
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch cluster_data_snapshot
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 1df92c86628cbbc6c3bf65483b8de02583535926
Merge: 9302f7e f5edb58
Author: jt2594838 <jt...@163.com>
AuthorDate: Mon Apr 13 16:00:52 2020 +0800
Merge branch 'separate_file_version' into cluster_data_snapshot
.../{Community-History&Vision.md => ASF.md} | 11 +-
.../Wiki.md} | 14 +-
.../5-Operation Manual/4-SQL Reference.md | 17 +-
.../Community/ASF.md} | 11 +-
.../Community/Wiki.md} | 8 +-
.../5-Operation Manual/4-SQL Reference.md | 16 +-
.../main/java/org/apache/iotdb/SessionExample.java | 23 +-
server/pom.xml | 4 +
.../src/assembly/resources/sbin/start-server.bat | 16 +-
server/src/assembly/resources/sbin/start-server.sh | 20 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 39 ++-
.../engine/storagegroup/StorageGroupProcessor.java | 30 +-
...viceException.java => RPCServiceException.java} | 6 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 4 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 19 +-
.../service/{JDBCService.java => RPCService.java} | 78 +++--
...entHandler.java => RPCServiceEventHandler.java} | 7 +-
...{JDBCServiceMBean.java => RPCServiceMBean.java} | 4 +-
.../org/apache/iotdb/db/service/ServiceType.java | 2 +-
.../iotdb/db/sync/receiver/SyncServerManager.java | 1 -
.../apache/iotdb/db/integration/IoTDBLastIT.java | 2 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 2 +-
site/src/main/.vuepress/components/Contributor.vue | 333 +++++++++++++--------
site/src/main/.vuepress/config.js | 48 +--
.../public/img/contributor-avatar/user.jpg | Bin 7637 -> 0 bytes
.../public/img/contributor-avatar/user.svg | 51 ++++
site/src/main/.vuepress/style.styl | 17 --
site/src/main/.vuepress/styles/palette.styl | 22 +-
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 2 +
30 files changed, 506 insertions(+), 305 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/service/RPCService.java
index 761ea3f,a1aeaa5..cd1ae74
--- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
@@@ -215,27 -207,24 +208,25 @@@ public class RPCService implements RPCS
.stopTimeoutVal(
IoTDBDescriptor.getInstance().getConfig().getThriftServerAwaitTimeForStopService());
poolArgs.executorService = IoTDBThreadPoolFactory.createThriftRpcClientThreadPool(poolArgs,
- ThreadName.JDBC_CLIENT.getName());
+ ThreadName.RPC_CLIENT.getName());
poolArgs.processor(processor);
poolArgs.protocolFactory(protocolFactory);
+ poolArgs.transportFactory(new TFastFramedTransport.Factory());
poolServer = new TThreadPoolServer(poolArgs);
- poolServer.setServerEventHandler(new JDBCServiceEventHandler(impl, threadStartLatch));
+ poolServer.setServerEventHandler(new RPCServiceEventHandler(impl, threadStartLatch));
poolServer.serve();
} catch (TTransportException e) {
- throw new JDBCServiceException(String.format("%s: failed to start %s, because ", IoTDBConstant.GLOBAL_DB_NAME,
+ throw new RPCServiceException(String.format("%s: failed to start %s, because ", IoTDBConstant.GLOBAL_DB_NAME,
getID().getName()), e);
} catch (Exception e) {
- throw new JDBCServiceException(String.format("%s: %s exit, because ", IoTDBConstant.GLOBAL_DB_NAME, getID().getName()), e);
+ throw new RPCServiceException(String.format("%s: %s exit, because ", IoTDBConstant.GLOBAL_DB_NAME, getID().getName()), e);
} finally {
close();
- // TODO debug log, will be deleted in production env
if (threadStopLatch == null) {
- logger.info("Stop Count Down latch is null");
+ logger.debug("Stop Count Down latch is null");
} else {
- logger.info("Stop Count Down latch is {}", threadStopLatch.getCount());
+ logger.debug("Stop Count Down latch is {}", threadStopLatch.getCount());
}
- // debug log, will be deleted in production env
if (threadStopLatch != null && threadStopLatch.getCount() == 1) {
threadStopLatch.countDown();