You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/08/31 07:32:20 UTC
[inlong] branch release-1.3.0 updated (ba5a86b46 -> b5df3e01f)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
from ba5a86b46 [INLONG-5735][Dashboard] Optimize the development environment and enable vite (#5736)
new 8c159e413 [INLONG-5748][TubeMQ] Remove the virtual keyword of the destructor of the TubeMQTDMsg and DataItem classes (#5750)
new fb3dc882c [INLONG-5749][Dashboard] Fix bad node public params (#5751)
new b5df3e01f [INLONG-5746]][Sort] Add spi dictionary of Inlong pb msg (#5747)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
inlong-dashboard/src/metas/nodes/index.tsx | 10 ----------
inlong-dashboard/src/pages/Clusters/CreateModal.tsx | 5 +++--
.../src/pages/GroupDetail/DataSources/DetailModal.tsx | 6 ++++--
.../src/pages/GroupDetail/DataStorage/DetailModal.tsx | 6 ++++--
inlong-dashboard/src/pages/Nodes/DetailModal.tsx | 4 +++-
.../services/org.apache.flink.table.factories.Factory | 2 +-
.../resources/org.apache.flink.table.factories.Factory | 16 ----------------
.../tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h | 4 ++--
8 files changed, 17 insertions(+), 36 deletions(-)
copy inlong-sort/{sort-connectors/mongodb-cdc => sort-formats/format-inlongmsg-pb}/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory (91%)
delete mode 100644 inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/org.apache.flink.table.factories.Factory
[inlong] 02/03: [INLONG-5749][Dashboard] Fix bad node public params (#5751)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit fb3dc882cd38b317638b86b659038b25b02ea10f
Author: Daniel <le...@apache.org>
AuthorDate: Wed Aug 31 14:24:39 2022 +0800
[INLONG-5749][Dashboard] Fix bad node public params (#5751)
---
inlong-dashboard/src/metas/nodes/index.tsx | 10 ----------
inlong-dashboard/src/pages/Clusters/CreateModal.tsx | 5 +++--
.../src/pages/GroupDetail/DataSources/DetailModal.tsx | 6 ++++--
.../src/pages/GroupDetail/DataStorage/DetailModal.tsx | 6 ++++--
inlong-dashboard/src/pages/Nodes/DetailModal.tsx | 4 +++-
5 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/inlong-dashboard/src/metas/nodes/index.tsx b/inlong-dashboard/src/metas/nodes/index.tsx
index 774d4d750..c2d47b5fa 100644
--- a/inlong-dashboard/src/metas/nodes/index.tsx
+++ b/inlong-dashboard/src/metas/nodes/index.tsx
@@ -64,16 +64,6 @@ const defaultCommonFields: FieldItemType[] = [
rules: [{ required: true }],
_renderTable: true,
},
- {
- type: 'input',
- label: 'URL',
- name: 'url',
- },
- {
- type: 'input',
- label: 'Token',
- name: 'token',
- },
{
type: 'textarea',
label: i18n.t('meta.Nodes.Description'),
diff --git a/inlong-dashboard/src/pages/Clusters/CreateModal.tsx b/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
index d266db4fc..1bafc2ca2 100644
--- a/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
+++ b/inlong-dashboard/src/pages/Clusters/CreateModal.tsx
@@ -77,11 +77,12 @@ const Comp: React.FC<Props> = ({ id, ...modalProps }) => {
useUpdateEffect(() => {
if (modalProps.visible) {
- // open
- form.resetFields();
if (id) {
getData(id);
}
+ } else {
+ form.resetFields();
+ setType(Clusters[0].value);
}
}, [modalProps.visible]);
diff --git a/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx b/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
index d44dc3386..3b090d3c4 100644
--- a/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataSources/DetailModal.tsx
@@ -106,9 +106,11 @@ const Comp: React.FC<Props> = ({ id, inlongGroupId, ...modalProps }) => {
useUpdateEffect(() => {
if (modalProps.visible) {
// open
- form.resetFields(); // Note that it will cause the form to remount to initiate a select request
if (id) {
getData(id);
+ } else {
+ form.resetFields(); // Note that it will cause the form to remount to initiate a select request
+ setType(sources[0].value);
}
} else {
setCurrentValues({});
@@ -163,7 +165,7 @@ const Comp: React.FC<Props> = ({ id, inlongGroupId, ...modalProps }) => {
type: 'radio',
label: t('meta.Sources.Type'),
rules: [{ required: true }],
- initialValue: type,
+ initialValue: sources[0].value,
props: {
disabled: !!id,
options: sources,
diff --git a/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx b/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
index 73ca25892..376eb3881 100644
--- a/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/GroupDetail/DataStorage/DetailModal.tsx
@@ -88,9 +88,11 @@ const Comp: React.FC<DetailModalProps> = ({ inlongGroupId, id, ...modalProps })
useUpdateEffect(() => {
if (modalProps.visible) {
// open
- form.resetFields(); // Note that it will cause the form to remount to initiate a select request
if (id) {
getData(id);
+ } else {
+ form.resetFields(); // Note that it will cause the form to remount to initiate a select request
+ setSinkType(Sinks[0].value);
}
} else {
setCurrentValues({});
@@ -153,7 +155,7 @@ const Comp: React.FC<DetailModalProps> = ({ inlongGroupId, id, ...modalProps })
type: 'select',
label: t('meta.Sinks.SinkType'),
rules: [{ required: true }],
- initialValue: sinkType,
+ initialValue: Sinks[0].value,
props: {
disabled: !!id,
options: Sinks,
diff --git a/inlong-dashboard/src/pages/Nodes/DetailModal.tsx b/inlong-dashboard/src/pages/Nodes/DetailModal.tsx
index b6c672ada..c4426a3e0 100644
--- a/inlong-dashboard/src/pages/Nodes/DetailModal.tsx
+++ b/inlong-dashboard/src/pages/Nodes/DetailModal.tsx
@@ -78,10 +78,12 @@ const Comp: React.FC<Props> = ({ id, ...modalProps }) => {
useUpdateEffect(() => {
if (modalProps.visible) {
// open
- form.resetFields();
if (id) {
getData(id);
}
+ } else {
+ form.resetFields();
+ setType(nodes[0].value);
}
}, [modalProps.visible]);
[inlong] 03/03: [INLONG-5746]][Sort] Add spi dictionary of Inlong pb msg (#5747)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit b5df3e01f8d0f8d1afab2319a5e01391f5696309
Author: vernedeng <de...@pku.edu.cn>
AuthorDate: Wed Aug 31 14:27:29 2022 +0800
[INLONG-5746]][Sort] Add spi dictionary of Inlong pb msg (#5747)
---
.../services}/org.apache.flink.table.factories.Factory | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/org.apache.flink.table.factories.Factory b/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
similarity index 71%
rename from inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/org.apache.flink.table.factories.Factory
rename to inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
index 6eec8f57b..342a7adae 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/org.apache.flink.table.factories.Factory
+++ b/inlong-sort/sort-formats/format-inlongmsg-pb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory
@@ -1,16 +1,18 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
+# 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
+# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# 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.
+#
-org.apache.inlong.sort.formats.inlongmsg.InLongMsgPbFormatFactory
+org.apache.inlong.sort.formats.inlongmsgpb.InLongMsgPbFormatFactory
[inlong] 01/03: [INLONG-5748][TubeMQ] Remove the virtual keyword of the destructor of the TubeMQTDMsg and DataItem classes (#5750)
Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 8c159e413bc2b5c60cbf8e900b176f72b1099986
Author: Goson Zhang <46...@qq.com>
AuthorDate: Wed Aug 31 14:22:58 2022 +0800
[INLONG-5748][TubeMQ] Remove the virtual keyword of the destructor of the TubeMQTDMsg and DataItem classes (#5750)
---
.../tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h b/inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h
index 395175b47..ec053b613 100644
--- a/inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h
+++ b/inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/include/tubemq/tubemq_tdmsg.h
@@ -41,7 +41,7 @@ class DataItem {
DataItem();
DataItem(const DataItem& target);
DataItem(const uint32_t length, const char* data);
- virtual ~DataItem();
+ ~DataItem();
DataItem& operator=(const DataItem& target);
const uint32_t GetLength() const { return length_; }
const char* GetData() const { return data_; }
@@ -58,7 +58,7 @@ class DataItem {
class TubeMQTDMsg {
public:
TubeMQTDMsg();
- virtual ~TubeMQTDMsg();
+ ~TubeMQTDMsg();
bool ParseTDMsg(const char* data,
uint32_t data_length, string& err_info);
bool ParseTDMsg(const vector<char>& data_vec, string& err_info);