From 8bc3ee29cd82f2df6721b58fe50608fb87d235f8 Mon Sep 17 00:00:00 2001 From: Benjamin Graf Date: Tue, 15 Nov 2016 17:01:34 +0100 Subject: [PATCH] AMQ-6057: Add performance patch to JDBC statements definition --- .../java/org/apache/activemq/store/jdbc/Statements.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java index 7bc6df517b..0fe63386e3 100644 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java @@ -95,7 +95,7 @@ public class Statements { if (createSchemaStatements == null) { createSchemaStatements = new String[] { "CREATE TABLE " + getFullMessageTableName() + "(" + "ID " + sequenceDataType + " NOT NULL" - + ", CONTAINER " + containerNameDataType + ", MSGID_PROD " + msgIdDataType + ", MSGID_SEQ " + + ", CONTAINER " + containerNameDataType + " NOT NULL, MSGID_PROD " + msgIdDataType + ", MSGID_SEQ " + sequenceDataType + ", EXPIRATION " + longDataType + ", MSG " + (useExternalMessageReferences ? stringIdDataType : binaryDataType) + ", PRIMARY KEY ( ID ) )", @@ -390,7 +390,7 @@ public class Statements { public String getFindAllDestinationsStatement() { if (findAllDestinationsStatement == null) { findAllDestinationsStatement = "SELECT DISTINCT CONTAINER FROM " + getFullMessageTableName() - + " UNION SELECT DISTINCT CONTAINER FROM " + getFullAckTableName(); + + " WHERE CONTAINER IS NOT NULL UNION SELECT DISTINCT CONTAINER FROM " + getFullAckTableName(); } return findAllDestinationsStatement; } @@ -991,4 +991,4 @@ public class Statements { public void setLeaseOwnerStatement(String leaseOwnerStatement) { this.leaseOwnerStatement = leaseOwnerStatement; } -} \ No newline at end of file +}