This is an automated email from the ASF dual-hosted git repository.
chenyz pushed a change to branch udtf-optimize
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 7f837fde69b resolve conflict
add 1ba9e50dd0f resolve conflict
No new revisions were added by this update.
Summary of changes:
a | 0
.../java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java | 6 +++---
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 8 ++++----
.../grouped/GroupedUserDefinedAggregateAccumulator.java | 4 ----
.../plan/execution/config/metadata/ShowFunctionsTask.java | 5 -----
.../db/queryengine/plan/relational/planner/OrderingScheme.java | 1 -
6 files changed, 7 insertions(+), 17 deletions(-)
delete mode 100644 a