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 2015/05/03 11:08:47 UTC

cayenne git commit: CAY-2005 Improving generated DISTINCT performance on PostgreSQL

Repository: cayenne
Updated Branches:
  refs/heads/master 933c2c0d0 -> d28c03635


CAY-2005 Improving generated DISTINCT performance on PostgreSQL

* undoing our PostgreSQL solution. It is not going to work
  for the reasons discussed in Jira


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d28c0363
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d28c0363
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d28c0363

Branch: refs/heads/master
Commit: d28c03635c56de7f3bc07da125fd456a1792be90
Parents: 933c2c0
Author: aadamchik <aa...@apache.org>
Authored: Sat May 2 14:41:45 2015 +0200
Committer: aadamchik <aa...@apache.org>
Committed: Sat May 2 17:46:14 2015 -0400

----------------------------------------------------------------------
 .../dba/postgres/PostgresSelectTranslator.java  | 33 --------------------
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 -
 2 files changed, 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/d28c0363/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
index b7c1917..8d1eded 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresSelectTranslator.java
@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.dba.postgres;
 
-import org.apache.cayenne.access.jdbc.ColumnDescriptor;
 import org.apache.cayenne.access.translator.select.DefaultSelectTranslator;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.EntityResolver;
@@ -52,36 +51,4 @@ class PostgresSelectTranslator extends DefaultSelectTranslator {
 			buffer.append(" OFFSET ").append(offset);
 		}
 	}
-
-	/**
-	 * @since 4.0
-	 */
-	@Override
-	protected String buildDistinctStatement() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("DISTINCT ");
-
-		boolean foundKey = false;
-
-		for (ColumnDescriptor column : getResultColumns()) {
-			if (column.getAttribute().isPrimaryKey()) {
-
-				if (foundKey) {
-					builder.append(", ");
-				} else {
-					builder.append("ON (");
-					foundKey = true;
-				}
-
-				builder.append(column.getQualifiedColumnName());
-			}
-		}
-
-		if (foundKey) {
-			builder.append(")");
-		}
-
-		return builder.toString();
-	}
-
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/d28c0363/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index fb1d0a8..5efb96d 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -19,7 +19,6 @@ CAY-1992 Allow to exclude DataMap java class from Modeler class generation
 CAY-1995 Add support for iterators to Select
 CAY-2001 Saving a display state of Project
 CAY-2004 EJBQL: Support for ordering on aggregate expressions
-CAY-2005 Improving generated DISTINCT performance on PostgreSQL
 CAY-2007 Refactoring SelectTranslator for better extensibility
 CAY-2008 Connection pool refactoring and validation query support in Cayenne DataSource