Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1058 -- JdbcDataSource can lookup javax.sql.DataSource using JNDI 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@757170 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2009-03-22 11:31:51 +00:00
parent 30efee5f15
commit ed946926a3
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dataimporthandler/CHANGES.txt
View File

@ -113,6 +113,10 @@ New Features
return a Callable<Connection> object.
(Noble Paul, shalin)
27.SOLR-1058: JdbcDataSource can lookup javax.sql.DataSource using JNDI. Use a jndiName attribute to specify the
location of the data source.
(Jason Shepherd, Noble Paul via shalin)
Optimizations
----------------------
1. SOLR-846: Reduce memory consumption during delta import by removing keys when used

36
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
View File

@ -20,6 +20,7 @@ import org.apache.solr.common.SolrException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.naming.InitialContext;
import java.sql.*;
import java.util.*;
import java.util.concurrent.Callable;
@ -57,7 +58,7 @@ public class JdbcDataSource extends
if (o != null)
convertType = Boolean.parseBoolean(o.toString());
createConnectionFactory(context, initProps);
factory = createConnectionFactory(context, initProps);
String bsz = initProps.getProperty("batchSize");
if (bsz != null) {
@ -93,6 +94,7 @@ public class JdbcDataSource extends
protected Callable<Connection> createConnectionFactory(final Context context,
final Properties initProps) {
final String jndiName = initProps.getProperty(JNDI_NAME);
final VariableResolver resolver = context.getVariableResolver();
resolveVariables(resolver, initProps);
@ -100,9 +102,9 @@ public class JdbcDataSource extends
final String url = initProps.getProperty(URL);
final String driver = initProps.getProperty(DRIVER);
if (url == null)
if (url == null && jndiName == null)
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
"JDBC URL cannot be null");
"JDBC URL or JNDI name has to be specified");
if (driver != null) {
try {
@ -111,7 +113,9 @@ public class JdbcDataSource extends
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Could not load driver: " + driver, e);
}
} else {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Driver must be specified");
if(jndiName != null){
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Driver must be specified");
}
}
String s = initProps.getProperty("maxRows");
@ -127,9 +131,27 @@ public class JdbcDataSource extends
+ context.getEntityAttribute(DataImporter.NAME) + " with URL: "
+ url);
long start = System.currentTimeMillis();
Connection c;
Connection c = null;
try {
c = DriverManager.getConnection(url, initProps);
if(url != null){
c = DriverManager.getConnection(url, initProps);
} else if(jndiName != null){
InitialContext ctx = new InitialContext();
Object jndival = ctx.lookup(jndiName);
if (jndival instanceof javax.sql.DataSource) {
javax.sql.DataSource dataSource = (javax.sql.DataSource) jndival;
String user = (String) initProps.get("user");
String pass = (String) initProps.get("password");
if(user != null){
c = dataSource.getConnection();
} else {
c = dataSource.getConnection(user, pass);
}
} else {
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
"the jndi name : '"+jndiName +"' is not a valid javax.sql.DataSource");
}
}
if (Boolean.parseBoolean(initProps.getProperty("readOnly"))) {
c.setReadOnly(true);
// Add other sane defaults
@ -370,6 +392,8 @@ public class JdbcDataSource extends
public static final String URL = "url";
public static final String JNDI_NAME = "jndiName";
public static final String DRIVER = "driver";
public static final String CONVERT_TYPE = "convertType";