Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(sink): refator es sink to support opensearch #16330

Merged
merged 12 commits into from
Jun 18, 2024
Merged

Conversation

xxhZs
Copy link
Contributor

@xxhZs xxhZs commented Apr 16, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

The interface structure of es and opensearch is exactly the same, and the input data format is exactly the same, but using the interface of es to call opensearch will cause compatibility problems, so we use the same data processing method to call the opensearch interface to support opensearch

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added test labels as necessary. See details.
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

license-eye has totally checked 5013 files.

Valid Invalid Ignored Fixed
2150 4 2859 0
Click to see the invalid file list
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/BulkProcessorAdapter.java
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/ElasticBulkProcessorAdapter.java
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/OpensearchBulkProcessorAdapter.java
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/RestHighLevelClientAdapter.java

@hzxa21 hzxa21 added the user-facing-changes Contains changes that are visible to users label Apr 17, 2024
@neverchanje neverchanje requested a review from hzxa21 April 30, 2024 04:16
@xxhZs xxhZs requested a review from wenym1 May 6, 2024 05:43
src/connector/src/sink/remote.rs Outdated Show resolved Hide resolved
@@ -77,10 +77,11 @@
<commons.text.version>1.10.0</commons.text.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<debezium.version>2.4.2.Final</debezium.version>
<jackson.version>2.13.5</jackson.version>
<jackson.version>2.15.0</jackson.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to bump the version of jackson?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

opensearch api need 2.15.0+

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

license-eye has totally checked 5065 files.

Valid Invalid Ignored Fixed
2164 2 2899 0
Click to see the invalid file list
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/ElasticRestHighLevelClientAdapter.java
  • java/connector-node/risingwave-sink-es-7/src/main/java/com/risingwave/connector/OpensearchRestHighLevelClientAdapter.java

@xxhZs xxhZs force-pushed the xxh/support-opensearch branch from 43b946a to 8230237 Compare May 24, 2024 06:31
fix

fix
@xxhZs xxhZs force-pushed the xxh/support-opensearch branch from 8230237 to e6b07a7 Compare May 24, 2024 06:37
@xxhZs xxhZs requested a review from wenym1 May 24, 2024 06:38
Copy link
Contributor

@wenym1 wenym1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

@xxhZs xxhZs force-pushed the xxh/support-opensearch branch 2 times, most recently from 21b54db to 6c447c2 Compare May 27, 2024 09:09
fix

fix ci

fix ci
@xxhZs xxhZs force-pushed the xxh/support-opensearch branch from 6c447c2 to 5848441 Compare May 27, 2024 09:20
@xxhZs xxhZs requested a review from wenym1 June 6, 2024 08:42
Copy link

gitguardian bot commented Jun 17, 2024

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
9425213 Triggered Generic Password 8d30b94 ci/scripts/e2e-sink-test.sh View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Copy link
Contributor

@wenym1 wenym1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest LGTM

src/connector/src/sink/remote.rs Outdated Show resolved Hide resolved
@xxhZs xxhZs enabled auto-merge June 18, 2024 08:54
@xxhZs xxhZs added the need-cherry-pick-release-1.10 Open a cherry-pick PR to branch release-1.10 after the current PR is merged label Jun 18, 2024
@xxhZs xxhZs added this pull request to the merge queue Jun 18, 2024
Merged via the queue into main with commit 35d3f49 Jun 18, 2024
28 of 30 checks passed
@xxhZs xxhZs deleted the xxh/support-opensearch branch June 18, 2024 09:53
github-merge-queue bot pushed a commit that referenced this pull request Jun 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
need-cherry-pick-release-1.10 Open a cherry-pick PR to branch release-1.10 after the current PR is merged type/feature user-facing-changes Contains changes that are visible to users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants