You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/12/09 09:22:13 UTC
[2/2] cayenne git commit: CAY-1976 Slow performance of DbMerger
CAY-1976 Slow performance of DbMerger
Merge branch '46'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c9793921
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c9793921
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c9793921
Branch: refs/heads/master
Commit: c9793921b1bbdc7b26f808d7bdcee6085226b6ea
Parents: 4e88f9a f3457df
Author: aadamchik <aa...@apache.org>
Authored: Tue Dec 9 11:13:56 2014 +0300
Committer: aadamchik <aa...@apache.org>
Committed: Tue Dec 9 11:21:48 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/access/DbLoader.java | 500 ++++++++++---------
.../loader/ManyToManyCandidateEntity.java | 3 +-
.../cayenne/access/loader/filters/DbPath.java | 6 +
.../apache/cayenne/map/naming/ExportedKey.java | 111 +++-
.../java/org/apache/cayenne/merge/DbMerger.java | 48 +-
.../org/apache/cayenne/access/DbLoaderIT.java | 26 +-
.../access/loader/filters/DbPathTest.java | 18 +
.../map/naming/LegacyNameGeneratorTest.java | 4 +-
.../merge/DropRelationshipToModelIT.java | 30 +-
.../org/apache/cayenne/merge/MergeCase.java | 24 +-
.../apache/cayenne/merge/MergerFactoryIT.java | 47 +-
.../cayenne/tools/dbimport/DbImportAction.java | 3 +-
.../map/naming/DefaultNameGeneratorTest.java | 6 +-
.../tools/dbimport/DbImportActionTest.java | 6 +-
.../InferRelationshipsControllerBase.java | 2 +-
.../dialog/objentity/ObjRelationshipInfo.java | 8 +-
16 files changed, 464 insertions(+), 378 deletions(-)
----------------------------------------------------------------------