You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2022/12/21 15:23:11 UTC

[jackrabbit-oak] branch 1.22 updated: OAK-9020: use SystemPropertySupplier in RDBDocumentStoreDB

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/1.22 by this push:
     new bd58ca0e4d OAK-9020: use SystemPropertySupplier in RDBDocumentStoreDB
bd58ca0e4d is described below

commit bd58ca0e4d1f7797a68095940340a4bd6d1d804f
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Apr 20 10:19:54 2020 +0000

    OAK-9020: use SystemPropertySupplier in RDBDocumentStoreDB
    
    git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1876751 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugins/document/rdb/RDBDocumentStoreDB.java   | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
index 328abfd68a..27e31a93b1 100755
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
@@ -32,6 +32,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.PreparedStatementComponent;
+import org.apache.jackrabbit.oak.plugins.document.util.SystemPropertySupplier;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -264,8 +265,9 @@ public enum RDBDocumentStoreDB {
             Connection con = null;
 
             // table data
-            String tableStats = System.getProperty(SYSPROP_PREFIX + ".DB2.TABLE_STATS",
-                    "card npages mpages fpages overflow pctfree avgrowsize stats_time");
+            String tableStats = SystemPropertySupplier
+                    .create(SYSPROP_PREFIX + ".DB2.TABLE_STATS", "card npages mpages fpages overflow pctfree avgrowsize stats_time")
+                    .loggingTo(LOG).get();
 
             try {
                 con = ch.getROConnection();
@@ -287,8 +289,9 @@ public enum RDBDocumentStoreDB {
             }
 
             // index data
-            String indexStats = System.getProperty(SYSPROP_PREFIX + ".DB2.INDEX_STATS",
-                    "indextype colnames pctfree clusterratio nleaf nlevels fullkeycard density indcard numrids numrids_deleted avgleafkeysize avgnleafkeysize remarks stats_time");
+            String indexStats = SystemPropertySupplier.create(SYSPROP_PREFIX + ".DB2.INDEX_STATS",
+                    "indextype colnames pctfree clusterratio nleaf nlevels fullkeycard density indcard numrids numrids_deleted avgleafkeysize avgnleafkeysize remarks stats_time")
+                    .loggingTo(LOG).get();
 
             try {
                 con = ch.getROConnection();
@@ -355,8 +358,9 @@ public enum RDBDocumentStoreDB {
             Connection con = null;
 
             // table data
-            String tableStats = System.getProperty(SYSPROP_PREFIX + ".ORACLE.TABLE_STATS",
-                    "num_rows blocks avg_row_len sample_size last_analyzed");
+            String tableStats = SystemPropertySupplier
+                    .create(SYSPROP_PREFIX + ".ORACLE.TABLE_STATS", "num_rows blocks avg_row_len sample_size last_analyzed")
+                    .loggingTo(LOG).get();
 
             try {
                 con = ch.getROConnection();
@@ -377,8 +381,9 @@ public enum RDBDocumentStoreDB {
             }
 
             // index data
-            String indexStats = System.getProperty(SYSPROP_PREFIX + ".ORACLE.INDEX_STATS",
-                    "blevel leaf_blocks distinct_keys avg_leaf_blocks_per_key avg_data_blocks_per_key clustering_factor num_rows sample_size last_analyzed");
+            String indexStats = SystemPropertySupplier.create(SYSPROP_PREFIX + ".ORACLE.INDEX_STATS",
+                    "blevel leaf_blocks distinct_keys avg_leaf_blocks_per_key avg_data_blocks_per_key clustering_factor num_rows sample_size last_analyzed")
+                    .loggingTo(LOG).get();
 
             try {
                 con = ch.getROConnection();
@@ -464,8 +469,10 @@ public enum RDBDocumentStoreDB {
             Connection con = null;
 
             // table data
-            String tableStats = System.getProperty(SYSPROP_PREFIX + ".MYSQL.TABLE_STATS",
-                    "engine version row_format rows avg_row_length data_length index_length data_free collation");
+            String tableStats = SystemPropertySupplier
+                    .create(SYSPROP_PREFIX + ".MYSQL.TABLE_STATS",
+                            "engine version row_format rows avg_row_length data_length index_length data_free collation")
+                    .loggingTo(LOG).get();
 
             try {
                 con = ch.getROConnection();
@@ -486,8 +493,9 @@ public enum RDBDocumentStoreDB {
             }
 
             // index data
-            String indexStats = System.getProperty(SYSPROP_PREFIX + ".MYSQL.INDEX_STATS",
-                    "column_name cardinality index_type sub_part");
+            String indexStats = SystemPropertySupplier
+                    .create(SYSPROP_PREFIX + ".MYSQL.INDEX_STATS", "column_name cardinality index_type sub_part").loggingTo(LOG)
+                    .get();
 
             try {
                 con = ch.getROConnection();