Add mysql to mapper-framework for enhancing pushmethod db. #5376

luomengY · 2024-01-19T09:06:30Z

What type of PR is this?
/kind feature

What this PR does / why we need it:
Add mysql to mapper-framework for enhancing pushmethod db.
Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

wbc6080 · 2024-02-26T02:33:31Z

cc @cl2017

luomengY · 2024-02-28T12:18:35Z

Add it to version v1.17.0. @Shelley-BaoYue

fisherxu · 2024-04-17T06:25:36Z

staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/mysql/client.go

@@ -0,0 +1,93 @@
+package mysql


Add KubeEdge License header for all new files.

Ihave added it.

wbc6080 · 2024-04-17T06:35:22Z

staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod

+	github.com/kubeedge/kubeedge => ../../../../../../../../kubeedge
+	github.com/kubeedge/mapper-framework => ../../../mapper-framework


Suggested change

github.com/kubeedge/kubeedge => ../../../../../../../../kubeedge

github.com/kubeedge/mapper-framework => ../../../mapper-framework

github.com/kubeedge/kubeedge => ../../../../../../kubeedge

github.com/kubeedge/mapper-framework => ../mapper-framework

Considering the e2e test of mapper-framework, the directory where the generated mapper project is located should be used as the standard for dependent applications. Otherwise, the directory actually referenced by the generated mapper project is incorrect.

Considering the e2e test of mapper-framework, the directory where the generated mapper project is located should be used as the standard for dependent applications. Otherwise, the directory actually referenced by the generated mapper project is incorrect.

ok

wbc6080 · 2024-04-17T07:11:27Z

Verify vendor CI need to be fixed :) @luomengY

luomengY · 2024-04-17T12:56:45Z

Verify vendor CI need to be fixed :) @luomengY

ok

wbc6080

/lgtm

fisherxu · 2024-04-19T07:00:24Z

staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/mysql/client.go

@@ -0,0 +1,106 @@
+/*
+Copyright 2024 The Kubernetes Authors.


Suggested change

Copyright 2024 The Kubernetes Authors.

Copyright 2024 The KubeEdge Authors.

KubeEdge, thanks :)

Shelley-BaoYue · 2024-04-19T07:03:05Z

pkg/apis/dmi/v1beta1/api.proto

@@ -251,6 +251,7 @@ message DBMethod{
    DBMethodInfluxdb2 influxdb2 = 1;
    DBMethodRedis redis = 2;
    DBMethodTDEngine tdengine = 3;
+    DBMethodMySQL mysql=4;


Add a space to keep the format consistent.

Suggested change

DBMethodMySQL mysql=4;

DBMethodMySQL mysql = 4;

Shelley-BaoYue · 2024-04-19T07:03:23Z

pkg/apis/dmi/v1beta1/api.proto

@@ -303,6 +304,20 @@ message TDEngineClientConfig{
    string dbname = 2;
 }

+
+message DBMethodMySQL{
+    MySQLClientConfig mysqlClientConfig=1;


Shelley-BaoYue · 2024-04-19T07:04:19Z

staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/mysql/client.go

+	if err != nil {
+		klog.Errorf("close mysql failed with err:%v", err)
+	}
+


remove redundant blank lines.

Shelley-BaoYue · 2024-04-19T07:06:16Z

...ing/src/github.com/kubeedge/mapper-framework/_template/mapper/data/dbmethod/mysql/handler.go

@@ -0,0 +1,70 @@
+/*


There need be a blank line between paragraphs in copyrights. You can refer to other files.

Shelley-BaoYue · 2024-04-19T07:15:29Z

staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod

 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.13.0
-	github.com/kubeedge/kubeedge v1.16.0-beta.0
-	github.com/kubeedge/mapper-framework v0.0.0-20240119021034-e7755b2f421c
+	github.com/kubeedge/kubeedge v0.0.0


Why did you change the way the mapper gomod is referenced in this pr? Wasn't it involved in other databases before? @luomengY @wbc6080

This part of the change is not caused by the addition of a new database, but the content of the mapper upgrade framework. Since part of the mapper code now needs to reference the content in the kubeedge/mapper-framework repo, when we modify the mapper code, the e2e test still uses the content in the old version of the kubeedge/mapper-framework repo, which will cause conflicts. So we change this part to a local reference @Shelley-BaoYue

Signed-off-by: luomengY <2938893385@qq.com>

Shelley-BaoYue

/lgtm

fisherxu

/approve

kubeedge-bot · 2024-04-20T08:00:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fisherxu, wbc6080

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [fisherxu]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

kubeedge-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. labels Jan 19, 2024

kubeedge-bot requested review from cl2017 and kevin-wangzefeng January 19, 2024 09:06

kubeedge-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 19, 2024

luomengY force-pushed the mysql branch 2 times, most recently from a89606e to 1847270 Compare January 23, 2024 07:05

kubeedge-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 23, 2024

luomengY force-pushed the mysql branch 15 times, most recently from e80e0d7 to d2dbd92 Compare January 25, 2024 08:44

luomengY closed this Jan 25, 2024

luomengY reopened this Jan 25, 2024

luomengY changed the title ~~[wip]Add mysql to mapper-framework for enhancing pushmethod db.~~ Add mysql to mapper-framework for enhancing pushmethod db. Jan 25, 2024

kubeedge-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2024

luomengY closed this Jan 25, 2024

luomengY reopened this Jan 25, 2024

kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2024

Shelley-BaoYue added this to the v1.17 milestone Feb 29, 2024

fisherxu reviewed Apr 17, 2024

View reviewed changes

wbc6080 reviewed Apr 17, 2024

View reviewed changes

luomengY force-pushed the mysql branch from 25818af to ad29cfe Compare April 17, 2024 06:59

kubeedge-bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 17, 2024

luomengY closed this Apr 17, 2024

luomengY reopened this Apr 17, 2024

luomengY force-pushed the mysql branch 2 times, most recently from c251421 to 91de952 Compare April 17, 2024 09:12

wbc6080 approved these changes Apr 19, 2024

View reviewed changes

kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024

fisherxu reviewed Apr 19, 2024

View reviewed changes

luomengY force-pushed the mysql branch from 91de952 to ce271b1 Compare April 19, 2024 07:14

kubeedge-bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 19, 2024

Shelley-BaoYue reviewed Apr 19, 2024

View reviewed changes

luomengY force-pushed the mysql branch from ce271b1 to ffe5cf6 Compare April 19, 2024 07:31

add msyql to mapper framwork

5d16542

Signed-off-by: luomengY <2938893385@qq.com>

luomengY force-pushed the mysql branch from ffe5cf6 to 5d16542 Compare April 19, 2024 08:09

Shelley-BaoYue reviewed Apr 20, 2024

View reviewed changes

kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2024

fisherxu reviewed Apr 20, 2024

View reviewed changes

kubeedge-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2024

kubeedge-bot merged commit 9de5264 into kubeedge:master Apr 20, 2024
21 checks passed

forsaken628 mentioned this pull request May 23, 2024

Add opentelemetry to mapper-framework for enhancing pushmethod. #5628

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add mysql to mapper-framework for enhancing pushmethod db. #5376

Add mysql to mapper-framework for enhancing pushmethod db. #5376

luomengY commented Jan 19, 2024

wbc6080 commented Feb 26, 2024

luomengY commented Feb 28, 2024

fisherxu Apr 17, 2024

luomengY Apr 17, 2024

wbc6080 Apr 17, 2024

luomengY Apr 17, 2024

wbc6080 commented Apr 17, 2024

luomengY commented Apr 17, 2024

wbc6080 left a comment

fisherxu Apr 19, 2024

Shelley-BaoYue Apr 19, 2024

Shelley-BaoYue Apr 19, 2024

Shelley-BaoYue Apr 19, 2024

Shelley-BaoYue Apr 19, 2024

Shelley-BaoYue Apr 19, 2024

wbc6080 Apr 19, 2024

Shelley-BaoYue left a comment

fisherxu left a comment

kubeedge-bot commented Apr 20, 2024

		github.com/kubeedge/kubeedge => ../../../../../../../../kubeedge
		github.com/kubeedge/mapper-framework => ../../../mapper-framework

	Copyright 2024 The Kubernetes Authors.
	Copyright 2024 The KubeEdge Authors.

Add mysql to mapper-framework for enhancing pushmethod db. #5376

Add mysql to mapper-framework for enhancing pushmethod db. #5376

Conversation

luomengY commented Jan 19, 2024

wbc6080 commented Feb 26, 2024

luomengY commented Feb 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wbc6080 commented Apr 17, 2024

luomengY commented Apr 17, 2024

wbc6080 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shelley-BaoYue left a comment

Choose a reason for hiding this comment

fisherxu left a comment

Choose a reason for hiding this comment

kubeedge-bot commented Apr 20, 2024