From 313da9aa719cafd9b742279d9737f76f5684b80c Mon Sep 17 00:00:00 2001 From: doleyzi Date: Mon, 8 Apr 2024 20:09:06 +0800 Subject: [PATCH] Audit-service add codes of source --- CHANGES.md | 2 +- inlong-audit/audit-service/pom.xml | 6 + .../src/main/java/config/SqlConstants.java | 37 --- .../inlong/audit}/channel/DataQueue.java | 20 +- .../inlong/audit}/config/ConfigConstants.java | 11 +- .../inlong/audit}/config/Configuration.java | 7 +- .../inlong/audit/config/SqlConstants.java | 80 +++++ .../elector/ElectorChangeListenerImpl.java | 5 +- .../inlong/audit}/elector/api/Selector.java | 2 +- .../elector/api/SelectorChangeListener.java | 2 +- .../audit}/elector/api/SelectorConfig.java | 2 +- .../audit}/elector/api/SelectorFactory.java | 4 +- .../audit}/elector/impl/DBDataSource.java | 39 +-- .../audit}/elector/impl/SelectorImpl.java | 28 +- .../audit}/elector/task/DBMonitorTask.java | 7 +- .../inlong/audit}/entities/AuditCycle.java | 2 +- .../inlong/audit}/entities/Request.java | 2 +- .../inlong/audit}/entities/SourceConfig.java | 26 +- .../inlong/audit}/entities/StartEndTime.java | 2 +- .../inlong/audit}/entities/StatData.java | 2 +- .../inlong/audit/source/JdbcSource.java | 300 ++++++++++++++++++ .../src/main/java/source/AbstractSource.java | 125 -------- .../src/main/java/source/SourceStat.java | 30 -- inlong-dataproxy/README.md | 2 +- .../dataproxy-mulit-pulsar-http-example.conf | 2 +- .../dataproxy-mulit-pulsar-udp-example.conf | 2 +- inlong-dataproxy/conf/dataproxy-tubemq.conf | 4 +- inlong-dataproxy/conf/dataproxy.conf | 4 +- .../dataproxy-sdk-golang/README.md | 4 +- .../dataproxy-sdk-golang/dataproxy/options.go | 2 +- .../dataproxy-sdk-golang/discoverer/dns.go | 2 +- .../src/test/resources/docker/mysql/my.cnf | 4 +- .../src/test/resources/docker/mysql/my.cnf | 4 +- .../src/main/resources/hbase-default.xml | 66 ++-- .../src/main/resources/hbase-default.xml | 66 ++-- inlong-tubemq/conf/broker.ini | 4 +- inlong-tubemq/resources/velocity.properties | 4 +- .../tubemq-client-go/errs/errs.go | 2 +- .../multiplexing/multiplexing.go | 30 +- .../tubemq-client-go/selector/ip_selector.go | 2 +- .../tubemq-client-go/selector/selector.go | 2 +- .../test/resources/broker_audit_prom_1.ini | 4 +- licenses/inlong-agent/LICENSE | 6 +- licenses/inlong-agent/NOTICE | 6 +- licenses/inlong-audit/LICENSE | 8 +- licenses/inlong-audit/NOTICE | 8 +- licenses/inlong-dataproxy/LICENSE | 4 +- licenses/inlong-dataproxy/NOTICE | 6 +- licenses/inlong-manager/LICENSE | 12 +- licenses/inlong-manager/NOTICE | 10 +- .../licenses/LICENSE-hadoop-annotations.txt | 2 +- .../licenses/LICENSE-hadoop-auth.txt | 2 +- .../licenses/LICENSE-hadoop-common.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs-client.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-api.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-client.txt | 2 +- .../inlong-manager/notices/NOTICE-sqlline.txt | 2 +- licenses/inlong-sort-connectors/LICENSE | 8 +- licenses/inlong-sort-connectors/NOTICE | 14 +- .../licenses/LICENSE-hadoop-annotations.txt | 2 +- .../licenses/LICENSE-hadoop-auth.txt | 2 +- .../licenses/LICENSE-hadoop-common.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs-client.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs.txt | 2 +- .../LICENSE-hadoop-mapreduce-client-core.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-api.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-client.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-common.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-registry.txt | 2 +- ...-yarn-server-applicationhistoryservice.txt | 2 +- .../LICENSE-hadoop-yarn-server-common.txt | 2 +- ...NSE-hadoop-yarn-server-resourcemanager.txt | 2 +- .../LICENSE-hadoop-yarn-server-web-proxy.txt | 2 +- .../notices/NOTICE-derby.txt | 2 +- licenses/inlong-sort-standalone/LICENSE | 8 +- licenses/inlong-sort-standalone/NOTICE | 10 +- .../licenses/LICENSE-hadoop-annotations.txt | 2 +- .../licenses/LICENSE-hadoop-auth.txt | 2 +- .../licenses/LICENSE-hadoop-common.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs-client.txt | 2 +- .../licenses/LICENSE-hadoop-hdfs.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-api.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-common.txt | 2 +- .../licenses/LICENSE-hadoop-yarn-registry.txt | 2 +- .../LICENSE-hadoop-yarn-server-applicat.txt | 2 +- .../LICENSE-hadoop-yarn-server-common.txt | 2 +- ...NSE-hadoop-yarn-server-resourcemanager.txt | 2 +- .../LICENSE-hadoop-yarn-server-web-proxy.txt | 2 +- licenses/inlong-tubemq-manager/LICENSE | 4 +- licenses/inlong-tubemq-manager/NOTICE | 2 +- licenses/inlong-tubemq-server/LICENSE | 2 +- licenses/inlong-tubemq-server/NOTICE | 2 +- 93 files changed, 680 insertions(+), 451 deletions(-) delete mode 100644 inlong-audit/audit-service/src/main/java/config/SqlConstants.java rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/channel/DataQueue.java (55%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/config/ConfigConstants.java (93%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/config/Configuration.java (92%) create mode 100644 inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/ElectorChangeListenerImpl.java (91%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/api/Selector.java (96%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/api/SelectorChangeListener.java (95%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/api/SelectorConfig.java (98%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/api/SelectorFactory.java (90%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/impl/DBDataSource.java (88%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/impl/SelectorImpl.java (88%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/elector/task/DBMonitorTask.java (92%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/entities/AuditCycle.java (96%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/entities/Request.java (95%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/entities/SourceConfig.java (57%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/entities/StartEndTime.java (95%) rename inlong-audit/audit-service/src/main/java/{ => org/apache/inlong/audit}/entities/StatData.java (96%) create mode 100644 inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java delete mode 100644 inlong-audit/audit-service/src/main/java/source/AbstractSource.java delete mode 100644 inlong-audit/audit-service/src/main/java/source/SourceStat.java diff --git a/CHANGES.md b/CHANGES.md index cdfe9f9c98..7983b92da6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,7 +33,7 @@ | [INLONG-9467](https://github.com/apache/inlong/issues/9467) | [Improve][Agent] Improve code exception detection to ensure task and instance state transitions | | [INLONG-9454](https://github.com/apache/inlong/issues/9454) | [Improve][Agent] Increase exit conditions to prevent dead loops | | [INLONG-9556](https://github.com/apache/inlong/issues/9556) | [Improve][Agent] Prevent thread freeze caused by deleting data sources when the backend cannot send out | -| [INLONG-9572](https://github.com/apache/inlong/issues/9572) | [Improve][Agent] Set data time of message cache by sink data time | +| [INLONG-9572](https://github.com/apache/inlong/issues/9572) | [Improve][Agent] Set data time of message channel by sink data time | | [INLONG-9548](https://github.com/apache/inlong/issues/9548) | [Improve][Agent] Supports HTTPS and can determine whether to enable it through configuration | | [INLONG-9600](https://github.com/apache/inlong/issues/9600) | [Improve][Agent]Adjust the sinks directory for code consistency | diff --git a/inlong-audit/audit-service/pom.xml b/inlong-audit/audit-service/pom.xml index 2851caf03c..814eba818c 100644 --- a/inlong-audit/audit-service/pom.xml +++ b/inlong-audit/audit-service/pom.xml @@ -81,6 +81,12 @@ junit test + + com.zaxxer + HikariCP + ${HikariCP.version} + compile + diff --git a/inlong-audit/audit-service/src/main/java/config/SqlConstants.java b/inlong-audit/audit-service/src/main/java/config/SqlConstants.java deleted file mode 100644 index a7164f2bdf..0000000000 --- a/inlong-audit/audit-service/src/main/java/config/SqlConstants.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package config; - -/** - * Sql constants - */ -public class SqlConstants { - - // HA selector sql - public static final String SELECTOR_SQL = - "insert ignore into {0} (service_id, leader_id, last_seen_active) values (''{1}'', ''{2}'', now()) on duplicate key update leader_id = if(last_seen_active < now() - interval # second, values(leader_id), leader_id),last_seen_active = if(leader_id = values(leader_id), values(last_seen_active), last_seen_active)"; - public static final String REPLACE_LEADER_SQL = - "replace into {0} ( service_id, leader_id, last_seen_active ) values (''{1}'', ''#'', now())"; - public static final String RELEASE_SQL = "delete from {0} where service_id=''{1}'' and leader_id= ''{2}''"; - public static final String IS_LEADER_SQL = - "select count(*) as is_leader from {0} where service_id=''{1}'' and leader_id=''{2}''"; - public static final String SEARCH_CURRENT_LEADER_SQL = - "select leader_id as leader from {0} where service_id=''{1}''"; - public static final String SELECT_TEST_SQL = "SELECT 1 "; - -} diff --git a/inlong-audit/audit-service/src/main/java/channel/DataQueue.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/channel/DataQueue.java similarity index 55% rename from inlong-audit/audit-service/src/main/java/channel/DataQueue.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/channel/DataQueue.java index 46b3d9068f..55b14f3718 100644 --- a/inlong-audit/audit-service/src/main/java/channel/DataQueue.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/channel/DataQueue.java @@ -15,9 +15,25 @@ * limitations under the License. */ -package channel; +package org.apache.inlong.audit.channel;/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.inlong.audit.entities.StatData; -import entities.StatData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inlong-audit/audit-service/src/main/java/config/ConfigConstants.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/ConfigConstants.java similarity index 93% rename from inlong-audit/audit-service/src/main/java/config/ConfigConstants.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/ConfigConstants.java index 42ef2d7046..bc4f0f9326 100644 --- a/inlong-audit/audit-service/src/main/java/config/ConfigConstants.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/ConfigConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package config; +package org.apache.inlong.audit.config; /** * Config constants @@ -112,6 +112,15 @@ public class ConfigConstants { public static final String PREP_STMT_CACHE_SIZE = "prepStmtCacheSize"; public static final String PREP_STMT_CACHE_SQL_LIMIT = "prepStmtCacheSqlLimit"; + public static final String KEY_CACHE_PREP_STMTS = "cache.prep.stmts"; + public static final boolean DEFAULT_CACHE_PREP_STMTS = true; + + public static final String KEY_PREP_STMT_CACHE_SIZE = "prep.stmt.cache.size"; + public static final int DEFAULT_PREP_STMT_CACHE_SIZE = 250; + + public static final String KEY_PREP_STMT_CACHE_SQL_LIMIT = "prep.stmt.cache.sql.limit"; + public static final int DEFAULT_PREP_STMT_CACHE_SQL_LIMIT = 2048; + public static final int MAX_INIT_COUNT = 2; public static final int RANDOM_BOUND = 10; } diff --git a/inlong-audit/audit-service/src/main/java/config/Configuration.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/Configuration.java similarity index 92% rename from inlong-audit/audit-service/src/main/java/config/Configuration.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/Configuration.java index 56a50f8266..c04aaf6aac 100644 --- a/inlong-audit/audit-service/src/main/java/config/Configuration.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/Configuration.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package config; +package org.apache.inlong.audit.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +72,11 @@ public String get(String key, String defaultValue) { return value == null ? defaultValue : value.toString(); } + public boolean get(String key, boolean defaultValue) { + Object value = properties.get(key); + return value == null ? defaultValue : (Boolean) value; + } + /** * @param key * @param defaultValue diff --git a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java new file mode 100644 index 0000000000..a64cd2234d --- /dev/null +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/config/SqlConstants.java @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.audit.config; + +/** + * Sql constants + */ +public class SqlConstants { + + // HA selector sql + public static final String SELECTOR_SQL = + "insert ignore into {0} (service_id, leader_id, last_seen_active) values (''{1}'', ''{2}'', now()) on duplicate key update leader_id = if(last_seen_active < now() - interval # second, values(leader_id), leader_id),last_seen_active = if(leader_id = values(leader_id), values(last_seen_active), last_seen_active)"; + public static final String REPLACE_LEADER_SQL = + "replace into {0} ( service_id, leader_id, last_seen_active ) values (''{1}'', ''#'', now())"; + public static final String RELEASE_SQL = "delete from {0} where service_id=''{1}'' and leader_id= ''{2}''"; + public static final String IS_LEADER_SQL = + "select count(*) as is_leader from {0} where service_id=''{1}'' and leader_id=''{2}''"; + public static final String SEARCH_CURRENT_LEADER_SQL = + "select leader_id as leader from {0} where service_id=''{1}''"; + public static final String SELECT_TEST_SQL = "SELECT 1 "; + + // ClickHouse query sql + public static final String KEY_CLICKHOUSE_SOURCE_QUERY_SQL = "clickhouse.source.query.sql"; + public static final String DEFAULT_CLICKHOUSE_SOURCE_QUERY_SQL = + "SELECT inlong_group_id, inlong_stream_id, audit_id, audit_tag\n" + + " , sum(cnt) AS cnt, sum(size) AS size\n" + + " , sum(delay) AS delay\n" + + "FROM (\n" + + " SELECT max(audit_version), ip, docker_id, thread_id\n" + + " , inlong_group_id, inlong_stream_id, audit_id, audit_tag, cnt\n" + + " , size, delay\n" + + " FROM (\n" + + " SELECT audit_version, ip, docker_id, thread_id, inlong_group_id\n" + + " , inlong_stream_id, audit_id, audit_tag, sum(count) AS cnt\n" + + " , sum(size) AS size, sum(delay) AS delay\n" + + " FROM (\n" + + " SELECT audit_version, docker_id, thread_id, sdk_ts, packet_id\n" + + " , log_ts, ip, inlong_group_id, inlong_stream_id, audit_id\n" + + " , audit_tag, count, size, delay\n" + + " FROM audit_data \n" + + " WHERE log_ts BETWEEN ? AND ? \n" + + " AND audit_id = ? \n" + + " GROUP BY audit_version, docker_id, thread_id, sdk_ts, packet_id, log_ts, ip, inlong_group_id, inlong_stream_id, audit_id, audit_tag, count, size, delay\n" + + + " ) t1\n" + + " GROUP BY audit_version, ip, docker_id, thread_id, inlong_group_id, inlong_stream_id, audit_id, audit_tag\n" + + + " ) t2\n" + + " GROUP BY ip, docker_id, thread_id, inlong_group_id, inlong_stream_id, audit_id, audit_tag, cnt, size, delay\n" + + + ") t3\n" + + "GROUP BY inlong_group_id, inlong_stream_id, audit_id, audit_tag"; + + // Mysql query sql + public static final String KEY_MYSQL_SOURCE_QUERY_TEMP_SQL = "mysql.query.temp.sql"; + public static final String DEFAULT_MYSQL_SOURCE_QUERY_TEMP_SQL = + "SELECT inlong_group_id, inlong_stream_id, audit_id, audit_tag\n" + + ", sum(count) AS cnt, sum(size) AS size\n" + + ", sum(delay) AS delay\n" + + "FROM audit_data_temp\n" + + "WHERE log_ts BETWEEN ? AND ? \n" + + "AND audit_id = ? \n" + + "GROUP BY inlong_group_id, inlong_stream_id, audit_id, audit_tag"; + +} diff --git a/inlong-audit/audit-service/src/main/java/elector/ElectorChangeListenerImpl.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/ElectorChangeListenerImpl.java similarity index 91% rename from inlong-audit/audit-service/src/main/java/elector/ElectorChangeListenerImpl.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/ElectorChangeListenerImpl.java index 9017caacff..b462e0a856 100644 --- a/inlong-audit/audit-service/src/main/java/elector/ElectorChangeListenerImpl.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/ElectorChangeListenerImpl.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package elector; +package org.apache.inlong.audit.elector; + +import org.apache.inlong.audit.elector.api.SelectorChangeListener; -import elector.api.SelectorChangeListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inlong-audit/audit-service/src/main/java/elector/api/Selector.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/Selector.java similarity index 96% rename from inlong-audit/audit-service/src/main/java/elector/api/Selector.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/Selector.java index 5e9e564762..2196574349 100644 --- a/inlong-audit/audit-service/src/main/java/elector/api/Selector.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/Selector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package elector.api; +package org.apache.inlong.audit.elector.api; /** * Selector diff --git a/inlong-audit/audit-service/src/main/java/elector/api/SelectorChangeListener.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorChangeListener.java similarity index 95% rename from inlong-audit/audit-service/src/main/java/elector/api/SelectorChangeListener.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorChangeListener.java index a4af6a9598..b81ca50354 100644 --- a/inlong-audit/audit-service/src/main/java/elector/api/SelectorChangeListener.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorChangeListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package elector.api; +package org.apache.inlong.audit.elector.api; /** * Selector change listener diff --git a/inlong-audit/audit-service/src/main/java/elector/api/SelectorConfig.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorConfig.java similarity index 98% rename from inlong-audit/audit-service/src/main/java/elector/api/SelectorConfig.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorConfig.java index d037985332..1147a9cbbe 100644 --- a/inlong-audit/audit-service/src/main/java/elector/api/SelectorConfig.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package elector.api; +package org.apache.inlong.audit.elector.api; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/inlong-audit/audit-service/src/main/java/elector/api/SelectorFactory.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorFactory.java similarity index 90% rename from inlong-audit/audit-service/src/main/java/elector/api/SelectorFactory.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorFactory.java index 42ed31a724..92bf339098 100644 --- a/inlong-audit/audit-service/src/main/java/elector/api/SelectorFactory.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/api/SelectorFactory.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package elector.api; +package org.apache.inlong.audit.elector.api; -import elector.impl.SelectorImpl; +import org.apache.inlong.audit.elector.impl.SelectorImpl; /** * Selector factory diff --git a/inlong-audit/audit-service/src/main/java/elector/impl/DBDataSource.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/DBDataSource.java similarity index 88% rename from inlong-audit/audit-service/src/main/java/elector/impl/DBDataSource.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/DBDataSource.java index 91eef3156f..fdf7a0d062 100644 --- a/inlong-audit/audit-service/src/main/java/elector/impl/DBDataSource.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/DBDataSource.java @@ -15,11 +15,14 @@ * limitations under the License. */ -package elector.impl; +package org.apache.inlong.audit.elector.impl; + +import org.apache.inlong.audit.config.ConfigConstants; +import org.apache.inlong.audit.config.SqlConstants; +import org.apache.inlong.audit.elector.api.SelectorConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import elector.api.SelectorConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,28 +32,17 @@ import java.text.MessageFormat; import java.util.concurrent.atomic.AtomicInteger; -import static config.ConfigConstants.CACHE_PREP_STMTS; -import static config.ConfigConstants.MAX_INIT_COUNT; -import static config.ConfigConstants.PREP_STMT_CACHE_SIZE; -import static config.ConfigConstants.PREP_STMT_CACHE_SQL_LIMIT; -import static config.SqlConstants.IS_LEADER_SQL; -import static config.SqlConstants.RELEASE_SQL; -import static config.SqlConstants.REPLACE_LEADER_SQL; -import static config.SqlConstants.SEARCH_CURRENT_LEADER_SQL; -import static config.SqlConstants.SELECTOR_SQL; -import static config.SqlConstants.SELECT_TEST_SQL; - /** * DB data source */ public class DBDataSource { private static final Logger logger = LoggerFactory.getLogger(DBDataSource.class); - private String selectorSql = SELECTOR_SQL; - private String replaceLeaderSql = REPLACE_LEADER_SQL; - private String reLeaseSql = RELEASE_SQL; - private String isLeaderSql = IS_LEADER_SQL; - private String searchCurrentLeaderSql = SEARCH_CURRENT_LEADER_SQL; + private String selectorSql = SqlConstants.SELECTOR_SQL; + private String replaceLeaderSql = SqlConstants.REPLACE_LEADER_SQL; + private String reLeaseSql = SqlConstants.RELEASE_SQL; + private String isLeaderSql = SqlConstants.IS_LEADER_SQL; + private String searchCurrentLeaderSql = SqlConstants.SEARCH_CURRENT_LEADER_SQL; private final SelectorConfig selectorConfig; private HikariDataSource datasource; public AtomicInteger getConnectionFailTimes; @@ -90,7 +82,7 @@ public void initDataSource() throws Exception { boolean initSucc = false; int initCount = 0; - while (!initSucc && initCount < MAX_INIT_COUNT) { + while (!initSucc && initCount < ConfigConstants.MAX_INIT_COUNT) { try { ++initCount; if (datasource == null || datasource.isClosed()) { @@ -104,11 +96,12 @@ public void initDataSource() throws Exception { config.setAutoCommit(true); config.setConnectionTimeout((long) selectorConfig.getConnectionTimeout()); config.setMaxLifetime((long) selectorConfig.getMaxLifetime()); - config.addDataSourceProperty(CACHE_PREP_STMTS, selectorConfig.getCachePrepStmts()); - config.addDataSourceProperty(PREP_STMT_CACHE_SIZE, selectorConfig.getPrepStmtCacheSize()); - config.addDataSourceProperty(PREP_STMT_CACHE_SQL_LIMIT, + config.addDataSourceProperty(ConfigConstants.CACHE_PREP_STMTS, selectorConfig.getCachePrepStmts()); + config.addDataSourceProperty(ConfigConstants.PREP_STMT_CACHE_SIZE, + selectorConfig.getPrepStmtCacheSize()); + config.addDataSourceProperty(ConfigConstants.PREP_STMT_CACHE_SQL_LIMIT, selectorConfig.getPrepStmtCacheSqlLimit()); - config.setConnectionTestQuery(SELECT_TEST_SQL); + config.setConnectionTestQuery(SqlConstants.SELECT_TEST_SQL); datasource = new HikariDataSource(config); } diff --git a/inlong-audit/audit-service/src/main/java/elector/impl/SelectorImpl.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/SelectorImpl.java similarity index 88% rename from inlong-audit/audit-service/src/main/java/elector/impl/SelectorImpl.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/SelectorImpl.java index b84051fccb..3a0bc3345e 100644 --- a/inlong-audit/audit-service/src/main/java/elector/impl/SelectorImpl.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/impl/SelectorImpl.java @@ -15,12 +15,14 @@ * limitations under the License. */ -package elector.impl; +package org.apache.inlong.audit.elector.impl; + +import org.apache.inlong.audit.config.ConfigConstants; +import org.apache.inlong.audit.config.Configuration; +import org.apache.inlong.audit.elector.api.Selector; +import org.apache.inlong.audit.elector.api.SelectorConfig; +import org.apache.inlong.audit.elector.task.DBMonitorTask; -import config.Configuration; -import elector.api.Selector; -import elector.api.SelectorConfig; -import elector.task.DBMonitorTask; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,12 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static config.ConfigConstants.DEFAULT_RELEASE_LEADER_INTERVAL; -import static config.ConfigConstants.DEFAULT_SELECTOR_THREAD_POOL_SIZE; -import static config.ConfigConstants.KEY_RELEASE_LEADER_INTERVAL; -import static config.ConfigConstants.KEY_SELECTOR_THREAD_POOL_SIZE; -import static config.ConfigConstants.RANDOM_BOUND; - /** * Elector Impl */ @@ -53,8 +49,8 @@ public SelectorImpl(SelectorConfig selectorConfig) { this.selectorConfig = selectorConfig; this.dbDataSource = new DBDataSource(selectorConfig); fixedThreadPool = Executors.newFixedThreadPool(Configuration.getInstance().get( - KEY_SELECTOR_THREAD_POOL_SIZE, - DEFAULT_SELECTOR_THREAD_POOL_SIZE)); + ConfigConstants.KEY_SELECTOR_THREAD_POOL_SIZE, + ConfigConstants.DEFAULT_SELECTOR_THREAD_POOL_SIZE)); } /** @@ -97,8 +93,8 @@ public void releaseLeader() { } try { - TimeUnit.SECONDS.sleep(Configuration.getInstance().get(KEY_RELEASE_LEADER_INTERVAL, - DEFAULT_RELEASE_LEADER_INTERVAL)); + TimeUnit.SECONDS.sleep(Configuration.getInstance().get(ConfigConstants.KEY_RELEASE_LEADER_INTERVAL, + ConfigConstants.DEFAULT_RELEASE_LEADER_INTERVAL)); } catch (Exception exception) { logger.error("Exception :{}", exception.getMessage()); } @@ -195,7 +191,7 @@ public void run() { isLeader = false; sleepTime = selectorConfig.getTryToBeLeaderInterval() - + random.nextInt(RANDOM_BOUND); + + random.nextInt(ConfigConstants.RANDOM_BOUND); } } diff --git a/inlong-audit/audit-service/src/main/java/elector/task/DBMonitorTask.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/task/DBMonitorTask.java similarity index 92% rename from inlong-audit/audit-service/src/main/java/elector/task/DBMonitorTask.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/task/DBMonitorTask.java index 8ccf92ab3b..d2ed840d8d 100644 --- a/inlong-audit/audit-service/src/main/java/elector/task/DBMonitorTask.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/elector/task/DBMonitorTask.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package elector.task; +package org.apache.inlong.audit.elector.task; + +import org.apache.inlong.audit.elector.api.SelectorConfig; +import org.apache.inlong.audit.elector.impl.DBDataSource; -import elector.api.SelectorConfig; -import elector.impl.DBDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/inlong-audit/audit-service/src/main/java/entities/AuditCycle.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/AuditCycle.java similarity index 96% rename from inlong-audit/audit-service/src/main/java/entities/AuditCycle.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/AuditCycle.java index 0b0bb82ce5..8420bdcaeb 100644 --- a/inlong-audit/audit-service/src/main/java/entities/AuditCycle.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/AuditCycle.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package entities; +package org.apache.inlong.audit.entities; /** * Audit cycle diff --git a/inlong-audit/audit-service/src/main/java/entities/Request.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/Request.java similarity index 95% rename from inlong-audit/audit-service/src/main/java/entities/Request.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/Request.java index 0e9ec8a4da..67954f1c72 100644 --- a/inlong-audit/audit-service/src/main/java/entities/Request.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/Request.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package entities; +package org.apache.inlong.audit.entities; import lombok.Data; diff --git a/inlong-audit/audit-service/src/main/java/entities/SourceConfig.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/SourceConfig.java similarity index 57% rename from inlong-audit/audit-service/src/main/java/entities/SourceConfig.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/SourceConfig.java index f26ea02566..428ca0389f 100644 --- a/inlong-audit/audit-service/src/main/java/entities/SourceConfig.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/SourceConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package entities; +package org.apache.inlong.audit.entities; import lombok.Data; @@ -26,12 +26,26 @@ public class SourceConfig { private AuditCycle auditCycle; - private String sourceTable; - private int beforeTimes; + private String querySql; + private int statBackTimes; + private final String driverClassName; + private final String jdbcUrl; + private final String username; + private final String password; - public SourceConfig(AuditCycle auditCycle, String sourceTable, int beforeTimes) { + public SourceConfig(AuditCycle auditCycle, + String querySql, + int statBackTimes, + String driverClassName, + String jdbcUrl, + String username, + String password) { this.auditCycle = auditCycle; - this.sourceTable = sourceTable; - this.beforeTimes = beforeTimes; + this.querySql = querySql; + this.statBackTimes = statBackTimes; + this.driverClassName = driverClassName; + this.jdbcUrl = jdbcUrl; + this.username = username; + this.password = password; } } diff --git a/inlong-audit/audit-service/src/main/java/entities/StartEndTime.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StartEndTime.java similarity index 95% rename from inlong-audit/audit-service/src/main/java/entities/StartEndTime.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StartEndTime.java index 7b7944320e..d7bba55679 100644 --- a/inlong-audit/audit-service/src/main/java/entities/StartEndTime.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StartEndTime.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package entities; +package org.apache.inlong.audit.entities; import lombok.Data; diff --git a/inlong-audit/audit-service/src/main/java/entities/StatData.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StatData.java similarity index 96% rename from inlong-audit/audit-service/src/main/java/entities/StatData.java rename to inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StatData.java index aefc828efe..b5f450b27d 100644 --- a/inlong-audit/audit-service/src/main/java/entities/StatData.java +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/entities/StatData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package entities; +package org.apache.inlong.audit.entities; import lombok.Data; diff --git a/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java new file mode 100644 index 0000000000..05ecedf93b --- /dev/null +++ b/inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/source/JdbcSource.java @@ -0,0 +1,300 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.inlong.audit.source; + +import org.apache.inlong.audit.channel.DataQueue; +import org.apache.inlong.audit.config.Configuration; +import org.apache.inlong.audit.entities.SourceConfig; +import org.apache.inlong.audit.entities.StartEndTime; +import org.apache.inlong.audit.entities.StatData; + +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; +import lombok.Data; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import static org.apache.inlong.audit.config.ConfigConstants.CACHE_PREP_STMTS; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_AUDIT_IDS; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_CACHE_PREP_STMTS; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_CONNECTION_TIMEOUT; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_DATASOURCE_POOL_SIZE; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_PREP_STMT_CACHE_SIZE; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_PREP_STMT_CACHE_SQL_LIMIT; +import static org.apache.inlong.audit.config.ConfigConstants.DEFAULT_SOURCE_DB_STAT_INTERVAL; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_AUDIT_IDS; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_CACHE_PREP_STMTS; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_DATASOURCE_CONNECTION_TIMEOUT; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_DATASOURCE_POOL_SIZE; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_PREP_STMT_CACHE_SIZE; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_PREP_STMT_CACHE_SQL_LIMIT; +import static org.apache.inlong.audit.config.ConfigConstants.KEY_SOURCE_DB_STAT_INTERVAL; +import static org.apache.inlong.audit.config.ConfigConstants.PREP_STMT_CACHE_SIZE; +import static org.apache.inlong.audit.config.ConfigConstants.PREP_STMT_CACHE_SQL_LIMIT; +import static org.apache.inlong.audit.entities.AuditCycle.DAY; +import static org.apache.inlong.audit.entities.AuditCycle.HOUR; + +/** + * Jdbc source + */ +@Data +public class JdbcSource { + + private static final Logger LOG = LoggerFactory.getLogger(JdbcSource.class); + private final ConcurrentHashMap statTimers = new ConcurrentHashMap<>(); + private DataQueue dataQueue; + private List auditIds; + private int querySqlTimeout; + private DataSource dataSource; + private String querySql; + private SourceConfig sourceConfig; + + private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + private static final int MAX_MINUTE = 60; + + public JdbcSource(DataQueue dataQueue, SourceConfig sourceConfig) { + this.dataQueue = dataQueue; + this.sourceConfig = sourceConfig; + auditIds = Arrays.asList(Configuration.getInstance().get(KEY_AUDIT_IDS, DEFAULT_AUDIT_IDS).split(";")); + } + + /** + * Init + */ + public void init() { + createDataSource(); + } + + public void start() { + init(); + int statInterval = Configuration.getInstance().get(KEY_SOURCE_DB_STAT_INTERVAL, + DEFAULT_SOURCE_DB_STAT_INTERVAL); + if (sourceConfig.getAuditCycle() == DAY) { + statInterval = HOUR.getValue(); + } + for (int statBackTime = 1; statBackTime < sourceConfig.getStatBackTimes(); statBackTime++) { + ScheduledExecutorService timer = + statTimers.computeIfAbsent(statBackTime, k -> Executors.newSingleThreadScheduledExecutor()); + timer.scheduleWithFixedDelay(new StatServer(statBackTime), + statBackTime, + statInterval, TimeUnit.MINUTES); + } + } + + ; + + /** + * Get stat cycle of minute + * + * @param hoursAgo + * @param dataCycle + * @return + */ + public List getStatCycleOfMinute(int hoursAgo, int dataCycle) { + List statCycleList = new LinkedList<>(); + for (int minute = 0; minute < MAX_MINUTE; minute = minute + dataCycle) { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.HOUR_OF_DAY, -hoursAgo); + + calendar.set(Calendar.MINUTE, minute); + calendar.set(Calendar.SECOND, 0); + SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); + StartEndTime statCycle = new StartEndTime(); + statCycle.setStartTime(dateFormat.format(calendar.getTime())); + + calendar.set(Calendar.MINUTE, minute + dataCycle - 1); + calendar.set(Calendar.SECOND, 0); + statCycle.setEndTime(dateFormat.format(calendar.getTime())); + statCycleList.add(statCycle); + } + return statCycleList; + } + + /** + * Get stat cycle of day + * + * @param daysAgo + * @return + */ + public List getStatCycleOfDay(int daysAgo) { + StartEndTime statCycle = new StartEndTime(); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE, -daysAgo); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + + SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); + statCycle.setStartTime(dateFormat.format(calendar.getTime())); + + calendar.set(Calendar.HOUR_OF_DAY, 23); + calendar.set(Calendar.MINUTE, 59); + statCycle.setEndTime(dateFormat.format(calendar.getTime())); + return new ArrayList() { + + { + add(statCycle); + } + }; + } + + /** + * Create data source + */ + protected void createDataSource() { + HikariConfig config = new HikariConfig(); + config.setDriverClassName(sourceConfig.getDriverClassName()); + config.setJdbcUrl(sourceConfig.getJdbcUrl()); + config.setUsername(sourceConfig.getUsername()); + config.setPassword(sourceConfig.getPassword()); + config.setConnectionTimeout(Configuration.getInstance().get(KEY_DATASOURCE_CONNECTION_TIMEOUT, + DEFAULT_CONNECTION_TIMEOUT)); + config.addDataSourceProperty(CACHE_PREP_STMTS, + Configuration.getInstance().get(KEY_CACHE_PREP_STMTS, DEFAULT_CACHE_PREP_STMTS)); + config.addDataSourceProperty(PREP_STMT_CACHE_SIZE, + Configuration.getInstance().get(KEY_PREP_STMT_CACHE_SIZE, DEFAULT_PREP_STMT_CACHE_SIZE)); + config.addDataSourceProperty(PREP_STMT_CACHE_SQL_LIMIT, + Configuration.getInstance().get(KEY_PREP_STMT_CACHE_SQL_LIMIT, DEFAULT_PREP_STMT_CACHE_SQL_LIMIT)); + config.setMaximumPoolSize( + Configuration.getInstance().get(KEY_DATASOURCE_POOL_SIZE, + DEFAULT_DATASOURCE_POOL_SIZE)); + dataSource = new HikariDataSource(config); + } + + /** + * Destory + */ + public void destroy() { + for (Map.Entry timer : statTimers.entrySet()) { + timer.getValue().shutdown(); + } + try { + dataSource.getConnection().close(); + } catch (SQLException exception) { + LOG.error(exception.getMessage()); + } + } + + /** + * Stat server + */ + class StatServer implements Runnable { + + private final int statBackTimes; + + public StatServer(int statBackTimes) { + this.statBackTimes = statBackTimes; + } + + public void run() { + long currentTimestamp = System.currentTimeMillis(); + LOG.info("Stat source data at {},stat back times:{}", currentTimestamp, statBackTimes); + + statByStep(); + + long timeCost = System.currentTimeMillis() - currentTimestamp; + LOG.info("Stat source data cost time:{}ms,stat back times:{}", timeCost, statBackTimes); + } + + public void statByStep() { + List> futures = new ArrayList<>(); + for (String auditId : auditIds) { + CompletableFuture future = CompletableFuture.supplyAsync(() -> { + aggregate(auditId); + return "Task " + auditId + " completed"; + }); + futures.add(future); + } + CompletableFuture[] futureArray = futures.toArray(new CompletableFuture[futures.size()]); + CompletableFuture allFutures = CompletableFuture.allOf(futureArray); + allFutures.join(); + } + + public void aggregate(String auditId) { + List statCycleList = sourceConfig.getAuditCycle() == DAY ? getStatCycleOfDay(statBackTimes) + : getStatCycleOfMinute(statBackTimes, sourceConfig.getAuditCycle().getValue()); + for (StartEndTime statCycle : statCycleList) { + long currentTimestamp = System.currentTimeMillis(); + query(statCycle.getStartTime(), statCycle.getEndTime(), auditId); + long timeCost = System.currentTimeMillis() - currentTimestamp; + LOG.info("[{}]-[{}],{},stat back times:{},audit id:{},cost:{}ms", + statCycle.getStartTime(), statCycle.getEndTime(), + sourceConfig.getAuditCycle(), + statBackTimes, auditId, timeCost); + } + } + + public void query(String startTime, String endTime, String auditId) { + try { + Connection connection = dataSource.getConnection(); + if (connection == null || connection.isClosed()) { + createDataSource(); + } + PreparedStatement pstat = connection.prepareStatement(sourceConfig.getQuerySql()); + pstat.setString(1, startTime); + pstat.setString(2, endTime); + pstat.setString(3, auditId); + ResultSet resultSet = pstat.executeQuery(); + while (resultSet.next()) { + String inlongGroupID = resultSet.getString(1); + String InlongStreamID = resultSet.getString(2); + String AuditId = resultSet.getString(3); + String AuditTag = resultSet.getString(4); + long count = resultSet.getLong(5); + long size = resultSet.getLong(6); + long delay = resultSet.getLong(7); + StatData data = new StatData(); + data.setLogTs(startTime); + data.setInlongGroupId(inlongGroupID); + data.setInlongStreamId(InlongStreamID); + data.setAuditId(AuditId); + data.setAuditTag(AuditTag); + data.setCount(count); + data.setSize(size); + data.setDelay(delay); + dataQueue.push(data); + } + resultSet.close(); + pstat.close(); + connection.close(); + } catch (Exception exception) { + LOG.error("Query has exception! ", exception); + } + } + } +} diff --git a/inlong-audit/audit-service/src/main/java/source/AbstractSource.java b/inlong-audit/audit-service/src/main/java/source/AbstractSource.java deleted file mode 100644 index b2c8cc8f2e..0000000000 --- a/inlong-audit/audit-service/src/main/java/source/AbstractSource.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package source; - -import channel.DataQueue; -import entities.SourceConfig; -import entities.StartEndTime; -import lombok.Data; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.sql.DataSource; - -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; - -/** - * Abstract source - */ -@Data -public class AbstractSource { - - private static final Logger LOG = LoggerFactory.getLogger(AbstractSource.class); - protected final ConcurrentHashMap statTimers = new ConcurrentHashMap<>(); - protected DataQueue dataQueue; - protected List auditIds; - protected int querySqlTimeout; - protected DataSource dataSource; - protected String querySql; - protected SourceConfig sourceConfig; - - protected static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; - - public AbstractSource(DataQueue dataQueue) { - this.dataQueue = dataQueue; - } - - /** - * Get stat cycle of minute - * - * @param beforeHour - * @param dataCycle - * @return - */ - public List getStatCycleMinute(int beforeHour, int dataCycle) { - List statCycleList = new LinkedList<>(); - for (int step = 0; step < 60; step = step + dataCycle) { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.HOUR_OF_DAY, -beforeHour); - - calendar.set(Calendar.MINUTE, step); - calendar.set(Calendar.SECOND, 0); - SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); - StartEndTime statCycle = new StartEndTime(); - statCycle.setStartTime(dateFormat.format(calendar.getTime())); - - calendar.set(Calendar.MINUTE, step + dataCycle - 1); - calendar.set(Calendar.SECOND, 0); - statCycle.setEndTime(dateFormat.format(calendar.getTime())); - statCycleList.add(statCycle); - } - return statCycleList; - } - - /** - * Get stat cycle of day - * - * @param beforeDay - * @return - */ - public List getStatCycleDay(int beforeDay) { - StartEndTime statCycle = new StartEndTime(); - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DATE, -beforeDay); - calendar.set(Calendar.HOUR_OF_DAY, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - - SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); - statCycle.setStartTime(dateFormat.format(calendar.getTime())); - - calendar.set(Calendar.HOUR_OF_DAY, 23); - calendar.set(Calendar.MINUTE, 59); - statCycle.setEndTime(dateFormat.format(calendar.getTime())); - return new ArrayList() { - - { - add(statCycle); - } - }; - } - - /** - * Destory - */ - public void destory() { - try { - dataSource.getConnection().close(); - } catch (SQLException exception) { - LOG.error(exception.getMessage()); - } - } -} diff --git a/inlong-audit/audit-service/src/main/java/source/SourceStat.java b/inlong-audit/audit-service/src/main/java/source/SourceStat.java deleted file mode 100644 index 4477d25532..0000000000 --- a/inlong-audit/audit-service/src/main/java/source/SourceStat.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package source; - -/** - * Source stat interface. - */ -public interface SourceStat extends Runnable { - - public void statByStep(); - - public void aggregate(String auditId); - - public void query(String startTime, String endTime, String auditId); -} diff --git a/inlong-dataproxy/README.md b/inlong-dataproxy/README.md index 8ddb147012..1173fe7aec 100644 --- a/inlong-dataproxy/README.md +++ b/inlong-dataproxy/README.md @@ -9,7 +9,7 @@ when use pulsar ,you can config these parameters to flume.conf like flume-mulit- 3. send_timeout_MILL: send message timeout, unit is millisecond, default value is 30000 (mean 30s) 4. stat_interval_sec: stat info will be made period time , unit is second, default value is 60s 5. thread-num: sink thread num. default value is 8 - 6. client-id-cache: whether use cache in client, default value is true + 6. client-id-channel: whether use channel in client, default value is true 7. max_pending_messages: default value is 10000 8. max_batching_messages: default value is 1000 9. enable_batch: default is true diff --git a/inlong-dataproxy/conf/dataproxy-mulit-pulsar-http-example.conf b/inlong-dataproxy/conf/dataproxy-mulit-pulsar-http-example.conf index 7d02fa45d0..a61340a6a1 100644 --- a/inlong-dataproxy/conf/dataproxy-mulit-pulsar-http-example.conf +++ b/inlong-dataproxy/conf/dataproxy-mulit-pulsar-http-example.conf @@ -42,7 +42,7 @@ agent1.sources.http-source.selector.type = org.apache.inlong.dataproxy.channel.F agent1.sources.http-source.selector.master = ch-msg1 ch-msg2 agent1.sources.http-source.metric-recovery-path = ./data/file/recovery agent1.sources.http-source.metric-agent-port=8003 -agent1.sources.http-source.metric-cache-size=1000000 +agent1.sources.http-source.metric-channel-size=1000000 agent1.sources.http-source.set=10 agent1.sources.http-source.max-monitor-cnt=500000 diff --git a/inlong-dataproxy/conf/dataproxy-mulit-pulsar-udp-example.conf b/inlong-dataproxy/conf/dataproxy-mulit-pulsar-udp-example.conf index cbe473266b..0bfb94651f 100644 --- a/inlong-dataproxy/conf/dataproxy-mulit-pulsar-udp-example.conf +++ b/inlong-dataproxy/conf/dataproxy-mulit-pulsar-udp-example.conf @@ -42,7 +42,7 @@ agent1.sources.upd-source.selector.type = org.apache.inlong.dataproxy.channel.Fa agent1.sources.upd-source.selector.master = ch-msg1 ch-msg2 agent1.sources.upd-source.metric-recovery-path = ./data/file/recovery agent1.sources.upd-source.metric-agent-port = 8003 -agent1.sources.upd-source.metric-cache-size = 1000000 +agent1.sources.upd-source.metric-channel-size = 1000000 agent1.sources.upd-source.set = 10 agent1.sources.upd-source.max-monitor-cnt=500000 diff --git a/inlong-dataproxy/conf/dataproxy-tubemq.conf b/inlong-dataproxy/conf/dataproxy-tubemq.conf index 86e9cff217..37da0a10b8 100644 --- a/inlong-dataproxy/conf/dataproxy-tubemq.conf +++ b/inlong-dataproxy/conf/dataproxy-tubemq.conf @@ -44,7 +44,7 @@ agent1.sources.tcp-source.selector.fileMetric = ch-back agent1.sources.tcp-source.selector.slaMetric = ch-msg10 agent1.sources.tcp-source.metric-recovery-path = ./data/metric agent1.sources.tcp-source.metric-agent-port=8003 -agent1.sources.tcp-source.metric-cache-size=10000 +agent1.sources.tcp-source.metric-channel-size=10000 agent1.sources.tcp-source.set=10 agent1.sources.tcp-source.old-metric-on=true agent1.sources.tcp-source.new-metric-on=true @@ -68,7 +68,7 @@ agent1.sources.http-source.selector.type = org.apache.inlong.dataproxy.channel.F agent1.sources.http-source.selector.master = ch-msg1 ch-msg2 agent1.sources.http-source.metric-recovery-path = ./data/file/recovery agent1.sources.http-source.metric-agent-port=8003 -agent1.sources.http-source.metric-cache-size=1000000 +agent1.sources.http-source.metric-channel-size=1000000 agent1.sources.http-source.set=10 agent1.sources.http-source.old-metric-on=true agent1.sources.http-source.new-metric-on=true diff --git a/inlong-dataproxy/conf/dataproxy.conf b/inlong-dataproxy/conf/dataproxy.conf index 35ad6f8d03..3a8d442584 100644 --- a/inlong-dataproxy/conf/dataproxy.conf +++ b/inlong-dataproxy/conf/dataproxy.conf @@ -54,7 +54,7 @@ agent1.sources.tcp-source.selector.master = ch-msg1 ch-msg2 agent1.sources.tcp-source.selector.order = ch-msg3 agent1.sources.tcp-source.metric-recovery-path = ./data/file/recovery agent1.sources.tcp-source.metric-agent-port = 8003 -agent1.sources.tcp-source.metric-cache-size = 1000000 +agent1.sources.tcp-source.metric-channel-size = 1000000 agent1.sources.tcp-source.set = 10 agent1.sources.tcp-source.max-monitor-cnt=500000 @@ -75,7 +75,7 @@ agent1.sources.http-source.selector.type = org.apache.inlong.dataproxy.channel.F agent1.sources.http-source.selector.master = ch-msg1 ch-msg2 agent1.sources.http-source.metric-recovery-path = ./data/file/recovery agent1.sources.http-source.metric-agent-port=8003 -agent1.sources.http-source.metric-cache-size=1000000 +agent1.sources.http-source.metric-channel-size=1000000 agent1.sources.http-source.set=10 agent1.sources.http-source.max-monitor-cnt=500000 diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/README.md b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/README.md index 3273b2a464..7cc92cd810 100755 --- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/README.md +++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/README.md @@ -5,7 +5,7 @@ dataproxy-sdk-golang is the golang version of InLong DataProxy client SDK. ## Features - Service discovery; -- Connection pool, buffer pool, byte pool; +- utils.JdbcUtils pool, buffer pool, byte pool; - Backoff retry; - Concurrently batch send; - Send synchronously; @@ -160,7 +160,7 @@ type Options struct { MaxPendingMessages int // the max size of the queue holding the messages pending to receive an acknowledgment from the broker, default: 204800 BlockIfQueueIsFull bool // whether Send and SendAsync block if producer's message queue is full, default: false AddColumns map[string]string // addition columns to add to the message, for example: __addcol1__worldid=xxx&__addcol2__ip=yyy, all the message will be added 2 more columns with worldid=xxx and ip=yyy - addColumnStr string // the string format of the AddColumns, just a cache, used internal + addColumnStr string // the string format of the AddColumns, just a channel, used internal } ``` diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/options.go b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/options.go index d55ca53fad..d9656e762f 100755 --- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/options.go +++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/dataproxy/options.go @@ -76,7 +76,7 @@ type Options struct { MaxPendingMessages int // the max size of the queue holding the messages pending to receive an acknowledgment from the broker, default: 204800 BlockIfQueueIsFull bool // whether Send and SendAsync block if producer's message queue is full, default: false AddColumns map[string]string // addition columns to add to the message, for example: __addcol1__worldid=xxx&__addcol2__ip=yyy, all the message will be added 2 more columns with worldid=xxx and ip=yyy - addColumnStr string // the string format of the AddColumns, just a cache, used internal + addColumnStr string // the string format of the AddColumns, just a channel, used internal } // ValidateAndSetDefault validates an options and set up the default values diff --git a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/discoverer/dns.go b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/discoverer/dns.go index 1e8d321aa7..2680bada5f 100755 --- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/discoverer/dns.go +++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-golang/discoverer/dns.go @@ -145,7 +145,7 @@ func (d *dnsDiscoverer) lookup() { } // will not update if ip list is empty if len(hosts) == 0 { - d.log.Warnf("no hosts were found from domain: %s, we will keep the local cache", d.domain) + d.log.Warnf("no hosts were found from domain: %s, we will keep the local channel", d.domain) return } diff --git a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/docker/mysql/my.cnf b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/docker/mysql/my.cnf index bbf52cd615..1e1d12f141 100644 --- a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/docker/mysql/my.cnf +++ b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.13/src/test/resources/docker/mysql/my.cnf @@ -19,7 +19,7 @@ [mysqld] # # Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# channel in MySQL. Start at 70% of total RAM for dedicated server, else 10%. # innodb_buffer_pool_size = 128M # # Remove leading # to turn on a very important data integrity option: logging @@ -32,7 +32,7 @@ # join_buffer_size = 128M # sort_buffer_size = 2M # read_rnd_buffer_size = 2M -skip-host-cache +skip-host-channel skip-name-resolve #datadir=/var/lib/mysql #socket=/var/lib/mysql/mysql.sock diff --git a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/resources/docker/mysql/my.cnf b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/resources/docker/mysql/my.cnf index bbf52cd615..1e1d12f141 100644 --- a/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/resources/docker/mysql/my.cnf +++ b/inlong-sort/sort-end-to-end-tests/sort-end-to-end-tests-v1.15/src/test/resources/docker/mysql/my.cnf @@ -19,7 +19,7 @@ [mysqld] # # Remove leading # and set to the amount of RAM for the most important data -# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# channel in MySQL. Start at 70% of total RAM for dedicated server, else 10%. # innodb_buffer_pool_size = 128M # # Remove leading # to turn on a very important data integrity option: logging @@ -32,7 +32,7 @@ # join_buffer_size = 128M # sort_buffer_size = 2M # read_rnd_buffer_size = 2M -skip-host-cache +skip-host-channel skip-name-resolve #datadir=/var/lib/mysql #socket=/var/lib/mysql/mysql.sock diff --git a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hbase/src/main/resources/hbase-default.xml b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hbase/src/main/resources/hbase-default.xml index 2d7e21d636..d9547e626d 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hbase/src/main/resources/hbase-default.xml +++ b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/hbase/src/main/resources/hbase-default.xml @@ -513,7 +513,7 @@ possible configurations would overwhelm and obscure the important. table to table. If you know ahead of time that you will not require more than a certain number of rows from a scan, this configuration should be set to that row limit via Scan#setCaching. Higher caching values will enable faster scanners but will eat up more - memory and some calls of next may take longer and longer times when the cache is empty. + memory and some calls of next may take longer and longer times when the channel is empty. Do not set this value such that the time between invocations is greater than the scanner timeout; i.e. hbase.client.scanner.timeout.period @@ -817,17 +817,17 @@ possible configurations would overwhelm and obscure the important. hbase.regionserver.majorcompaction.pagecache.drop true - Specifies whether to drop pages read/written into the system page cache by + Specifies whether to drop pages read/written into the system page channel by major compactions. Setting it to true helps prevent major compactions from - polluting the page cache, which is almost always required, especially for clusters + polluting the page channel, which is almost always required, especially for clusters with low/moderate memory to storage ratio. hbase.regionserver.minorcompaction.pagecache.drop true - Specifies whether to drop pages read/written into the system page cache by + Specifies whether to drop pages read/written into the system page channel by minor compactions. Setting it to true helps prevent minor compactions from - polluting the page cache, which is most beneficial on clusters with low + polluting the page channel, which is most beneficial on clusters with low memory to storage ratio or very write heavy clusters. You may want to set it to false under moderate to low write workload when bulk of the reads are on the most recently written data. @@ -853,18 +853,18 @@ possible configurations would overwhelm and obscure the important. The default thread pool size if parallel-seeking feature enabled. - hfile.block.cache.size + hfile.block.channel.size 0.4 - Percentage of maximum heap (-Xmx setting) to allocate to block cache + Percentage of maximum heap (-Xmx setting) to allocate to block channel used by a StoreFile. Default of 0.4 means allocate 40%. Set to 0 to disable but it's not recommended; you need at least - enough cache to hold the storefile indices. + enough channel to hold the storefile indices. hfile.block.index.cacheonwrite false This allows to put non-root multi-level index blocks into the block - cache at the time the index is being written. + channel at the time the index is being written. hfile.index.block.max.size @@ -886,20 +886,20 @@ possible configurations would overwhelm and obscure the important. hbase.bucketcache.size A float that EITHER represents a percentage of total heap memory - size to give to the cache (if < 1.0) OR, it is the total capacity in + size to give to the channel (if < 1.0) OR, it is the total capacity in megabytes of BucketCache. Default: 0.0 hbase.bucketcache.bucket.sizes A comma-separated list of sizes for buckets for the bucketcache. - Can be multiple sizes. List block sizes in order from smallest to largest. - The sizes you use will depend on your data access patterns. - Must be a multiple of 256 else you will run into - 'java.io.IOException: Invalid HFile block magic' when you go to read from cache. - If you specify no values here, then you pick up the default bucketsizes set - in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). - + Can be multiple sizes. List block sizes in order from smallest to largest. + The sizes you use will depend on your data access patterns. + Must be a multiple of 256 else you will run into + 'java.io.IOException: Invalid HFile block magic' when you go to read from channel. + If you specify no values here, then you pick up the default bucketsizes set + in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). + hfile.format.version @@ -912,7 +912,7 @@ possible configurations would overwhelm and obscure the important. hfile.block.bloom.cacheonwrite false - Enables cache-on-write for inline blocks of a compound Bloom filter. + Enables channel-on-write for inline blocks of a compound Bloom filter. io.storefile.bloom.block.size @@ -925,7 +925,7 @@ possible configurations would overwhelm and obscure the important. hbase.rs.cacheblocksonwrite false - Whether an HFile block should be added to the block cache when the + Whether an HFile block should be added to the block channel when the block is finished. @@ -1581,32 +1581,32 @@ possible configurations would overwhelm and obscure the important. - hbase.mob.file.cache.size + hbase.mob.file.channel.size 1000 - Number of opened file handlers to cache. - A larger value will benefit reads by providing more file handlers per mob - file cache and would reduce frequent file opening and closing. - However, if this is set too high, this could lead to a "too many opened file handlers" - The default value is 1000. - + Number of opened file handlers to channel. + A larger value will benefit reads by providing more file handlers per mob + file channel and would reduce frequent file opening and closing. + However, if this is set too high, this could lead to a "too many opened file handlers" + The default value is 1000. + - hbase.mob.cache.evict.period + hbase.mob.channel.evict.period 3600 - The amount of time in seconds before the mob cache evicts cached mob files. + The amount of time in seconds before the mob channel evicts cached mob files. The default value is 3600 seconds. - hbase.mob.cache.evict.remain.ratio + hbase.mob.channel.evict.remain.ratio 0.5f - The ratio (between 0.0 and 1.0) of files that remains cached after an eviction - is triggered when the number of cached mob files exceeds the hbase.mob.file.cache.size. - The default value is 0.5f. - + The ratio (between 0.0 and 1.0) of files that remains cached after an eviction + is triggered when the number of cached mob files exceeds the hbase.mob.file.channel.size. + The default value is 0.5f. + hbase.master.mob.ttl.cleaner.period diff --git a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hbase/src/main/resources/hbase-default.xml b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hbase/src/main/resources/hbase-default.xml index 2d7e21d636..d9547e626d 100644 --- a/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hbase/src/main/resources/hbase-default.xml +++ b/inlong-sort/sort-flink/sort-flink-v1.15/sort-connectors/hbase/src/main/resources/hbase-default.xml @@ -513,7 +513,7 @@ possible configurations would overwhelm and obscure the important. table to table. If you know ahead of time that you will not require more than a certain number of rows from a scan, this configuration should be set to that row limit via Scan#setCaching. Higher caching values will enable faster scanners but will eat up more - memory and some calls of next may take longer and longer times when the cache is empty. + memory and some calls of next may take longer and longer times when the channel is empty. Do not set this value such that the time between invocations is greater than the scanner timeout; i.e. hbase.client.scanner.timeout.period @@ -817,17 +817,17 @@ possible configurations would overwhelm and obscure the important. hbase.regionserver.majorcompaction.pagecache.drop true - Specifies whether to drop pages read/written into the system page cache by + Specifies whether to drop pages read/written into the system page channel by major compactions. Setting it to true helps prevent major compactions from - polluting the page cache, which is almost always required, especially for clusters + polluting the page channel, which is almost always required, especially for clusters with low/moderate memory to storage ratio. hbase.regionserver.minorcompaction.pagecache.drop true - Specifies whether to drop pages read/written into the system page cache by + Specifies whether to drop pages read/written into the system page channel by minor compactions. Setting it to true helps prevent minor compactions from - polluting the page cache, which is most beneficial on clusters with low + polluting the page channel, which is most beneficial on clusters with low memory to storage ratio or very write heavy clusters. You may want to set it to false under moderate to low write workload when bulk of the reads are on the most recently written data. @@ -853,18 +853,18 @@ possible configurations would overwhelm and obscure the important. The default thread pool size if parallel-seeking feature enabled. - hfile.block.cache.size + hfile.block.channel.size 0.4 - Percentage of maximum heap (-Xmx setting) to allocate to block cache + Percentage of maximum heap (-Xmx setting) to allocate to block channel used by a StoreFile. Default of 0.4 means allocate 40%. Set to 0 to disable but it's not recommended; you need at least - enough cache to hold the storefile indices. + enough channel to hold the storefile indices. hfile.block.index.cacheonwrite false This allows to put non-root multi-level index blocks into the block - cache at the time the index is being written. + channel at the time the index is being written. hfile.index.block.max.size @@ -886,20 +886,20 @@ possible configurations would overwhelm and obscure the important. hbase.bucketcache.size A float that EITHER represents a percentage of total heap memory - size to give to the cache (if < 1.0) OR, it is the total capacity in + size to give to the channel (if < 1.0) OR, it is the total capacity in megabytes of BucketCache. Default: 0.0 hbase.bucketcache.bucket.sizes A comma-separated list of sizes for buckets for the bucketcache. - Can be multiple sizes. List block sizes in order from smallest to largest. - The sizes you use will depend on your data access patterns. - Must be a multiple of 256 else you will run into - 'java.io.IOException: Invalid HFile block magic' when you go to read from cache. - If you specify no values here, then you pick up the default bucketsizes set - in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). - + Can be multiple sizes. List block sizes in order from smallest to largest. + The sizes you use will depend on your data access patterns. + Must be a multiple of 256 else you will run into + 'java.io.IOException: Invalid HFile block magic' when you go to read from channel. + If you specify no values here, then you pick up the default bucketsizes set + in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). + hfile.format.version @@ -912,7 +912,7 @@ possible configurations would overwhelm and obscure the important. hfile.block.bloom.cacheonwrite false - Enables cache-on-write for inline blocks of a compound Bloom filter. + Enables channel-on-write for inline blocks of a compound Bloom filter. io.storefile.bloom.block.size @@ -925,7 +925,7 @@ possible configurations would overwhelm and obscure the important. hbase.rs.cacheblocksonwrite false - Whether an HFile block should be added to the block cache when the + Whether an HFile block should be added to the block channel when the block is finished. @@ -1581,32 +1581,32 @@ possible configurations would overwhelm and obscure the important. - hbase.mob.file.cache.size + hbase.mob.file.channel.size 1000 - Number of opened file handlers to cache. - A larger value will benefit reads by providing more file handlers per mob - file cache and would reduce frequent file opening and closing. - However, if this is set too high, this could lead to a "too many opened file handlers" - The default value is 1000. - + Number of opened file handlers to channel. + A larger value will benefit reads by providing more file handlers per mob + file channel and would reduce frequent file opening and closing. + However, if this is set too high, this could lead to a "too many opened file handlers" + The default value is 1000. + - hbase.mob.cache.evict.period + hbase.mob.channel.evict.period 3600 - The amount of time in seconds before the mob cache evicts cached mob files. + The amount of time in seconds before the mob channel evicts cached mob files. The default value is 3600 seconds. - hbase.mob.cache.evict.remain.ratio + hbase.mob.channel.evict.remain.ratio 0.5f - The ratio (between 0.0 and 1.0) of files that remains cached after an eviction - is triggered when the number of cached mob files exceeds the hbase.mob.file.cache.size. - The default value is 0.5f. - + The ratio (between 0.0 and 1.0) of files that remains cached after an eviction + is triggered when the number of cached mob files exceeds the hbase.mob.file.channel.size. + The default value is 0.5f. + hbase.master.mob.ttl.cleaner.period diff --git a/inlong-tubemq/conf/broker.ini b/inlong-tubemq/conf/broker.ini index 70503d2ae7..abfa0acf85 100644 --- a/inlong-tubemq/conf/broker.ini +++ b/inlong-tubemq/conf/broker.ini @@ -63,9 +63,9 @@ zkCommitFailRetries=10 auditEnable=false ; audit proxy server addresses, default is '127.0.0.1:10081' auditProxyAddr=127.0.0.1:10081 -; file path for audit cache data +; file path for audit channel data auditCacheFilePath=/data/inlong/audit -; max cache records for audit cache +; max channel records for audit channel auditCacheMaxRows=2000000 ; audit id for production auditIdProduce=9 diff --git a/inlong-tubemq/resources/velocity.properties b/inlong-tubemq/resources/velocity.properties index a4175e6ff5..6bec917e7c 100644 --- a/inlong-tubemq/resources/velocity.properties +++ b/inlong-tubemq/resources/velocity.properties @@ -100,7 +100,7 @@ resource.loader=file file.resource.loader.description=Velocity File Resource Loader file.resource.loader.class=org.apache.velocity.runtime.resource.loader.FileResourceLoader file.resource.loader.path=resources/templates -file.resource.loader.cache=false +file.resource.loader.channel=false file.resource.loader.modificationCheckInterval=2 string.resource.loader.description=Velocity String Resource Loader string.resource.loader.class=org.apache.velocity.runtime.resource.loader.StringResourceLoader @@ -160,7 +160,7 @@ runtime.interpolate.string.literals=true # to be plugged in. # ---------------------------------------------------------------------------- resource.manager.class=org.apache.velocity.runtime.resource.ResourceManagerImpl -resource.manager.cache.class=org.apache.velocity.runtime.resource.ResourceCacheImpl +resource.manager.channel.class=org.apache.velocity.runtime.resource.ResourceCacheImpl # ---------------------------------------------------------------------------- # PARSER POOL # ---------------------------------------------------------------------------- diff --git a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/errs/errs.go b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/errs/errs.go index 0d80fa4bc7..9a12cab063 100644 --- a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/errs/errs.go +++ b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/errs/errs.go @@ -66,7 +66,7 @@ const ( // ErrAssertionFailure represents RetAssertionFailure error. var ( ErrAssertionFailure = New(RetAssertionFailure, "AssertionFailure") - ErrNoPartAssigned = New(RetErrNoPartAssigned, "No partition info in local cache, please retry later!") + ErrNoPartAssigned = New(RetErrNoPartAssigned, "No partition info in local channel, please retry later!") ErrAllPartWaiting = New(RetErrAllPartWaiting, "All partitions reach max position, please retry later!") ErrAllPartInUse = New(RetErrAllPartInUse, "No idle partition to consume, please retry later!") ErrInvalidNodeString = New(RetInvalidNodeString, "Node string should have format: node_id:host:port") diff --git a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/multiplexing/multiplexing.go b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/multiplexing/multiplexing.go index bb40bb7026..8092681b83 100644 --- a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/multiplexing/multiplexing.go +++ b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/multiplexing/multiplexing.go @@ -81,7 +81,7 @@ func (p *Pool) Get(ctx context.Context, address string, serialNo uint32, } if v, ok := p.connections.Load(address); ok { - if c, ok := v.(*Connection); ok { + if c, ok := v.(*utils.JdbcUtils); ok { return c.new(ctx, serialNo) } return nil, ErrAssertConnection @@ -90,14 +90,14 @@ func (p *Pool) Get(ctx context.Context, address string, serialNo uint32, defer p.mu.Unlock() // If the concurrent request has created the connection, the connection can be returned directly. if v, ok := p.connections.Load(address); ok { - if c, ok := v.(*Connection); ok { + if c, ok := v.(*utils.JdbcUtils); ok { mc, err := c.new(ctx, serialNo) return mc, err } return nil, ErrAssertConnection } - c := &Connection{ + c := &utils.JdbcUtils{ address: address, connections: make(map[uint32]*MultiplexConnection), done: make(chan struct{}), @@ -191,7 +191,7 @@ func getCertPool(caCertFile string) (*x509.CertPool, error) { // Close will release all the connections. func (p *Pool) Close() { p.connections.Range(func(key, value interface{}) bool { - connection, ok := value.(*Connection) + connection, ok := value.(*utils.JdbcUtils) if !ok { return false } @@ -211,7 +211,7 @@ type recvReader struct { // It is distinguished by the serialNo. type MultiplexConnection struct { serialNo uint32 - conn *Connection + conn *utils.JdbcUtils reader *recvReader done chan struct{} } @@ -261,9 +261,9 @@ type DialOptions struct { TLSServerName string } -// Connection represents the underlying TCP connection of the multiplex connections of an address +// utils.JdbcUtils represents the underlying TCP connection of the multiplex connections of an address // and maintains the multiplex connections. -type Connection struct { +type utils.JdbcUtils struct { err error address string mu sync.RWMutex @@ -278,7 +278,7 @@ type Connection struct { pool *Pool } -func (c *Connection) new(ctx context.Context, serialNo uint32) (*MultiplexConnection, error) { +func (c *utils.JdbcUtils) new(ctx context.Context, serialNo uint32) (*MultiplexConnection, error) { c.mu.Lock() defer c.mu.Unlock() if c.err != nil { @@ -302,7 +302,7 @@ func (c *Connection) new(ctx context.Context, serialNo uint32) (*MultiplexConnec return mc, nil } -func (c *Connection) close(lastErr error, done chan struct{}) { +func (c *utils.JdbcUtils) close(lastErr error, done chan struct{}) { if lastErr == nil { return } @@ -334,7 +334,7 @@ func (c *Connection) close(lastErr error, done chan struct{}) { } } -func (c *Connection) reconnect() error { +func (c *utils.JdbcUtils) reconnect() error { conn, err := dialWithTimeout(c.dialOpts) if err != nil { return err @@ -353,7 +353,7 @@ func (c *Connection) reconnect() error { // The response handling logic of the TCP connection. // 1. Read from the connection and decode it to the Response. // 2. Send the response to the corresponding multiplex connection based on the serialNo. -func (c *Connection) reader() { +func (c *utils.JdbcUtils) reader() { var lastErr error for { select { @@ -379,7 +379,7 @@ func (c *Connection) reader() { c.close(lastErr, c.done) } -func (c *Connection) writer() { +func (c *utils.JdbcUtils) writer() { var lastErr error for { select { @@ -400,7 +400,7 @@ func (c *Connection) writer() { c.close(lastErr, c.done) } -func (c *Connection) write(b []byte) error { +func (c *utils.JdbcUtils) write(b []byte) error { sent := 0 for sent < len(b) { n, err := c.conn.Write(b[sent:]) @@ -412,7 +412,7 @@ func (c *Connection) write(b []byte) error { return nil } -func (c *Connection) send(b []byte) error { +func (c *utils.JdbcUtils) send(b []byte) error { if c.state == Closed { return ErrConnClosed } @@ -425,7 +425,7 @@ func (c *Connection) send(b []byte) error { } } -func (c *Connection) remove(id uint32) { +func (c *utils.JdbcUtils) remove(id uint32) { c.mu.Lock() delete(c.connections, id) c.mu.Unlock() diff --git a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/ip_selector.go b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/ip_selector.go index b1193645ec..ec06e626cf 100644 --- a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/ip_selector.go +++ b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/ip_selector.go @@ -68,7 +68,7 @@ func (s *ipSelector) Select(serviceName string) (*Node, error) { return node, nil } -// Refresh will refresh a service address cache data. +// Refresh will refresh a service address channel data. func (s *ipSelector) Refresh(serviceName string) { s.mu.Lock() defer s.mu.Unlock() diff --git a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/selector.go b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/selector.go index 63c503c018..35a6ef649c 100644 --- a/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/selector.go +++ b/inlong-tubemq/tubemq-client-twins/tubemq-client-go/selector/selector.go @@ -29,7 +29,7 @@ import ( type Selector interface { // Select will return a service node which contains an available address. Select(serviceName string) (*Node, error) - // Refresh will refresh a service address cache data. + // Refresh will refresh a service address channel data. Refresh(serviceName string) } diff --git a/inlong-tubemq/tubemq-server/src/test/resources/broker_audit_prom_1.ini b/inlong-tubemq/tubemq-server/src/test/resources/broker_audit_prom_1.ini index 068a5e0393..d10bac35e9 100644 --- a/inlong-tubemq/tubemq-server/src/test/resources/broker_audit_prom_1.ini +++ b/inlong-tubemq/tubemq-server/src/test/resources/broker_audit_prom_1.ini @@ -63,9 +63,9 @@ zkCommitFailRetries=10 auditEnable=true ; audit proxy server addresses, default is '127.0.0.1:10081' auditProxyAddr=127.0.0.2:10081,127.0.0.3:10081 -; file path for audit cache data +; file path for audit channel data auditCacheFilePath=/data/inlong/audit/test -; max cache records for audit cache +; max channel records for audit channel auditCacheMaxRows=20000 ; audit id for production auditIdProduce=3 diff --git a/licenses/inlong-agent/LICENSE b/licenses/inlong-agent/LICENSE index 33a51c916a..d4fc7fb507 100644 --- a/licenses/inlong-agent/LICENSE +++ b/licenses/inlong-agent/LICENSE @@ -372,14 +372,14 @@ The text of each license is the standard Apache 2.0 license. io.debezium:debezium-core:1.8.0.Final - Debezium Core (https://github.com/debezium/debezium/tree/v1.8.0.Final), (The Apache Software License, Version 2.0) io.debezium:debezium-ddl-parser:1.8.0.Final - Debezium ANTLR DDL parsers (https://github.com/debezium/debezium/tree/v1.8.0.Final), (The Apache Software License, Version 2.0) io.debezium:debezium-embedded:1.8.0.Final - Debezium Embedded (https://github.com/debezium/debezium/tree/v1.8.0.Final), (The Apache Software License, Version 2.0) - org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/), (Apache 2) + org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded utils.JdbcUtils Driver (http://db.apache.org/derby/), (Apache 2) com.google.errorprone:error_prone_annotations:2.7.1 - error-prone annotations (https://github.com/google/error-prone/tree/v2.7.1), (Apache 2.0) com.google.guava:failureaccess:1.0.1 - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/tree/failureaccess-v1.0.1), (The Apache Software License, Version 2.0) com.alibaba:fastjson:1.2.83 - fastjson (https://github.com/alibaba/fastjson), (Apache 2) org.apache.flume.flume-ng-channels:flume-file-channel:1.9.0 - Flume NG file-based channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-file-channel), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-hdfs-sink:1.9.0 - Flume NG HDFS Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-hdfs-sink), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-irc-sink:1.9.0 - Flume NG IRC Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-irc-sink), (The Apache Software License, Version 2.0) - org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG JDBC channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) + org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG utils.JdbcUtils channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-auth:1.9.0 - Flume Auth (https://github.com/apache/flume/tree/flume-1.9/flume-ng-auth), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-configfilters:flume-ng-config-filter-api:1.9.0 - Flume NG Config Filters API (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configfilters/flume-ng-config-filter-api), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-configuration:1.9.0 - Flume NG Configuration (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configuration), (The Apache Software License, Version 2.0) @@ -525,7 +525,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.G org.antlr:antlr4-runtime:4.8 - ANTLR 4 Runtime (https://github.com/antlr/antlr4/tree/4.8), (The BSD License) com.google.code.findbugs:jsr305:3.0.2 - FindBugs-jsr305 (http://findbugs.sourceforge.net/), (New BSD License) com.thoughtworks.paranamer:paranamer:2.8 - ParaNamer Core (https://github.com/paul-hammant/paranamer/tree/paranamer-parent-2.8), (BSD) - org.postgresql:postgresql:42.4.4 - PostgreSQL JDBC Driver (https://jdbc.postgresql.org), (BSD-2-Clause) + org.postgresql:postgresql:42.4.4 - PostgreSQL utils.JdbcUtils Driver (https://jdbc.postgresql.org), (BSD-2-Clause) com.google.protobuf:protobuf-java:3.19.6 - Protocol Buffers [Core] (https://github.com/protocolbuffers/protobuf/tree/v3.19.6), (3-Clause BSD License) org.scala-lang.modules:scala-java8-compat_2.11:0.9.0 - scala-java8-compat (https://github.com/scala/scala-java8-compat/tree/v0.9.0), (BSD 3-clause) org.scala-lang:scala-library:2.11.12 - Scala Library (https://github.com/scala/scala/tree/v2.11.12), (BSD 3-clause) diff --git a/licenses/inlong-agent/NOTICE b/licenses/inlong-agent/NOTICE index fd5db7ce46..447afeb79c 100644 --- a/licenses/inlong-agent/NOTICE +++ b/licenses/inlong-agent/NOTICE @@ -356,10 +356,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Flume NG JDBC channel NOTICE +Flume NG utils.JdbcUtils channel NOTICE ======================================================================== -Flume NG JDBC channel +Flume NG utils.JdbcUtils channel Copyright 2009-2018 Apache Software Foundation This product includes software developed at @@ -960,7 +960,7 @@ aopalliance version 1.0 repackaged as a module NOTICE ------------------------------------------------------ Apache Commons Compress NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ HK2 API module NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-audit/LICENSE b/licenses/inlong-audit/LICENSE index 04ee912d7f..19891c546c 100644 --- a/licenses/inlong-audit/LICENSE +++ b/licenses/inlong-audit/LICENSE @@ -359,7 +359,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.curator:curator-client:4.2.0 - Curator Client (https://curator.apache.org/curator-client), (The Apache Software License, Version 2.0) org.apache.curator:curator-framework:4.2.0 - Curator Framework (https://curator.apache.org/curator-framework), (The Apache Software License, Version 2.0) org.apache.curator:curator-recipes:4.2.0 - Curator Recipes (https://curator.apache.org/curator-recipes), (The Apache Software License, Version 2.0) - org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/), (Apache 2) + org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded utils.JdbcUtils Driver (http://db.apache.org/derby/), (Apache 2) com.alibaba:druid:1.2.6 - druid (https://github.com/alibaba/druid/tree/1.2.6), (Apache 2) com.alibaba:druid-spring-boot-starter:1.2.6 - druid-spring-boot-starter (https://github.com/alibaba/druid/tree/1.2.6/druid-spring-boot-starter), (Apache 2) org.elasticsearch:elasticsearch:6.8.23 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0) @@ -374,7 +374,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume.flume-ng-channels:flume-file-channel:1.9.0 - Flume NG file-based channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-file-channel), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-hdfs-sink:1.9.0 - Flume NG HDFS Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-hdfs-sink), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-irc-sink:1.9.0 - Flume NG IRC Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-irc-sink), (The Apache Software License, Version 2.0) - org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG JDBC channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) + org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG utils.JdbcUtils channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-auth:1.9.0 - Flume Auth (https://github.com/apache/flume/tree/flume-1.9/flume-ng-auth), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-configfilters:flume-ng-config-filter-api:1.9.0 - Flume NG Config Filters API (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configfilters/flume-ng-config-filter-api), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-configuration:1.9.0 - Flume NG Configuration (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configuration), (The Apache Software License, Version 2.0) @@ -486,7 +486,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.32 - Spring utils.JdbcUtils (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) ru.yandex.clickhouse:clickhouse-jdbc:0.3.1 - clickhouse-jdbc (https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc), (The Apache Software License, Version 2.0) @@ -499,7 +499,7 @@ The following components are provided under BSD license. See project link for de The text of each license is also included at licenses/LICENSE-[project].txt. com.google.code.findbugs:jsr305:3.0.2 - FindBugs-jsr305 (http://findbugs.sourceforge.net/), (New BSD License) - org.postgresql:postgresql:42.4.4 - PostgreSQL JDBC Driver (https://jdbc.postgresql.org), (BSD-2-Clause) + org.postgresql:postgresql:42.4.4 - PostgreSQL utils.JdbcUtils Driver (https://jdbc.postgresql.org), (BSD-2-Clause) com.google.protobuf:protobuf-java:3.19.6 - Protocol Buffers [Core] (https://github.com/protocolbuffers/protobuf/tree/v3.19.6), (3-Clause BSD License) com.github.luben:zstd-jni:1.4.5-12 - zstd-jni (https://github.com/luben/zstd-jni/tree/v1.4.5-12), (BSD 2-Clause License) diff --git a/licenses/inlong-audit/NOTICE b/licenses/inlong-audit/NOTICE index c9b80cc535..73526ebb54 100644 --- a/licenses/inlong-audit/NOTICE +++ b/licenses/inlong-audit/NOTICE @@ -318,10 +318,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Flume NG JDBC channel NOTICE +Flume NG utils.JdbcUtils channel NOTICE ======================================================================== -Flume NG JDBC channel +Flume NG utils.JdbcUtils channel Copyright 2009-2018 Apache Software Foundation This product includes software developed at @@ -781,7 +781,7 @@ Spring Expression Language (SpEL) NOTICE ------------------------------------------------------ Spring Commons Logging Bridge NOTICE ------------------------------------------------------ -Spring JDBC NOTICE +Spring utils.JdbcUtils NOTICE ------------------------------------------------------ Spring Transaction NOTICE ======================================================================== @@ -836,7 +836,7 @@ https://github.com/airlift/airlift/blob/master/LICENSE Apache Commons Compress NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ Jakarta Annotations API NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-dataproxy/LICENSE b/licenses/inlong-dataproxy/LICENSE index ceaffb953c..3d45f078b4 100644 --- a/licenses/inlong-dataproxy/LICENSE +++ b/licenses/inlong-dataproxy/LICENSE @@ -358,14 +358,14 @@ The text of each license is the standard Apache 2.0 license. org.apache.curator:curator-client:4.2.0 - Curator Client (https://curator.apache.org/curator-client), (The Apache Software License, Version 2.0) org.apache.curator:curator-framework:4.2.0 - Curator Framework (https://curator.apache.org/curator-framework), (The Apache Software License, Version 2.0) org.apache.curator:curator-recipes:4.2.0 - Curator Recipes (https://curator.apache.org/curator-recipes), (The Apache Software License, Version 2.0) - org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby), (Apache 2) + org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded utils.JdbcUtils Driver (http://db.apache.org/derby), (Apache 2) com.google.errorprone:error_prone_annotations:2.7.1 - error-prone annotations (https://github.com/google/error-prone), (Apache 2.0) com.google.guava:failureaccess:1.0.1 - Guava InternalFutureFailureAccess and InternalFutures (https://github.com/google/guava/tree/failureaccess-v1.0.1), (The Apache Software License, Version 2.0) com.alibaba:fastjson:1.2.83 - fastjson (https://github.com/alibaba/fastjson), (Apache 2) org.apache.flume.flume-ng-channels:flume-file-channel:1.10.0 - Flume NG file-based channel (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-channels/flume-file-channel), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-32.1.2sinks:flume-hdfs-sink:1.10.0 - Flume NG HDFS Sink (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-sinks/flume-hdfs-sink), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-irc-sink:1.10.0 - Flume NG IRC Sink (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-sinks/flume-irc-sink), (The Apache Software License, Version 2.0) - org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.10.0 - Flume NG JDBC channel (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) + org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.10.0 - Flume NG utils.JdbcUtils channel (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-auth:1.10.0 - Flume Auth (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-auth), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-configfilters:flume-ng-config-filter-api:1.10.0 - Flume NG Config Filters API (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-configfilters/flume-ng-config-filter-api), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-configuration:1.10.0 - Flume NG Configuration (https://github.com/apache/flume/tree/flume-1.10.0/flume-ng-configuration), (The Apache Software License, Version 2.0) diff --git a/licenses/inlong-dataproxy/NOTICE b/licenses/inlong-dataproxy/NOTICE index a448b96c3a..4be75a5119 100644 --- a/licenses/inlong-dataproxy/NOTICE +++ b/licenses/inlong-dataproxy/NOTICE @@ -285,10 +285,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Flume NG JDBC channel NOTICE +Flume NG utils.JdbcUtils channel NOTICE ======================================================================== -Flume NG JDBC channel +Flume NG utils.JdbcUtils channel Copyright 2009-2018 Apache Software Foundation This product includes software developed at @@ -689,7 +689,7 @@ https://github.com/airlift/airlift/blob/master/LICENSE Apache Commons Compress NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ Jetty :: Http Utility NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-manager/LICENSE b/licenses/inlong-manager/LICENSE index 89d6489310..c8220de0fe 100644 --- a/licenses/inlong-manager/LICENSE +++ b/licenses/inlong-manager/LICENSE @@ -357,7 +357,7 @@ The text of each license is the standard Apache 2.0 license. com.jolbox:bonecp:0.8.0.RELEASE - BoneCP (https://github.com/wwadge/bonecp/tree/bonecp-parent-0.8.0.RELEASE), (Apache 2.0) org.apache.pulsar:bouncy-castle-bc:pkg:2.8.4 - Apache Pulsar :: Bouncy Castle :: BC (https://github.com/apache/pulsar/tree/master/bouncy-castle/bc), (Apache License, Version 2.0) net.bytebuddy:byte-buddy-agent:1.11.13 - Byte Buddy agent (https://github.com/raphw/byte-buddy/tree/byte-buddy-1.11.13), (Apache License, Version 2.0) - com.github.ben-manes.caffeine:caffeine:2.9.3 - Caffeine cache (https://github.com/ben-manes/caffeine), (Apache License, Version 2.0) + com.github.ben-manes.caffeine:caffeine:2.9.3 - Caffeine channel (https://github.com/ben-manes/caffeine), (Apache License, Version 2.0) com.twitter:chill_2.11:0.7.6 - chill (https://github.com/twitter/chill/tree/v0.7.6), (Apache 2) com.twitter:chill-java:0.7.6 - chill-java (https://github.com/twitter/chill/tree/v0.7.6), (Apache 2) ru.yandex.clickhouse:clickhouse-jdbc:0.3.1 - clickhouse-jdbc (https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc), (The Apache Software License, Version 2.0) @@ -447,7 +447,7 @@ The text of each license is the standard Apache 2.0 license. com.zaxxer:HikariCP:4.0.3 - HikariCP (https://github.com/brettwooldridge/HikariCP/tree/HikariCP-4.0.3), (The Apache Software License, Version 2.0) org.apache.hive:hive-common:3.1.3 - Hive Common (https://github.com/apache/hive/tree/rel/release-3.1.3/common), (Apache License, Version 2.0) org.apache.hive:hive-exec:3.1.3 - Hive Query Language (https://github.com/apache/hive/tree/rel/release-3.1.3/ql), (Apache License, Version 2.0) - org.apache.hive:hive-jdbc:3.1.3 - Hive JDBC (https://github.com/apache/hive/tree/rel/release-3.1.3/jdbc), (Apache License, Version 2.0) + org.apache.hive:hive-jdbc:3.1.3 - Hive utils.JdbcUtils (https://github.com/apache/hive/tree/rel/release-3.1.3/jdbc), (Apache License, Version 2.0) org.apache.hive:hive-metastore:3.1.3 - Hive Metastore (https://github.com/apache/hive/tree/rel/release-3.1.3/metastore), (Apache License, Version 2.0) org.apache.hive:hive-serde:3.1.3 - Hive Serde (https://github.com/apache/hive/tree/rel/release-3.1.3/serde), (Apache License, Version 2.0) org.apache.hive:hive-service:3.1.3 - Hive Service (https://github.com/apache/hive/tree/rel/release-3.1.3/service), (Apache License, Version 2.0) @@ -528,7 +528,7 @@ The text of each license is the standard Apache 2.0 license. org.elasticsearch.plugin:rank-eval-client:6.8.23 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0) org.reflections:reflections:0.10.2 - Reflections (https://github.com/ronmamo/reflections/tree/0.10.2), (The Apache Software License, Version 2.0; WTFPL) com.squareup.retrofit2:retrofit:2.9.0 - Retrofit (https://github.com/square/retrofit) (Apache License, Version 2.0) - org.apache.shiro:shiro-cache:1.13.0 - Apache Shiro Cache (https://shiro.apache.org/caching.html), (Apache License, Version 2.0) + org.apache.shiro:shiro-channel:1.13.0 - Apache Shiro Cache (https://shiro.apache.org/caching.html), (Apache License, Version 2.0) org.apache.shiro:shiro-config-core:1.13.0 - Apache Shiro :: Config :: Core (https://shiro.apache.org/), (Apache License, Version 2.0) org.apache.shiro:shiro-config-ogdl:1.13.0 - Apache Shiro :: Config :: Ogdl (https://shiro.apache.org/), (Apache License, Version 2.0) org.apache.shiro:shiro-core:1.13.0 - Apache Shiro Cache (https://shiro.apache.org/), (Apache License, Version 2.0) @@ -552,7 +552,7 @@ The text of each license is the standard Apache 2.0 license. org.springframework.boot:spring-boot-configuration-processor:2.6.15 - spring-boot-configuration-processor (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) org.springframework.boot:spring-boot-starter:2.6.15 - spring-boot-starter (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) org.springframework.boot:spring-boot-starter-aop:2.6.15 - spring-boot-starter-aop (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) - org.springframework.boot:spring-boot-starter-cache:2.6.15 - spring-boot-starter-cache (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) + org.springframework.boot:spring-boot-starter-channel:2.6.15 - spring-boot-starter-channel (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) org.springframework.boot:spring-boot-starter-jdbc:2.6.15 - spring-boot-starter-jdbc (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) org.springframework.boot:spring-boot-starter-json:2.6.15 - spring-boot-starter-json (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) org.springframework.boot:spring-boot-starter-log4j2:2.6.15 - spring-boot-starter-log4j2 (https://spring.io/projects/spring-boot), (Apache License, Version 2.0) @@ -669,7 +669,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.32 - Spring utils.JdbcUtils (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - Spring Plugin - Core (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE - Spring Plugin - Metadata Extension (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) @@ -698,7 +698,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. com.esotericsoftware.kryo:kryo:2.24.0 - Kryo (https://github.com/EsotericSoftware/kryo/tree/kryo-2.24.0), (New BSD License) org.fusesource.leveldbjni:leveldbjni-all:1.8 - leveldbjni-all (https://github.com/fusesource/leveldbjni/tree/leveldbjni-1.8), (The BSD 3-Clause License) com.esotericsoftware.minlog:minlog:1.2 - MinLog (https://github.com/EsotericSoftware/minlog/tree/1.2), (New BSD License) - org.postgresql:postgresql:42.4.4 - PostgreSQL JDBC Driver (https://jdbc.postgresql.org), (BSD-2-Clause) + org.postgresql:postgresql:42.4.4 - PostgreSQL utils.JdbcUtils Driver (https://jdbc.postgresql.org), (BSD-2-Clause) com.google.protobuf:protobuf-java:3.19.6 - Protocol Buffers [Core] (https://github.com/protocolbuffers/protobuf/tree/v3.19.6), (3-Clause BSD License) org.scala-lang:scala-compiler:2.11.12 - Scala Compiler (http://www.scala-lang.org/), (BSD 3-Clause) org.scala-lang.modules:scala-java8-compat_2.11:0.7.0 - scala-java8-compat (https://github.com/scala/scala-java8-compat/tree/v0.7.0), (BSD 3-clause) diff --git a/licenses/inlong-manager/NOTICE b/licenses/inlong-manager/NOTICE index 13fb77230e..034e6bd706 100644 --- a/licenses/inlong-manager/NOTICE +++ b/licenses/inlong-manager/NOTICE @@ -1265,10 +1265,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Hive JDBC NOTICE +Hive utils.JdbcUtils NOTICE ======================================================================== -Hive JDBC +Hive utils.JdbcUtils Copyright 2019 The Apache Software Foundation This product includes software developed at @@ -2034,7 +2034,7 @@ Spring Core NOTICE ------------------------------------------------------ Spring Commons Logging Bridge NOTICE ------------------------------------------------------ -Spring JDBC NOTICE +Spring utils.JdbcUtils NOTICE ------------------------------------------------------ Spring Transaction NOTICE ------------------------------------------------------ @@ -2105,7 +2105,7 @@ spring-boot-starter NOTICE ------------------------------------------------------ spring-boot-starter-aop NOTICE ------------------------------------------------------ -spring-boot-starter-cache NOTICE +spring-boot-starter-channel NOTICE ------------------------------------------------------ spring-boot-starter-jdbc NOTICE ------------------------------------------------------ @@ -2301,7 +2301,7 @@ DataNucleus Core NOTICE ------------------------------------------------------ DataNucleus RDBMS plugin NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ Flink : Runtime NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-annotations.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-annotations.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-annotations.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-annotations.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-auth.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-auth.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-auth.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-auth.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-common.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-common.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-common.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-common.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs-client.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs-client.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs-client.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs-client.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-hdfs.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-api.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-api.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-api.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-api.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-client.txt b/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-client.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-client.txt +++ b/licenses/inlong-manager/licenses/LICENSE-hadoop-yarn-client.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-manager/notices/NOTICE-sqlline.txt b/licenses/inlong-manager/notices/NOTICE-sqlline.txt index c4e40ac651..311732f37c 100644 --- a/licenses/inlong-manager/notices/NOTICE-sqlline.txt +++ b/licenses/inlong-manager/notices/NOTICE-sqlline.txt @@ -1,4 +1,4 @@ -SQLLine - Shell for issuing SQL to relational databases via JDBC +SQLLine - Shell for issuing SQL to relational databases via utils.JdbcUtils Copyright (c) 2002,2003,2004,2005,2006,2007 Marc Prud'hommeaux Copyright (c) 2004-2010 The Eigenbase Project diff --git a/licenses/inlong-sort-connectors/LICENSE b/licenses/inlong-sort-connectors/LICENSE index 44dce64c4d..dd21c56634 100644 --- a/licenses/inlong-sort-connectors/LICENSE +++ b/licenses/inlong-sort-connectors/LICENSE @@ -865,7 +865,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.avro:avro:1.10.1 - Apache Avro (https://avro.apache.org), (The Apache Software License, Version 2.0) org.apache.pulsar:bouncy-castle-bc:2.8.4 - Apache Pulsar :: Bouncy Castle :: BC (https://github.com/apache/pulsar/tree/master/bouncy-castle/bc), (Apache License, Version 2.0) org.mongodb:bson:4.3.1 - BSON (https://bsonspec.org), (The Apache License, Version 2.0) - com.github.ben-manes.caffeine:caffeine:2.8.4 - Caffeine cache (https://github.com/ben-manes/caffeine), (Apache License, Version 2.0) + com.github.ben-manes.caffeine:caffeine:2.8.4 - Caffeine channel (https://github.com/ben-manes/caffeine), (Apache License, Version 2.0) ru.yandex.clickhouse:clickhouse-jdbc:0.3.1 - clickhouse-jdbc (https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-jdbc), (The Apache Software License, Version 2.0) commons-beanutils:commons-beanutils:1.9.4 - Apache Commons BeanUtils (https://commons.apache.org/proper/commons-beanutils/), (Apache License, Version 2.0) commons-cli:commons-cli:1.4 - Apache Commons CLI (http://commons.apache.org/proper/commons-cli), (The Apache Software License, Version 2.0) @@ -926,7 +926,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flink:flink-connector-hbase-2.2_2.11:1.13.5 - Flink : Connectors : HBase 2.2 (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-hbase-2.2), (The Apache Software License, Version 2.0) org.apache.flink:flink-connector-hbase-base_2.11:1.13.5 - Flink : Connectors : HBase base (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-hbase-base), (The Apache Software License, Version 2.0) org.apache.flink:flink-connector-hive_2.11:1.13.5 - Flink : Connectors : Hive (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-hive), (The Apache Software License, Version 2.0) - org.apache.flink:flink-connector-jdbc_2.11:1.13.5 - Flink : Connectors : JDBC (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-jdbc), (The Apache Software License, Version 2.0) + org.apache.flink:flink-connector-jdbc_2.11:1.13.5 - Flink : Connectors : utils.JdbcUtils (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-jdbc), (The Apache Software License, Version 2.0) org.apache.flink:flink-connector-kafka_2.11:1.13.5 - Flink : Connectors : Kafka (https://github.com/apache/flink/tree/release-1.13.5/flink-connectors/flink-connector-kafka), (The Apache Software License, Version 2.0) com.ververica:flink-connector-mongodb-cdc:2.3.0 - flink-connector-mongodb-cdc (https://github.com/ververica/flink-cdc-connectors/tree/release-2.2.1/flink-connector-mongodb-cdc), (The Apache Software License, Version 2.0) com.ververica:flink-connector-mysql-cdc:2.2.1 - flink-connector-mysql-cdc (https://github.com/ververica/flink-cdc-connectors/tree/release-2.2.1/flink-connector-mysql-cdc), (The Apache Software License, Version 2.0) @@ -1204,7 +1204,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. jline:jline:2.12 - JLine (https://jline.github.io), (The BSD License) com.jcraft:jsch:0.1.55 - JSch (http://www.jcraft.com/jsch/), (Revised BSD) com.google.code.findbugs:jsr305:3.0.2 - FindBugs-jsr305 (http://findbugs.sourceforge.net/), (New BSD License) - org.postgresql:postgresql:42.4.4 - PostgreSQL JDBC Driver (https://jdbc.postgresql.org), (BSD-2-Clause) + org.postgresql:postgresql:42.4.4 - PostgreSQL utils.JdbcUtils Driver (https://jdbc.postgresql.org), (BSD-2-Clause) com.google.protobuf:protobuf-java:3.19.6 - Protocol Buffers [Core] (https://github.com/protocolbuffers/protobuf/tree/v3.19.6), (3-Clause BSD License) org.codehaus.woodstox:stax2-api:3.1.4 - Stax2 API (https://github.com/FasterXML/stax2-api), (The BSD License) org.threeten:threeten-extra:1.5.0 - ThreeTen-Extra (https://www.threeten.org/threeten-extra), (BSD 3-clause) @@ -1233,7 +1233,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.jruby.joni:joni:2.1.11 - Joni (https://github.com/jruby/joni/tree/joni-2.1.11), (MIT License) net.sf.jopt-simple:jopt-simple:5.0.2 - JOpt Simple (https://github.com/jopt-simple/jopt-simple/tree/jopt-simple-5.0.2), (The MIT License) org.slf4j:jul-to-slf4j:1.7.25 - JUL to SLF4J bridge (http://www.slf4j.org), (MIT License) - com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8 - Microsoft JDBC Driver for SQL Server (https://github.com/Microsoft/mssql-jdbc/tree/v7.2.2), (MIT License) + com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8 - Microsoft utils.JdbcUtils Driver for SQL Server (https://github.com/Microsoft/mssql-jdbc/tree/v7.2.2), (MIT License) org.slf4j:slf4j-api:1.7.36 - SLF4J API Module (http://www.slf4j.org), (MIT License) Codes: diff --git a/licenses/inlong-sort-connectors/NOTICE b/licenses/inlong-sort-connectors/NOTICE index de79d72435..91fea06b30 100644 --- a/licenses/inlong-sort-connectors/NOTICE +++ b/licenses/inlong-sort-connectors/NOTICE @@ -768,7 +768,7 @@ Copyright 2014-2021 The Apache Software Foundation ======================================================================== -Flink : Connectors : JDBC NOTICE +Flink : Connectors : utils.JdbcUtils NOTICE ======================================================================== // ------------------------------------------------------------------ @@ -783,7 +783,7 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Flink : Connectors : JDBC +Flink : Connectors : utils.JdbcUtils Copyright 2014-2021 The Apache Software Foundation @@ -1123,10 +1123,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Flume NG JDBC channel NOTICE +Flume NG utils.JdbcUtils channel NOTICE ======================================================================== -Flume NG JDBC channel +Flume NG utils.JdbcUtils channel Copyright 2009-2018 Apache Software Foundation This product includes software developed at @@ -1501,10 +1501,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Hive JDBC NOTICE +Hive utils.JdbcUtils NOTICE ======================================================================== -Hive JDBC +Hive utils.JdbcUtils Copyright 2019 The Apache Software Foundation This product includes software developed at @@ -2413,7 +2413,7 @@ Apache :: JSTL module NOTICE ------------------------------------------------------ Commons Math NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ DataNucleus Core NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-annotations.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-annotations.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-annotations.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-annotations.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-auth.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-auth.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-auth.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-auth.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-common.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-common.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-common.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-common.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs-client.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs-client.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs-client.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs-client.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-hdfs.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-mapreduce-client-core.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-mapreduce-client-core.txt index 63ea3e5e81..4d8e1ef24f 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-mapreduce-client-core.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-mapreduce-client-core.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-api.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-api.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-api.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-api.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-client.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-client.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-client.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-client.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-common.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-common.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-common.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-common.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-registry.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-registry.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-registry.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-registry.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-applicationhistoryservice.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-applicationhistoryservice.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-applicationhistoryservice.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-applicationhistoryservice.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-common.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-common.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-common.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-common.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt +++ b/licenses/inlong-sort-connectors/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-connectors/notices/NOTICE-derby.txt b/licenses/inlong-sort-connectors/notices/NOTICE-derby.txt index 69d204e724..c2b44a88b8 100644 --- a/licenses/inlong-sort-connectors/notices/NOTICE-derby.txt +++ b/licenses/inlong-sort-connectors/notices/NOTICE-derby.txt @@ -45,7 +45,7 @@ http://www.itl.nist.gov/div897/ctg/sql_form.htm ========================================================================= -The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and +The utils.JdbcUtils apis for small devices and JDBC3 (under java/stubs/jsr169 and java/stubs/jdbc3) were produced by trimming sources supplied by the Apache Harmony project. In addition, the Harmony SerialBlob and SerialClob implementations are used. The following notice covers the Harmony sources: diff --git a/licenses/inlong-sort-standalone/LICENSE b/licenses/inlong-sort-standalone/LICENSE index 878e58939a..adc0f6ff09 100644 --- a/licenses/inlong-sort-standalone/LICENSE +++ b/licenses/inlong-sort-standalone/LICENSE @@ -373,7 +373,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.curator:curator-client:2.13.0 - Curator Client (https://curator.apache.org/curator-client), (The Apache Software License, Version 2.0) org.apache.curator:curator-framework:4.2.0 - Curator Framework (https://curator.apache.org/curator-framework), (The Apache Software License, Version 2.0) org.apache.curator:curator-recipes:4.2.0 - Curator Recipes (https://curator.apache.org/curator-recipes), (The Apache Software License, Version 2.0) - org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded JDBC Driver (http://db.apache.org/derby/), (Apache 2) + org.apache.derby:derby:10.14.1.0 - Apache Derby Database Engine and Embedded utils.JdbcUtils Driver (http://db.apache.org/derby/), (Apache 2) com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - Hadoop Metrics2 Reporter for Dropwizard Metrics (https://github.com/joshelser/dropwizard-hadoop-metrics2), (Apache License, Version 2.0) org.ehcache:ehcache:3.3.1 - Ehcache (http://ehcache.org), (The Apache Software License, Version 2.0) org.elasticsearch:elasticsearch:6.8.23 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0) @@ -389,7 +389,7 @@ The text of each license is the standard Apache 2.0 license. org.apache.flume.flume-ng-channels:flume-file-channel:1.9.0 - Flume NG file-based channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-file-channel), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-hdfs-sink:1.9.0 - Flume NG HDFS Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-hdfs-sink), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-sinks:flume-irc-sink:1.9.0 - Flume NG IRC Sink (https://github.com/apache/flume/tree/flume-1.9/flume-ng-sinks/flume-irc-sink), (The Apache Software License, Version 2.0) - org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG JDBC channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) + org.apache.flume.flume-ng-channels:flume-jdbc-channel:1.9.0 - Flume NG utils.JdbcUtils channel (https://github.com/apache/flume/tree/flume-1.9/flume-ng-channels/flume-jdbc-channel), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-auth:1.9.0 - Flume Auth (https://github.com/apache/flume/tree/flume-1.9/flume-ng-auth), (The Apache Software License, Version 2.0) org.apache.flume.flume-ng-configfilters:flume-ng-config-filter-api:1.9.0 - Flume NG Config Filters API (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configfilters/flume-ng-config-filter-api), (The Apache Software License, Version 2.0) org.apache.flume:flume-ng-configuration:1.9.0 - Flume NG Configuration (https://github.com/apache/flume/tree/flume-1.9/flume-ng-configuration), (The Apache Software License, Version 2.0) @@ -407,7 +407,7 @@ The text of each license is the standard Apache 2.0 license. com.zaxxer:HikariCP-java7:2.4.12 - HikariCP (https://github.com/brettwooldridge/HikariCP/tree/HikariCP-2.4.12), (Apache License, Version 2.0) org.apache.hive:hive-classification:3.1.3 - Hive Classifications (https://github.com/apache/hive/tree/rel/release-3.1.3/classification), (Apache License, Version 2.0) org.apache.hive:hive-common:3.1.3 - Hive Common (https://github.com/apache/hive/tree/rel/release-3.1.3/common) - org.apache.hive:hive-jdbc:3.1.3 - Hive JDBC (https://github.com/apache/hive/tree/rel/release-3.1.3/jdbc) + org.apache.hive:hive-jdbc:3.1.3 - Hive utils.JdbcUtils (https://github.com/apache/hive/tree/rel/release-3.1.3/jdbc) org.apache.hive:hive-llap-client:3.1.3 - Hive Llap Client (https://github.com/apache/hive/tree/rel/release-3.1.3/llap-client) org.apache.hive:hive-llap-common:3.1.3 - Hive Llap Common (https://github.com/apache/hive/tree/rel/release-3.1.3/llap-common) org.apache.hive:hive-llap-common:tests:3.1.3 - Hive Llap Common (https://github.com/apache/hive/tree/rel/release-3.1.3/llap-common) @@ -603,7 +603,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.bouncycastle:bcutil-jdk15on:1.69 - Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/java.html), (MIT License) net.sf.jopt-simple:jopt-simple:5.0.2 - JOpt Simple (https://github.com/jopt-simple/jopt-simple/tree/jopt-simple-5.0.2), (The MIT License) org.projectlombok:lombok:1.18.22 - Project Lombok (https://projectlombok.org), (The MIT License) - com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7 - Microsoft JDBC Driver for SQL Server (https://github.com/Microsoft/mssql-jdbc/tree/v6.2.1), (MIT License) + com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7 - Microsoft utils.JdbcUtils Driver for SQL Server (https://github.com/Microsoft/mssql-jdbc/tree/v6.2.1), (MIT License) org.slf4j:slf4j-api:1.7.36 - SLF4J API Module (http://www.slf4j.org), (MIT License) diff --git a/licenses/inlong-sort-standalone/NOTICE b/licenses/inlong-sort-standalone/NOTICE index ca64ee7681..34056e45b3 100644 --- a/licenses/inlong-sort-standalone/NOTICE +++ b/licenses/inlong-sort-standalone/NOTICE @@ -553,10 +553,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Flume NG JDBC channel NOTICE +Flume NG utils.JdbcUtils channel NOTICE ======================================================================== -Flume NG JDBC channel +Flume NG utils.JdbcUtils channel Copyright 2009-2018 Apache Software Foundation This product includes software developed at @@ -722,10 +722,10 @@ The Apache Software Foundation (http://www.apache.org/). ======================================================================== -Hive JDBC NOTICE +Hive utils.JdbcUtils NOTICE ======================================================================== -Hive JDBC +Hive utils.JdbcUtils Copyright 2019 The Apache Software Foundation This product includes software developed at @@ -1488,7 +1488,7 @@ aircompressor NOTICE ------------------------------------------------------ Commons Math3 NOTICE ------------------------------------------------------ -Apache Derby Database Engine and Embedded JDBC Driver NOTICE +Apache Derby Database Engine and Embedded utils.JdbcUtils Driver NOTICE ------------------------------------------------------ Apache Hadoop Annotations NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-annotations.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-annotations.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-annotations.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-annotations.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-auth.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-auth.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-auth.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-auth.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-common.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-common.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-common.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-common.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs-client.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs-client.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs-client.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs-client.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs.txt index 5283f670a8..08050b5029 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-hdfs.txt @@ -664,7 +664,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-api.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-api.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-api.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-api.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-common.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-common.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-common.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-common.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-registry.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-registry.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-registry.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-registry.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-applicat.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-applicat.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-applicat.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-applicat.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-common.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-common.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-common.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-common.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-resourcemanager.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt index 447c609d01..a5fbbde967 100644 --- a/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt +++ b/licenses/inlong-sort-standalone/licenses/LICENSE-hadoop-yarn-server-web-proxy.txt @@ -698,7 +698,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-1.10.2.min.js hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery Apache HBase - Server which contains JQuery minified javascript library version 1.8.3 -Microsoft JDBC Driver for SQLServer - version 6.2.1.jre7 +Microsoft utils.JdbcUtils Driver for SQLServer - version 6.2.1.jre7 -------------------------------------------------------------------------------- MIT License diff --git a/licenses/inlong-tubemq-manager/LICENSE b/licenses/inlong-tubemq-manager/LICENSE index e87e5777c3..dca3694859 100644 --- a/licenses/inlong-tubemq-manager/LICENSE +++ b/licenses/inlong-tubemq-manager/LICENSE @@ -444,7 +444,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.hateoas:spring-hateoas:1.4.1 - Spring HATEOAS (https://github.com/spring-projects/spring-hateoas), (Apache License, Version 2.0) org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.32 - Spring utils.JdbcUtils (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-orm:5.3.32 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - Spring Plugin - Core (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE - Spring Plugin - Metadata Extension (https://github.com/spring-projects/spring-plugin/tree/2.0.0.RELEASE), (Apache License, Version 2.0) @@ -462,7 +462,7 @@ The following components are provided under BSD license. See project link for de The text of each license is also included at licenses/LICENSE-[project].txt. org.ow2.asm:asm:9.1 - asm (http://asm.ow2.io/), (BSD-3-Clause) - org.postgresql:postgresql:42.4.4 - PostgreSQL JDBC Driver (https://jdbc.postgresql.org), (BSD-2-Clause) + org.postgresql:postgresql:42.4.4 - PostgreSQL utils.JdbcUtils Driver (https://jdbc.postgresql.org), (BSD-2-Clause) ======================================================================== diff --git a/licenses/inlong-tubemq-manager/NOTICE b/licenses/inlong-tubemq-manager/NOTICE index 63fce1b4d4..ad28eafc0a 100644 --- a/licenses/inlong-tubemq-manager/NOTICE +++ b/licenses/inlong-tubemq-manager/NOTICE @@ -267,7 +267,7 @@ Spring Core NOTICE ------------------------------------------------------ Spring Commons Logging Bridge NOTICE ------------------------------------------------------ -Spring JDBC NOTICE +Spring utils.JdbcUtils NOTICE ------------------------------------------------------ Spring Object/Relational Mapping NOTICE ------------------------------------------------------ diff --git a/licenses/inlong-tubemq-server/LICENSE b/licenses/inlong-tubemq-server/LICENSE index 5771b85745..8cb5e81f3a 100644 --- a/licenses/inlong-tubemq-server/LICENSE +++ b/licenses/inlong-tubemq-server/LICENSE @@ -432,7 +432,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt. org.springframework:spring-core:5.3.32 - Spring Core (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-expression:5.3.32 - Spring Expression Language (SpEL) (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-jcl:5.3.32 - Spring Commons Logging Bridge (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) - org.springframework:spring-jdbc:5.3.32 - Spring JDBC (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) + org.springframework:spring-jdbc:5.3.32 - Spring utils.JdbcUtils (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-orm:5.3.32 - Spring Object/Relational Mapping (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) org.springframework:spring-tx:5.3.32 - Spring Transaction (https://github.com/spring-projects/spring-framework), (Apache License, Version 2.0) diff --git a/licenses/inlong-tubemq-server/NOTICE b/licenses/inlong-tubemq-server/NOTICE index 1945ec1b5d..13678c602e 100644 --- a/licenses/inlong-tubemq-server/NOTICE +++ b/licenses/inlong-tubemq-server/NOTICE @@ -309,7 +309,7 @@ Spring Expression Language (SpEL) NOTICE -------------------------------------------------------------- Spring Commons Logging Bridge NOTICE -------------------------------------------------------------- -Spring JDBC NOTICE +Spring utils.JdbcUtils NOTICE -------------------------------------------------------------- Spring Object/Relational Mapping NOTICE --------------------------------------------------------------