You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/09/20 12:13:01 UTC
svn commit: r1867219 -
/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
Author: desruisseaux
Date: Fri Sep 20 12:13:01 2019
New Revision: 1867219
URL: http://svn.apache.org/viewvc?rev=1867219&view=rev
Log:
Compress also the metadata schema (in addition of EPSG schema).
Modified:
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
Modified: sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
URL: http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1867219&r1=1867218&r2=1867219&view=diff
==============================================================================
--- sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] (original)
+++ sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java [UTF-8] Fri Sep 20 12:13:01 2019
@@ -193,16 +193,20 @@ final class Generator {
*/
private void compress() throws SQLException {
try (Connection c = dataSource.getConnection()) {
- List<String> tables = new ArrayList<>();
- try (ResultSet r = c.getMetaData().getTables(null, Constants.EPSG, null, null)) {
+ List<String> tables = new ArrayList<>(80); // As (schema,table) pairs.
+ try (ResultSet r = c.getMetaData().getTables(null, null, null, null)) {
while (r.next()) {
- tables.add(r.getString("TABLE_NAME"));
+ final String schema = r.getString("TABLE_SCHEM");
+ if (!schema.startsWith("SYS")) {
+ tables.add(schema);
+ tables.add(r.getString("TABLE_NAME"));
+ }
}
}
try (CallableStatement cs = c.prepareCall("CALL SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?)")) {
- for (final String table : tables) {
- cs.setString(1, Constants.EPSG);
- cs.setString(2, table);
+ for (int i=0; i<tables.size();) {
+ cs.setString(1, tables.get(i++)); // Schema name.
+ cs.setString(2, tables.get(i++)); // Table name.
cs.setShort (3, (short) 1);
cs.execute();
}