Skip to content

Set locale to english when creating session db #34254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jjiwooLim wants to merge 1 commit into
base: integration
Choose a base branch
from
+21 −20
Open

Set locale to english when creating session db #34254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions dev/com.ibm.ws.session.db/src/com/ibm/ws/session/store/db/DatabaseHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.ConcurrentModificationException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;

Expand Down Expand Up @@ -489,16 +490,16 @@ private boolean getTableDefinition(Connection tbcon) throws SQLException {
//tbName = TABLE_NAME.toUpperCase();
int index = tableName.indexOf(".");
if (index != -1) {
tbName = tableName.substring(index + 1).toUpperCase();
tbName = tableName.substring(index + 1).toUpperCase(Locale.ENGLISH);
} else {
tbName = tableName.toUpperCase();
tbName = tableName.toUpperCase(Locale.ENGLISH);
}
if (collectionName != null)
qualifierName = collectionName;
} else if (usingDB2 || usingDerby || usingOracle) { // cmd 162172
tbName = tbName.toUpperCase();
tbName = tbName.toUpperCase(Locale.ENGLISH);
if (dbid != null) {
qualifierName = dbid.toUpperCase(); // cmd PQ81615
qualifierName = dbid.toUpperCase(Locale.ENGLISH); // cmd PQ81615
}

if (_smc.isUsingCustomSchemaName()) { //PM27191
Expand Down Expand Up @@ -3270,15 +3271,15 @@ private boolean doesIndexExistsDistributed(Connection con, String indexName) {
PreparedStatement ps = null;
ResultSet rs = null;

tblName = tblName.toUpperCase();
tblName = tblName.toUpperCase(Locale.ENGLISH);
if (_smc.isUsingCustomSchemaName()) { //PM27191
qualifierName = qualifierNameWhenCustomSchemaIsSet;
} else if (dbid != null) {
qualifierName = dbid.toUpperCase();
qualifierName = dbid.toUpperCase(Locale.ENGLISH);
}

sqlQueryCol = "select ColNames from syscat.indexes " +
"where IndName = '" + indexName.toUpperCase() + "' and " +
"where IndName = '" + indexName.toUpperCase(Locale.ENGLISH) + "' and " +
"TabName = '" + tblName + "' and UniqueRule = 'U'";
if (qualifierName != null)
sqlQueryCol += " and tabschema = '" + qualifierName + "'";
Expand All @@ -3300,9 +3301,9 @@ private boolean doesIndexExistsDistributed(Connection con, String indexName) {
if (com.ibm.websphere.ras.TraceComponent.isAnyTracingEnabled() && LoggingUtil.SESSION_LOGGER_WAS.isLoggable(Level.FINE)) {
LoggingUtil.SESSION_LOGGER_WAS.logp(Level.FINE, methodClassName, methodNames[DOES_INDEX_EXISTS_DISTRIBUTED], colNames);
}
if (colNames.indexOf(idCol.toUpperCase()) != -1) {
if (colNames.indexOf(propCol.toUpperCase()) != -1) {
if (colNames.indexOf(appCol.toUpperCase()) != -1) {
if (colNames.indexOf(idCol.toUpperCase(Locale.ENGLISH)) != -1) {
if (colNames.indexOf(propCol.toUpperCase(Locale.ENGLISH)) != -1) {
if (colNames.indexOf(appCol.toUpperCase(Locale.ENGLISH)) != -1) {
if (com.ibm.websphere.ras.TraceComponent.isAnyTracingEnabled() && LoggingUtil.SESSION_LOGGER_WAS.isLoggable(Level.FINE)) {
LoggingUtil.SESSION_LOGGER_WAS.logp(Level.FINE, methodClassName, methodNames[DOES_INDEX_EXISTS_DISTRIBUTED],
"Index Column Definition is correct");
Expand Down Expand Up @@ -3377,17 +3378,17 @@ private boolean doesIndexExistsiSeries(Connection con, String indexName) {
//SELECT INDEX_NAME FROM QSYS2.SYSINDEXES WHERE INDEX_NAME='SESS_INDEX' AND TABLE_NAME='SESSIONS'
//AND IS_UNIQUE='U' AND TABLE_SCHEMA='KPW51BSSSN'FOR READ ONLY
sqlQueryIndex = "select index_name from " + sysIndexes + " where Index_Name = '"
+ indexName.toUpperCase() + "' and " + "Table_Name = '" + noQualifiertblName
+ indexName.toUpperCase(Locale.ENGLISH) + "' and " + "Table_Name = '" + noQualifiertblName
+ "' and IS_UNIQUE = 'U'";

//Keep the following line for future reference
//SELECT COLUMN_NAME FROM qsys2.SYSKEYS WHERE INDEX_NAME='SESS_INDEX' AND INDEX_SCHEMA='KPW51BSSSN'
sqlQueryCol = "select COLUMN_NAME from " + sysKeys +
" where INDEX_NAME = '" + indexName.toUpperCase() + "'";
" where INDEX_NAME = '" + indexName.toUpperCase(Locale.ENGLISH) + "'";

if (collectionName != null) {
sqlQueryIndex += " and table_schema = '" + collectionName.toUpperCase() + "'";
sqlQueryCol += " and index_schema = '" + collectionName.toUpperCase() + "'";
sqlQueryIndex += " and table_schema = '" + collectionName.toUpperCase(Locale.ENGLISH) + "'";
sqlQueryCol += " and index_schema = '" + collectionName.toUpperCase(Locale.ENGLISH) + "'";
}
sqlQueryIndex += " for read only";
sqlQueryCol += " for read only";
Expand All @@ -3405,7 +3406,7 @@ private boolean doesIndexExistsiSeries(Connection con, String indexName) {
if (rs.next()) { //ResultSet returning the possible SESS_INDEX
returnIndexName = rs.getString(1);
if (returnIndexName != null) {
if (returnIndexName.indexOf(indexName.toUpperCase()) != -1) {
if (returnIndexName.indexOf(indexName.toUpperCase(Locale.ENGLISH)) != -1) {
if (com.ibm.websphere.ras.TraceComponent.isAnyTracingEnabled() && LoggingUtil.SESSION_LOGGER_WAS.isLoggable(Level.FINE)) {
LoggingUtil.SESSION_LOGGER_WAS.logp(Level.FINE, methodClassName, methodNames[DOES_INDEX_EXISTS_ISERIES], "index: " + returnIndexName + " exists");
}
Expand Down Expand Up @@ -3441,9 +3442,9 @@ private boolean doesIndexExistsiSeries(Connection con, String indexName) {
if (com.ibm.websphere.ras.TraceComponent.isAnyTracingEnabled() && LoggingUtil.SESSION_LOGGER_WAS.isLoggable(Level.FINE)) {
LoggingUtil.SESSION_LOGGER_WAS.logp(Level.FINE, methodClassName, methodNames[DOES_INDEX_EXISTS_ISERIES], "extractedColumn : " + extractedColumn);
}
if ((extractedColumn.indexOf(idCol.toUpperCase()) != -1) ||
(extractedColumn.indexOf(propCol.toUpperCase()) != -1) ||
(extractedColumn.indexOf(appCol.toUpperCase()) != -1)) {
if ((extractedColumn.indexOf(idCol.toUpperCase(Locale.ENGLISH)) != -1) ||
(extractedColumn.indexOf(propCol.toUpperCase(Locale.ENGLISH)) != -1) ||
(extractedColumn.indexOf(appCol.toUpperCase(Locale.ENGLISH)) != -1)) {

if (com.ibm.websphere.ras.TraceComponent.isAnyTracingEnabled() && LoggingUtil.SESSION_LOGGER_WAS.isLoggable(Level.FINE)) {
LoggingUtil.SESSION_LOGGER_WAS.logp(Level.FINE, methodClassName, methodNames[DOES_INDEX_EXISTS_ISERIES], "column is found : " + extractedColumn);
Expand Down Expand Up @@ -3494,12 +3495,12 @@ private boolean isTableMarkedVolatile(Connection con) {
String tblName = tableName, qualifierName = null, sqlQuery = null;
PreparedStatement ps = null;
ResultSet rs = null;
tblName = tblName.toUpperCase();
tblName = tblName.toUpperCase(Locale.ENGLISH);

if (_smc.isUsingCustomSchemaName()) { //PM27191
qualifierName = qualifierNameWhenCustomSchemaIsSet;
} else if (dbid != null) {
qualifierName = dbid.toUpperCase();
qualifierName = dbid.toUpperCase(Locale.ENGLISH);
}
sqlQuery = "select 1 from syscat.tables " +
"where TabName = '" + tblName + "' and Volatile = 'C' ";
Expand Down