Author: pcl
Date: Wed Jun 11 16:55:03 2008
New Revision: 666914
URL: http://svn.apache.org/viewvc?rev=666914&view=rev
Log:
OPENJPA-130. Merging r655581 from 1.1.x
Modified:
openjpa/trunk/openjpa-jdbc/pom.xml
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml
Modified: openjpa/trunk/openjpa-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/pom.xml?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-jdbc/pom.xml Wed Jun 11 16:55:03 2008
@@ -49,6 +49,11 @@
<artifactId>hsqldb</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.1-407.jdbc3</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/MappedQueryResultObjectProvider.java
Wed Jun 11 16:55:03 2008
@@ -419,6 +419,13 @@
return _res.getSQLObject(obj, map);
}
+ protected Object getStreamInternal(JDBCStore store, Object obj,
+ int metaTypeCode, Object arg, Joins joins) throws SQLException {
+ if (obj instanceof Column)
+ return _res.getObject((Column) obj, arg, joins);
+ return _res.getObject(obj, metaTypeCode, arg);
+ }
+
protected Ref getRefInternal(Object obj, Map map, Joins joins)
throws SQLException {
if (obj instanceof Column)
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/LobFieldStrategy.java
Wed Jun 11 16:55:03 2008
@@ -28,11 +28,13 @@
import org.apache.openjpa.jdbc.meta.FieldMapping;
import org.apache.openjpa.jdbc.meta.ValueMappingInfo;
import org.apache.openjpa.jdbc.schema.Column;
+import org.apache.openjpa.jdbc.sql.PostgresDictionary;
import org.apache.openjpa.jdbc.sql.Result;
import org.apache.openjpa.jdbc.sql.Row;
import org.apache.openjpa.jdbc.sql.RowManager;
import org.apache.openjpa.jdbc.sql.Select;
import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.meta.JavaTypes;
/**
* Direct mapping from a stream value to a column.
@@ -43,6 +45,7 @@
public class LobFieldStrategy extends AbstractFieldStrategy {
private int fieldType;
+ private boolean isBlob;
public void map(boolean adapt) {
assertNotMappedBy();
@@ -57,8 +60,9 @@
vinfo.assertNoForeignKey(field, !adapt);
Column tmpCol = new Column();
tmpCol.setName(field.getName());
- tmpCol.setJavaType(field.getTypeCode());
tmpCol.setType(fieldType);
+ tmpCol.setJavaType(field.getTypeCode());
+
tmpCol.setSize(-1);
Column[] cols = vinfo.getColumns(field, field.getName(),
@@ -74,15 +78,22 @@
return null;
}
+ public void delete(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
+ throws SQLException {
+ Select sel = createSelect(sm, store);
+ store.getDBDictionary().deleteStream(store, sel);
+ }
+
public void insert(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
throws SQLException {
Object ob = toDataStoreValue(sm.fetchObjectField
(field.getIndex()), store);
Row row = field.getRow(sm, store, rm, Row.ACTION_INSERT);
if (field.getColumnIO().isInsertable(0, ob == null)) {
- if (isBlob()) {
+ Select sel = createSelect(sm, store);
+ if (isBlob) {
store.getDBDictionary().insertBlobForStreamingLoad
- (row, field.getColumns()[0], ob);
+ (row, field.getColumns()[0], store, ob, sel);
} else {
store.getDBDictionary().insertClobForStreamingLoad
(row, field.getColumns()[0], ob);
@@ -97,7 +108,7 @@
if (field.getColumnIO().isInsertable(0, ob == null)) {
if (ob != null) {
Select sel = createSelect(sm, store);
- if (isBlob()) {
+ if (isBlob) {
store.getDBDictionary().updateBlob
(sel, store, (InputStream)ob);
} else {
@@ -115,15 +126,16 @@
public void update(OpenJPAStateManager sm, JDBCStore store, RowManager rm)
throws SQLException {
Object ob = toDataStoreValue(sm.fetchObjectField
- (field.getIndex()), store);
+ (field.getIndex()), store);
if (field.getColumnIO().isUpdatable(0, ob == null)) {
Row row = field.getRow(sm, store, rm, Row.ACTION_UPDATE);
- if (isBlob()) {
+ Select sel = createSelect(sm, store);
+ if (isBlob) {
store.getDBDictionary().insertBlobForStreamingLoad
- (row, field.getColumns()[0], ob);
+ (row, field.getColumns()[0], store, ob, sel);
} else {
store.getDBDictionary().insertClobForStreamingLoad
- (row, field.getColumns()[0], ob);
+ (row, field.getColumns()[0], sel);
}
}
}
@@ -135,7 +147,7 @@
if (field.getColumnIO().isUpdatable(0, ob == null)) {
if (ob != null) {
Select sel = createSelect(sm, store);
- if (isBlob()) {
+ if (isBlob) {
store.getDBDictionary().updateBlob
(sel, store, (InputStream)ob);
} else {
@@ -163,8 +175,8 @@
JDBCFetchConfiguration fetch, Result res) throws SQLException {
Column col = field.getColumns()[0];
if (res.contains(col)) {
- if (isBlob()) {
- sm.storeObject(field.getIndex(), res.getBinaryStream(col));
+ if (isBlob) {
+ sm.storeObject(field.getIndex(), res.getLOBStream(store, col));
} else {
sm.storeObject(field.getIndex(), res.getCharacterStream(col));
}
@@ -177,18 +189,21 @@
}
public void setFieldMapping(FieldMapping owner) {
- if (owner.getType().isAssignableFrom(InputStream.class)) {
- fieldType = Types.BLOB;
- } else if (owner.getType().isAssignableFrom(Reader.class)) {
- fieldType = Types.CLOB;
- }
field = owner;
- }
-
- private boolean isBlob() {
- if (fieldType == Types.BLOB)
- return true;
- return false;
+ if (owner.getElementMapping().getMappingRepository().getDBDictionary()
+ instanceof PostgresDictionary) {
+ fieldType = Types.INTEGER;
+ isBlob = true;
+ field.setTypeCode(JavaTypes.INT);
+ } else {
+ if (owner.getType().isAssignableFrom(InputStream.class)) {
+ isBlob = true;
+ fieldType = Types.BLOB;
+ } else if (owner.getType().isAssignableFrom(Reader.class)) {
+ isBlob = false;
+ fieldType = Types.CLOB;
+ }
+ }
}
private Select createSelect(OpenJPAStateManager sm, JDBCStore store) {
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractResult.java
Wed Jun 11 16:55:03 2008
@@ -49,6 +49,7 @@
import org.apache.openjpa.lib.util.Closeable;
import org.apache.openjpa.meta.JavaTypes;
import org.apache.openjpa.util.UnsupportedException;
+
import serp.util.Strings;
/**
@@ -341,12 +342,23 @@
return getBinaryStreamInternal(translate(col, joins), joins);
}
+ public InputStream getLOBStream(JDBCStore store, Object obj)
+ throws SQLException {
+ return getLOBStreamInternal(store, translate(obj, null), null);
+ }
+
protected InputStream getBinaryStreamInternal(Object obj, Joins joins)
throws SQLException {
return (InputStream) checkNull(getObjectInternal(obj,
JavaSQLTypes.BINARY_STREAM, null, joins));
}
+ protected InputStream getLOBStreamInternal(JDBCStore store, Object obj,
+ Joins joins) throws SQLException {
+ return (InputStream) checkNull(getStreamInternal(store, obj,
+ JavaSQLTypes.BINARY_STREAM, null, joins));
+ }
+
public Blob getBlob(Object obj)
throws SQLException {
return getBlobInternal(translate(obj, null), null);
@@ -670,6 +682,9 @@
Object arg, Joins joins)
throws SQLException;
+ protected abstract Object getStreamInternal(JDBCStore store, Object obj,
+ int metaType, Object arg, Joins joins) throws SQLException;
+
public Object getSQLObject(Object obj, Map map)
throws SQLException {
return getSQLObjectInternal(translate(obj, null), map, null);
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Wed Jun 11 16:55:03 2008
@@ -60,6 +60,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+
import javax.sql.DataSource;
import org.apache.commons.lang.StringUtils;
@@ -101,10 +102,12 @@
import org.apache.openjpa.util.InternalException;
import org.apache.openjpa.util.InvalidStateException;
import org.apache.openjpa.util.OpenJPAException;
+import org.apache.openjpa.util.ReferentialIntegrityException;
import org.apache.openjpa.util.Serialization;
import org.apache.openjpa.util.StoreException;
import org.apache.openjpa.util.UnsupportedException;
import org.apache.openjpa.util.UserException;
+
import serp.util.Numbers;
import serp.util.Strings;
@@ -506,6 +509,11 @@
return rs.getBinaryStream(column);
}
+ public InputStream getLOBStream(JDBCStore store, ResultSet rs,
+ int column) throws SQLException {
+ return rs.getBinaryStream(column);
+ }
+
/**
* Convert the specified column of the SQL ResultSet to the proper
* java type.
@@ -4189,11 +4197,11 @@
return column.toString();
}
- public void insertBlobForStreamingLoad(Row row, Column col, Object ob)
- throws SQLException {
+ public void insertBlobForStreamingLoad(Row row, Column col,
+ JDBCStore store, Object ob, Select sel) throws SQLException {
if (ob != null) {
row.setBinaryStream(col,
- new ByteArrayInputStream(new byte[0]), 0);
+ new ByteArrayInputStream(new byte[0]), 0);
} else {
row.setNull(col);
}
@@ -4459,4 +4467,8 @@
public void setTrimSchemaName(boolean trimSchemaName) {
this.trimSchemaName = trimSchemaName;
}
+
+ public void deleteStream(JDBCStore store, Select sel) throws SQLException {
+ // Do nothing
+ }
}
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/MergedResult.java
Wed Jun 11 16:55:03 2008
@@ -252,6 +252,11 @@
return _res[_idx].getBinaryStream(obj);
}
+ public InputStream getLOBStream(JDBCStore store, Object obj)
+ throws SQLException {
+ return _res[_idx].getLOBStream(store, obj);
+ }
+
public Blob getBlob(Object obj)
throws SQLException {
return _res[_idx].getBlob(obj);
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
Wed Jun 11 16:55:03 2008
@@ -18,6 +18,9 @@
*/
package org.apache.openjpa.jdbc.sql;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -29,6 +32,7 @@
import java.util.Arrays;
import java.util.Date;
+import org.apache.openjpa.jdbc.kernel.JDBCStore;
import org.apache.openjpa.jdbc.kernel.exps.FilterValue;
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.schema.Sequence;
@@ -36,6 +40,11 @@
import org.apache.openjpa.lib.jdbc.DelegatingConnection;
import org.apache.openjpa.lib.jdbc.DelegatingPreparedStatement;
import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.util.InternalException;
+import org.apache.openjpa.util.StoreException;
+import org.postgresql.PGConnection;
+import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
/**
* Dictionary for Postgres.
@@ -319,6 +328,151 @@
return new PostgresConnection(super.decorate(conn), this);
}
+ public InputStream getLOBStream(JDBCStore store, ResultSet rs,
+ int column) throws SQLException {
+ DelegatingConnection conn = (DelegatingConnection)store
+ .getConnection();
+ conn.setAutoCommit(false);
+ LargeObjectManager lom = ((PGConnection)conn.getInnermostDelegate())
+ .getLargeObjectAPI();
+ if (rs.getInt(column) != -1) {
+ LargeObject lo = lom.open(rs.getInt(column));
+ return lo.getInputStream();
+ } else {
+ return null;
+ }
+ }
+
+ public void insertBlobForStreamingLoad(Row row, Column col,
+ JDBCStore store, Object ob, Select sel) throws SQLException {
+ if (row.getAction() == Row.ACTION_INSERT) {
+ insertPostgresBlob(row, col, store, ob);
+ } else if (row.getAction() == Row.ACTION_UPDATE) {
+ updatePostgresBlob(row, col, store, ob, sel);
+ }
+ }
+
+ private void insertPostgresBlob(Row row, Column col, JDBCStore store,
+ Object ob) throws SQLException {
+ if (ob != null) {
+ col.setType(Types.INTEGER);
+ DelegatingConnection conn = (DelegatingConnection)store
+ .getConnection();
+ try {
+ conn.setAutoCommit(false);
+ PGConnection pgconn = (PGConnection)
conn.getInnermostDelegate();
+ LargeObjectManager lom = pgconn.getLargeObjectAPI();
+ // The create method is valid in versions previous 8.3
+ // in 8.3 this methos is deprecated, use createLO
+ int oid = lom.create();
+ LargeObject lo = lom.open(oid, LargeObjectManager.WRITE);
+ OutputStream os = lo.getOutputStream();
+ copy((InputStream)ob, os);
+ lo.close();
+ row.setInt(col, oid);
+ } catch (IOException ioe) {
+ throw new StoreException(ioe);
+ } finally {
+ conn.close();
+ }
+ } else {
+ row.setInt(col, -1);
+ }
+ }
+
+ private void updatePostgresBlob(Row row, Column col, JDBCStore store,
+ Object ob, Select sel) throws SQLException {
+ SQLBuffer sql = sel.toSelect(true, store.getFetchConfiguration());
+ ResultSet res = null;
+ DelegatingConnection conn =
+ (DelegatingConnection) store.getConnection();
+ PreparedStatement stmnt = null;
+ try {
+ stmnt = sql.prepareStatement(conn, store.getFetchConfiguration(),
+ ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+ res = stmnt.executeQuery();
+ if (!res.next()) {
+ throw new InternalException(_loc.get("stream-exception"));
+ }
+ int oid = res.getInt(1);
+ if (oid != -1) {
+ conn.setAutoCommit(false);
+ PGConnection pgconn = (PGConnection)conn
+ .getInnermostDelegate();
+ LargeObjectManager lom = pgconn.getLargeObjectAPI();
+ if (ob != null) {
+ LargeObject lo = lom.open(oid, LargeObjectManager.WRITE);
+ OutputStream os = lo.getOutputStream();
+ copy((InputStream)ob, os);
+ lo.close();
+ } else {
+ lom.delete(oid);
+ row.setInt(col, -1);
+ }
+ } else {
+ if (ob != null) {
+ conn.setAutoCommit(false);
+ PGConnection pgconn = (PGConnection)conn
+ .getInnermostDelegate();
+ LargeObjectManager lom = pgconn.getLargeObjectAPI();
+ oid = lom.create();
+ LargeObject lo = lom.open(oid, LargeObjectManager.WRITE);
+ OutputStream os = lo.getOutputStream();
+ copy((InputStream)ob, os);
+ lo.close();
+ row.setInt(col, oid);
+ }
+ }
+
+ } catch (IOException ioe) {
+ throw new StoreException(ioe);
+ } finally {
+ if (res != null)
+ try { res.close (); } catch (SQLException e) {}
+ if (stmnt != null)
+ try { stmnt.close (); } catch (SQLException e) {}
+ if (conn != null)
+ try { conn.close (); } catch (SQLException e) {}
+ }
+
+ }
+
+ public void updateBlob(Select sel, JDBCStore store, InputStream is)
+ throws SQLException {
+ //Do nothing
+ }
+
+ public void deleteStream(JDBCStore store, Select sel) throws SQLException {
+ SQLBuffer sql = sel.toSelect(true, store.getFetchConfiguration());
+ ResultSet res = null;
+ DelegatingConnection conn =
+ (DelegatingConnection) store.getConnection();
+ PreparedStatement stmnt = null;
+ try {
+ stmnt = sql.prepareStatement(conn, store.getFetchConfiguration(),
+ ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+ res = stmnt.executeQuery();
+ if (!res.next()) {
+ throw new InternalException(_loc.get("stream-exception"));
+ }
+ int oid = res.getInt(1);
+ if (oid != -1) {
+ conn.setAutoCommit(false);
+ PGConnection pgconn = (PGConnection)conn
+ .getInnermostDelegate();
+ LargeObjectManager lom = pgconn.getLargeObjectAPI();
+ lom.delete(oid);
+ }
+ } finally {
+ if (res != null)
+ try { res.close (); } catch (SQLException e) {}
+ if (stmnt != null)
+ try { stmnt.close (); } catch (SQLException e) {}
+ if (conn != null)
+ try { conn.close (); } catch (SQLException e) {}
+ }
+ }
+
/**
* Connection wrapper to work around the postgres empty result set bug.
*/
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
Wed Jun 11 16:55:03 2008
@@ -212,7 +212,9 @@
*/
public InputStream getBinaryStream(Object obj)
throws SQLException;
-
+
+ public InputStream getLOBStream(JDBCStore store, Object obj)
+ throws SQLException;
/**
* Return the value stored in the given column or id; may not be supported
* by results that are not backed by a SQL result set.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ResultSetResult.java
Wed Jun 11 16:55:03 2008
@@ -42,6 +42,7 @@
import org.apache.openjpa.jdbc.meta.JavaSQLTypes;
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.meta.JavaTypes;
+
import serp.util.Numbers;
/**
@@ -345,6 +346,11 @@
return _dict.getLong(_rs, ((Number) obj).intValue());
}
+ protected Object getStreamInternal(JDBCStore store, Object obj,
+ int metaTypeCode, Object arg, Joins joins) throws SQLException {
+ return getLOBStreamInternal(store, obj, joins);
+ }
+
protected Object getObjectInternal(Object obj, int metaTypeCode,
Object arg, Joins joins)
throws SQLException {
@@ -498,4 +504,9 @@
return 0;
}
}
+
+ protected InputStream getLOBStreamInternal(JDBCStore store, Object obj,
+ Joins joins) throws SQLException {
+ return _dict.getLOBStream(store, _rs, ((Number) obj).intValue());
+ }
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/jdbc/meta/strats/AbstractLobTest.java
Wed Jun 11 16:55:03 2008
@@ -30,6 +30,7 @@
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.MySQLDictionary;
import org.apache.openjpa.jdbc.sql.OracleDictionary;
+import org.apache.openjpa.jdbc.sql.PostgresDictionary;
import org.apache.openjpa.jdbc.sql.SQLServerDictionary;
import org.apache.openjpa.meta.ClassMetaData;
import org.apache.openjpa.persistence.JPAFacadeHelper;
@@ -56,7 +57,8 @@
.getDBDictionaryInstance();
if (dict instanceof MySQLDictionary ||
dict instanceof SQLServerDictionary ||
- dict instanceof OracleDictionary) {
+ dict instanceof OracleDictionary ||
+ dict instanceof PostgresDictionary) {
return true;
}
return false;
@@ -81,6 +83,7 @@
insert(newLobEntity(s, 1));
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
+
Query query = em.createQuery(getSelectQuery());
LobEntity entity = (LobEntity) query.getSingleResult();
assertNotNull(entity.getStream());
@@ -169,7 +172,7 @@
em.getTransaction().commit();
em.close();
}
-
+
public void testLifeCycleInsertFlushModify() {
if (!isDatabaseSupported()) return;
EntityManager em = emf.createEntityManager();
Modified: openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml
(original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_dbsetup.xml Wed Jun
11 16:55:03 2008
@@ -2400,6 +2400,38 @@
sequence name. Defaults to a database-appropriate value.
</para>
</listitem>
+ <listitem id="DBDictionary.BlobBufferSize">
+ <para>
+ <indexterm>
+ <primary>
+ BLOB
+ </primary>
+ <secondary>
+ BlobBufferSize
+ </secondary>
+ </indexterm>
+<literal>BlobBufferSize</literal>: This property establishes the buffer size in
+the <literal>INSERT/UPDATE</literal> operations with an
+<literal>java.io.InputStream</literal>This is only used with OpenJPA's
+<xref linkend="ref_guide_streamsupport"/>. Defaults to 50000.
+ </para>
+ </listitem>
+ <listitem id="DBDictionary.ClobBufferSize">
+ <para>
+ <indexterm>
+ <primary>
+ CLOB
+ </primary>
+ <secondary>
+ ClobBufferSize
+ </secondary>
+ </indexterm>
+<literal>ClobBufferSize</literal>: This property establish the buffer size in
+the <literal>INSERT/UPDATE</literal> operations with a
+<literal>java.io.Reader</literal>This is only used with OpenJPA's
+<xref linkend="ref_guide_streamsupport"/>. Defaults to 50000.
+ </para>
+ </listitem>
</itemizedlist>
</section>
<section id="ref_guide_dbsetup_dbsupport_mysql">
Modified: openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml?rev=666914&r1=666913&r2=666914&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml
(original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml Wed Jun
11 16:55:03 2008
@@ -2680,6 +2680,47 @@
</programlisting>
</example>
</section>
+ <section id="ref_guide_streamsupport">
+ <title>
+ Stream LOB Support
+ </title>
+ <indexterm zone="ref_guide_streamsupport">
+ <primary>
+ stream support
+ </primary>
+ </indexterm>
+ <indexterm zone="ref_guide_streamsupport">
+ <primary>
+ stream lob support
+ </primary>
+ </indexterm>
+ <para>
+Since the 1.1.0 release Apache OpenJPA added support for Streams. This feature
+makes it possible to stream large amounts of data into and out of fields in
+objects managed by OpenJPA without ever holding all the data in memory at the
+same time.
+ </para>
+ <para>
+To persist a stream, use the
+<ulink url="../javadoc/org/apache/openjpa/persistence/Persistent.html">
+<classname>org.apache.openjpa.persistence.Persistent</classname></ulink>
+annotation.
+ </para>
+ <example id="ref_guide_streamsupport_example">
+ <title>
+ Showing annotated InputStream
+ </title>
+<programlisting>
[EMAIL PROTECTED]
+public class Employee {
+ ...
+ @Persistent
+ private InputStream photoStream;
+ ...
+}
+</programlisting>
+ </example>
+ </section>
</section>
<section id="ref_guide_mapping_jpa_map_keycols">
<title>Key Columns</title>
