Author: vhalbert(a)redhat.com
Date: 2009-04-20 14:21:26 -0400 (Mon, 20 Apr 2009)
New Revision: 805
Modified:
trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java
Log:
Teiid - 510 - removed the 2 properties that are no longer used and change the statics to
reference DQPConfigSource
Modified:
trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java 2009-04-20
18:20:52 UTC (rev 804)
+++
trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java 2009-04-20
18:21:26 UTC (rev 805)
@@ -51,7 +51,6 @@
import com.metamatrix.server.dqp.service.PlatformTransactionService;
import com.metamatrix.server.dqp.service.PlatformVDBService;
import com.metamatrix.server.dqp.service.tracker.DatabaseCommandLogger;
-import com.metamatrix.server.query.service.QueryServicePropertyNames;
/**
*/
@@ -66,21 +65,7 @@
public PlatformConfigSource(Properties queryServiceProps, Properties
currentConfiguration, Object clientId, Host host, String processName) {
dqpProps = PropertiesUtils.clone(queryServiceProps, currentConfiguration, true);
- dqpProps.setProperty(DQPConfigSource.PROCESS_POOL_MAX_THREADS,
queryServiceProps.getProperty(QueryServicePropertyNames.PROCESS_POOL_MAX_THREADS));
- dqpProps.setProperty(DQPConfigSource.PROCESS_POOL_THREAD_TTL,
queryServiceProps.getProperty(QueryServicePropertyNames.PROCESS_POOL_THREAD_TTL));
- dqpProps.setProperty(DQPConfigSource.MIN_FETCH_SIZE,
queryServiceProps.getProperty(QueryServicePropertyNames.MIN_FETCH_SIZE));
- dqpProps.setProperty(DQPConfigSource.MAX_FETCH_SIZE,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_FETCH_SIZE));
- dqpProps.setProperty(DQPConfigSource.MAX_CODE_TABLE_RECORDS,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_CODE_TABLE_RECORDS));
- dqpProps.setProperty(DQPConfigSource.MAX_CODE_TABLES,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_CODE_TABLES));
- dqpProps.setProperty(DQPConfigSource.PROCESSOR_TIMESLICE,
queryServiceProps.getProperty(QueryServicePropertyNames.PROCESSOR_TIMESLICE));
- dqpProps.setProperty(DQPConfigSource.USE_RESULTSET_CACHE,
queryServiceProps.getProperty(QueryServicePropertyNames.USE_RESULTSET_CACHE));
- dqpProps.setProperty(DQPConfigSource.MAX_RESULTSET_CACHE_SIZE,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_RESULTSET_CACHE_SIZE));
- dqpProps.setProperty(DQPConfigSource.MAX_RESULTSET_CACHE_AGE,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_RESULTSET_CACHE_AGE));
- dqpProps.setProperty(DQPConfigSource.RESULTSET_CACHE_SCOPE,
queryServiceProps.getProperty(QueryServicePropertyNames.RESULTSET_CACHE_SCOPE));
-
- dqpProps.setProperty(DQPConfigSource.MAX_PLAN_CACHE_SIZE,
queryServiceProps.getProperty(QueryServicePropertyNames.MAX_PLAN_CACHE_SIZE));
-
String procDebugStr = currentConfiguration.getProperty(PROC_DEBUG_ALLOWED);
if(procDebugStr != null) {
dqpProps.setProperty(DQPConfigSource.PROCESSOR_DEBUG_ALLOWED, procDebugStr);
Modified:
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java 2009-04-20
18:20:52 UTC (rev 804)
+++
trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java 2009-04-20
18:21:26 UTC (rev 805)
@@ -22,30 +22,29 @@
package com.metamatrix.server.query.service;
+import com.metamatrix.common.application.DQPConfigSource;
+
public class QueryServicePropertyNames {
- public static final String PROCESS_POOL_MAX_THREADS =
"ProcessPoolMaxThreads"; //$NON-NLS-1$
- public static final String PROCESS_POOL_THREAD_TTL =
"ProcessPoolThreadTTL"; //$NON-NLS-1$
+ public static final String PROCESS_POOL_MAX_THREADS =
DQPConfigSource.PROCESS_POOL_MAX_THREADS;
- public static final String MIN_FETCH_SIZE = "MinFetchSize"; //$NON-NLS-1$
- public static final String MAX_FETCH_SIZE = "MaxFetchSize"; //$NON-NLS-1$
+ public static final String MAX_FETCH_SIZE = DQPConfigSource.MAX_FETCH_SIZE;
- public static final String MAX_CODE_TABLE_RECORDS = "MaxCodeTableRecords";
//$NON-NLS-1$
- public static final String MAX_CODE_TABLES = "MaxCodeTables"; //$NON-NLS-1$
+ public static final String MAX_CODE_TABLE_RECORDS =
DQPConfigSource.MAX_CODE_TABLE_RECORDS;
+
+ public static final String MAX_CODE_TABLES = DQPConfigSource.MAX_CODE_TABLES;
- public static final String PROCESSOR_TIMESLICE = "ProcessorTimeslice";
//$NON-NLS-1$
+ public static final String PROCESSOR_TIMESLICE =
DQPConfigSource.PROCESSOR_TIMESLICE;
public static final String UDF_SOURCE = "UDFSource"; //$NON-NLS-1$
-
-// public static final String SOCKET_WORKER_POOL_MAX_THREADS =
"SocketWorkerPoolMaxThreads"; //$NON-NLS-1$
-// public static final String SOCKET_WORKER_POOL_THREAD_TTL =
"SocketWorkerPoolThreadTTL"; //$NON-NLS-1$
-//
-// public static final String SOCKET_PORT = "SocketPort"; //$NON-NLS-1$
- public static final String USE_RESULTSET_CACHE = "ResultSetCacheEnabled";
//$NON-NLS-1$
- public static final String MAX_RESULTSET_CACHE_SIZE =
"ResultSetCacheMaxSize"; //$NON-NLS-1$
- public static final String MAX_RESULTSET_CACHE_AGE =
"ResultSetCacheMaxAge"; //$NON-NLS-1$
- public static final String RESULTSET_CACHE_SCOPE = "ResultSetCacheScope";
//$NON-NLS-1$
+ public static final String USE_RESULTSET_CACHE =
DQPConfigSource.USE_RESULTSET_CACHE;
- public static final String MAX_PLAN_CACHE_SIZE = "MaxPlanCacheSize";
//$NON-NLS-1$
+ public static final String MAX_RESULTSET_CACHE_SIZE =
DQPConfigSource.MAX_RESULTSET_CACHE_SIZE;
+
+ public static final String MAX_RESULTSET_CACHE_AGE =
DQPConfigSource.MAX_RESULTSET_CACHE_AGE;
+
+ public static final String RESULTSET_CACHE_SCOPE =
DQPConfigSource.RESULTSET_CACHE_SCOPE;
+
+ public static final String MAX_PLAN_CACHE_SIZE = DQPConfigSource.MAX_PLAN_CACHE_SIZE;
}