MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Internal help: Support table stats for external dbs

Browse Source
This commit is contained in:
François-Xavier Thomas
2020-02-12 21:41:47 +00:00
committed by jvoisin
parent 1cde8accc7
commit 9d3ec88796
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java
+25 -15
View File
@@ -51,6 +51,7 @@ import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.*;
@@ -274,21 +275,23 @@ public class InternalHelpController {
} }
private void gatherDatabaseInfo(Map<String, Object> map) { private void gatherDatabaseInfo(Map<String, Object> map) {
try (Connection conn = daoHelper.getDataSource().getConnection()) { try (Connection conn = daoHelper.getDataSource().getConnection()) {
// Driver name/version
map.put("dbDriverName", conn.getMetaData().getDriverName()); map.put("dbDriverName", conn.getMetaData().getDriverName());
map.put("dbDriverVersion", conn.getMetaData().getDriverVersion()); map.put("dbDriverVersion", conn.getMetaData().getDriverVersion());
} catch (SQLException e) {
LOG.debug("Unable to gather information", e); // Gather information for existing database tables
} ResultSet resultSet = conn.getMetaData().getTables(null, null, "%", null);
File dbDirectory = new File(settingsService.getAirsonicHome(), "db"); SortedMap<String, Long> dbTableCount = new TreeMap<>();
map.put("dbDirectorySizeBytes", dbDirectory.exists() ? FileUtils.sizeOfDirectory(dbDirectory) : 0); while (resultSet.next()) {
map.put("dbDirectorySize", FileUtils.byteCountToDisplaySize((long) map.get("dbDirectorySizeBytes"))); String tableSchema = resultSet.getString("TABLE_SCHEM");
File dbLogFile = new File(dbDirectory, "airsonic.log"); String tableName = resultSet.getString("TABLE_NAME");
map.put("dbLogSizeBytes", dbLogFile.exists() ? dbLogFile.length() : 0); String tableType = resultSet.getString("TABLE_TYPE");
map.put("dbLogSize", FileUtils.byteCountToDisplaySize((long) map.get("dbLogSizeBytes"))); LOG.debug("Got database table {}, schema {}, type {}", tableName, tableSchema, tableType);
SortedMap<String, Long> dbTableCount = new TreeMap<>(); if (!"table".equalsIgnoreCase(tableType)) continue; // Table type
try { if (!"public".equalsIgnoreCase(tableSchema)) continue; // Table schema
for (String tableName : daoHelper.getJdbcTemplate().queryForList("SELECT table_name FROM INFORMATION_SCHEMA.SYSTEM_TABLES WHERE table_schem = 'PUBLIC'", String.class)) {
try { try {
Long tableCount = daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM %s", tableName), Long.class); Long tableCount = daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM %s", tableName), Long.class);
dbTableCount.put(tableName, tableCount); dbTableCount.put(tableName, tableCount);
@@ -296,10 +299,19 @@ public class InternalHelpController {
LOG.debug("Unable to gather information", e); LOG.debug("Unable to gather information", e);
} }
} }
} catch (Exception e) { map.put("dbTableCount", dbTableCount);
} catch (SQLException e) {
LOG.debug("Unable to gather information", e); LOG.debug("Unable to gather information", e);
} }
File dbDirectory = new File(settingsService.getAirsonicHome(), "db");
map.put("dbDirectorySizeBytes", dbDirectory.exists() ? FileUtils.sizeOfDirectory(dbDirectory) : 0);
map.put("dbDirectorySize", FileUtils.byteCountToDisplaySize((long) map.get("dbDirectorySizeBytes")));
File dbLogFile = new File(dbDirectory, "airsonic.log");
map.put("dbLogSizeBytes", dbLogFile.exists() ? dbLogFile.length() : 0);
map.put("dbLogSize", FileUtils.byteCountToDisplaySize((long) map.get("dbLogSizeBytes")));
map.put("dbMediaFileMusicNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'MUSIC'"), Long.class)); map.put("dbMediaFileMusicNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'MUSIC'"), Long.class));
map.put("dbMediaFilePodcastNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'PODCAST'"), Long.class)); map.put("dbMediaFilePodcastNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'PODCAST'"), Long.class));
map.put("dbMediaFileDirectoryNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'DIRECTORY'"), Long.class)); map.put("dbMediaFileDirectoryNonPresentCount", daoHelper.getJdbcTemplate().queryForObject(String.format("SELECT count(*) FROM MEDIA_FILE WHERE NOT present AND type = 'DIRECTORY'"), Long.class));
@@ -319,8 +331,6 @@ public class InternalHelpController {
map.put("dbMediaFilesWithMusicFolderMismatchCount", mediaFileDao.getFilesWithMusicFolderMismatchCount()); map.put("dbMediaFilesWithMusicFolderMismatchCount", mediaFileDao.getFilesWithMusicFolderMismatchCount());
map.put("dbMediaFilesWithMusicFolderMismatchSample", mediaFileDao.getFilesWithMusicFolderMismatch(10)); map.put("dbMediaFilesWithMusicFolderMismatchSample", mediaFileDao.getFilesWithMusicFolderMismatch(10));
map.put("dbTableCount", dbTableCount);
} }
private void gatherFilesystemInfo(Map<String, Object> map) { private void gatherFilesystemInfo(Map<String, Object> map) {