11:31 a.m.
Author: rareddy
Date: 2009-08-26 12:31:05 -0400 (Wed, 26 Aug 2009)
New Revision: 1282
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
trunk/runtime/src/test/resources/dqp/dqp.properties
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java
Log:
TEIID-697: Fixing the "exportConfiguration" call to return the configuration
properties from the "deploy.properties" instead of
"configuration.xml"
Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -104,7 +104,7 @@
Cache.QUERY_SERVICE_RESULT_SET_CACHE
};
- EmbeddedConnectionFactoryImpl manager = null;
+ private EmbeddedConnectionFactoryImpl manager = null;
BaseAdmin(EmbeddedConnectionFactoryImpl manager){
this.manager = manager;
@@ -546,7 +546,7 @@
MMSystem system = new MMSystem();
system.setStartTime(new Date(manager.getStartTime()));
system.setStarted(manager.isAlive());
- system.setProperties(manager.getProperties());
+ system.setProperties(getConfigurationService().getSystemProperties());
return system;
}
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -22,6 +22,8 @@
package com.metamatrix.dqp.embedded.admin;
+import java.io.IOException;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -47,7 +49,6 @@
import com.metamatrix.common.config.api.ComponentType;
import com.metamatrix.common.config.api.ComponentTypeDefn;
import com.metamatrix.common.config.api.ComponentTypeID;
-import com.metamatrix.common.config.api.ConfigurationModelContainer;
import com.metamatrix.common.config.api.ConnectorArchive;
import com.metamatrix.common.config.api.ConnectorBinding;
import com.metamatrix.common.config.api.ConnectorBindingType;
@@ -64,7 +65,6 @@
import com.metamatrix.dqp.embedded.DQPEmbeddedProperties;
import com.metamatrix.dqp.embedded.configuration.ConnectorConfigurationReader;
import com.metamatrix.dqp.embedded.configuration.ConnectorConfigurationWriter;
-import com.metamatrix.dqp.embedded.configuration.ServerConfigFileWriter;
import com.metamatrix.dqp.embedded.configuration.VDBConfigurationReader;
import com.metamatrix.dqp.service.ConfigurationService;
import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl;
@@ -761,9 +761,11 @@
*/
public char[] exportConfiguration() throws AdminException {
try {
- ConfigurationModelContainer model =
getConfigurationService().getSystemConfiguration();
- return ServerConfigFileWriter.writeToCharArray(model);
- } catch (MetaMatrixComponentException e) {
+ StringWriter sw = new StringWriter();
+ Properties props = getConfigurationService().getSystemProperties();
+ props.store(sw, "Export of Teiid Configuration Properties");
//$NON-NLS-1$
+ return sw.toString().toCharArray();
+ } catch (IOException e) {
throw new AdminComponentException(e);
}
}
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonitoringAdminImpl.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -188,7 +188,7 @@
List results = new ArrayList();
if (matches(identifier, "dqp")) { //$NON-NLS-1$
// First get the queue statistics for the DQP
- Collection c = manager.getDQP().getQueueStatistics();;
+ Collection c = getManager().getDQP().getQueueStatistics();;
if (c != null && !c.isEmpty()) {
results.addAll(c);
}
@@ -260,7 +260,7 @@
ArrayList requestList = new ArrayList();
// List contains both top and atomic requests, only add the top requests
- List<RequestInfo> requests = manager.getDQP().getRequests();
+ List<RequestInfo> requests = getManager().getDQP().getRequests();
for(RequestInfo request:requests) {
if (request.getConnectorBindingUUID() == null) {
requestList.add(request);
@@ -281,7 +281,7 @@
}
ArrayList atomicRequestList = new ArrayList();
- List<RequestInfo> requests = manager.getDQP().getRequests();
+ List<RequestInfo> requests = getManager().getDQP().getRequests();
for (RequestInfo request:requests) {
if (request.getConnectorBindingUUID() != null) {
atomicRequestList.add(request);
@@ -322,7 +322,7 @@
switch(type) {
case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT:
- Properties properties = manager.getProperties();
+ Properties properties =
getConfigurationService().getSystemProperties();
return convertPropertyDefinitions(properties);
case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING:
@@ -374,7 +374,7 @@
@Override
public Collection<ProcessObject> getProcesses(String processIdentifier) throws
AdminException {
ArrayList<ProcessObject> list = new ArrayList<ProcessObject>();
- list.add(this.manager.getProcess());
+ list.add(getManager().getProcess());
return list;
}
}
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntimeStateAdminImpl.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -173,13 +173,13 @@
if (matches(identifier, cacheTypes[i])) {
if(cacheTypes[i].equals(Cache.CODE_TABLE_CACHE)) {
processed = true;
- manager.getDQP().clearCodeTableCache();
+ getManager().getDQP().clearCodeTableCache();
} else if(cacheTypes[i].equals(Cache.PREPARED_PLAN_CACHE)) {
processed = true;
- manager.getDQP().clearPlanCache();
+ getManager().getDQP().clearPlanCache();
} else if(cacheTypes[i].equals( Cache.QUERY_SERVICE_RESULT_SET_CACHE)) {
processed = true;
- manager.getDQP().clearResultSetCache();
+ getManager().getDQP().clearResultSetCache();
} else if (cacheTypes[i].equals(Cache.CONNECTOR_RESULT_SET_CACHE)) {
processed = true;
try {
@@ -243,7 +243,7 @@
RequestID id = new RequestID(connId, requestId);
try {
- this.manager.getDQP().cancelRequest(id);
+ getManager().getDQP().cancelRequest(id);
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
}
@@ -269,7 +269,7 @@
AtomicRequestID id = new AtomicRequestID(new RequestID(connId, requestId),
nodeId, executionId);
try {
- this.manager.getDQP().cancelAtomicRequest(id);
+ getManager().getDQP().cancelAtomicRequest(id);
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
}
Modified:
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -224,7 +224,7 @@
if (valid(configFile)) {
return getFullyQualifiedPath(configFile);
}
- return null;
+ return
Thread.currentThread().getContextClassLoader().getResource("configuration.xml");
//$NON-NLS-1$
}
/**
@@ -978,9 +978,6 @@
this.configurationModel = getSystemConfiguration();
ServerConfigFileReader configReader = loadServerConfigFile();
- // Add properties to all the user preferences.
- getUserPreferences().putAll(configReader.getSystemProperties());
-
// Get the alternate connector bindings from the server configuration
Map connectorBindings = configReader.getConnectorBindings();
@@ -1337,7 +1334,7 @@
* @return true if yes to use buffering; false otherwise
*/
public boolean useDiskBuffering() {
- return
Boolean.valueOf(getUserPreferences().getProperty(DQPEmbeddedProperties.BufferService.DQP_BUFFER_USEDISK,
"true")).booleanValue(); //$NON-NLS-1$
+ return
Boolean.valueOf(getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_BUFFER_USEDISK,
"true")).booleanValue(); //$NON-NLS-1$
}
private File getWorkDir() {
@@ -1366,7 +1363,7 @@
* @return must a return a location
*/
public String getBufferMemorySize() {
- return
getUserPreferences().getProperty(DQPEmbeddedProperties.BufferService.DQP_BUFFER_MEMORY,
"64"); //$NON-NLS-1$
+ return getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_BUFFER_MEMORY,
"64"); //$NON-NLS-1$
}
/**
@@ -1378,10 +1375,10 @@
public String getProcessorBatchSize() {
- return
getUserPreferences().getProperty(DQPEmbeddedProperties.BufferService.DQP_PROCESSOR_BATCH_SIZE,
"2000"); //$NON-NLS-1$
+ return
getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_PROCESSOR_BATCH_SIZE,
"2000"); //$NON-NLS-1$
}
public String getConnectorBatchSize() {
- return
getUserPreferences().getProperty(DQPEmbeddedProperties.BufferService.DQP_CONNECTOR_BATCH_SIZE,
"2000"); //$NON-NLS-1$
+ return
getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_CONNECTOR_BATCH_SIZE,
"2000"); //$NON-NLS-1$
}
@Override
Modified:
trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
===================================================================
---
trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -134,13 +134,6 @@
if (vdbDefinitions == null) {
props.setProperty(DQPEmbeddedProperties.VDB_DEFINITION,
deployDirectory.getCanonicalPath());
}
-
- // create log directory
- File logDirectory = new File(teiidHome,
props.getProperty(DQPEmbeddedProperties.DQP_LOGDIR, "log")); //$NON-NLS-1$
- props.setProperty(DQPEmbeddedProperties.DQP_LOGDIR,
logDirectory.getCanonicalPath());
- if (!logDirectory.exists()) {
- logDirectory.mkdirs();
- }
} catch (IOException e) {
throw new ApplicationInitializationException(e);
}
@@ -278,7 +271,7 @@
return this.starttime;
}
- public Properties getProperties() {
+ private Properties getProperties() {
if (isAlive()) {
return
((ConfigurationService)findService(DQPServiceNames.CONFIGURATION_SERVICE)).getSystemProperties();
}
Modified: trunk/runtime/src/test/resources/dqp/dqp.properties
===================================================================
--- trunk/runtime/src/test/resources/dqp/dqp.properties 2009-08-26 16:23:28 UTC (rev
1281)
+++ trunk/runtime/src/test/resources/dqp/dqp.properties 2009-08-26 16:31:05 UTC (rev
1282)
@@ -33,5 +33,8 @@
#only for testing, as this takes more time to start and shutdown
xa.enable_recovery=false
+MaxCodeTables=50
+MaxPlanCacheSize=100
+MaxFetchSize=20000
teiid.home=target/scratch
Modified:
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java
===================================================================
---
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/test-integration/src/test/java/com/metamatrix/server/integration/TestAdminApi.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -36,7 +36,6 @@
import org.junit.Before;
import org.junit.Test;
-import org.teiid.adminapi.Admin;
import org.teiid.adminapi.AdminException;
import org.teiid.adminapi.AdminObject;
import org.teiid.adminapi.AdminOptions;
@@ -375,9 +374,6 @@
addVDB(BQT, UnitTestUtil.getTestDataPath()+"/admin/QT_Ora9DSwDEF.vdb");
//$NON-NLS-1$
Collection<ConnectorType> types = getAdmin().getConnectorTypes(STAR);
- for (ConnectorType type:types) {
- // System.out.println(type.getName());
- }
assertEquals("31 types expected", 31, types.size()); //$NON-NLS-1$
@@ -664,10 +660,10 @@
getConnection(ADMIN, PROPS_FILE);
cleanDeploy();
- Util.writeToFile(UnitTestUtil.getTestScratchPath()+"/serverconfigexport.xml",
getAdmin().exportConfiguration()); //$NON-NLS-1$
- File f = new
File(UnitTestUtil.getTestScratchPath()+"/serverconfigexport.xml");
//$NON-NLS-1$
+ Util.writeToFile(UnitTestUtil.getTestScratchPath()+"/serverconfigexport.properties",
getAdmin().exportConfiguration()); //$NON-NLS-1$
+ File f = new
File(UnitTestUtil.getTestScratchPath()+"/serverconfigexport.properties");
//$NON-NLS-1$
assertTrue("Exported configuration must exist", f.exists());
//$NON-NLS-1$
- f.delete();
+ //f.delete();
closeConnection();
}
@@ -1018,60 +1014,7 @@
closeConnection();
}
-// /**
-// * SIP51, SIP52
-// * @throws Exception
-// */
-// @Test public void testDeleteInvalidVdb() throws Exception {
-// getConnection(ADMIN, PROPS_FILE);
-// cleanDeploy();
-//
-// String VDB_NAME = "DeleteInvalid"; //$NON-NLS-1$
-// try {
-// // Try clean deployment twice
-// try {
-// addVDB(VDB_NAME,
UnitTestUtil.getTestDataPath()+"/admin/TestORSInvalid.vdb"); //$NON-NLS-1$
-// fail("Failed with exception "); //$NON-NLS-1$
-// } catch (Exception e) {
-// //pass
-// }
-// } catch (Exception x) {
-// fail("Failed with exception " + Util.getStackTraceAsString(x));
//$NON-NLS-1$
-// } finally {
-// closeConnection();
-// }
-// }
-//
-// /**
-// * Opens connection to the VDB and tries to deploy when conn is open.
-// * The redeployment should not affect the current connection.
-// * @throws Exception
-// */
-// @Test public void testKeepConnectionReplaceVdb () throws Exception {
-// getConnection(ADMIN, PROPS_FILE);
-// cleanDeploy();
-//
-// String VDB_NAME = "ReplaceActive"; //$NON-NLS-1$
-// try {
-// VDB vdb = addVDB(VDB_NAME,
UnitTestUtil.getTestDataPath()+"/admin/TestORS.vdb"); //$NON-NLS-1$
-// String currentVersion = vdb.getVDBVersion();
-// assertEquals("1", currentVersion); //$NON-NLS-1$
-//
-// // Connect and run test query
-// pushConnection();
-// Connection c1 = getConnection( VDB_NAME, PROPS_FILE);
-// execute("SELECT * FROM C_REPOS_DB_RELEASE"); //$NON-NLS-1$
-//
-// // Redeploy the VDB while the connection is open. New VDB has A_CCOUNT
table
-// vdb = deployVdbClean(admin, VDB_NAME,
UnitTestUtil.getTestDataPath()+"/admin/TestORS1.vdb"); //$NON-NLS-1$
-//
-// testConnection(testConn, "select * from C_ACCOUNT", false,
"Redeploy V2 Test"); //$NON-NLS-1$ //$NON-NLS-2$
-// } catch (Exception x) {
-// fail("Failed with exception " + Util.getStackTraceAsString(x));
//$NON-NLS-1$
-// } finally {
-// Util.closeQuietly(conn);
-// }
-// }
+
VDB addVDB(String name, String vdbFile) {
try {
Modified:
trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java
===================================================================
---
trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java 2009-08-26
16:23:28 UTC (rev 1281)
+++
trunk/test-integration/src/test/java/org/teiid/runtime/adminapi/TestEmbeddedAdmin.java 2009-08-26
16:31:05 UTC (rev 1282)
@@ -15,7 +15,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;