forked from elastic/elasticsearch-hadoop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement delete operation (elastic#1324)
This PR adds support for delete operations. Document ID's must be present for each document for this to work. A new bulk command factory has been added which will render a delete operation with the id and no document body in the bulk output.
- Loading branch information
1 parent
fbc52bc
commit 41cfc5e
Showing
9 changed files
with
248 additions
and
95 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
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
61 changes: 61 additions & 0 deletions
61
mr/src/main/java/org/elasticsearch/hadoop/serialization/bulk/DeleteBulkFactory.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,61 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.hadoop.serialization.bulk; | ||
|
|
||
| import org.apache.hadoop.io.BooleanWritable; | ||
| import org.apache.hadoop.io.ByteWritable; | ||
| import org.apache.hadoop.io.BytesWritable; | ||
| import org.apache.hadoop.io.DoubleWritable; | ||
| import org.apache.hadoop.io.FloatWritable; | ||
| import org.apache.hadoop.io.IntWritable; | ||
| import org.apache.hadoop.io.LongWritable; | ||
| import org.apache.hadoop.io.MD5Hash; | ||
| import org.apache.hadoop.io.NullWritable; | ||
| import org.apache.hadoop.io.Text; | ||
| import org.apache.hadoop.io.UTF8; | ||
| import org.apache.hadoop.io.VIntWritable; | ||
| import org.apache.hadoop.io.VLongWritable; | ||
| import org.elasticsearch.hadoop.cfg.ConfigurationOptions; | ||
| import org.elasticsearch.hadoop.cfg.Settings; | ||
| import org.elasticsearch.hadoop.serialization.Generator; | ||
| import org.elasticsearch.hadoop.serialization.builder.ValueWriter; | ||
| import org.elasticsearch.hadoop.util.EsMajorVersion; | ||
| import org.elasticsearch.hadoop.util.StringUtils; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class DeleteBulkFactory extends AbstractBulkFactory { | ||
|
|
||
|
|
||
| public DeleteBulkFactory(Settings settings, MetadataExtractor metaExtractor, EsMajorVersion version) { | ||
| super(settings, metaExtractor, version); | ||
| } | ||
|
|
||
| @Override | ||
| protected String getOperation() { | ||
| return ConfigurationOptions.ES_OPERATION_DELETE; | ||
| } | ||
|
|
||
| @Override | ||
| protected void writeObjectEnd(List<Object> list) { | ||
| // skip adding new-line for each entity as delete doesn't need entity output | ||
| list.add(StringUtils.EMPTY); | ||
| } | ||
| } | ||
|
|
41 changes: 41 additions & 0 deletions
41
mr/src/main/java/org/elasticsearch/hadoop/serialization/bulk/DeleteTemplatedBulk.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,41 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.hadoop.serialization.bulk; | ||
|
|
||
| import org.elasticsearch.hadoop.util.BytesRef; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| public class DeleteTemplatedBulk extends TemplatedBulk { | ||
|
|
||
| DeleteTemplatedBulk(Collection<Object> beforeObject, Collection<Object> afterObject) { | ||
| super(beforeObject, afterObject, null); | ||
| } | ||
|
|
||
| @Override | ||
| public BytesRef write(Object object) { | ||
| ref.reset(); | ||
| scratchPad.reset(); | ||
| Object processed = preProcess(object, scratchPad); | ||
| writeTemplate(beforeObject, processed); | ||
| writeTemplate(afterObject, processed); | ||
| return ref; | ||
| } | ||
| } | ||
|
|
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.