Skip to content

Feature/import documents logging #289

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.

Sign up for GitHub

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

Closed
wants to merge 20 commits into from
Closed

Feature/import documents logging #289

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
178e596
Added some logging messages. Made sure to shutdown executorService.
rkhaja Jul 26, 2019
ab3abfa
Measuring and reporting import performance.
rkhaja Jul 26, 2019
44aac4d
Automatically adjusting logging performance messages for second and m…
rkhaja Jul 26, 2019
34516a1
Adjusted logging messages.
rkhaja Jul 26, 2019
628c4ce
More logging.
rkhaja Jul 29, 2019
71b6d9c
Corrected counting of completed batches.
rkhaja Jul 29, 2019
4bdf76c
Attempt to combine individual DocumentImportEntity objects into singl…
rkhaja Jul 30, 2019
a651bd3
Consolidate logging messages.
rkhaja Jul 30, 2019
c8cd43c
Implemented 2 additional JUnit tessts for importDocumentsBatchSizeNum…
rkhaja Jul 30, 2019
83dddf1
Creating a combined DocumentImportEntity is not a good idea, because …
rkhaja Jul 30, 2019
2fed0d2
Put back combinedDocumentImportEntity. Adjusted measurement of perfor…
rkhaja Jul 30, 2019
1fd05a2
Fixed incorrect counts for combinedDocumentImportEntity.
rkhaja Jul 31, 2019
c1a5efc
Refactoring.
rkhaja Aug 1, 2019
d592ab0
Added Gson library to easily generate JSON string representation of o…
rkhaja Aug 2, 2019
6cd7ddc
Implemented toString() and toJSONString() methods.
rkhaja Aug 2, 2019
ec6891e
Implemented toString() and toJSONString() methods.
rkhaja Aug 2, 2019
4a7bb5a
Refactored loggin to use toJSONString() methods of DocumentImportOpti…
rkhaja Aug 2, 2019
54df698
Merge branch 'master' into feature/import-documents-logging
rkhaja Aug 6, 2019
0a3e40e
Made method parameters final.
rkhaja Aug 7, 2019
2f22b3f
Merge remote-tracking branch 'origin/feature/import-documents-logging…
rkhaja Aug 7, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed incorrect counts for combinedDocumentImportEntity.
  • Loading branch information
@rkhaja
rkhaja committed Jul 31, 2019
commit 1fd05a2894d02f19ae277d81d4505c22f912cf71
24 changes: 12 additions & 12 deletions src/main/java/com/arangodb/internal/ArangoCollectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,33 +153,33 @@ public Collection<DocumentImportEntity> importDocuments(Collection<?> values, Do
documentImportEntity.getEmpty(), documentImportEntity.getDetails()
);
combinedDocumentImportEntity.setCreated(
combinedDocumentImportEntity.getCreated() == null ? 0 : combinedDocumentImportEntity.getCreated()
+ documentImportEntity.getCreated()
combinedDocumentImportEntity.getCreated() == null ? documentImportEntity.getCreated()
: combinedDocumentImportEntity.getCreated() + documentImportEntity.getCreated()
);
combinedDocumentImportEntity.setErrors(
combinedDocumentImportEntity.getErrors() == null ? 0 : combinedDocumentImportEntity.getErrors()
+ documentImportEntity.getErrors()
combinedDocumentImportEntity.getErrors() == null ? documentImportEntity.getErrors()
: combinedDocumentImportEntity.getErrors() + documentImportEntity.getErrors()
);
combinedDocumentImportEntity.setUpdated(
combinedDocumentImportEntity.getUpdated() == null ? 0 : combinedDocumentImportEntity.getUpdated()
+ documentImportEntity.getUpdated()
combinedDocumentImportEntity.getUpdated() == null ? documentImportEntity.getUpdated()
: combinedDocumentImportEntity.getUpdated() + documentImportEntity.getUpdated()
);
combinedDocumentImportEntity.setIgnored(
combinedDocumentImportEntity.getIgnored() == null ? 0 : combinedDocumentImportEntity.getIgnored()
+ documentImportEntity.getIgnored()
combinedDocumentImportEntity.getIgnored() == null ? documentImportEntity.getIgnored()
: combinedDocumentImportEntity.getIgnored() + documentImportEntity.getIgnored()
);
combinedDocumentImportEntity.setEmpty(
combinedDocumentImportEntity.getEmpty() == null ? 0 : combinedDocumentImportEntity.getEmpty()
+ documentImportEntity.getEmpty()
combinedDocumentImportEntity.getEmpty() == null ? documentImportEntity.getEmpty()
: combinedDocumentImportEntity.getEmpty() + documentImportEntity.getEmpty()
);
Collection<String> combinedDetails = new ArrayList<>();
combinedDetails.addAll(combinedDocumentImportEntity.getDetails());
combinedDetails.addAll(documentImportEntity.getDetails());
combinedDocumentImportEntity.setDetails(combinedDetails);
completedBatchNumber++;
}
LOGGER.info("Finished importing batches into collection: [{}].", this.name);
LOGGER.info("Totals. Created: [{}], Errors: [{}], Updated: [{}], Ignored: [{}], Empty: [{}]",
LOGGER.info("Finished importing batches into collection: [{}]. Created: [{}], Errors: [{}], Updated: [{}], "
+ "Ignored: [{}], Empty: [{}]", this.name,
combinedDocumentImportEntity.getCreated(), combinedDocumentImportEntity.getErrors(),
combinedDocumentImportEntity.getUpdated(), combinedDocumentImportEntity.getIgnored(),
combinedDocumentImportEntity.getEmpty()
Expand Down