forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-10269] [connectors] Fix Elasticsearch 6 UpdateRequest binary i…
…ncompatibility This commit fixes the binary incompatibility for UpdateRequests in Elasticsearch. This is due to a binary compatibility issue between the base module (which is compiled against a very old ES version and the current Elasticsearch version). It lets the API call bridge also provide the RequestIndexer version-specific. This closes apache#6682.
- Loading branch information
Showing
10 changed files
with
319 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...pache/flink/streaming/connectors/elasticsearch/PreElasticsearch6BulkProcessorIndexer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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:https://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.streaming.connectors.elasticsearch; | ||
|
|
||
| import org.apache.flink.annotation.Internal; | ||
|
|
||
| import org.elasticsearch.action.ActionRequest; | ||
| import org.elasticsearch.action.bulk.BulkProcessor; | ||
| import org.elasticsearch.action.delete.DeleteRequest; | ||
| import org.elasticsearch.action.index.IndexRequest; | ||
| import org.elasticsearch.action.update.UpdateRequest; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicLong; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** | ||
| * Implementation of a {@link RequestIndexer}, using a {@link BulkProcessor}. | ||
| * {@link ActionRequest ActionRequests} will be buffered before sending a bulk request to the Elasticsearch cluster. | ||
| * | ||
| * @deprecated This class is not binary compatible with newer Elasticsearch 6+ versions | ||
| * (i.e. the {@link #add(UpdateRequest...)} ). However, this module is currently | ||
| * compiled against a very old Elasticsearch version. | ||
| */ | ||
| @Deprecated | ||
| @Internal | ||
| class PreElasticsearch6BulkProcessorIndexer implements RequestIndexer { | ||
|
|
||
| private final BulkProcessor bulkProcessor; | ||
| private final boolean flushOnCheckpoint; | ||
| private final AtomicLong numPendingRequestsRef; | ||
|
|
||
| PreElasticsearch6BulkProcessorIndexer(BulkProcessor bulkProcessor, boolean flushOnCheckpoint, AtomicLong numPendingRequestsRef) { | ||
| this.bulkProcessor = checkNotNull(bulkProcessor); | ||
| this.flushOnCheckpoint = flushOnCheckpoint; | ||
| this.numPendingRequestsRef = checkNotNull(numPendingRequestsRef); | ||
| } | ||
|
|
||
| @Override | ||
| public void add(DeleteRequest... deleteRequests) { | ||
| for (DeleteRequest deleteRequest : deleteRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(deleteRequest); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void add(IndexRequest... indexRequests) { | ||
| for (IndexRequest indexRequest : indexRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(indexRequest); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void add(UpdateRequest... updateRequests) { | ||
| for (UpdateRequest updateRequest : updateRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(updateRequest); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
.../apache/flink/streaming/connectors/elasticsearch6/Elasticsearch6BulkProcessorIndexer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * 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:https://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.streaming.connectors.elasticsearch6; | ||
|
|
||
| import org.apache.flink.annotation.Internal; | ||
| import org.apache.flink.streaming.connectors.elasticsearch.RequestIndexer; | ||
|
|
||
| import org.elasticsearch.action.ActionRequest; | ||
| import org.elasticsearch.action.bulk.BulkProcessor; | ||
| import org.elasticsearch.action.delete.DeleteRequest; | ||
| import org.elasticsearch.action.index.IndexRequest; | ||
| import org.elasticsearch.action.update.UpdateRequest; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicLong; | ||
|
|
||
| import static org.apache.flink.util.Preconditions.checkNotNull; | ||
|
|
||
| /** | ||
| * Implementation of a {@link RequestIndexer}, using a {@link BulkProcessor}. | ||
| * {@link ActionRequest ActionRequests} will be buffered before sending a bulk request to the Elasticsearch cluster. | ||
| * | ||
| * <p>Note: This class is binary compatible to Elasticsearch 6. | ||
| */ | ||
| @Internal | ||
| class Elasticsearch6BulkProcessorIndexer implements RequestIndexer { | ||
|
|
||
| private final BulkProcessor bulkProcessor; | ||
| private final boolean flushOnCheckpoint; | ||
| private final AtomicLong numPendingRequestsRef; | ||
|
|
||
| Elasticsearch6BulkProcessorIndexer( | ||
| BulkProcessor bulkProcessor, | ||
| boolean flushOnCheckpoint, | ||
| AtomicLong numPendingRequestsRef) { | ||
| this.bulkProcessor = checkNotNull(bulkProcessor); | ||
| this.flushOnCheckpoint = flushOnCheckpoint; | ||
| this.numPendingRequestsRef = checkNotNull(numPendingRequestsRef); | ||
| } | ||
|
|
||
| @Override | ||
| public void add(DeleteRequest... deleteRequests) { | ||
| for (DeleteRequest deleteRequest : deleteRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(deleteRequest); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void add(IndexRequest... indexRequests) { | ||
| for (IndexRequest indexRequest : indexRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(indexRequest); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void add(UpdateRequest... updateRequests) { | ||
| for (UpdateRequest updateRequest : updateRequests) { | ||
| if (flushOnCheckpoint) { | ||
| numPendingRequestsRef.getAndIncrement(); | ||
| } | ||
| this.bulkProcessor.add(updateRequest); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.