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 2020/04/27 18:07:09 UTC
svn commit: r1877087 - in /jackrabbit/oak/branches/1.8: ./
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Mon Apr 27 18:07:09 2020
New Revision: 1877087
URL: http://svn.apache.org/viewvc?rev=1877087&view=rev
Log:
OAK-8918: RDBBlobStore: warn when legacy (SQLServer) default collation is active (merged r1874271 into 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1874271
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java?rev=1877087&r1=1877086&r2=1877087&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStore.java Mon Apr 27 18:07:09 2020
@@ -255,6 +255,11 @@ public class RDBBlobStore extends Cachin
+ (options.isDropTablesOnClose() ? " (will be dropped on exit)" : ""));
}
+ String moreDiags = db.evaluateDiagnostics(diag);
+ if (moreDiags != null) {
+ LOG.info(moreDiags);
+ }
+
this.callStack = LOG.isDebugEnabled() ? new Exception("call stack of RDBBlobStore creation") : null;
} finally {
closeStatement(createStatement);
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java?rev=1877087&r1=1877086&r2=1877087&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java Mon Apr 27 18:07:09 2020
@@ -18,9 +18,11 @@ package org.apache.jackrabbit.oak.plugin
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import java.util.Locale;
import java.util.Map;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,6 +76,18 @@ public enum RDBBlobStoreDB {
+ ") not null, LVL int, LASTMOD bigint "
+ "constraint " + tableName + "_PK primary key clustered (ID ASC))";
}
+
+ @Override
+ @Nullable
+ public String evaluateDiagnostics(Map<String, String> diags) {
+ String collation = diags.get("collation_name");
+ if (collation != null && collation.toLowerCase(Locale.ENGLISH).startsWith("sql")) {
+ return "Default server collation is: '" + collation
+ + "'. There's a risk of performance degradation; see https://issues.apache.org/jira/browse/OAK-8908 for more information.";
+ } else {
+ return null;
+ }
+ }
},
MYSQL("MySQL", RDBCommonVendorSpecificCode.MYSQL) {
@@ -153,6 +167,11 @@ public enum RDBBlobStoreDB {
return vendorCode.getAdditionalDiagnostics(ch, tableName);
}
+ @Nullable
+ public String evaluateDiagnostics(Map<String, String> diags) {
+ return null;
+ }
+
@Override
public String toString() {
return this.description;