svn commit: r61191 - in /dev/flink/flink-ml-2.2.0-rc2: ./ apache-flink-ml-2.2.0.tar.gz apache-flink-ml-2.2.0.tar.gz.asc apache-flink-ml-2.2.0.tar.gz.sha512 flink-ml-2.2.0-src.tgz flink-ml-2.2.0-src.tg
Author: lindong Date: Wed Apr 12 05:56:52 2023 New Revision: 61191 Log: Apache Flink ML, version 2.2.0, release candidate 2 Added: dev/flink/flink-ml-2.2.0-rc2/ dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz (with props) dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.asc dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.sha512 dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz (with props) dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.asc dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.sha512 Added: dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz == Binary file - no diff available. Propchange: dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz -- svn:mime-type = application/octet-stream Added: dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.asc == --- dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.asc (added) +++ dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.asc Wed Apr 12 05:56:52 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2RMIACgkQvu1PbLn3 +fQ6o9w//cwFuPnXcRrN8xCYEiJm4oAe7tQHB6jAfYCrFjfRwQClCE1i1nMTjaz5h +AyTVR+pBZi3ZflOwoS0KKHdmht/gGHpqYF/2YQglNXRUuNz/Vxp7PYf1pSQWTBpX ++WDHXSXcgiuTUd/Ifmnu0wPQ2umHAR8JiRLzM0PpzQVNuab1vz/OiGTnCiLCTCgG +vSE0IGz1jrvq9DIdJvMeWMxesHJPtm7FG+8pEGt9uxKnepPK0zzit9GwMOXsklJ1 +s5pdH0SI+5ZX6tAqEBWkvg+ImtSTkjCd20PDla5zQXQap/xkQi1hjNl+zfcLyjIo +9BhiTrWn3bbbHlhl74xdeornxSN/oa0Zso1gagGXDJUAf+Mag8Vv545MdQpGvNeR +Mki9ZMQZJfORskun+LByTc9JRiFPLGwCFU6g1pYMn15yNAWMZW3jsUiIG9ioeF36 +0OhpHdiFnkrW9lBDdUEEVkuvMkk+3mAcIHaDdyJOQY/sHgMbB/0UYc6RLagPYoP4 +8godY/aThZJ7eE9IL+Y5VX+oD/eG94qyHe6+qBvBTOMt3rRYwgl5z9NoCMI72p9W +QW0Ys5W9yEDLa/WaG5grjgCgVKVsCSFaDJRT+nqkC79EYn1YT3h2ehe1unJfSDE9 +noIE1oC24zRK0CzfDz2HxypYXIsPRq6/mpW7uE+zXWAaDopzdfw= +=4ctA +-END PGP SIGNATURE- Added: dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.sha512 == --- dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.sha512 (added) +++ dev/flink/flink-ml-2.2.0-rc2/apache-flink-ml-2.2.0.tar.gz.sha512 Wed Apr 12 05:56:52 2023 @@ -0,0 +1 @@ +138a2278fa95cb5382fa82bac3d27ec0c7e142d03518aeea3d91ab7e3acecfebf67f1a41a60a929be174de20cdcbd73558f2a31a30b2a6edbedb7668050fa8ba apache-flink-ml-2.2.0.tar.gz Added: dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz == Binary file - no diff available. Propchange: dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz -- svn:mime-type = application/octet-stream Added: dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.asc == --- dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.asc (added) +++ dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.asc Wed Apr 12 05:56:52 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2Qu8ACgkQvu1PbLn3 +fQ4jUQ/+IhRqOV3tH7gjJg3M+325b6++rz8PsqsKtWHXPYlLS7q4RAZ2HGqcSD2Q +WONwR/GrLnGj5CFzkAVfi4LsBayI6sGDCxWfc3KU4GS4yW3gDJFC20byrwXYIIhm +UWbi1GqZ/tjT6HU1eeTkZxkzr4WyW7aVyNL91g+LLT89fn7KVvplPWYkvGP9okcu +5SwxNaZvK4X+cWpWjxARMEsTWjOUH8adCNehUJa+oLbWQhsH8s6GrI1vD4KHmnIe +YZ+uEjNPMkZhojFHTi+jEnpA9HvyzyWfN5SEFx5QtNzRY++xj62iG/e+gWF8TPLj +ux1h2Irhh4PW0EG7VKPuEIeWMj7krGx94ggeNuL0xyYWW3m0ka5gIi8KtaSUKz5k +HIlrhJtkvXkqKkQtwo/EOJqNSoVh2JyyZVoYhnQtDtPRqEhO2iTkOAya589kcQov +hTTqbwbSgbZJICI8KsFiYks7MC5ZdKya9y4kViPBpMojeIxMqy8Nx4h/0IxZ9vC1 +3kzKH1ju6gEgjT5cqnHXGPMcOKdjIUO0EafDPlNecbLOs3UKshOJQKBwa0DnMyLx +xXpZPafE+7MpHey5sIv7/d6Ky8mN7oWlogbtyVsEIgB+RzliVVe4XOB98VLRkgZw +wC6T+3MSnt/4QOUP/5BYfGhuB3ik85GQ8V14G02A1vxvN+GopN8= +=ZTay +-END PGP SIGNATURE- Added: dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.sha512 == --- dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.sha512 (added) +++ dev/flink/flink-ml-2.2.0-rc2/flink-ml-2.2.0-src.tgz.sha512 Wed Apr 12 05:56:52 2023 @@ -0,0 +1 @@ +28c60b17c7eeff1452d7de4d6b7f5d21b5a39f35c409538dd3c306d11d24e3cefb07903f13fa01051bea0423694ffb82ab231293fb7eef8048a32d17164afeba flink-ml-2.2.0-src.tgz
[flink-ml] annotated tag release-2.2.0-rc2 updated (4ad12f89 -> 5845cf94)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to annotated tag release-2.2.0-rc2 in repository https://gitbox.apache.org/repos/asf/flink-ml.git *** WARNING: tag release-2.2.0-rc2 was modified! *** from 4ad12f89 (commit) to 5845cf94 (tag) tagging 4ad12f8948a69dd168d1c00732e79d34b7703f21 (commit) replaces release-2.2.0-rc1 by Dong Lin on Wed Apr 12 13:32:40 2023 +0800 - Log - release-2.2.0-rc2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2QngACgkQvu1PbLn3 fQ7tIA//eXYXT2TQFB5xTJ3UqmWTjOacQGH8UUemLvSfeEMwiZZvxLphALdzGjjs 1+5BEJ17a4IxYhHRkWZi+yd/YcbjVXkjueh6pByJozVtZ2GsfYXCGjFE4fZXHqFb s7zqRqTr6oXGTJln4tBf46QlZ9iwiM7Y3WCufz/PZr+MV8cyJFvNlRsAunPKgRX6 Bfd076OgAJdPvW3Bi9dZAJPaLDmiVZ03uMTrCsXMJ9dAEBirozicvOH/OB75BThA oqY45zXBOsZY27hT7gvmKXnd9OwK6ywF/z4BCX8/KacTVFbxNN3hq0YOGtFkhCwt oInLmuxIs9mwgR+vPiii/305liGXl/TG5nPrH8XFX8zpFiTQF+34Q5DgbPQE7kCo tCUoLvTR6JqMBOcQvSDIGrtdrLFvp6jGWiqHXloWIThh34Lyg7oQuVgqhIcgd//l JnFcvRI9XWuTt7cWigRVZ4JgMsV+PbwBHYTqgCIzWgmcj8X41TkNBr7z2+W4rJR9 gDSuU9GEadR7I1uQP2UnsqHQ3ie08/wfUJHl5nww5xfSQQ3BfBbuU9H1xejIqYHz t8qIbusvzNACf8+FBplzkIJ0UVHvZKhMzodsbm2HSStm0oeVoX+enpVvD9gGS2hW fFXwhI/D4er9G5EqllFddUMQn3mTNtf/WztQyYzj+WioDr0mVtc= =fZ8a -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[flink-ml] branch release-2.2 updated: [hotfix] Update pattern matching in test_ml_lib_completeness to work with release branch
This is an automated email from the ASF dual-hosted git repository.
lindong pushed a commit to branch release-2.2
in repository https://gitbox.apache.org/repos/asf/flink-ml.git
The following commit(s) were added to refs/heads/release-2.2 by this push:
new 4ad12f89 [hotfix] Update pattern matching in test_ml_lib_completeness
to work with release branch
4ad12f89 is described below
commit 4ad12f8948a69dd168d1c00732e79d34b7703f21
Author: Dong Lin
AuthorDate: Wed Apr 12 13:13:29 2023 +0800
[hotfix] Update pattern matching in test_ml_lib_completeness to work with
release branch
---
flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
b/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
index 2806e7bd..db59df0b 100644
--- a/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
+++ b/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
@@ -50,7 +50,7 @@ class MLLibTest(PyFlinkMLTestCase):
this_directory, "../../../../flink-ml-lib"))
paths = glob.glob(os.path.join(
-FLINK_ML_LIB_SOURCE_PATH, "target", "flink-ml-lib-*.jar"))[0]
+FLINK_ML_LIB_SOURCE_PATH, "target", "flink-ml-lib-*.jar"))
paths = [path for path in paths if "test" not in path]
if len(paths) != 1:
raise Exception("The number of matched paths " + str(paths) + " is
unexpected.")
[flink-ml] branch release-2.2 updated (96f70749 -> 30938bd7)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to branch release-2.2 in repository https://gitbox.apache.org/repos/asf/flink-ml.git from 96f70749 [hotfix] Update pattern matching in test_ml_lib_completeness to work with release branch add 30938bd7 [hotfix] Update pattern matching in test_ml_lib_completeness to work with release branch No new revisions were added by this update. Summary of changes: flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
[flink-ml] annotated tag release-2.2.0-rc2 updated (30938bd7 -> 4d8d9f90)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to annotated tag release-2.2.0-rc2 in repository https://gitbox.apache.org/repos/asf/flink-ml.git *** WARNING: tag release-2.2.0-rc2 was modified! *** from 30938bd7 (commit) to 4d8d9f90 (tag) tagging 30938bd7a7d88f79f577e7bc7dd3df3d0dd513c1 (commit) replaces release-2.2.0-rc1 by Dong Lin on Wed Apr 12 13:03:29 2023 +0800 - Log - release-2.2.0-rc2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2O6EACgkQvu1PbLn3 fQ44UA/+L4Fg6smAzNGaEvBqqt1xDoh4FpvcnOX4OG3i9U2vb+gZiFs1UBqe43Ge voUNZAXuKZDp2tWT7UYSbvihCWqb6rHlOmZuIQaLcGGS1JJT91oBxqHEO/FA5eLm zqWs/K5QbJRtc40kXxmfMUSkyglRJDYh9YIUg8+hcTBwEb5gGJgWXNYCZiidl6zy KVe6aA6PvYQkW1Ipqnt+zIHbHJZK9mLjFZ4I+5mZubyvhI7UQBHBswfbQq6jApiv RaLuEmLJCHR6Ci9k4Jpt45fcLsqoL7S0jhCEX5sQbZbjRjARE//PwA+4XTv5s8PV xfjsploa9e/aYPxPelH4FCzst/PSC76+hice4yxdV8s38YOIfYsycYCKGpQm3tJF SnoxGDHJRGMyglI8p6ZSZ/JEEPqDyPO2CLgL+Tupqsj014xMqL3mfNJUV+ULf0dS 4E9odxff1sCeL3xI5M0fTpaOsDlH9R9BXJRPjC+xV7WWBgJbe2HheFMrDy6/MNHq fYlhnaOkptWI2mH8Rmy7kriJ8sYV5VLmU8QkmaXQImoneN88fdhcqVdyzIixjFCS 2rVdLjamhf2/2qolcHs9961efWgO2fhEHqP5oLcQiPLDrDs+bChy3sAdjIw0oMwp y5I7TVuQUkhUjnsUktx+oiPl/J6GXpwoTlgxwqF0XbFuyJY6Xg0= =P1ns -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[flink-ml] branch release-2.2 updated: [hotfix] Update pattern matching in test_ml_lib_completeness to work with release branch
This is an automated email from the ASF dual-hosted git repository.
lindong pushed a commit to branch release-2.2
in repository https://gitbox.apache.org/repos/asf/flink-ml.git
The following commit(s) were added to refs/heads/release-2.2 by this push:
new 96f70749 [hotfix] Update pattern matching in test_ml_lib_completeness
to work with release branch
96f70749 is described below
commit 96f707499453d53c58d45e5a0091e32f2c88c98b
Author: Dong Lin
AuthorDate: Wed Apr 12 11:43:43 2023 +0800
[hotfix] Update pattern matching in test_ml_lib_completeness to work with
release branch
---
flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
b/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
index 243c0dbe..7563ff7e 100644
--- a/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
+++ b/flink-ml-python/pyflink/ml/tests/test_ml_lib_completeness.py
@@ -50,7 +50,7 @@ class MLLibTest(PyFlinkMLTestCase):
this_directory, "../../../../flink-ml-lib"))
ml_lib_jar = glob.glob(os.path.join(
-FLINK_ML_LIB_SOURCE_PATH, "target",
"flink-ml-lib-*SNAPSHOT.jar"))[0]
+FLINK_ML_LIB_SOURCE_PATH, "target", "flink-ml-lib-*.jar"))[0]
StageAnalyzer =
get_gateway().jvm.org.apache.flink.ml.util.StageAnalyzer
module_path = 'org.apache.flink.ml.{0}'.format(self.module_name())
[flink-ml] branch release-2.2 updated (b118d9b6 -> c4d628c0)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to branch release-2.2 in repository https://gitbox.apache.org/repos/asf/flink-ml.git from b118d9b6 [release] Update config.toml for release-2.2 add c4d628c0 [release] Update version to 2.2.0 No new revisions were added by this update. Summary of changes: flink-ml-benchmark/pom.xml| 2 +- flink-ml-core/pom.xml | 2 +- flink-ml-dist/pom.xml | 2 +- flink-ml-examples/pom.xml | 2 +- flink-ml-iteration/pom.xml| 2 +- flink-ml-lib/pom.xml | 2 +- flink-ml-python/pom.xml | 2 +- flink-ml-python/pyflink/ml/version.py | 2 +- flink-ml-servable-core/pom.xml| 2 +- flink-ml-servable-lib/pom.xml | 2 +- flink-ml-tests/pom.xml| 2 +- flink-ml-uber/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
[flink-ml] annotated tag release-2.2.0-rc1 updated (c4d628c0 -> e6de3b3b)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to annotated tag release-2.2.0-rc1 in repository https://gitbox.apache.org/repos/asf/flink-ml.git *** WARNING: tag release-2.2.0-rc1 was modified! *** from c4d628c0 (commit) to e6de3b3b (tag) tagging c4d628c0f8e782609e402f17c745695609243496 (commit) replaces release-2.0.0-rc2 by Dong Lin on Wed Apr 12 10:49:32 2023 +0800 - Log - release-2.2.0-rc1 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2HDwACgkQvu1PbLn3 fQ7oJRAAhZPwB0T9AQ2E9ntzhi3n7xkEydHl63vDHSLY2u/gTrVjHJwzBq7WzMTQ T0Zg6/P1Tz1suhdJT/YCkGd0WdIACAi8Zsi7oRbO9m6HKjag+SZwAVMjrFmtf/MH eX3i2Ju92BugFFNI+peJyzeSMWjNEK+X/6TssCrS3v+xHMvysCUYpqorvxV2mvZ3 QHNq3EFZj82at/BuD4c+wVlGVCoBmBdY6Ka7auThItYf8lby3m6dYnrPx9+z0j5z i3MZGdrr7ejhF/dDmSZCMZIyfd58xE4V7wmEeW6F7LRWw6SMmkzBqZL00wzLNnQ4 5SsjKdduvx5BVoDxguVbK+BtzxbS0Jp/zEEQnhdNlzpPpAk3E746MRrSMP00tEHy js4ggNzLwbzwWO+W9CrgNLN9fZfzNcA7RWzPCIoG3yTMewn9PfWPQ9lcTJM/eJtO /lY6wRoHvR2d1tpwTWPB/Bc8EBFRim/hs/zPe6dmAlxh1aOr4D2pGxiU6phIVIjV aG1gGed9kFXHqsmbzJiavNCKbbxhuJ8MsrKjgCoNpH2DpxKDEkaR5/Tzn5nWLaUB Ta8r+aUBlbyQ/5vjUT0HClt8mHocTbGi8Awj7/YwZcs5W8JUio7XnmXyFn4EaccH 8kcbeBL+PzkjZoakV5HSmjC0XGq9xEV0qs0QevL/VQvXveg2i2Y= =iGfO -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[flink-ml] annotated tag release-2.2.0 updated (c4d628c0 -> a252c0b3)
This is an automated email from the ASF dual-hosted git repository. lindong pushed a change to annotated tag release-2.2.0 in repository https://gitbox.apache.org/repos/asf/flink-ml.git *** WARNING: tag release-2.2.0 was modified! *** from c4d628c0 (commit) to a252c0b3 (tag) tagging c4d628c0f8e782609e402f17c745695609243496 (commit) replaces release-2.0.0-rc2 by Dong Lin on Wed Apr 12 10:37:29 2023 +0800 - Log - Release Flink ML 2.2.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEr6zbCebw/yjJPWS8vu1PbLn3fQ4FAmQ2GWkACgkQvu1PbLn3 fQ7AYA/+JxqveD/4zzuXE9i70j24DkM6t/p60Uh1tfwEbsqCwCp5Z+l9s5Z4GVIl 9CyLo2Zy9tyG49KTpuR55MJNJCkxB88/FIX9RETH0CRbI4g0LUzG3mUEh1vk05xh eLdc8h3a0Rti99ZLaHLWYAVfNo5W/NK2snp4lsoxjelOGK39mAQ19TyecO2oEaah JOV1nPc72fyFb0BQVicAX+cDct7YuOTHCj2SXPARcVzh5bGBe/SYgARDDyDLq1+L UHNQTfYk/ORKtuohp06YBAYDbJGYjuolNbomjmhuI5ehroy7ciFcOqmKxe/K2ABr xe9P825nGP+pyt8rbGxEy1/pek070Kca0TiV+vqgJTG36N7KZL1gXfngNmUzTi+a /qlGrW5hQD365FdF/rX6s3X3z18uZz1KW53J5rC76ed5Ccanh2sFABdoD6tU2tcl Jev2xvL8Y+NmdZi71GeVB346CJM1FoNf8gz7qQizMml6MJN02CnXRa2XpD6ovBVC Xw1XuLPkBoYoDwoRh8MirItXpR4HoxvUL0Y4h5GizVD9Y69gOv0p/cnLpAJk8N48 9FnGBP1mqRi2zCS6gy4Z06hye8T/go7dHuUdJpMPAe5ZOKzFfa0y6t5Gs2niPLJK AM5VzNfYHp89Ec0XIkZCoyIVkrI0F333qS7jUeH901cu0hVyuiI= =94gU -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[flink-connector-kafka] branch main updated: [FLINK-31049] [flink-connector-kafka] Add support for Kafka record headers to KafkaSink
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-kafka.git
The following commit(s) were added to refs/heads/main by this push:
new a7785630 [FLINK-31049] [flink-connector-kafka] Add support for Kafka
record headers to KafkaSink
a7785630 is described below
commit a7785630e714af303b224c38d9a6caa89a551265
Author: Alex Gout
AuthorDate: Mon Mar 27 10:07:33 2023 -0400
[FLINK-31049] [flink-connector-kafka] Add support for Kafka record headers
to KafkaSink
Co-Authored-By: Tzu-Li (Gordon) Tai
This closes #18.
---
.../flink/connector/kafka/sink/HeaderProvider.java | 32 +++
.../KafkaRecordSerializationSchemaBuilder.java | 48 ++
.../KafkaRecordSerializationSchemaBuilderTest.java | 24 +++
3 files changed, 96 insertions(+), 8 deletions(-)
diff --git
a/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/HeaderProvider.java
b/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/HeaderProvider.java
new file mode 100644
index ..2c0c080b
--- /dev/null
+++
b/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/HeaderProvider.java
@@ -0,0 +1,32 @@
+/*
+ * 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.flink.connector.kafka.sink;
+
+import org.apache.flink.annotation.PublicEvolving;
+
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+
+import java.io.Serializable;
+
+/** Creates an {@link Iterable} of {@link Header}s from the input element. */
+@PublicEvolving
+public interface HeaderProvider extends Serializable {
+Headers getHeaders(IN input);
+}
diff --git
a/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/KafkaRecordSerializationSchemaBuilder.java
b/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/KafkaRecordSerializationSchemaBuilder.java
index 59864a37..1cc92201 100644
---
a/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/KafkaRecordSerializationSchemaBuilder.java
+++
b/flink-connector-kafka/src/main/java/org/apache/flink/connector/kafka/sink/KafkaRecordSerializationSchemaBuilder.java
@@ -84,6 +84,7 @@ public class KafkaRecordSerializationSchemaBuilder {
@Nullable private SerializationSchema valueSerializationSchema;
@Nullable private FlinkKafkaPartitioner partitioner;
@Nullable private SerializationSchema keySerializationSchema;
+@Nullable private HeaderProvider headerProvider;
/**
* Sets a custom partitioner determining the target partition of the
target topic.
@@ -190,6 +191,20 @@ public class KafkaRecordSerializationSchemaBuilder {
return self;
}
+/**
+ * Sets a {@link HeaderProvider} which is used to add headers to the
{@link ProducerRecord} for
+ * the current element.
+ *
+ * @param headerProvider
+ * @return {@code this}
+ */
+public KafkaRecordSerializationSchemaBuilder
setHeaderProvider(
+HeaderProvider headerProvider) {
+KafkaRecordSerializationSchemaBuilder self = self();
+self.headerProvider = checkNotNull(headerProvider);
+return self;
+}
+
@SuppressWarnings("unchecked")
private KafkaRecordSerializationSchemaBuilder self() {
return (KafkaRecordSerializationSchemaBuilder) this;
@@ -239,7 +254,11 @@ public class KafkaRecordSerializationSchemaBuilder {
checkState(valueSerializationSchema != null, "No value serializer is
configured.");
checkState(topicSelector != null, "No topic selector is configured.");
return new KafkaRecordSerializationSchemaWrapper<>(
-topicSelector, valueSerializationSchema,
keySerializationSchema, partitioner);
+topicSelector,
+valueSerializationSchema,
+keySerializationSchema,
+partitioner,
+headerProvider);
}
private void checkValueSerializerNotSet() {
@@ -278,16 +297,19 @@ public class KafkaRecordSerializationSchemaBuilder {
[flink-connector-elasticsearch] branch main updated: [FLINK-31696] ElasticSearch nightly CI failure
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/flink-connector-elasticsearch.git
The following commit(s) were added to refs/heads/main by this push:
new 85f0f40 [FLINK-31696] ElasticSearch nightly CI failure
85f0f40 is described below
commit 85f0f4057a6b241a7d9b0ae2996ac1147e0e2428
Author: Andriy Redko
AuthorDate: Tue Apr 11 12:36:09 2023 -0400
[FLINK-31696] ElasticSearch nightly CI failure
Signed-off-by: Andriy Redko
---
.github/workflows/push_pr.yml | 5 -
.github/workflows/weekly.yml| 2 +-
.../org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java | 6 ++
.../elasticsearch/table/Elasticsearch6DynamicSinkITCase.java| 5 +
.../elasticsearch/table/Elasticsearch6DynamicSinkTest.java | 5 +
.../elasticsearch/table/Elasticsearch7DynamicSinkITCase.java| 5 +
.../elasticsearch/table/Elasticsearch7DynamicSinkTest.java | 5 +
7 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 335f108..b30b09f 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -23,6 +23,9 @@ concurrency:
cancel-in-progress: true
jobs:
compile_and_test:
+strategy:
+ matrix:
+flink: [1.17.0, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: 1.17.0
+ flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index f4645db..b4daceb 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -26,7 +26,7 @@ jobs:
if: github.repository_owner == 'apache'
strategy:
matrix:
-flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT, 1.18-SNAPSHOT]
+flink: [1.17-SNAPSHOT, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
diff --git
a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
index 7b856c2..f7126b7 100644
---
a/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
+++
b/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/ElasticsearchUtil.java
@@ -29,6 +29,8 @@ import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.elasticsearch.ElasticsearchContainer;
import org.testcontainers.utility.DockerImageName;
+import java.util.Optional;
+
/** Collection of utility methods for Elasticsearch tests. */
@Internal
public class ElasticsearchUtil {
@@ -88,5 +90,9 @@ public class ElasticsearchUtil {
DataType consumedDataType) {
return null;
}
+
+public Optional getTargetColumns() {
+return Optional.empty();
+}
}
}
diff --git
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
index 32baf0a..f1c8f7e 100644
---
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
+++
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
@@ -61,6 +61,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Optional;
import static
org.apache.flink.streaming.connectors.elasticsearch.table.TestContext.context;
import static org.apache.flink.table.api.Expressions.row;
@@ -402,5 +403,9 @@ public class Elasticsearch6DynamicSinkITCase extends
TestLogger {
DataType consumedDataType) {
return null;
}
+
+public Optional getTargetColumns() {
+return Optional.empty();
+}
}
}
diff --git
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
b/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
index f8ab0ab..e00f6b3 100644
---
a/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
+++
[flink-connector-opensearch] branch main updated: [hotfix] Downgrade to Flink 1.17.0
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git
The following commit(s) were added to refs/heads/main by this push:
new 489d00b [hotfix] Downgrade to Flink 1.17.0
489d00b is described below
commit 489d00b3ed19d9c2c8f8867194719d90d985a9b0
Author: Martijn Visser
AuthorDate: Tue Apr 11 17:41:07 2023 +0200
[hotfix] Downgrade to Flink 1.17.0
---
.github/workflows/push_pr.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 6c2dc05..b30b09f 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -25,7 +25,7 @@ jobs:
compile_and_test:
strategy:
matrix:
-flink: [1.17.1, 1.18-SNAPSHOT]
+flink: [1.17.0, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
[flink-connector-opensearch] branch main updated: [hotfix] Update to Flink 1.17.1
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git
The following commit(s) were added to refs/heads/main by this push:
new 74f32f8 [hotfix] Update to Flink 1.17.1
74f32f8 is described below
commit 74f32f827c675180d78cb3f94d4a0171c3ce496b
Author: Martijn Visser
AuthorDate: Tue Apr 11 17:38:23 2023 +0200
[hotfix] Update to Flink 1.17.1
---
.github/workflows/push_pr.yml | 5 -
.github/workflows/release.yml | 31 ---
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 335f108..6c2dc05 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -23,6 +23,9 @@ concurrency:
cancel-in-progress: true
jobs:
compile_and_test:
+strategy:
+ matrix:
+flink: [1.17.1, 1.18-SNAPSHOT]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
- flink_version: 1.17.0
+ flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 95d583d..000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,31 +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.
-
-
-name: Release Build
-on:
- workflow_dispatch:
-jobs:
- compile_and_test:
-if: github.repository_owner == 'apache'
-strategy:
- matrix:
-flink: [1.17.0]
-uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
-with:
- flink_version: ${{ matrix.flink }}
- run_dependency_convergence: false
[flink-connector-opensearch] branch main updated (4db50a3 -> 7a31d7b)
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git from 4db50a3 [hotfix] Add opensearch.yml to enable flink to find the data add 7a31d7b [hotfix] Fix nightly build for 1.18-SNAPSHOT, drop 1.16-SNAPSHOT from the nightly matrix No new revisions were added by this update. Summary of changes: .github/workflows/release.yml| 2 +- .github/workflows/weekly.yml | 2 +- .../java/org/apache/flink/connector/opensearch/OpensearchUtil.java | 5 + pom.xml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
[flink-connector-opensearch] branch main updated: [hotfix] Add opensearch.yml to enable flink to find the data
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git The following commit(s) were added to refs/heads/main by this push: new 4db50a3 [hotfix] Add opensearch.yml to enable flink to find the data 4db50a3 is described below commit 4db50a37452b5f1c6cf5a0f03be900f12acea8c4 Author: Weijie Guo AuthorDate: Tue Apr 11 02:10:29 2023 +0800 [hotfix] Add opensearch.yml to enable flink to find the data --- docs/data/opensearch.yml | 21 + 1 file changed, 21 insertions(+) diff --git a/docs/data/opensearch.yml b/docs/data/opensearch.yml new file mode 100644 index 000..f5629bf --- /dev/null +++ b/docs/data/opensearch.yml @@ -0,0 +1,21 @@ + +# 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. + + +variants: + - maven: flink-connector-opensearch +sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-opensearch/$full_version/flink-sql-connector-opensearch-$full_version.jar
[flink-connector-opensearch] branch v1.0 updated: [hotfix] Add opensearch.yml to enable flink to find the data
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch v1.0 in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git The following commit(s) were added to refs/heads/v1.0 by this push: new 75279fc [hotfix] Add opensearch.yml to enable flink to find the data 75279fc is described below commit 75279fcc545d437931679b0f8d755c076a8b2a65 Author: Weijie Guo AuthorDate: Tue Apr 11 02:10:29 2023 +0800 [hotfix] Add opensearch.yml to enable flink to find the data --- docs/data/opensearch.yml | 21 + 1 file changed, 21 insertions(+) diff --git a/docs/data/opensearch.yml b/docs/data/opensearch.yml new file mode 100644 index 000..f5629bf --- /dev/null +++ b/docs/data/opensearch.yml @@ -0,0 +1,21 @@ + +# 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. + + +variants: + - maven: flink-connector-opensearch +sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-sql-connector-opensearch/$full_version/flink-sql-connector-opensearch-$full_version.jar
[flink-connector-opensearch] branch main updated (f1ebea6 -> 7cb07f4)
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git from f1ebea6 [hotfix] Update flink, flink-shaded, archunit (#14) add 7cb07f4 Update version to 2.0-SNAPSHOT No new revisions were added by this update. Summary of changes: flink-connector-opensearch-e2e-tests/pom.xml | 2 +- flink-connector-opensearch/pom.xml | 2 +- flink-sql-connector-opensearch/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
[flink-connector-opensearch] branch v1.0 created (now d40b74d)
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a change to branch v1.0 in repository https://gitbox.apache.org/repos/asf/flink-connector-opensearch.git at d40b74d [hotfix] Allow manual run of nightly builds No new revisions were added by this update.
[flink] branch release-1.17 updated: [FLINK-31738] Prevent name clash in generated clients
This is an automated email from the ASF dual-hosted git repository.
dmvk pushed a commit to branch release-1.17
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.17 by this push:
new e026cb58e17 [FLINK-31738] Prevent name clash in generated clients
e026cb58e17 is described below
commit e026cb58e1771f21cba5b5dfb4950ef004f6a261
Author: Chesnay Schepler
AuthorDate: Wed Apr 5 16:41:17 2023 +0200
[FLINK-31738] Prevent name clash in generated clients
---
docs/static/generated/rest_v1_dispatcher.yml | 14 +++---
.../rest/messages/FlameGraphTypeQueryParameter.java| 3 +++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/docs/static/generated/rest_v1_dispatcher.yml
b/docs/static/generated/rest_v1_dispatcher.yml
index 87f46e93836..d02d40d6937 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -1068,7 +1068,7 @@ paths:
required: false
style: form
schema:
- $ref: '#/components/schemas/Type'
+ $ref: '#/components/schemas/ThreadStates'
- name: subtaskindex
in: query
description: Positive integer value that identifies a subtask.
@@ -3233,6 +3233,12 @@ components:
type: string
threadName:
type: string
+ThreadStates:
+ type: string
+ enum:
+ - FULL
+ - ON_CPU
+ - OFF_CPU
TriggerId:
pattern: "[0-9a-f]{32}"
type: string
@@ -3241,12 +3247,6 @@ components:
properties:
request-id:
$ref: '#/components/schemas/TriggerId'
-Type:
- type: string
- enum:
- - FULL
- - ON_CPU
- - OFF_CPU
UploadStatus:
type: string
enum:
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
index a0625394469..6e7aba5b358 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
@@ -18,6 +18,8 @@
package org.apache.flink.runtime.rest.messages;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import java.util.Arrays;
/** Flame Graph type query parameter. */
@@ -48,6 +50,7 @@ public class FlameGraphTypeQueryParameter
}
/** Flame Graph type. */
+@Schema(name = "ThreadStates")
public enum Type {
/** Type of the Flame Graph that includes threads in all possible
states. */
FULL,
[flink-connector-cassandra] 01/02: [FLINK-31722] remove unneeded flink-shaded-force-shading dependency
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch v3.0
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit 4ff4bf37b6b4213e7063faa3d7874113a60c5ec4
Author: Etienne Chauchot
AuthorDate: Thu Apr 6 10:14:23 2023 +0200
[FLINK-31722] remove unneeded flink-shaded-force-shading dependency
---
flink-connector-cassandra/pom.xml | 6 --
1 file changed, 6 deletions(-)
diff --git a/flink-connector-cassandra/pom.xml
b/flink-connector-cassandra/pom.xml
index 45f05cb..aea5308 100644
--- a/flink-connector-cassandra/pom.xml
+++ b/flink-connector-cassandra/pom.xml
@@ -37,7 +37,6 @@ under the License.
- 15.0
2.12
2.12.7
1.7.36
@@ -56,11 +55,6 @@ under the License.
-
- org.apache.flink
- flink-shaded-force-shading
- ${flink.shaded.version}
-
[flink-connector-cassandra] 02/02: [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava.
This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch v3.0 in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git commit 25de5b58107c5211e7a5100a3c6b0e2cc352da67 Author: Etienne Chauchot AuthorDate: Thu Apr 6 13:00:30 2023 +0200 [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava. --- flink-connector-cassandra/pom.xml | 1 + .../CassandraColumnarOutputFormatBase.java | 3 +- .../cassandra/CassandraInputFormatBase.java| 3 +- tools/maven/checkstyle.xml | 4 --- tools/maven/suppressions.xml | 38 +- 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml index aea5308..0373ace 100644 --- a/flink-connector-cassandra/pom.xml +++ b/flink-connector-cassandra/pom.xml @@ -153,6 +153,7 @@ under the License. + com.google.guava guava diff --git a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java index cb2346e..def3015 100644 --- a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java +++ b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java @@ -20,11 +20,10 @@ package org.apache.flink.batch.connectors.cassandra; import org.apache.flink.streaming.connectors.cassandra.ClusterBuilder; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.base.Strings; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; +import com.google.common.base.Strings; import java.time.Duration; import java.util.concurrent.CompletionStage; diff --git a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java index 5b09649..ccd4b9e 100644 --- a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java +++ b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java @@ -28,10 +28,9 @@ import org.apache.flink.core.io.InputSplitAssigner; import org.apache.flink.streaming.connectors.cassandra.ClusterBuilder; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.base.Strings; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml index 3fc4711..576985f 100644 --- a/tools/maven/checkstyle.xml +++ b/tools/maven/checkstyle.xml @@ -224,10 +224,6 @@ This file is based on the checkstyle file of Apache Beam. - - - - + ~ 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. + --> http://www.puppycrawl.com/dtds/suppressions_1_1.dtd;> - - -
[flink-connector-cassandra] branch v3.0 updated (9d930f5 -> 25de5b5)
This is an automated email from the ASF dual-hosted git repository. chesnay pushed a change to branch v3.0 in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git from 9d930f5 [FLINK-31739][ci] Reuse ci.yml in flink-connector-shared-utils. (#6) new 4ff4bf3 [FLINK-31722] remove unneeded flink-shaded-force-shading dependency new 25de5b5 [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: flink-connector-cassandra/pom.xml | 7 +--- .../CassandraColumnarOutputFormatBase.java | 3 +- .../cassandra/CassandraInputFormatBase.java| 3 +- tools/maven/checkstyle.xml | 4 --- tools/maven/suppressions.xml | 38 +- 5 files changed, 19 insertions(+), 36 deletions(-)
[flink-connector-cassandra] branch main updated (764fa31 -> a63379d)
This is an automated email from the ASF dual-hosted git repository. chesnay pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git from 764fa31 [FLINK-31698][Connector/Cassandra] Set `japicmp.referenceVersion` to latest released version of the Cassandra connector new d2b569c [FLINK-31722] remove unneeded flink-shaded-force-shading dependency new a63379d [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: flink-connector-cassandra/pom.xml | 7 +--- .../CassandraColumnarOutputFormatBase.java | 3 +- .../cassandra/CassandraInputFormatBase.java| 3 +- .../CassandraEnumeratorStateSerializerTest.java| 3 +- tools/maven/checkstyle.xml | 4 --- tools/maven/suppressions.xml | 38 +- 6 files changed, 20 insertions(+), 38 deletions(-)
[flink-connector-cassandra] 01/02: [FLINK-31722] remove unneeded flink-shaded-force-shading dependency
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git
commit d2b569cdfdc3f6898d783e5bdfa562a5115ccfae
Author: Etienne Chauchot
AuthorDate: Thu Apr 6 10:14:23 2023 +0200
[FLINK-31722] remove unneeded flink-shaded-force-shading dependency
---
flink-connector-cassandra/pom.xml | 6 --
1 file changed, 6 deletions(-)
diff --git a/flink-connector-cassandra/pom.xml
b/flink-connector-cassandra/pom.xml
index 04c5e19..4567616 100644
--- a/flink-connector-cassandra/pom.xml
+++ b/flink-connector-cassandra/pom.xml
@@ -37,7 +37,6 @@ under the License.
- 16.1
2.12
2.12.7
1.7.36
@@ -56,11 +55,6 @@ under the License.
-
- org.apache.flink
- flink-shaded-force-shading
- ${flink.shaded.version}
-
[flink-connector-cassandra] 02/02: [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava.
This is an automated email from the ASF dual-hosted git repository. chesnay pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-connector-cassandra.git commit a63379d3a439af30dec3cf0e4ef5e36efbfe7e7b Author: Etienne Chauchot AuthorDate: Thu Apr 6 13:00:30 2023 +0200 [FLINK-31722] use cassandra driver provided guava as it already surfaces in the cassandra driver API. shade provided guava. --- flink-connector-cassandra/pom.xml | 1 + .../CassandraColumnarOutputFormatBase.java | 3 +- .../cassandra/CassandraInputFormatBase.java| 3 +- .../CassandraEnumeratorStateSerializerTest.java| 3 +- tools/maven/checkstyle.xml | 4 --- tools/maven/suppressions.xml | 38 +- 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/flink-connector-cassandra/pom.xml b/flink-connector-cassandra/pom.xml index 4567616..5d78331 100644 --- a/flink-connector-cassandra/pom.xml +++ b/flink-connector-cassandra/pom.xml @@ -160,6 +160,7 @@ under the License. + com.google.guava guava diff --git a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java index cb2346e..def3015 100644 --- a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java +++ b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraColumnarOutputFormatBase.java @@ -20,11 +20,10 @@ package org.apache.flink.batch.connectors.cassandra; import org.apache.flink.streaming.connectors.cassandra.ClusterBuilder; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.base.Strings; - import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; +import com.google.common.base.Strings; import java.time.Duration; import java.util.concurrent.CompletionStage; diff --git a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java index 5b09649..ccd4b9e 100644 --- a/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java +++ b/flink-connector-cassandra/src/main/java/org/apache/flink/batch/connectors/cassandra/CassandraInputFormatBase.java @@ -28,10 +28,9 @@ import org.apache.flink.core.io.InputSplitAssigner; import org.apache.flink.streaming.connectors.cassandra.ClusterBuilder; import org.apache.flink.util.Preconditions; -import org.apache.flink.shaded.guava30.com.google.common.base.Strings; - import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; +import com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flink-connector-cassandra/src/test/java/org/apache/flink/connector/cassandra/source/enumerator/CassandraEnumeratorStateSerializerTest.java b/flink-connector-cassandra/src/test/java/org/apache/flink/connector/cassandra/source/enumerator/CassandraEnumeratorStateSerializerTest.java index 0a4a3ec..8e472b9 100644 --- a/flink-connector-cassandra/src/test/java/org/apache/flink/connector/cassandra/source/enumerator/CassandraEnumeratorStateSerializerTest.java +++ b/flink-connector-cassandra/src/test/java/org/apache/flink/connector/cassandra/source/enumerator/CassandraEnumeratorStateSerializerTest.java @@ -20,8 +20,7 @@ package org.apache.flink.connector.cassandra.source.enumerator; import org.apache.flink.connector.cassandra.source.split.CassandraSplit; -import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableList; - +import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; import java.math.BigInteger; diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml index 3fc4711..576985f 100644 --- a/tools/maven/checkstyle.xml +++ b/tools/maven/checkstyle.xml @@ -224,10 +224,6 @@ This file is based on the checkstyle file of Apache Beam. - - - - + ~ 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
[flink] branch master updated: [FLINK-31170][Docs] The spelling error of the document word causes sql to fail to execute. This closes #22204
This is an automated email from the ASF dual-hosted git repository. martijnvisser pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git The following commit(s) were added to refs/heads/master by this push: new a5372e0c92c [FLINK-31170][Docs] The spelling error of the document word causes sql to fail to execute. This closes #22204 a5372e0c92c is described below commit a5372e0c92c7a0f465beba5e5204b07769cd92e6 Author: BoYiZhang AuthorDate: Tue Apr 11 16:05:15 2023 +0800 [FLINK-31170][Docs] The spelling error of the document word causes sql to fail to execute. This closes #22204 --- docs/content.zh/docs/dev/table/sql/create.md | 2 +- docs/content/docs/dev/table/sql/create.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content.zh/docs/dev/table/sql/create.md b/docs/content.zh/docs/dev/table/sql/create.md index 73bfbf1eea1..ca87efd6cbb 100644 --- a/docs/content.zh/docs/dev/table/sql/create.md +++ b/docs/content.zh/docs/dev/table/sql/create.md @@ -317,7 +317,7 @@ CREATE TABLE MyTable ( `user_id` BIGINT, `price` DOUBLE, `quantity` DOUBLE, - `cost` AS price * quanitity, -- evaluate expression and supply the result to queries + `cost` AS price * quantity -- evaluate expression and supply the result to queries ) WITH ( 'connector' = 'kafka' ... diff --git a/docs/content/docs/dev/table/sql/create.md b/docs/content/docs/dev/table/sql/create.md index 69d3dd24f67..2cff682b5ba 100644 --- a/docs/content/docs/dev/table/sql/create.md +++ b/docs/content/docs/dev/table/sql/create.md @@ -316,7 +316,7 @@ CREATE TABLE MyTable ( `user_id` BIGINT, `price` DOUBLE, `quantity` DOUBLE, - `cost` AS price * quanitity, -- evaluate expression and supply the result to queries + `cost` AS price * quantity -- evaluate expression and supply the result to queries ) WITH ( 'connector' = 'kafka' ...
[flink] branch master updated: [FLINK-31738] Prevent name clash in generated clients
This is an automated email from the ASF dual-hosted git repository.
dmvk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 4f15da77dcb [FLINK-31738] Prevent name clash in generated clients
4f15da77dcb is described below
commit 4f15da77dcb7d83e211eb65f24e1b49cb46618a2
Author: Chesnay Schepler
AuthorDate: Wed Apr 5 16:41:17 2023 +0200
[FLINK-31738] Prevent name clash in generated clients
---
docs/static/generated/rest_v1_dispatcher.yml | 14 +++---
.../rest/messages/FlameGraphTypeQueryParameter.java| 3 +++
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/docs/static/generated/rest_v1_dispatcher.yml
b/docs/static/generated/rest_v1_dispatcher.yml
index 7b0a1fac3cc..2e8d49145a2 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -1104,7 +1104,7 @@ paths:
required: false
style: form
schema:
- $ref: '#/components/schemas/Type'
+ $ref: '#/components/schemas/ThreadStates'
- name: subtaskindex
in: query
description: Positive integer value that identifies a subtask.
@@ -3287,6 +3287,12 @@ components:
type: string
threadName:
type: string
+ThreadStates:
+ type: string
+ enum:
+ - FULL
+ - ON_CPU
+ - OFF_CPU
TriggerId:
pattern: "[0-9a-f]{32}"
type: string
@@ -3295,12 +3301,6 @@ components:
properties:
request-id:
$ref: '#/components/schemas/TriggerId'
-Type:
- type: string
- enum:
- - FULL
- - ON_CPU
- - OFF_CPU
UploadStatus:
type: string
enum:
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
index a0625394469..6e7aba5b358 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
@@ -18,6 +18,8 @@
package org.apache.flink.runtime.rest.messages;
+import io.swagger.v3.oas.annotations.media.Schema;
+
import java.util.Arrays;
/** Flame Graph type query parameter. */
@@ -48,6 +50,7 @@ public class FlameGraphTypeQueryParameter
}
/** Flame Graph type. */
+@Schema(name = "ThreadStates")
public enum Type {
/** Type of the Flame Graph that includes threads in all possible
states. */
FULL,
[flink] branch master updated: [FLINK-31510][yarn] Replace deprecated getMemory by getMemorySize
This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 0c4db2dd577 [FLINK-31510][yarn] Replace deprecated getMemory by
getMemorySize
0c4db2dd577 is described below
commit 0c4db2dd577fdfca1a12c115948bf67931d0bcde
Author: slfan1989
AuthorDate: Sun Apr 9 08:54:13 2023 +0800
[FLINK-31510][yarn] Replace deprecated getMemory by getMemorySize
This closes #22207
---
...rocessSpecContainerResourcePriorityAdapter.java | 2 +-
.../apache/flink/yarn/YarnClusterDescriptor.java | 34 +++---
...ssSpecContainerResourcePriorityAdapterTest.java | 4 +--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/flink-yarn/src/main/java/org/apache/flink/yarn/TaskExecutorProcessSpecContainerResourcePriorityAdapter.java
b/flink-yarn/src/main/java/org/apache/flink/yarn/TaskExecutorProcessSpecContainerResourcePriorityAdapter.java
index 1fb1bc2b421..bfe4da71e45 100644
---
a/flink-yarn/src/main/java/org/apache/flink/yarn/TaskExecutorProcessSpecContainerResourcePriorityAdapter.java
+++
b/flink-yarn/src/main/java/org/apache/flink/yarn/TaskExecutorProcessSpecContainerResourcePriorityAdapter.java
@@ -123,7 +123,7 @@ public class
TaskExecutorProcessSpecContainerResourcePriorityAdapter {
taskExecutorProcessSpec.getTotalProcessMemorySize().getMebiBytes(),
taskExecutorProcessSpec.getCpuCores().getValue().intValue());
-if (resource.getMemory() > maxContainerResource.getMemory()
+if (resource.getMemorySize() > maxContainerResource.getMemorySize()
|| resource.getVirtualCores() >
maxContainerResource.getVirtualCores()) {
LOG.warn(
"Requested container resource ({}) exceeds the max
limitation of the Yarn cluster ({}). Will not allocate resource.",
diff --git
a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
index 965c608e38d..c2d830f9c3b 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java
@@ -672,22 +672,22 @@ public class YarnClusterDescriptor implements
ClusterDescriptor {
final String note =
"Please check the 'yarn.scheduler.maximum-allocation-mb' and
the 'yarn.nodemanager.resource.memory-mb' configuration values\n";
-if (jobManagerMemoryMb > maximumResourceCapability.getMemory()) {
+if (jobManagerMemoryMb > maximumResourceCapability.getMemorySize()) {
throw new YarnDeploymentException(
"The cluster does not have the requested resources for the
JobManager available!\n"
+ "Maximum Memory: "
-+ maximumResourceCapability.getMemory()
++ maximumResourceCapability.getMemorySize()
+ "MB Requested: "
+ jobManagerMemoryMb
+ "MB. "
+ note);
}
-if (taskManagerMemoryMb > maximumResourceCapability.getMemory()) {
+if (taskManagerMemoryMb > maximumResourceCapability.getMemorySize()) {
throw new YarnDeploymentException(
"The cluster does not have the requested resources for the
TaskManagers available!\n"
+ "Maximum Memory: "
-+ maximumResourceCapability.getMemory()
++ maximumResourceCapability.getMemorySize()
+ " Requested: "
+ taskManagerMemoryMb
+ "MB. "
@@ -1196,7 +1196,7 @@ public class YarnClusterDescriptor implements
ClusterDescriptor {
// Set up resource type requirements for ApplicationMaster
Resource capability = Records.newRecord(Resource.class);
-capability.setMemory(clusterSpecification.getMasterMemoryMB());
+capability.setMemorySize(clusterSpecification.getMasterMemoryMB());
capability.setVirtualCores(
flinkConfiguration.getInteger(YarnConfigOptions.APP_MASTER_VCORES));
@@ -1390,12 +1390,12 @@ public class YarnClusterDescriptor implements
ClusterDescriptor {
}
private static class ClusterResourceDescription {
-public final int totalFreeMemory;
-public final int containerLimit;
-public final int[] nodeManagersFree;
+public final long totalFreeMemory;
+public final long containerLimit;
+public final long[] nodeManagersFree;
public ClusterResourceDescription(
-int totalFreeMemory, int containerLimit, int[]
