You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/12/10 06:45:19 UTC

[iotdb] branch fix_sync_0.11 created (now 8ef723a)

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch fix_sync_0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


      at 8ef723a  fix sync client compression bug

This branch includes the following new commits:

     new f046d8d  Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11
     new 8ef723a  fix sync client compression bug

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[iotdb] 02/02: fix sync client compression bug

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_sync_0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 8ef723a10f7894ae83564000b475c01a67cc8bbf
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Dec 10 14:44:49 2020 +0800

    fix sync client compression bug
---
 .../java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
index 3423323..fdee50c 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/SyncClient.java
@@ -277,9 +277,9 @@ public class SyncClient implements ISyncClient {
     transport = new TFastFramedTransport(new TSocket(serverIp, serverPort, TIMEOUT_MS));
     TProtocol protocol = null;
     if (IoTDBDescriptor.getInstance().getConfig().isRpcThriftCompressionEnable()) {
-      protocol = new TBinaryProtocol(transport);
-    } else {
       protocol = new TCompactProtocol(transport);
+    } else {
+      protocol = new TBinaryProtocol(transport);
     }
     serviceClient = new SyncService.Client(protocol);
     try {


[iotdb] 01/02: Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11

Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_sync_0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit f046d8d8f912f866ced8c83f91b29249171ada67
Merge: 8806aa5 f5fc83b
Author: qiaojialin <64...@qq.com>
AuthorDate: Thu Dec 10 14:43:43 2020 +0800

    Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11

 .../iotdb/db/query/executor/LastQueryExecutor.java |  9 ++-
 .../db/query/executor/fill/LastPointReader.java    |  3 +-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   | 69 ++++++++++++++--------
 3 files changed, 53 insertions(+), 28 deletions(-)