Skip to content
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

Use try-with-resources to close BatchHandler #15661

Merged
merged 18 commits into from
Nov 15, 2023
Merged

Use try-with-resources to close BatchHandler #15661

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
850109e
Use try-with-resources to close BatchHandler
jason-p-pickering Nov 13, 2023
cd2d4bc
Merge branch 'master' into batchhandler-autoclose
jason-p-pickering Nov 14, 2023
192420c
Test with 1.4.3 version of quick
jason-p-pickering Nov 14, 2023
206921f
Remove unneeded flush statement from test tear down
jason-p-pickering Nov 14, 2023
d615125
Rework test to deal with multi-theading
jason-p-pickering Nov 14, 2023
a8bc667
Rework test to deal with multi-theading
jason-p-pickering Nov 14, 2023
e8b6232
Linting
jason-p-pickering Nov 14, 2023
d4f97de
Merge branch 'master' into batchhandler-autoclose
jason-p-pickering Nov 15, 2023
6a7e57b
Add try-catch to Analytics table manager
jason-p-pickering Nov 15, 2023
df4ee6c
Merge branch 'batchhandler-autoclose' of github.com:dhis2/dhis2-core …
jason-p-pickering Nov 15, 2023
731ad8f
Minor
jason-p-pickering Nov 15, 2023
f241434
Bump quick to 1.4.3
jason-p-pickering Nov 15, 2023
c1c973e
Merge branch 'master' into batchhandler-autoclose
jason-p-pickering Nov 15, 2023
b4776c2
Let exception flow to logs
jason-p-pickering Nov 15, 2023
d51d9fc
Linting
jason-p-pickering Nov 15, 2023
0e5251d
Resolve issues with Lombok
jason-p-pickering Nov 15, 2023
031d0f7
Revert "Resolve issues with Lombok"
jason-p-pickering Nov 15, 2023
3b790d5
Revert change to builder
jason-p-pickering Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions ...ytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOwnershipAnalyticsTableManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,30 +178,32 @@ private void populateTableInternal(AnalyticsTablePartition partition, String sql
List<String> columnNames =
getDimensionColumns().stream().map(AnalyticsTableColumn::getName).collect(toList());

MappingBatchHandler batchHandler =
try (MappingBatchHandler batchHandler =
MappingBatchHandler.builder()
.jdbcConfiguration(jdbcConfiguration)
.tableName(partition.getTempTableName())
.columns(columnNames)
.build();

batchHandler.init();

JdbcOwnershipWriter writer = JdbcOwnershipWriter.getInstance(batchHandler);
AtomicInteger queryRowCount = new AtomicInteger();

jdbcTemplate.query(
sql,
resultSet -> {
writer.write(getRowMap(columnNames, resultSet));
queryRowCount.getAndIncrement();
});

log.info(
"OwnershipAnalytics query row count was {} for {}",
queryRowCount,
partition.getTempTableName());
batchHandler.flush();
.build()) {
batchHandler.init();

JdbcOwnershipWriter writer = JdbcOwnershipWriter.getInstance(batchHandler);
AtomicInteger queryRowCount = new AtomicInteger();

jdbcTemplate.query(
sql,
resultSet -> {
writer.write(getRowMap(columnNames, resultSet));
queryRowCount.getAndIncrement();
});

log.info(
"OwnershipAnalytics query row count was {} for {}",
queryRowCount,
partition.getTempTableName());
batchHandler.flush();
} catch (Exception e) {
log.error(e.toString());
jason-p-pickering marked this conversation as resolved.
Show resolved Hide resolved
}
}

private String getInputSql(Program program) {
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/org/hisp/dhis/dxf2/dataset/DefaultCompleteDataSetRegistrationExchangeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ public ImportSummary saveCompleteDataSetRegistrationsJson(
private ImportSummary saveCompleteDataSetRegistrations(
ImportOptions importOptions,
Callable<CompleteDataSetRegistrations> deserializeRegistrations) {
BatchHandler<CompleteDataSetRegistration> batchHandler =
batchHandlerFactory.createBatchHandler(CompleteDataSetRegistrationBatchHandler.class);
try {

try (BatchHandler<CompleteDataSetRegistration> batchHandler =
batchHandlerFactory.createBatchHandler(CompleteDataSetRegistrationBatchHandler.class)) {
CompleteDataSetRegistrations completeDataSetRegistrations = deserializeRegistrations.call();
ImportSummary summary =
saveCompleteDataSetRegistrations(
Expand All @@ -256,7 +256,7 @@ private ImportSummary saveCompleteDataSetRegistrations(

return summary;
} catch (Exception ex) {
batchHandler.flush();
log.error("Complete data set registrations could not be saved.");
return handleImportError(ex);
}
}
Expand Down
13 changes: 5 additions & 8 deletions ...ervice-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,14 +620,13 @@ private ImportSummary importDataValueSet(
ImportOptions options, JobConfiguration id, Callable<DataValueSetReader> createReader) {
options = ObjectUtils.firstNonNull(options, ImportOptions.getDefaultImportOptions());

BatchHandler<DataValue> dvBatch =
batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class);
BatchHandler<DataValueAudit> dvaBatch =
batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class);

notifier.clear(id);

try (DataValueSetReader reader = createReader.call()) {
try (BatchHandler<DataValue> dvBatch =
batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class);
BatchHandler<DataValueAudit> dvaBatch =
batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class);
DataValueSetReader reader = createReader.call()) {
ImportSummary summary = importDataValueSet(options, id, reader, dvBatch, dvaBatch);

dvBatch.flush();
Expand All @@ -640,8 +639,6 @@ private ImportSummary importDataValueSet(

return summary;
} catch (Exception ex) {
dvBatch.flush();
dvaBatch.flush();
log.error(DebugUtils.getStackTrace(ex));
notifier.notify(id, ERROR, "Process failed: " + ex.getMessage(), true);
return new ImportSummary(ImportStatus.ERROR, "The import process failed: " + ex.getMessage());
Expand Down
10 changes: 4 additions & 6 deletions ...est/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ class CompleteDataSetRegistrationBatchHandlerTest extends IntegrationTestBase {

private CompleteDataSetRegistration regD;

private Date now = new Date();
private final Date now = new Date();

private String storedBy = "johndoe";
private final String storedBy = "johndoe";

private String lastUpdatedBy = "johndoe";
private final String lastUpdatedBy = "johndoe";

// -------------------------------------------------------------------------
// Fixture
Expand Down Expand Up @@ -165,9 +165,7 @@ public void setUpTest() {
}

@Override
public void tearDownTest() {
batchHandler.flush();
}
public void tearDownTest() {}

// -------------------------------------------------------------------------
// Tests
Expand Down
15 changes: 8 additions & 7 deletions ...gration/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueAuditBatchHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ class DataValueAuditBatchHandlerTest extends SingleSetupIntegrationTestBase {

@Autowired private CategoryService categoryService;

private BatchHandler<DataValueAudit> batchHandler;

private DataElement dataElementA;

private CategoryOptionCombo categoryOptionComboA;
Expand Down Expand Up @@ -107,7 +105,7 @@ class DataValueAuditBatchHandlerTest extends SingleSetupIntegrationTestBase {
// -------------------------------------------------------------------------
@Override
public void setUpTest() {
batchHandler = batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class);

dataElementA = createDataElement('A');
dataElementService.addDataElement(dataElementA);
categoryOptionComboA = categoryService.getDefaultCategoryOptionCombo();
Expand All @@ -132,19 +130,18 @@ public void setUpTest() {
auditB = new DataValueAudit(dataValueA, "12", storedBy, AuditType.UPDATE);
auditC = new DataValueAudit(dataValueB, "21", storedBy, AuditType.UPDATE);
auditD = new DataValueAudit(dataValueB, "22", storedBy, AuditType.UPDATE);
batchHandler.init();
}

@Override
public void tearDownTest() {
batchHandler.flush();
}
public void tearDownTest() {}

// -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
@Test
void testAddObject() {
BatchHandler<DataValueAudit> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class).init();
batchHandler.addObject(auditA);
batchHandler.addObject(auditB);
batchHandler.addObject(auditC);
Expand All @@ -161,6 +158,8 @@ void testAddObject() {
/** DataValueAudit can never equal another. */
@Test
void testObjectExists() {
BatchHandler<DataValueAudit> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class).init();
auditService.addDataValueAudit(auditA);
auditService.addDataValueAudit(auditB);
assertFalse(batchHandler.objectExists(auditA));
Expand All @@ -171,6 +170,8 @@ void testObjectExists() {

@Test
void testUpdateObject() {
BatchHandler<DataValueAudit> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueAuditBatchHandler.class).init();
auditService.addDataValueAudit(auditA);
auditA.setModifiedBy("bill");
batchHandler.updateObject(auditA);
Expand Down
24 changes: 17 additions & 7 deletions ...-integration/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ class DataValueBatchHandlerTest extends IntegrationTestBase {

@Autowired private CategoryService categoryService;

private BatchHandler<DataValue> batchHandler;

private DataElement dataElementA;

private CategoryOptionCombo categoryOptionComboA;
Expand Down Expand Up @@ -105,7 +103,7 @@ class DataValueBatchHandlerTest extends IntegrationTestBase {
// -------------------------------------------------------------------------
@Override
public void setUpTest() {
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class);

dataElementA = createDataElement('A');
dataElementService.addDataElement(dataElementA);
categoryOptionComboA = categoryService.getDefaultCategoryOptionCombo();
Expand Down Expand Up @@ -142,19 +140,19 @@ public void setUpTest() {
dataElementA, periodB, unitB, categoryOptionComboA, categoryOptionComboA, "15");
// with
// 4th
batchHandler.init();

}

@Override
public void tearDownTest() {
batchHandler.flush();
}
public void tearDownTest() {}

// -------------------------------------------------------------------------
// Tests
// -------------------------------------------------------------------------
@Test
void testInsertObject() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
batchHandler.insertObject(dataValueA);
DataValue dataValue =
dataValueService.getDataValue(
Expand All @@ -164,6 +162,8 @@ void testInsertObject() {

@Test
void testAddObject() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
batchHandler.addObject(dataValueA);
batchHandler.addObject(dataValueB);
batchHandler.addObject(dataValueC);
Expand All @@ -185,6 +185,8 @@ void testAddObject() {

@Test
void testAddObjectDuplicates() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
batchHandler.addObject(dataValueA);
batchHandler.addObject(dataValueB);
batchHandler.addObject(dataValueC);
Expand All @@ -208,6 +210,8 @@ void testAddObjectDuplicates() {

@Test
void testFindObject() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
dataValueService.addDataValue(dataValueA);
dataValueService.addDataValue(dataValueC);
DataValue retrievedDataValueA = batchHandler.findObject(dataValueA);
Expand All @@ -224,6 +228,8 @@ void testFindObject() {

@Test
void testObjectExists() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
dataValueService.addDataValue(dataValueA);
dataValueService.addDataValue(dataValueC);
assertTrue(batchHandler.objectExists(dataValueA));
Expand All @@ -235,6 +241,8 @@ void testObjectExists() {
@Test
@Disabled("ERROR: cannot execute UPDATE in a read-only transaction")
void testUpdateObject() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
dataValueService.addDataValue(dataValueA);
dataValueA.setValue("20");
batchHandler.updateObject(dataValueA);
Expand All @@ -247,6 +255,8 @@ void testUpdateObject() {

@Test
void testDeleteObject() {
BatchHandler<DataValue> batchHandler;
batchHandler = batchHandlerFactory.createBatchHandler(DataValueBatchHandler.class).init();
dataValueService.addDataValue(dataValueA);
dataValueService.addDataValue(dataValueC);
assertTrue(batchHandler.objectExists(dataValueA));
Expand Down
2 changes: 1 addition & 1 deletion dhis-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<dhis2-rule-engine.version>2.1.9</dhis2-rule-engine.version>

<!-- HISP Quick and Staxwax -->
<dhis-hisp-quick.version>1.4.1</dhis-hisp-quick.version>
<dhis-hisp-quick.version>1.4.3</dhis-hisp-quick.version>
<dhis-hisp-staxwax.version>2.0.0</dhis-hisp-staxwax.version>
<dhis-json-tree.version>0.10.3</dhis-json-tree.version>

Expand Down
Loading