You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/11/08 10:18:10 UTC
[1/3] qpid-broker-j git commit: QPID-7973: Table Name Prefix is set
to NULL if no prefix is provided instead of empty String This closes #2
Repository: qpid-broker-j
Updated Branches:
refs/heads/6.1.x 5656dcef4 -> 94dd1bb27
QPID-7973: Table Name Prefix is set to NULL if no prefix is provided instead of empty String
This closes #2
Cherry picked from master d68c897052ca3e7a07f7ca4fccfd1f4d6832b6d7
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/848a209b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/848a209b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/848a209b
Branch: refs/heads/6.1.x
Commit: 848a209b1279ddb7c0fdef495c91abc5cda48339
Parents: 5656dce
Author: aboutros <ab...@murex.com>
Authored: Wed Oct 18 12:34:14 2017 +0200
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Nov 8 10:12:02 2017 +0000
----------------------------------------------------------------------
.../apache/qpid/server/store/AbstractJDBCConfigurationStore.java | 2 +-
.../org/apache/qpid/server/store/AbstractJDBCMessageStore.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/848a209b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
index bdc7a58..ad73a68 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
@@ -66,7 +66,7 @@ public abstract class AbstractJDBCConfigurationStore implements MessageStoreProv
protected void setTableNamePrefix(final String tableNamePrefix)
{
- _tableNamePrefix = tableNamePrefix;
+ _tableNamePrefix = tableNamePrefix == null ? "" : tableNamePrefix;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/848a209b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index d74d44d..5f708b7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -754,7 +754,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
protected void setTablePrefix(final String tablePrefix)
{
- _tablePrefix = tablePrefix;
+ _tablePrefix = tablePrefix == null ? "" : tablePrefix;
}
private String getDbVersionTableName()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-7974: Only search for the needed
table instead of querying the whole database tables This closes #3
Posted by kw...@apache.org.
QPID-7974: Only search for the needed table instead of querying the whole database tables
This closes #3
Cherry-picked from master 3a6bb20dc037a88d528045eae4bcc2daacf955ae
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/696107df
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/696107df
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/696107df
Branch: refs/heads/6.1.x
Commit: 696107df078c420394bed8594d8e50dfc283dc84
Parents: 848a209
Author: aboutros <ab...@murex.com>
Authored: Wed Oct 18 14:41:42 2017 +0200
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Nov 8 10:14:14 2017 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/store/JdbcUtils.java | 25 ++++++++------------
1 file changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/696107df/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java b/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
index 6267586..9b09c68 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
@@ -62,24 +62,19 @@ public class JdbcUtils
public static boolean tableExists(final String tableName, final Connection conn) throws SQLException
{
DatabaseMetaData metaData = conn.getMetaData();
- ResultSet rs = metaData.getTables(null, null, "%", null);
+ // Some databases are not case sensitive in their table names and/or report back a different case for the
+ // name of the table than the one originally used to create it
+ return tableExistsCase(tableName.toUpperCase(), metaData) || tableExistsCase(tableName.toLowerCase(), metaData)
+ || tableName.equals(tableName.toUpperCase()) || tableName.equals(tableName.toLowerCase())
+ || tableExistsCase(tableName, metaData);
- try
- {
+ }
- while(rs.next())
- {
- final String table = rs.getString(3);
- if(tableName.equalsIgnoreCase(table))
- {
- return true;
- }
- }
- return false;
- }
- finally
+ private static boolean tableExistsCase(final String tableName, final DatabaseMetaData metaData) throws SQLException
+ {
+ try (ResultSet rs = metaData.getTables(null, null, tableName, null))
{
- rs.close();
+ return rs.next();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: QPID-7974 : Fix the logic I broker in
Adel's commit
Posted by kw...@apache.org.
QPID-7974 : Fix the logic I broker in Adel's commit
Cherry picked from master 955a79b7dfde570dc7d7a6cc9d89b2e6dd1ff137
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/94dd1bb2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/94dd1bb2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/94dd1bb2
Branch: refs/heads/6.1.x
Commit: 94dd1bb2712c0af989030f38728c3ca095bd64fc
Parents: 696107d
Author: rgodfrey <rg...@apache.org>
Authored: Wed Oct 18 16:19:15 2017 +0200
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Nov 8 10:14:46 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/server/store/JdbcUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/94dd1bb2/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java b/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
index 9b09c68..b186967 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
@@ -65,8 +65,9 @@ public class JdbcUtils
// Some databases are not case sensitive in their table names and/or report back a different case for the
// name of the table than the one originally used to create it
return tableExistsCase(tableName.toUpperCase(), metaData) || tableExistsCase(tableName.toLowerCase(), metaData)
- || tableName.equals(tableName.toUpperCase()) || tableName.equals(tableName.toLowerCase())
- || tableExistsCase(tableName, metaData);
+ || (!tableName.equals(tableName.toUpperCase())
+ && !tableName.equals(tableName.toLowerCase())
+ && tableExistsCase(tableName, metaData));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org