teiid SVN: r1002 - trunk/server/src/main/java/com/metamatrix/server.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-27 21:42:53 -0400 (Wed, 27 May 2009)
New Revision: 1002
Modified:
trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java
Log:
removing unused imports
Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java 2009-05-28 01:39:24 UTC (rev 1001)
+++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java 2009-05-28 01:42:53 UTC (rev 1002)
@@ -22,10 +22,6 @@
package com.metamatrix.server;
-import java.util.Collection;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
import org.jboss.cache.Cache;
import org.jgroups.mux.Multiplexer;
import org.teiid.dqp.internal.cache.DQPContextCache;
@@ -38,7 +34,6 @@
import com.metamatrix.common.comm.platform.socket.SocketVMController;
import com.metamatrix.common.config.CurrentConfiguration;
import com.metamatrix.common.config.api.Host;
-import com.metamatrix.common.config.api.HostID;
import com.metamatrix.common.config.api.VMComponentDefn;
import com.metamatrix.common.config.api.VMComponentDefnType;
import com.metamatrix.common.config.api.exceptions.ConfigurationException;
15 years, 7 months
teiid SVN: r1001 - in trunk/embedded/src/main/java/com/metamatrix/dqp/embedded: services and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-27 21:39:24 -0400 (Wed, 27 May 2009)
New Revision: 1001
Modified:
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedBufferService.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java
Log:
removing unused imports
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java 2009-05-26 19:37:05 UTC (rev 1000)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/ServerConfigFileReader.java 2009-05-28 01:39:24 UTC (rev 1001)
@@ -38,7 +38,6 @@
import com.metamatrix.common.config.api.Configuration;
import com.metamatrix.common.config.api.ConfigurationModelContainer;
import com.metamatrix.common.config.api.ConnectorBinding;
-import com.metamatrix.common.config.api.ConnectorBindingType;
import com.metamatrix.common.config.api.exceptions.ConfigurationException;
import com.metamatrix.common.config.model.BasicComponentType;
import com.metamatrix.common.config.model.ConfigurationModelContainerAdapter;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedBufferService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedBufferService.java 2009-05-26 19:37:05 UTC (rev 1000)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedBufferService.java 2009-05-28 01:39:24 UTC (rev 1001)
@@ -26,14 +26,10 @@
import java.io.IOException;
import java.util.Properties;
-import org.teiid.connector.api.CacheScope;
-import org.teiid.connector.api.ExecutionContext;
import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.internal.process.DQPWorkContext;
import com.google.inject.Inject;
import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.cache.Cache;
import com.metamatrix.common.application.ApplicationEnvironment;
import com.metamatrix.common.application.exception.ApplicationInitializationException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-05-26 19:37:05 UTC (rev 1000)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-05-28 01:39:24 UTC (rev 1001)
@@ -31,9 +31,7 @@
import java.util.Map;
import java.util.Properties;
-import org.teiid.connector.api.CacheScope;
import org.teiid.dqp.internal.cache.DQPContextCache;
-import org.teiid.dqp.internal.process.DQPWorkContext;
import com.google.inject.Inject;
import com.metamatrix.api.exception.MetaMatrixComponentException;
@@ -47,11 +45,7 @@
import com.metamatrix.common.vdb.api.VDBDefn;
import com.metamatrix.core.util.StringUtil;
import com.metamatrix.core.vdb.VDBStatus;
-import com.metamatrix.dqp.ResourceFinder;
import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin;
-import com.metamatrix.dqp.embedded.DQPEmbeddedProperties;
-import com.metamatrix.dqp.service.BufferService;
-import com.metamatrix.dqp.service.DQPServiceNames;
import com.metamatrix.dqp.service.VDBLifeCycleListener;
import com.metamatrix.dqp.service.VDBService;
import com.metamatrix.vdb.runtime.BasicModelInfo;
15 years, 7 months
teiid SVN: r1000 - trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata.
by teiid-commits＠lists.jboss.org
Author: ghelblin
Date: 2009-05-26 15:37:05 -0400 (Tue, 26 May 2009)
New Revision: 1000
Modified:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java
Log:
ghelblin: backing out test mod
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java 2009-05-26 19:35:16 UTC (rev 999)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java 2009-05-26 19:37:05 UTC (rev 1000)
@@ -28,7 +28,7 @@
import org.teiid.connector.jdbc.JDBCCapabilities;
-// ghelblin test: Can I commit?
+
/**
* for Teradata database Release V2R5.1
*/
15 years, 7 months
teiid SVN: r999 - trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata.
by teiid-commits＠lists.jboss.org
Author: ghelblin
Date: 2009-05-26 15:35:16 -0400 (Tue, 26 May 2009)
New Revision: 999
Modified:
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java
Log:
ghelblin: test to see if I can commit. Will back out immediately if successful.
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java 2009-05-26 18:46:46 UTC (rev 998)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/teradata/TeradataCapabilities.java 2009-05-26 19:35:16 UTC (rev 999)
@@ -28,7 +28,7 @@
import org.teiid.connector.jdbc.JDBCCapabilities;
-
+// ghelblin test: Can I commit?
/**
* for Teradata database Release V2R5.1
*/
15 years, 7 months
teiid SVN: r998 - in trunk/engine/src: test/java/com/metamatrix/query/processor and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-26 14:46:46 -0400 (Tue, 26 May 2009)
New Revision: 998
Modified:
trunk/engine/src/main/java/com/metamatrix/query/processor/relational/SubqueryAwareEvaluator.java
trunk/engine/src/test/java/com/metamatrix/query/processor/HardcodedDataManager.java
trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.java
Log:
TEIID-629 fix for subqueries throwing blocked exceptions.
Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relational/SubqueryAwareEvaluator.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/SubqueryAwareEvaluator.java 2009-05-25 16:32:46 UTC (rev 997)
+++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/SubqueryAwareEvaluator.java 2009-05-26 18:46:46 UTC (rev 998)
@@ -129,6 +129,10 @@
}
try {
state.processor.process(Integer.MAX_VALUE);
+ } catch (MetaMatrixComponentException e) {
+ throw e;
+ } catch (MetaMatrixProcessingException e) {
+ throw e;
} catch (MetaMatrixCoreException e) {
throw new MetaMatrixComponentException(e);
}
Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/HardcodedDataManager.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/processor/HardcodedDataManager.java 2009-05-25 16:32:46 UTC (rev 997)
+++ trunk/engine/src/test/java/com/metamatrix/query/processor/HardcodedDataManager.java 2009-05-26 18:46:46 UTC (rev 998)
@@ -50,6 +50,8 @@
private boolean mustRegisterCommands = true;
+ private boolean blockOnce;
+
// Collect all commands run against this class
private Collection commandHistory = new ArrayList(); // Commands
@@ -70,6 +72,10 @@
this.commandHistory.clear();
}
+ public void setBlockOnce(boolean blockOnce) {
+ this.blockOnce = blockOnce;
+ }
+
/**
* Set of model names that are valid. Invalid ones will throw an error.
* @param models
@@ -132,6 +138,9 @@
}
FakeTupleSource source = new FakeTupleSource(projectedSymbols, rows);
+ if (blockOnce) {
+ source.setBlockOnce();
+ }
return source;
}
Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.java
===================================================================
--- trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.java 2009-05-25 16:32:46 UTC (rev 997)
+++ trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.java 2009-05-26 18:46:46 UTC (rev 998)
@@ -7641,6 +7641,7 @@
// Construct data manager with data
HardcodedDataManager dataManager = new HardcodedDataManager();
+ dataManager.setBlockOnce(true);
dataManager.addData("SELECT pm1.g1.e2, pm1.g1.e1 FROM pm1.g1", new List[] { //$NON-NLS-1$
Arrays.asList(Integer.valueOf(1), "a"), //$NON-NLS-1$
Arrays.asList(Integer.valueOf(2), "b") //$NON-NLS-1$
15 years, 7 months
teiid SVN: r997 - in trunk/common-internal/src/main/java/com/metamatrix/common/config: model and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: vhalbert(a)redhat.com
Date: 2009-05-25 12:32:46 -0400 (Mon, 25 May 2009)
New Revision: 997
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java
Log:
Teiid-627 : added support for pre 6.0 connector types, to look for the old connector class path variable when the new classpath variable is not found.
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-22 18:41:01 UTC (rev 996)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-25 16:32:46 UTC (rev 997)
@@ -40,6 +40,9 @@
public static final String CONNECTOR_CLASS = "ConnectorClass";//$NON-NLS-1$
public static final String MM_JAR_PROTOCOL = "extensionjar"; //$NON-NLS-1$
public static final String CONNECTOR_TYPE_CLASSPATH = "ConnectorTypeClassPath"; //$NON-NLS-1$
+
+ public static final String CONNECTOR_CLASSPATH_PRE_6 = "ConnectorClassPath"; //$NON-NLS-1$
+
}
/**
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-22 18:41:01 UTC (rev 996)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-25 16:32:46 UTC (rev 997)
@@ -94,8 +94,24 @@
modules.add(jarFile);
}
}
+ } else {
+ // This is a pre-6 campatibility to support connector types that use the old classpath variable.
+
+ classPath = getDefaultValue(Attributes.CONNECTOR_CLASSPATH_PRE_6);
+ if (classPath != null) {
+ StringTokenizer st = new StringTokenizer(classPath, ";"); //$NON-NLS-1$
+ while (st.hasMoreTokens()) {
+ String path = st.nextToken();
+ int idx = path.indexOf(Attributes.MM_JAR_PROTOCOL);
+ if (idx != -1) {
+ String jarFile = path.substring(idx + Attributes.MM_JAR_PROTOCOL.length() + 1);
+ modules.add(jarFile);
+ }
+ }
+ }
+
}
return (String[])modules.toArray(new String[modules.size()]);
}
-
+
}
15 years, 7 months
teiid SVN: r996 - trunk/connector-api/src/main/java/org/teiid/connector.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-22 14:41:01 -0400 (Fri, 22 May 2009)
New Revision: 996
Removed:
trunk/connector-api/src/main/java/org/teiid/connector/internal/
Log:
TEIID-627 updating extension modules for connectors to be based upon the connector type classpath. also moving ConnectorPropertyNames
15 years, 7 months
teiid SVN: r995 - in trunk: common-internal/src/main/java/com/metamatrix/common/config/model and 11 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-22 14:40:57 -0400 (Fri, 22 May 2009)
New Revision: 995
Added:
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java
trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java
trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java
trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java
trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java
trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java
trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java
trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java
trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java
trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java
trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
Log:
TEIID-627 updating extension modules for connectors to be based upon the connector type classpath. also moving ConnectorPropertyNames
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ConnectorBindingType.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -39,7 +39,7 @@
public static final String IS_XA = "IsXA"; //$NON-NLS-1$
public static final String CONNECTOR_CLASS = "ConnectorClass";//$NON-NLS-1$
public static final String MM_JAR_PROTOCOL = "extensionjar"; //$NON-NLS-1$
- public static final String CONNECTOR_CLASSPATH = "ConnectorClassPath"; //$NON-NLS-1$
+ public static final String CONNECTOR_TYPE_CLASSPATH = "ConnectorTypeClassPath"; //$NON-NLS-1$
}
/**
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConnectorBindingType.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -83,7 +83,7 @@
*/
public String[] getExtensionModules() {
ArrayList modules = new ArrayList();
- String classPath = getDefaultValue(Attributes.CONNECTOR_CLASSPATH);
+ String classPath = getDefaultValue(Attributes.CONNECTOR_TYPE_CLASSPATH);
if (classPath != null) {
StringTokenizer st = new StringTokenizer(classPath, ";"); //$NON-NLS-1$
while (st.hasMoreTokens()) {
Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnotations.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -27,7 +27,6 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.teiid.connector.internal.ConnectorPropertyNames;
public class ConnectorAnnotations {
Copied: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java (from rev 992, trunk/connector-api/src/main/java/org/teiid/connector/internal/ConnectorPropertyNames.java)
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java (rev 0)
+++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership. Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+package org.teiid.connector.api;
+
+public class ConnectorPropertyNames {
+
+ /**
+ * The property that specifies the class name of the custom connector class
+ * that connects to the data source. This property is required.
+ */
+ public static final String CONNECTOR_CLASS = "ConnectorClass"; //$NON-NLS-1$
+
+ /**
+ * The environment property name whose value defines the maximum number
+ * of processor threads. This property is required.
+ */
+ public static final String MAX_CONNECTIONS = "ConnectorMaxConnections"; //$NON-NLS-1$
+
+ /**
+ * This property can be used to specify the maximum number of rows to be returned
+ * from the datasource of this connector. The connector should stop adding records
+ * to the ResultsCollector when the rows collected is equal to this value. This
+ * property is optional and if no value is specified, we should return all the rows.
+ * @since 3.0
+ */
+ public static final String MAX_RESULT_ROWS = "MaxResultRows"; //$NON-NLS-1$
+
+ /**
+ * This property can be used to specify whether or not an exception should be thrown
+ * if the number of rows for a query exceeds the value of MAX_RESULT_ROWS. If this
+ * flag is set to false, then no more than MAX_RESULT_ROWS values will be returned but
+ * no exception will be thrown.
+ */
+ public static final String EXCEPTION_ON_MAX_ROWS = "ExceptionOnMaxRows"; //$NON-NLS-1$
+
+ /**
+ * This property can be used to specify whether or not Connection Pooling is enabled.
+ * If this flag is set to false, then connection pooling is disabled.
+ */
+ public static final String CONNECTION_POOL_ENABLED = "ConnectionPoolEnabled"; //$NON-NLS-1$
+
+ /**
+ * The environment property used to identify a <i>type</i> of connector binding.
+ * This property is required and is a component used to uniquely identify a
+ * connector instance.
+ * @since 4.0
+ */
+ public static final String CONNECTOR_BINDING_NAME = "ConnectorBindingName"; //$NON-NLS-1$
+
+ /**
+ * The environment property used to identify a routing ID. This value should
+ * be used to locate this particular connector from the DQP.
+ * @since 4.0
+ */
+ public static final String CONNECTOR_ID = "ConnectorID"; //$NON-NLS-1$
+
+ /**
+ * The name of the VM where the connector is running on.
+ * @since 4.0
+ */
+ public static final String CONNECTOR_VM_NAME = "ConnectorVMName"; //$NON-NLS-1$
+
+ /**
+ * Indicates whether the connector represents a pooled resource. If it does, then
+ * synchronous workers will be used.
+ */
+ public static final String SYNCH_WORKERS = "SynchWorkers"; //$NON-NLS-1$
+
+ public static final String USING_CUSTOM_CLASSLOADER = "UsingCustomClassloader"; //$NON-NLS-1$
+
+ public static final String CONNECTOR_CLASSPATH = "ConnectorClassPath"; //$NON-NLS-1$
+
+ public static final String CONNECTOR_TYPE_CLASSPATH = "ConnectorTypeClassPath"; //$NON-NLS-1$
+
+ public static final String IS_XA = "IsXA"; //$NON-NLS-1$
+
+ public static final String USE_CREDENTIALS_MAP = "UseCredentialMap"; //$NON-NLS-1$
+
+ public static final String ADMIN_CONNECTIONS_ALLOWED = "AdminConnectionsAllowed"; //$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$
+
+ /**
+ * This property can be used to bypass the normal logic that throws an exception when a command
+ * is about to be executed by a non-XA compatible connector, but there is a global transaction.
+ */
+ public static final String IS_IMMUTABLE = "Immutable"; //$NON-NLS-1$
+
+ public static final String USE_POST_DELEGATION = "UsePostDelegation"; //$NON-NLS-1$
+
+}
Property changes on: trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorPropertyNames.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:mergeinfo
+
Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java
===================================================================
--- trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnector.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -5,11 +5,11 @@
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.CredentialMap;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.MappedUserIdentity;
import org.teiid.connector.api.SingleIdentity;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import com.metamatrix.common.util.PropertiesUtils;
Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java
===================================================================
--- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtility.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -27,8 +27,8 @@
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ExecutionContext;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCBaseExecution.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -34,9 +34,9 @@
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorIdentity;
import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.basic.BasicExecution;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.jdbc.translator.TranslatedCommand;
import org.teiid.connector.jdbc.translator.Translator;
import org.teiid.connector.language.ICommand;
Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java
===================================================================
--- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/JDBCConnector.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -39,12 +39,12 @@
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.MappedUserIdentity;
import org.teiid.connector.api.SingleIdentity;
import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
import org.teiid.connector.basic.BasicConnector;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.jdbc.translator.Translator;
import org.teiid.connector.xa.api.TransactionContext;
import org.teiid.connector.xa.api.XAConnection;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/DefaultIndexConnectorBinding.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -25,7 +25,7 @@
import java.util.Date;
import java.util.Properties;
-import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorPropertyNames;
import com.metamatrix.common.config.api.ComponentTypeID;
import com.metamatrix.common.config.api.ConfigurationID;
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedDataService.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -32,7 +32,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.dqp.internal.datamgr.impl.ConnectorManager;
import org.teiid.dqp.internal.process.DQPWorkContext;
Modified: trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java
===================================================================
--- trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEmbeddedConfigurationService.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -34,7 +34,7 @@
import junit.framework.TestCase;
-import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorPropertyNames;
import com.metamatrix.api.exception.MetaMatrixComponentException;
import com.metamatrix.common.application.ApplicationEnvironment;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorEnvironmentImpl.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -33,8 +33,8 @@
import org.teiid.connector.api.CacheScope;
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.TypeFacility;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.language.ILanguageFactory;
import org.teiid.dqp.internal.cache.DQPContextCache;
import org.teiid.dqp.internal.datamgr.language.LanguageFactoryImpl;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/datamgr/impl/ConnectorManager.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -45,10 +45,10 @@
import org.teiid.connector.api.ConnectorCapabilities;
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling;
import org.teiid.connector.api.ConnectorAnnotations.SynchronousWorkers;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.xa.api.XAConnection;
import org.teiid.connector.xa.api.XAConnector;
import org.teiid.dqp.internal.cache.DQPContextCache;
Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/pooling/connector/ConnectionPool.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -40,9 +40,9 @@
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorIdentity;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.SingleIdentity;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.xa.api.TransactionContext;
import org.teiid.connector.xa.api.XAConnector;
import org.teiid.dqp.internal.datamgr.impl.ConnectorWrapper;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorManagerImpl.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -35,7 +35,7 @@
import org.junit.Test;
import org.mockito.Mockito;
-import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.dqp.internal.cache.ResultSetCache;
import org.teiid.dqp.internal.datamgr.impl.TestConnectorWorkItem.QueueResultsReceiver;
import org.teiid.dqp.internal.pooling.connector.FakeSourceConnectionFactory;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/datamgr/impl/TestConnectorWorkItem.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -33,8 +33,8 @@
import junit.framework.TestCase;
import org.teiid.connector.api.ConnectorException;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.ProcedureExecution;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.connector.language.IProcedure;
import org.teiid.connector.xa.api.TransactionContext;
import org.teiid.dqp.internal.datamgr.language.LanguageBridgeFactory;
Modified: trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/engine/src/test/java/org/teiid/dqp/internal/pooling/connector/TestPerUserPool.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -34,11 +34,11 @@
import org.teiid.connector.api.ConnectorEnvironment;
import org.teiid.connector.api.ConnectorException;
import org.teiid.connector.api.ConnectorLogger;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.connector.api.CredentialMap;
import org.teiid.connector.api.ExecutionContext;
import org.teiid.connector.api.MappedUserIdentity;
import org.teiid.connector.basic.BasicConnector;
-import org.teiid.connector.internal.ConnectorPropertyNames;
import org.teiid.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl;
import org.teiid.dqp.internal.datamgr.impl.ExecutionContextImpl;
Modified: trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-05-22 18:31:39 UTC (rev 994)
+++ trunk/server/src/main/java/com/metamatrix/server/connector/service/ConnectorService.java 2009-05-22 18:40:57 UTC (rev 995)
@@ -39,7 +39,7 @@
import java.util.Properties;
import org.teiid.connector.api.ConnectorException;
-import org.teiid.connector.internal.ConnectorPropertyNames;
+import org.teiid.connector.api.ConnectorPropertyNames;
import org.teiid.dqp.internal.datamgr.impl.ConnectorManager;
import org.teiid.dqp.internal.process.DQPCore;
import org.teiid.dqp.internal.process.DQPWorkContext;
15 years, 7 months
teiid SVN: r993 - in trunk: embedded/src/main/java/com/metamatrix/dqp/embedded/admin and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2009-05-22 13:22:12 -0400 (Fri, 22 May 2009)
New Revision: 993
Modified:
trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedConfigAdmin.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java
Log:
TEIID-623 adding a method to notify the embedded config that an extensionmodule has changed.
Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedConfigAdmin.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedConfigAdmin.java 2009-05-21 20:54:34 UTC (rev 992)
+++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedConfigAdmin.java 2009-05-22 17:22:12 UTC (rev 993)
@@ -31,9 +31,9 @@
*/
public interface EmbeddedConfigAdmin extends CoreConfigAdmin {
/**
- * Reload the User Defined function.
+ * Indicates that an extension module has changed
* @throws AdminException
* @since 6.1.0
*/
- void reloadUDF() throws AdminException;
+ void extensionModuleModified(String name) throws AdminException;
}
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-05-21 20:54:34 UTC (rev 992)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfigAdminImpl.java 2009-05-22 17:22:12 UTC (rev 993)
@@ -42,7 +42,6 @@
import com.metamatrix.admin.objects.MMAdminObject;
import com.metamatrix.admin.objects.MMAdminStatus;
import com.metamatrix.api.exception.MetaMatrixComponentException;
-import com.metamatrix.api.exception.MetaMatrixProcessingException;
import com.metamatrix.common.application.exception.ApplicationLifecycleException;
import com.metamatrix.common.config.api.ComponentType;
import com.metamatrix.common.config.api.ComponentTypeDefn;
@@ -1050,10 +1049,11 @@
throw new AdminComponentException(e);
}
}
-
+
@Override
- public void reloadUDF() throws AdminException {
+ public void extensionModuleModified(String name) throws AdminException {
try {
+ getConfigurationService().clearClassLoaderCache();
getConfigurationService().loadUDF();
} catch (MetaMatrixComponentException e) {
throw new AdminComponentException(e);
Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
--- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-05-21 20:54:34 UTC (rev 992)
+++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-05-22 17:22:12 UTC (rev 993)
@@ -1496,5 +1496,10 @@
public void unregister(ConnectorBindingLifeCycleListener listener) {
this.connectorBindingLifeCycleListeners.remove(listener);
}
+
+ @Override
+ public void clearClassLoaderCache() throws MetaMatrixComponentException {
+ this.classLoaderManager.clearCache();
+ }
}
Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java
===================================================================
--- trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java 2009-05-21 20:54:34 UTC (rev 992)
+++ trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationService.java 2009-05-22 17:22:12 UTC (rev 993)
@@ -408,7 +408,9 @@
* Load the UDF function model
* @throws MetaMatrixComponentException
*/
- void loadUDF() throws MetaMatrixComponentException;
+ void loadUDF() throws MetaMatrixComponentException;
+ void clearClassLoaderCache() throws MetaMatrixComponentException;
+
boolean isFullyConfiguredVDB(VDBArchive vdb) throws MetaMatrixComponentException;
}
15 years, 7 months
