You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2013/06/21 09:47:52 UTC
svn commit: r1495305 [21/21] - in /db/derby/code/trunk:
java/engine/org/apache/derby/ java/engine/org/apache/derby/catalog/types/
java/engine/org/apache/derby/iapi/services/io/
java/engine/org/apache/derby/iapi/sql/
java/engine/org/apache/derby/iapi/sq...
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java Fri Jun 21 07:47:47 2013
@@ -40,7 +40,6 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.sql.compile.NodeFactory;
import org.apache.derby.iapi.sql.compile.Parser;
import org.apache.derby.iapi.services.property.PropertyFactory;
@@ -96,7 +95,6 @@ public class GenericLanguageConnectionFa
private UUIDFactory uuidFactory;
private JavaFactory javaFactory;
private ClassFactory classFactory;
- private NodeFactory nodeFactory;
private PropertyFactory pf;
private int nextLCCInstanceNumber;
@@ -204,15 +202,6 @@ public class GenericLanguageConnectionFa
}
/**
- Get the NodeFactory to use with this language connection
- REMIND: is this only used by the compiler?
- */
- public NodeFactory getNodeFactory()
- {
- return nodeFactory;
- }
-
- /**
Get the ExecutionFactory to use with this language connection
*/
public ExecutionFactory getExecutionFactory() {
@@ -311,7 +300,6 @@ public class GenericLanguageConnectionFa
of = (OptimizerFactory) Monitor.bootServiceModule(create, this, OptimizerFactory.MODULE, startParams);
tcf =
(TypeCompilerFactory) Monitor.startSystemModule(TypeCompilerFactory.MODULE);
- nodeFactory = (NodeFactory) Monitor.bootServiceModule(create, this, NodeFactory.MODULE, startParams);
// If the system supports statement caching boot the CacheFactory module.
int cacheSize = statementCacheSize(startParams);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java Fri Jun 21 07:47:47 2013
@@ -63,7 +63,7 @@ public final class AvgAggregator extends
if ( typeName.equals(TypeId.TINYINT_NAME)
|| typeName.equals(TypeId.SMALLINT_NAME)
|| typeName.equals(TypeId.INTEGER_NAME)
- || typeName.equals(TypeId.LONGINT_NAME)) {
+ || typeName.equals(TypeId.BIGINT_NAME)) {
scale = 0;
} else if ( typeName.equals(TypeId.REAL_NAME)
|| typeName.equals(TypeId.DOUBLE_NAME)) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java Fri Jun 21 07:47:47 2013
@@ -21,6 +21,7 @@
package org.apache.derby.impl.sql.execute;
+import java.util.List;
import org.apache.derby.catalog.AliasInfo;
import org.apache.derby.catalog.UUID;
import org.apache.derby.catalog.types.RoutineAliasInfo;
@@ -243,10 +244,14 @@ class CreateAliasConstantAction extends
}
// also don't want to collide with 1-arg functions by the same name
- java.util.List funcList = dd.getRoutineList( sd.getUUID().toString(), aliasName, AliasInfo.ALIAS_TYPE_FUNCTION_AS_CHAR );
+ List<AliasDescriptor> funcList =
+ dd.getRoutineList(sd.getUUID().toString(),
+ aliasName,
+ AliasInfo.ALIAS_TYPE_FUNCTION_AS_CHAR);
+
for ( int i = 0; i < funcList.size(); i++ )
{
- AliasDescriptor func = (AliasDescriptor) funcList.get(i);
+ AliasDescriptor func = funcList.get(i);
RoutineAliasInfo funcInfo = (RoutineAliasInfo) func.getAliasInfo();
if ( funcInfo.getParameterCount() == 1 )
@@ -362,11 +367,12 @@ class CreateAliasConstantAction extends
)
throws StandardException
{
- java.util.List list = dd.getRoutineList( sd.getUUID().toString(), aliasName, aliasType );
+ List<AliasDescriptor> list = dd.getRoutineList(
+ sd.getUUID().toString(), aliasName, aliasType);
for (int i = list.size() - 1; i >= 0; i--)
{
- AliasDescriptor proc = (AliasDescriptor) list.get(i);
+ AliasDescriptor proc = list.get(i);
RoutineAliasInfo procedureInfo = (RoutineAliasInfo) proc.getAliasInfo();
int parameterCount = procedureInfo.getParameterCount();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/modules.properties?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/modules.properties Fri Jun 21 07:47:47 2013
@@ -245,9 +245,6 @@ cloudscape.config.lcf=all
derby.module.dataDictionary=org.apache.derby.impl.sql.catalog.DataDictionaryImpl
cloudscape.config.dataDictionary=all
-derby.module.nodeFactory=org.apache.derby.impl.sql.compile.NodeFactoryImpl
-cloudscape.config.nodeFactory=all
-
derby.module.ef=org.apache.derby.impl.sql.execute.GenericExecutionFactory
cloudscape.config.ef=all
Modified: db/derby/code/trunk/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java (original)
+++ db/derby/code/trunk/java/storeless/org/apache/derby/impl/storeless/EmptyDictionary.java Fri Jun 21 07:47:47 2013
@@ -675,8 +675,10 @@ public class EmptyDictionary implements
return null;
}
- public List getRoutineList(String schemaID, String routineName,
- char nameSpace) throws StandardException {
+ public List<AliasDescriptor> getRoutineList(String schemaID,
+ String routineName,
+ char nameSpace)
+ throws StandardException {
// Auto-generated method stub
return null;
}
Modified: db/derby/code/trunk/tools/jar/extraDBMStypes.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMStypes.properties?rev=1495305&r1=1495304&r2=1495305&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMStypes.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMStypes.properties Fri Jun 21 07:47:47 2013
@@ -16,7 +16,6 @@
derby.module.type.a=org.apache.derby.impl.sql.compile.BitTypeCompiler
derby.module.type.b=org.apache.derby.impl.sql.compile.BooleanTypeCompiler
derby.module.type.c=org.apache.derby.impl.sql.compile.CLOBTypeCompiler
-derby.module.type.d=org.apache.derby.impl.sql.compile.C_NodeNames
derby.module.type.e=org.apache.derby.impl.sql.compile.CharTypeCompiler
derby.module.type.f=org.apache.derby.impl.sql.compile.DateTypeCompiler
derby.module.type.i=org.apache.derby.impl.sql.compile.LOBTypeCompiler