Skip to content

Commit c316212

Browse files
authored
Merge pull request #93 from rchicoli/parse-request
elasticsearch: improve map bulkable requests
2 parents 73c8ec4 + bea4b81 commit c316212

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ matrix:
5858
- stage: release
5959
# env: MAJOR_RELEASE=true
6060
# it would be nice to map github labels instead
61-
env: RELEASE_TAG=0.5.0
61+
# env: RELEASE_TAG=0.5.0
6262
if: type IN (push)
6363
script:
6464
- ./scripts/git-release.sh

pkg/elasticsearch/v5/elasticsearch.go

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,20 @@ type Index struct {
161161

162162
func parseRequest(bulkableRequests []elastic.BulkableRequest) (*mapRequests, error) {
163163

164-
header := true
165164
payload := &Payload{}
166165
requests := make(map[string]string)
167166

168167
for _, bulkableRequest := range bulkableRequests {
169-
vv, err := bulkableRequest.Source()
168+
v, err := bulkableRequest.Source()
170169
if err != nil {
171170
return nil, err
172171
}
173-
for _, v := range vv {
174-
if header {
175-
err := json.Unmarshal([]byte(v), payload)
176-
if err != nil {
177-
// skip error and try to parse next line
178-
continue
179-
}
180-
requests[payload.ID] = ""
181-
header = false
182-
continue
183-
}
184-
requests[payload.ID] = v
185-
header = true
172+
err = json.Unmarshal([]byte(v[0]), payload)
173+
if err != nil {
174+
// skip error and try to parse next line
175+
continue
186176
}
177+
requests[payload.ID] = v[1]
187178
}
188179

189180
return &mapRequests{requests}, nil

0 commit comments

Comments
 (0)