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

OPENJPA-855 JPA2 Query updates add support for Index function 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@733142 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Catalina Wei 2009-01-09 20:13:20 +00:00
parent f491d6e361
commit 4427455757
19 changed files with 298 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/AbstractVal.java
View File

@ -74,6 +74,11 @@ abstract class AbstractVal
sql.append(" IS NOT ").appendValue(null);
}
public void appendIndex(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql) {
sql.append("1");
}
public void appendSize(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql) {
sql.append("1");

57
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Index.java Normal file
View File

@ -0,0 +1,57 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.openjpa.jdbc.kernel.exps;
import org.apache.openjpa.jdbc.sql.SQLBuffer;
import org.apache.openjpa.jdbc.sql.Select;
import org.apache.openjpa.util.InternalException;
/**
* Index.
*
* @author Catalina Wei
*/
class Index
extends UnaryOp {
public Index(Val val) {
super(val);
}
public ExpState initialize(Select sel, ExpContext ctx, int flags) {
// initialize the value with a null test
return initializeValue(sel, ctx, NULL_CMP);
}
public void appendTo(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql, int index) {
getValue().calculateValue(sel, ctx, state, null, null);
getValue().appendIndex(sel, ctx, state, sql);
sel.append(sql, state.joins);
}
protected Class getType(Class c) {
return long.class;
}
protected String getOperator() {
// since we override appendTo(), this method should never be called
throw new InternalException();
}
}

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
View File

@ -391,6 +391,11 @@ public class JDBCExpressionFactory
return new Size((Val) val);
}
public Value index(Value val) {
((PCPath) val).verifyIndexedField();
return new Index((Val) val);
}
public Value getObjectId(Value val) {
if (val instanceof Const)
return new ConstGetObjectId((Const) val);

16
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
View File

@ -761,6 +761,13 @@ public class PCPath
// we eventually call appendIsEmpty or appendIsNull rather than appendTo
}
public void verifyIndexedField() {
Action lastAction = (Action) lastFieldAction();
FieldMapping fm = (FieldMapping) lastAction.data;
if (fm.getOrderColumn() == null)
throw new UserException(_loc.get("no-order-column", fm.getName()));
}
public int length(Select sel, ExpContext ctx, ExpState state) {
return getColumns(state).length;
}
@ -798,6 +805,15 @@ public class PCPath
pstate.field.appendIsNotEmpty(sql, sel, pstate.joins);
}
public void appendIndex(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql) {
PathExpState pstate = (PathExpState) state;
if (pstate.field == null)
sql.append("1");
else
pstate.field.appendIndex(sql, sel, pstate.joins);;
}
public void appendSize(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql) {
PathExpState pstate = (PathExpState) state;

6
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/Val.java
View File

@ -146,6 +146,12 @@ public interface Val
public void appendIsNotEmpty(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql);
/**
* Append the SQL checking the index of this value.
*/
public void appendIndex(Select sel, ExpContext ctx, ExpState state,
SQLBuffer sql);
/**
* Append the SQL checking the size of this value.
*/

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
View File

@ -849,6 +849,10 @@ public class FieldMapping
assertStrategy().appendSize(sql, sel, joins);
}
public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
assertStrategy().appendIndex(sql, sel, joins);
}
public Joins join(Joins joins, boolean forceOuter) {
return assertStrategy().join(joins, forceOuter);
}

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldStrategy.java
View File

@ -180,6 +180,11 @@ public interface FieldStrategy
*/
public void appendSize(SQLBuffer sql, Select sel, Joins joins);
/**
* Append the ordered column alias to the given statement.
*/
public void appendIndex(SQLBuffer sql, Select sel, Joins joins);
/**
* Join this value to the class table. Does nothing by default.
*/

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/AbstractFieldStrategy.java
View File

@ -135,6 +135,10 @@ public abstract class AbstractFieldStrategy
sql.append("1");
}
public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
sql.append("1");
}
public Joins join(Joins joins, boolean forceOuter) {
return joins;
}

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ContainerFieldStrategy.java
View File

@ -91,6 +91,11 @@ public abstract class ContainerFieldStrategy
appendJoinCount(sql, sel, joins, dict, field, fk);
}
public void appendIndex(SQLBuffer sql, Select sel, Joins joins) {
sql.append(sel.getOrderedColumnAlias(field.getOrderColumn(),
field.getName()));
}
protected static void appendJoinCount(SQLBuffer sql, Select sel,
Joins joins, DBDictionary dict, FieldMapping field, ForeignKey fk) {
String fullTable = dict.getFullName(fk.getTable(), false);

4
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/LogicalUnion.java
View File

@ -540,6 +540,10 @@ public class LogicalUnion
return sel.getColumnAlias(col, joins);
}
public String getOrderedColumnAlias(Column col, Object alias) {
return sel.getOrderedColumnAlias(col, alias);
}
public String getColumnAlias(String col, Table table) {
return sel.getColumnAlias(col, table);
}

5
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
View File

@ -721,4 +721,9 @@ public interface Select
* Implement toString to generate SQL string for profiling/debuggging.
*/
public String toString();
/**
* Return the alias for the given ordered column.
*/
public String getOrderedColumnAlias(Column col, Object path);
}

27
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
View File

@ -784,6 +784,29 @@ public class SelectImpl
return getColumnAlias(col, table, getJoins(joins, false));
}
public String getOrderedColumnAlias(Column col, Object path) {
String columnName = col.getName();
String tableName = col.getTable().getFullName();
Set<Map.Entry> entries = _aliases.entrySet();
Integer tableAlias = null;
for (Map.Entry entry : entries) {
Object obj = entry.getKey();
Key key = null;
if (obj instanceof Key)
key = (Key) obj;
String str = key != null ? key.getKey().toString() : obj.toString();
if (str.equals(tableName)) {
tableAlias = (Integer) entry.getValue();
break;
}
}
if (tableAlias != null)
return new StringBuffer("t").append(tableAlias.toString()).append(".").
append(columnName).toString();
else
throw new InternalException(path.toString());
}
/**
* Return the alias for the given column.
*/
@ -2327,6 +2350,10 @@ public class SelectImpl
public String toString() {
return _path + "|" + _key;
}
Object getKey() {
return _key;
}
}
/**

1
openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/kernel/exps/localizer.properties
View File

@ -27,3 +27,4 @@ no-col: The column "{0}" given to filter "{1}" does not exist in the table \
of the specified target.
cant-convert: Attempt to compare incompatible types "{0}" and "{1}".
invalid-unbound-var: Invalid unbound variable "{0}" in query.
no-order-column: Field "{0}" does not have order column defined".

7
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/ExpressionFactory.java
View File

@ -395,6 +395,13 @@ public interface ExpressionFactory {
*/
public Value size(Value target);
/**
* Return an index/position of the given value within a collection/map.
*
* @since 2.0.0
*/
public Value index(Value target);
/**
* Return distinct values of the given value. This is typically used
* within aggregates, for example: max(distinct(path))

4
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/InMemoryExpressionFactory.java
View File

@ -631,6 +631,10 @@ public class InMemoryExpressionFactory
return new Size((Val) val);
}
public Value index(Value val) {
return new Index((Val) val);
}
public Value getObjectId(Value val) {
return new GetObjectId((Val) val);
}

47
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/Index.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.openjpa.kernel.exps;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.util.UnsupportedException;
/**
* Returns the index of a value within a collection/map.
*
* @author Catalina Wei
*/
class Index extends UnaryMathVal {
private static final Localizer _loc = Localizer.forPackage(Index.class);
/**
* Constructor.
*/
public Index(Val val) {
super(val);
}
public Class getType(Class c) {
return int.class;
}
protected Object operate(Object o, Class c) {
throw new UnsupportedException(_loc.get("in-mem-index"));
}
}

3
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
View File

@ -965,6 +965,9 @@ public class JPQLExpressionBuilder
case JJTSIZE:
return factory.size(getValue(onlyChild(node)));
case JJTINDEX:
return factory.index(getValue(onlyChild(node)));
case JJTUPPER:
val1 = getValue(onlyChild(node));
setImplicitType(val1, TYPE_STRING);

3
openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/exps/localizer.properties
View File

@ -31,3 +31,6 @@ non-numeric-comparison: Filter invalid. Cannot compare {0} to {1}. Numeric \
comparisons must be between numeric types only. To enable such comparisons \
for backwards-compatibility, add "QuotedNumbersInQueries=true" to the \
org.apache.openjpa.Compatibility setting in your configuration.
in-mem-index: Index function is not supported for queries that execute \
in-memory. If you do not intend for this query to execute in-memory, \
consider setting IgnoreCache to true for the query.

89
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java Normal file
View File

@ -0,0 +1,89 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.openjpa.persistence.jpql.expressions;
import java.util.List;
import javax.persistence.EntityManager;
import org.apache.openjpa.persistence.proxy.TreeNode;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
/**
* Tests index function
*
* @author Catalina Wei
*/
public class TestIndex extends SingleEMFTestCase {
public void setUp() {
super.setUp(CLEAR_TABLES, TreeNode.class);
}
public void testQueryIndex() {
persistTree();
EntityManager em = emf.createEntityManager();
String query = "SELECT index(c) from TreeNode t, in (t.childern) c" +
" WHERE index(c) = 2";
List<Object> rs = em.createQuery(query).getResultList();
for (Object t: rs)
assertEquals(2, Integer.parseInt(t.toString()));
em.close();
}
public void createTree() {
TreeNode root = new TreeNode();
root.setName("0");
int[] fanOuts = {1,2,3};
root.createTree(fanOuts);
assertArrayEquals(fanOuts, root.getFanOuts());
}
public void persistTree() {
int[] fanOuts = {2,3,4};
create(fanOuts);
}
/**
* Create a uniform tree with given fan out.
* Persist.
*/
TreeNode create(int[] original) {
TreeNode root = new TreeNode();
root.createTree(original);
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
em.persist(root);
em.getTransaction().commit();
em.clear();
return root;
}
/**
* Asserts the given arrays have exactly same elements at the same index.
*/
void assertArrayEquals(int[] a, int[] b) {
assertEquals(a.length, b.length);
for (int i = 0; i<a.length; i++)
assertEquals(a[i], b[i]);
}
}