Return-Path: X-Original-To: apmail-openjpa-commits-archive@www.apache.org Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28AD9F22A for ; Fri, 19 Apr 2013 00:55:36 +0000 (UTC) Received: (qmail 18290 invoked by uid 500); 19 Apr 2013 00:55:36 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 18265 invoked by uid 500); 19 Apr 2013 00:55:36 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 18257 invoked by uid 99); 19 Apr 2013 00:55:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 00:55:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 00:55:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 015D123889FA; Fri, 19 Apr 2013 00:55:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1469649 - in /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc: meta/strats/RelationFieldStrategy.java sql/RowImpl.java Date: Fri, 19 Apr 2013 00:55:11 -0000 To: commits@openjpa.apache.org From: ppoddar@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130419005512.015D123889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ppoddar Date: Fri Apr 19 00:55:11 2013 New Revision: 1469649 URL: http://svn.apache.org/r1469649 Log: OPENJPA-2373: special processing path for MapsId with auto-generated identity Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java?rev=1469649&r1=1469648&r2=1469649&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java Fri Apr 19 00:55:11 2013 @@ -57,6 +57,7 @@ import org.apache.openjpa.jdbc.sql.Selec import org.apache.openjpa.jdbc.sql.Union; import org.apache.openjpa.kernel.LockManager; import org.apache.openjpa.kernel.OpenJPAStateManager; +import org.apache.openjpa.kernel.StateManagerImpl; import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.meta.ClassMetaData; @@ -268,13 +269,26 @@ public class RelationFieldStrategy throws SQLException { if (field.getMappedBy() != null) return; - + Row row = null; OpenJPAStateManager rel = RelationStrategies.getStateManager (sm.fetchObjectField(field.getIndex()), store.getContext()); - if (field.getJoinDirection() == field.JOIN_INVERSE) + // Checks if the field being inserted is a MapsId field and + // the related object is using auto-assigned identity + // If the above conditions are satisfied and the related instance has + // already been inserted in the RowManger, then returns without further + // processing + if (sm instanceof StateManagerImpl) { + List mappedByIdFields = ((StateManagerImpl)sm).getMappedByIdFields(); + if (rel != null && ((ClassMapping)rel.getMetaData()).getTable().getAutoAssignedColumns().length > 0 + && mappedByIdFields!= null && mappedByIdFields.contains(field)) { + row = rm.getRow(((ClassMapping)rel.getMetaData()).getTable(), Row.ACTION_INSERT, rel, false); + if (row != null) return; + } + } + if (field.getJoinDirection() == FieldMapping.JOIN_INVERSE) updateInverse(sm, rel, store, rm); else { - Row row = field.getRow(sm, store, rm, Row.ACTION_INSERT); + if (row == null) row = field.getRow(sm, store, rm, Row.ACTION_INSERT); if (row != null && !field.isBiMTo1JT()) { field.setForeignKey(row, rel); // this is for bi-directional maps, the key and value of the Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java?rev=1469649&r1=1469648&r2=1469649&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/RowImpl.java Fri Apr 19 00:55:11 2013 @@ -897,6 +897,7 @@ public class RowImpl idx++; } } + setFlushed(true); } /**