Author: rareddy Date: 2009-08-26 16:23:56 -0400 (Wed, 26 Aug 2009) New Revision: 1283 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-802: consolidated all the proeprties to DQPEmbeddedProperties and renames some of the process based properties 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-08-26 16:31:05 UTC (rev 1282) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConfigSource.java 2009-08-26 20:23:56 UTC (rev 1283) @@ -36,6 +36,7 @@ import com.metamatrix.common.config.api.Host; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.metadata.IndexMetadataService; import com.metamatrix.metadata.runtime.RuntimeMetadataCatalog; @@ -66,12 +67,12 @@ String procDebugStr = currentConfiguration.getProperty(PROC_DEBUG_ALLOWED); if(procDebugStr != null) { - dqpProps.setProperty(DQPConfigSource.PROCESSOR_DEBUG_ALLOWED, procDebugStr); + dqpProps.setProperty(DQPEmbeddedProperties.PROCESSOR_DEBUG_ALLOWED, procDebugStr); } - String streamingBatchSize = currentConfiguration.getProperty(DQPConfigSource.STREAMING_BATCH_SIZE); + String streamingBatchSize = currentConfiguration.getProperty(DQPEmbeddedProperties.STREAMING_BATCH_SIZE); if(streamingBatchSize != null) { - dqpProps.setProperty(DQPConfigSource.STREAMING_BATCH_SIZE, streamingBatchSize); + dqpProps.setProperty(DQPEmbeddedProperties.STREAMING_BATCH_SIZE, streamingBatchSize); } this.host = host; 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-08-26 16:31:05 UTC (rev 1282) +++ trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServicePropertyNames.java 2009-08-26 20:23:56 UTC (rev 1283) @@ -22,29 +22,29 @@ package com.metamatrix.server.query.service; -import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; public class QueryServicePropertyNames { - public static final String PROCESS_POOL_MAX_THREADS = DQPConfigSource.PROCESS_POOL_MAX_THREADS; + public static final String PROCESS_POOL_MAX_THREADS = DQPEmbeddedProperties.PROCESS_POOL_MAX_THREADS; - public static final String MAX_FETCH_SIZE = DQPConfigSource.MAX_FETCH_SIZE; + public static final String MAX_FETCH_SIZE = DQPEmbeddedProperties.MAX_FETCH_SIZE; - public static final String MAX_CODE_TABLE_RECORDS = DQPConfigSource.MAX_CODE_TABLE_RECORDS; + public static final String MAX_CODE_TABLE_RECORDS = DQPEmbeddedProperties.MAX_CODE_TABLE_RECORDS; - public static final String MAX_CODE_TABLES = DQPConfigSource.MAX_CODE_TABLES; + public static final String MAX_CODE_TABLES = DQPEmbeddedProperties.MAX_CODE_TABLES; - public static final String PROCESSOR_TIMESLICE = DQPConfigSource.PROCESSOR_TIMESLICE; + public static final String PROCESSOR_TIMESLICE = DQPEmbeddedProperties.PROCESS_TIMESLICE; public static final String UDF_SOURCE = "UDFSource"; //$NON-NLS-1$ - public static final String USE_RESULTSET_CACHE = DQPConfigSource.USE_RESULTSET_CACHE; + public static final String USE_RESULTSET_CACHE = DQPEmbeddedProperties.USE_RESULTSET_CACHE; - public static final String MAX_RESULTSET_CACHE_SIZE = DQPConfigSource.MAX_RESULTSET_CACHE_SIZE; + public static final String MAX_RESULTSET_CACHE_SIZE = DQPEmbeddedProperties.MAX_RESULTSET_CACHE_SIZE; - public static final String MAX_RESULTSET_CACHE_AGE = DQPConfigSource.MAX_RESULTSET_CACHE_AGE; + public static final String MAX_RESULTSET_CACHE_AGE = DQPEmbeddedProperties.MAX_RESULTSET_CACHE_AGE; - public static final String RESULTSET_CACHE_SCOPE = DQPConfigSource.RESULTSET_CACHE_SCOPE; + public static final String RESULTSET_CACHE_SCOPE = DQPEmbeddedProperties.RESULTSET_CACHE_SCOPE; - public static final String MAX_PLAN_CACHE_SIZE = DQPConfigSource.MAX_PLAN_CACHE_SIZE; + public static final String MAX_PLAN_CACHE_SIZE = DQPEmbeddedProperties.MAX_PLAN_CACHE_SIZE; }