You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2016/11/23 09:47:15 UTC

activemq git commit: AMQ-6057: Add performance patch to JDBC statements definition

Repository: activemq
Updated Branches:
  refs/heads/master 2a56c6037 -> 8bc3ee29c


AMQ-6057: Add performance patch to JDBC statements definition


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8bc3ee29
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8bc3ee29
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8bc3ee29

Branch: refs/heads/master
Commit: 8bc3ee29cd82f2df6721b58fe50608fb87d235f8
Parents: 2a56c60
Author: Benjamin Graf <be...@gmx.net>
Authored: Tue Nov 15 17:01:34 2016 +0100
Committer: Claus Ibsen <cl...@gmail.com>
Committed: Wed Nov 23 10:46:58 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/activemq/store/jdbc/Statements.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/8bc3ee29/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/Statements.java
----------------------------------------------------------------------
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 7bc6df5..0fe6338 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
+}