- Add missing refactoring-change.
- Code polishing. - Update Spring.
This commit is contained in:
parent
c8485d472e
commit
c4670073ae
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'org.springframework.boot' version '2.7.8'
|
id 'org.springframework.boot' version '2.7.9'
|
||||||
id 'io.spring.dependency-management' version '1.1.0'
|
id 'io.spring.dependency-management' version '1.1.0'
|
||||||
id 'java'
|
id 'java'
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package eu.openaire.urls_controller;
|
package eu.openaire.urls_controller;
|
||||||
|
|
||||||
import eu.openaire.urls_controller.controllers.UrlController;
|
import eu.openaire.urls_controller.services.UrlsServiceImpl;
|
||||||
import eu.openaire.urls_controller.util.FileUtils;
|
import eu.openaire.urls_controller.util.FileUtils;
|
||||||
import eu.openaire.urls_controller.util.UriBuilder;
|
import eu.openaire.urls_controller.util.UriBuilder;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
@ -49,7 +49,7 @@ public class Application {
|
||||||
public void preDestroy() {
|
public void preDestroy() {
|
||||||
logger.info("Shutting down the threads..");
|
logger.info("Shutting down the threads..");
|
||||||
|
|
||||||
shutdownThreads(UrlController.insertsExecutor);
|
shutdownThreads(UrlsServiceImpl.insertsExecutor);
|
||||||
shutdownThreads(FileUtils.hashMatchingExecutor);
|
shutdownThreads(FileUtils.hashMatchingExecutor);
|
||||||
|
|
||||||
logger.info("Exiting..");
|
logger.info("Exiting..");
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class ImpalaConnector {
|
||||||
private void createDatabase()
|
private void createDatabase()
|
||||||
{
|
{
|
||||||
if ( isTestEnvironment ) {
|
if ( isTestEnvironment ) {
|
||||||
logger.info("Going to create (if not exist) the test-database \"" + testDatabaseName + "\" and its tables. Also will fill some tables with data from the initial-database \"" + initialDatabaseName + "\".");
|
logger.info("Going to create (if not exist) the TEST-database \"" + testDatabaseName + "\" and its tables. Also will fill some tables with data from the initial-database \"" + initialDatabaseName + "\".");
|
||||||
jdbcTemplate.execute("CREATE DATABASE IF NOT EXISTS " + testDatabaseName);
|
jdbcTemplate.execute("CREATE DATABASE IF NOT EXISTS " + testDatabaseName);
|
||||||
|
|
||||||
jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + testDatabaseName + ".publication stored as parquet as select * from " + initialDatabaseName + ".publication");
|
jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + testDatabaseName + ".publication stored as parquet as select * from " + initialDatabaseName + ".publication");
|
||||||
|
@ -89,7 +89,7 @@ public class ImpalaConnector {
|
||||||
jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + databaseName + ".payload (id string, original_url string, actual_url string, `date` bigint, mimetype string, size string, `hash` string, `location` string, provenance string) stored as parquet");
|
jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS " + databaseName + ".payload (id string, original_url string, actual_url string, `date` bigint, mimetype string, size string, `hash` string, `location` string, provenance string) stored as parquet");
|
||||||
jdbcTemplate.execute("COMPUTE STATS " + databaseName + ".payload");
|
jdbcTemplate.execute("COMPUTE STATS " + databaseName + ".payload");
|
||||||
|
|
||||||
logger.info("The " + (isTestEnvironment ? "test-" : "") + "database \"" + databaseName + "\" and its tables were created or validated.");
|
logger.info("The " + (isTestEnvironment ? "TEST-" : "") + "database \"" + databaseName + "\" and its tables were created or validated.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue