Skip to content

Commit

Permalink
SAK-40012 Remove the longDataSource (sakaiproject#5605)
Browse files Browse the repository at this point in the history
This used to be used to separate file uploads/downloads from using all the connections in the pool, but it isn’t used any more and can be removed.
  • Loading branch information
buckett authored and jonespm committed May 21, 2018
1 parent 6d1c5ac commit 3c77111
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ public abstract class BasicSqlService implements SqlService
/** The "shared", "common" database connection pool */
protected DataSource defaultDataSource;

/** The "slow" connection pool for file uploads/downloads */
protected DataSource longDataSource;

/** Should we do a commit after a single statement read? */
protected boolean m_commitAfterRead = false;

Expand Down Expand Up @@ -2453,20 +2450,6 @@ public void setDefaultDataSource(DataSource defaultDataSource)
this.defaultDataSource = defaultDataSource;
}

/**
* @param slowDataSource
* The slowDataSource to set.
*/
public void setLongDataSource(DataSource slowDataSource)
{
if (log.isDebugEnabled())
{
log.debug("setLongDataSource(DataSource " + slowDataSource + ")");
}

this.longDataSource = slowDataSource;
}

/**
* {@inheritDoc}
*/
Expand Down
11 changes: 1 addition & 10 deletions kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
<property name="defaultDataSource">
<ref bean="javax.sql.DataSource" />
</property>

<property name="longDataSource">
<ref bean="javax.sql.LongDataSource" />
</property>


<property name="autoDdl">
<value>${auto.ddl}</value>
</property>
Expand Down Expand Up @@ -422,11 +418,6 @@
<property name="targetDataSource"><ref bean="javax.sql.DataSource" /></property>
</bean>

<!-- The "slow" connection pool for streaming downloads from db -->
<bean id="javax.sql.LongDataSource"
parent="javax.sql.BaseDataSource">
</bean>

<!-- The "Global" Hibernate Session Factory -->
<bean id="org.sakaiproject.springframework.orm.hibernate.GlobalSessionFactory"
class="org.sakaiproject.springframework.orm.hibernate.AddableSessionFactoryBean"
Expand Down

0 comments on commit 3c77111

Please sign in to comment.