Skip to content

Commit 95bbdca

Browse files
committed
Merge remote-tracking branch 'origin/master'
Conflicts: src/main/java/org/xbib/elasticsearch/common/util/PlainKeyValueStreamListener.java
2 parents 00c3716 + 615a135 commit 95bbdca

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

src/main/java/org/xbib/elasticsearch/common/util/PlainKeyValueStreamListener.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -189,27 +189,27 @@ public KeyValueStreamListener<K, V> values(List<V> values) throws IOException {
189189
}
190190

191191
protected void map(K k, V v, IndexableObject current) throws IOException {
192-
if (ControlKeys._optype.name().equals(k)) {
192+
if (ControlKeys._optype.name().equalsIgnoreCase(k.toString())) {
193193
current.optype(v.toString());
194-
} else if (ControlKeys._index.name().equals(k)) {
194+
} else if (ControlKeys._index.name().equalsIgnoreCase(k.toString())) {
195195
current.index(v.toString());
196-
} else if (ControlKeys._type.name().equals(k)) {
196+
} else if (ControlKeys._type.name().equalsIgnoreCase(k.toString())) {
197197
current.type(v.toString());
198-
} else if (ControlKeys._id.name().equals(k)) {
198+
} else if (ControlKeys._id.name().equalsIgnoreCase(k.toString())) {
199199
current.id(v.toString());
200-
} else if (ControlKeys._version.name().equals(k)) {
201-
current.meta(k.toString(), v.toString());
202-
} else if (ControlKeys._routing.name().equals(k)) {
203-
current.meta(k.toString(), v.toString());
204-
} else if (ControlKeys._parent.name().equals(k)) {
205-
current.meta(k.toString(), v.toString());
206-
} else if (ControlKeys._timestamp.name().equals(k)) {
207-
current.meta(k.toString(), v.toString());
208-
} else if (ControlKeys._ttl.name().equals(k)) {
209-
current.meta(k.toString(), v.toString());
210-
} else if (ControlKeys._job.name().equals(k)) {
211-
current.meta(k.toString(), v.toString());
212-
} else if (ControlKeys._source.name().equals(k)) {
200+
} else if (ControlKeys._version.name().equalsIgnoreCase(k.toString())) {
201+
current.meta(ControlKeys._version.name(), v.toString());
202+
} else if (ControlKeys._routing.name().equalsIgnoreCase(k.toString())) {
203+
current.meta(ControlKeys._routing.name(), v.toString());
204+
} else if (ControlKeys._parent.name().equalsIgnoreCase(k.toString())) {
205+
current.meta(ControlKeys._parent.name(), v.toString());
206+
} else if (ControlKeys._timestamp.name().equalsIgnoreCase(k.toString())) {
207+
current.meta(ControlKeys._timestamp.name(), v.toString());
208+
} else if (ControlKeys._ttl.name().equalsIgnoreCase(k.toString())) {
209+
current.meta(ControlKeys._ttl.name(), v.toString());
210+
} else if (ControlKeys._job.name().equalsIgnoreCase(k.toString())) {
211+
current.meta(ControlKeys._job.name(), v.toString());
212+
} else if (ControlKeys._source.name().equalsIgnoreCase(k.toString())) {
213213
current.source(JsonXContent.jsonXContent.createParser(v.toString()).map());
214214
}
215215
}

src/main/java/org/xbib/elasticsearch/jdbc/strategy/standard/StandardSink.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public void delete(IndexableObject object) {
277277
}
278278

279279
@Override
280-
public void update(IndexableObject object) {
280+
public void update(IndexableObject object) throws IOException {
281281
if (ingest == null) {
282282
return;
283283
}
@@ -293,7 +293,9 @@ public void update(IndexableObject object) {
293293
if (getId() == null) {
294294
return; // skip if no doc is specified to delete
295295
}
296-
UpdateRequest request = new UpdateRequest().index(this.index).type(this.type).id(getId());
296+
UpdateRequest request = new UpdateRequest().index(this.index).type(this.type).id(getId()).doc(object.source());
297+
request.docAsUpsert(true);
298+
297299
if (object.meta(ControlKeys._version.name()) != null) {
298300
request.versionType(VersionType.EXTERNAL)
299301
.version(Long.parseLong(object.meta(ControlKeys._version.name())));

0 commit comments

Comments
 (0)