This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch no_retry
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 637bf1b Fix incorrect error msg in avg() query
new b1f10b7 fix OOM for merge
new 3315833 Revert "[IOTDB-667] add retry in session and jdbc.execute
(#1194)"
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.
Summary of changes:
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 1 -
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 14 +-
.../db/engine/merge/manage/MergeResource.java | 4 +
.../db/engine/merge/task/MergeMultiChunkTask.java | 1 +
.../java/org/apache/iotdb/session/Session.java | 165 ++-------------------
5 files changed, 24 insertions(+), 161 deletions(-)
