Changeset 4589

Timestamp:

Oct 16, 2008, 1:23:42 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1146: updateindexes.sh should create indexes for foreign keys

Location:

trunk

Files:

• doc/src/docbook/admindoc/installation_upgrade.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/dbengine/TableInfo.java (modified) (2 diffs)

trunk/doc/src/docbook/admindoc/installation_upgrade.xml

@@ -1002 +1002 @@
             Change directory to
             <filename class="directory">&lt;base-dir&gt;/bin</filename>
-            and run <filename>initdb.sh</filename> as 
-<programlisting>./initdb.sh [base_root_login] base_root_password</programlisting>
+            and execute the following commands: 
+        <programlisting>
+./initdb.sh [base_root_login] base_root_password
+./updateindexes.sh
+</programlisting>
+
+            The second command is important for PostgreSQL users
+            since the Hibernate database initialisation utility
+            is not able to create all indexes that are required.
+            BASE will still work without the indexes but performance
+            may suffer.
 
             <important>

trunk/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -2092 +2092 @@
               
               TableInfo tiHib = new TableInfo(table, dialect);
-              
               if (isVerbose)
               {
@@ -2103 +2102 @@
                 // Write primary key
                 System.out.println("  Primary key  : " + tiHib.getPrimaryKey());
+              }
               
-                // Write foreign keys
-                for (ForeignKeyInfo fk : tiHib.getForeignKeys())
+              // Write foreign keys
+              for (ForeignKeyInfo fk : tiHib.getForeignKeys())
+              {
+                if (!silent) 
                 {
                   System.out.println("  Foreign key  : " + fk);
+                }
+                
+                // Check that an index for the foreign key exists
+                String indexName = tiDb.findIndexName(fk.getName(), fk.getFkColumns());
+                boolean indexExists = indexName != null;
+                String createSql = 
+                  dbEngine.getCreateIndexSql(table.getCatalog(), table.getSchema(),
+                    table.getName(), fk.getName(), fk.getFkColumns(), false);
+                boolean actionCreate = updateIndexes && !indexExists;
+                
+                if (!silent)
+                {
+                  System.out.println("    Indexed    : " + indexExists + (indexExists ? "(" + indexName + ")" : ""));
+                  System.out.println("    INDEX-SQL  : " + createSql);
+                  System.out.println("    Actions    : " + (actionCreate ? "CREATE INDEX" : ""));
+                }
+                if (actionCreate)
+                {
+                  Statement st = null;
+                  try
+                  {
+                    st = connection.createStatement();
+                    if (actionCreate) 
+                    {
+                      log.info("Creating foreign key index: + " + createSql);
+                      st.executeUpdate(createSql);
+                    }
+                    connection.commit();
+                    st.close();
+                    st = null;
+                  }
+                  catch (SQLException ex)
+                  {
+                    log.error("Exception", ex);
+                    throw new BaseException(ex);
+                  }
+                  finally
+                  {
+                    if (st != null)
+                    {
+                      try
+                      {
+                        st.close();
+                      }
+                      catch (Throwable t)
+                      {
+                        log.error("Exception", t);
+                      }
+                    }
+                  }
                 }
               }

trunk/src/core/net/sf/basedb/core/dbengine/TableInfo.java

@@ -218 +218 @@
         fki.refColumns.add(column.getName());
       }
+      foreignKeys.add(fki);
     }
     
@@ -453 +454 @@
     public String toString()
     {
-      return name == null ? "MISSING" : name + " " + columns;
+      return columns.isEmpty() ? "MISSING" : (name == null ? "<no name>" : name) + " " + columns;
     }
   }