teiid SVN: r2556 - in branches/7.1.x: runtime/src/main/java/org/teiid/deployers and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-10 15:34:56 -0400 (Fri, 10 Sep 2010)
New Revision: 2556
Added:
branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java
Modified:
branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
Log:
TEIID-1256: when the vdb un-deployed the caches are flushed.
Modified: branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java
===================================================================
--- branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-09 18:37:14 UTC (rev 2555)
+++ branches/7.1.x/jboss-integration/src/main/java/org/teiid/jboss/deployers/RuntimeEngineDeployer.java 2010-09-10 19:34:56 UTC (rev 2556)
@@ -49,6 +49,7 @@
import org.teiid.adminapi.Admin;
import org.teiid.adminapi.AdminComponentException;
import org.teiid.adminapi.AdminException;
+import org.teiid.adminapi.Admin.Cache;
import org.teiid.adminapi.impl.CacheStatisticsMetadata;
import org.teiid.adminapi.impl.DQPManagement;
import org.teiid.adminapi.impl.RequestMetadata;
@@ -62,6 +63,7 @@
import org.teiid.core.ComponentNotFoundException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
+import org.teiid.deployers.VDBLifeCycleListener;
import org.teiid.deployers.VDBRepository;
import org.teiid.dqp.internal.process.DQPConfiguration;
import org.teiid.dqp.internal.process.DQPCore;
@@ -181,6 +183,35 @@
LogManager.logError(LogConstants.CTX_RUNTIME, ne, IntegrationPlugin.Util.getString("jndi_failed", new Date(System.currentTimeMillis()).toString())); //$NON-NLS-1$
}
}
+
+ // add vdb life cycle listeners
+ this.vdbRepository.addListener(new VDBLifeCycleListener() {
+
+ @Override
+ public void added(String name, int version) {
+
+ }
+
+ @Override
+ public void removed(String name, int version) {
+ // terminate all the previous sessions
+ try {
+ Collection<SessionMetadata> sessions = sessionService.getActiveSessions();
+ for (SessionMetadata session:sessions) {
+ if (name.equalsIgnoreCase(session.getVDBName()) && version == session.getVDBVersion()){
+ sessionService.terminateSession(session.getSessionId(), null);
+ }
+ }
+ } catch (SessionServiceException e) {
+ //ignore
+ }
+
+ // dump the caches. TODO:It would have nice if only removed this VDB
+ // specific cache, but based on JBoss cache structure it is hard to just get keys
+ dqpCore.clearCache(Cache.PREPARED_PLAN_CACHE.toString());
+ dqpCore.clearCache(Cache.QUERY_SERVICE_RESULT_SET_CACHE.toString());
+ }
+ });
}
public void stop() {
Added: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java (rev 0)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java 2010-09-10 19:34:56 UTC (rev 2556)
@@ -0,0 +1,27 @@
+/*
+ * 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.deployers;
+
+public interface VDBLifeCycleListener {
+ void added(String name, int version);
+ void removed(String name, int version);
+}
Property changes on: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-09 18:37:14 UTC (rev 2555)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2010-09-10 19:34:56 UTC (rev 2556)
@@ -61,6 +61,7 @@
private MetadataStore systemStore;
private MetadataStore odbcStore;
private boolean odbcEnabled = false;
+ private List<VDBLifeCycleListener> listeners = new ArrayList<VDBLifeCycleListener>();
public void addVDB(VDBMetaData vdb, MetadataStoreGroup stores, LinkedHashMap<String, Resource> visibilityMap, UDFMetaData udf, ConnectorManagerRepository cmr) throws DeploymentException {
if (getVDB(vdb.getName(), vdb.getVersion()) != null) {
@@ -85,6 +86,7 @@
addODBCModel(vdb);
this.vdbRepo.put(vdbId(vdb), new CompositeVDB(vdb, stores, visibilityMap, udf, cmr, this.systemStore, odbcStore));
}
+ notifyAdd(vdb.getName(), vdb.getVersion());
}
private void addODBCModel(VDBMetaData vdb) {
@@ -186,6 +188,7 @@
for (CompositeVDB other:this.vdbRepo.values()) {
other.removeChild(key);
}
+ notifyRemove(key.getName(), key.getVersion());
return true;
}
return false;
@@ -227,10 +230,30 @@
}
}
- public void updateVDB(String name, int version) {
+ void updateVDB(String name, int version) {
CompositeVDB v = this.vdbRepo.get(new VDBKey(name, version));
if (v!= null) {
v.update(v.getVDB());
}
}
+
+ public synchronized void addListener(VDBLifeCycleListener listener) {
+ this.listeners.add(listener);
+ }
+
+ public synchronized void removeListener(VDBLifeCycleListener listener) {
+ this.listeners.remove(listener);
+ }
+
+ private void notifyAdd(String name, int version) {
+ for(VDBLifeCycleListener l:this.listeners) {
+ l.added(name, version);
+ }
+ }
+
+ private void notifyRemove(String name, int version) {
+ for(VDBLifeCycleListener l:this.listeners) {
+ l.removed(name, version);
+ }
+ }
}
13 years, 8 months
- 1
- 0
teiid SVN: r2555 - branches/7.1.x/build/kits/jboss-container/teiid-examples/jca.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-09 14:37:14 -0400 (Thu, 09 Sep 2010)
New Revision: 2555
Modified:
branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/ldap-ds.xml
Log:
fixing typo
Modified: branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/ldap-ds.xml
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/ldap-ds.xml 2010-09-09 15:59:30 UTC (rev 2554)
+++ branches/7.1.x/build/kits/jboss-container/teiid-examples/jca/ldap-ds.xml 2010-09-09 18:37:14 UTC (rev 2555)
@@ -7,7 +7,7 @@
<jndi-name>ldapDS</jndi-name>
<!-- The resource archive file that defines JCA connection for Sales Force (do not change this) -->
- <rar-name>teiid-connector-file.rar</rar-name>
+ <rar-name>teiid-connector-ldap.rar</rar-name>
<!-- connection interface; (do not change this) -->
<connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
13 years, 8 months
- 1
- 0
teiid SVN: r2554 - in branches/7.1.x: connectors/translator-file/src/main/java/org/teiid/translator/file and 4 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-09 11:59:30 -0400 (Thu, 09 Sep 2010)
New Revision: 2554
Modified:
branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionContext.java
branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java
branches/7.1.x/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java
branches/7.1.x/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/message/AtomicResultsMessage.java
Log:
TEIID-1252 took the simplest approach, which is to have the executionfactory indicate if lobs are usable after close
Modified: branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionContext.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionContext.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionContext.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -109,8 +109,14 @@
/**
* When the execution is turned on with "alive=true", the execution object will not
* be implicitly closed at the end of the last batch. It will only be closed at end
- * of the user query. This is useful in keeping the connection open for
+ * of the user query.
+ * <p>
+ * The engine will already detect situations when the connection should stay open for
* LOB (clob/blob/xml) streaming.
+ * <p>
+ * Keeping the execution alive unnecessarily may cause issues with connection usage
+ * as the connection instance may not be usable by other queries.
+ *
* @param alive
*/
void keepExecutionAlive(boolean alive);
Modified: branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java
===================================================================
--- branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/api/src/main/java/org/teiid/translator/ExecutionFactory.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -753,7 +753,7 @@
try {
if (className == null) {
if (defaultClass == null) {
- throw new TranslatorException("Neither class name or default class specified to create an instance"); //$NON-NLS-1$
+ throw new TranslatorException("Neither class name nor default class specified to create an instance"); //$NON-NLS-1$
}
return expectedType.cast(defaultClass.newInstance());
}
@@ -777,4 +777,12 @@
public void getMetadata(MetadataFactory metadataFactory, C conn) throws TranslatorException {
}
+
+ /**
+ * Indicates if LOBs are usable after the execution is closed.
+ * @return true if LOBs can be used after close
+ */
+ public boolean areLobsUsableAfterClose() {
+ return false;
+ }
}
Modified: branches/7.1.x/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java
===================================================================
--- branches/7.1.x/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -221,4 +221,9 @@
param.setAnnotation("The contents to save. Can be one of CLOB, BLOB, or XML");
}
+ @Override
+ public boolean areLobsUsableAfterClose() {
+ return true;
+ }
+
}
Modified: branches/7.1.x/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java
===================================================================
--- branches/7.1.x/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSExecutionFactory.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -159,5 +159,10 @@
metadataFactory.addProcedureParameter("result", TypeFacility.RUNTIME_NAMES.BLOB, Type.ReturnValue, p); //$NON-NLS-1$
metadataFactory.addProcedureParameter("contentType", TypeFacility.RUNTIME_NAMES.STRING, Type.Out, p); //$NON-NLS-1$
}
+
+ @Override
+ public boolean areLobsUsableAfterClose() {
+ return true;
+ }
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -136,7 +136,6 @@
}
public ConnectorWork registerRequest(AtomicRequestMessage message) throws TeiidComponentException {
- // Set the connector ID to be used; if not already set.
checkStatus();
AtomicRequestID atomicRequestId = message.getAtomicRequestID();
LogManager.logDetail(LogConstants.CTX_CONNECTOR, new Object[] {atomicRequestId, "Create State"}); //$NON-NLS-1$
@@ -156,7 +155,7 @@
*/
void removeState(AtomicRequestID id) {
LogManager.logDetail(LogConstants.CTX_CONNECTOR, new Object[] {id, "Remove State"}); //$NON-NLS-1$
- ConnectorWorkItem cwi = requestStates.remove(id);
+ requestStates.remove(id);
}
int size() {
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -335,6 +335,7 @@
response.setSupportsImplicitClose(!this.securityContext.keepExecutionAlive());
response.setTransactional(this.securityContext.isTransactional());
response.setWarnings(this.securityContext.getWarnings());
+ response.setSupportsCloseWithLobs(this.connector.areLobsUsableAfterClose());
if ( lastBatch ) {
response.setFinalRow(rowCount);
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierTupleSource.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -23,7 +23,6 @@
package org.teiid.dqp.internal.process;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
@@ -70,21 +69,21 @@
* notify the parent plan and just schedule the next poll.
*/
public class DataTierTupleSource implements TupleSource {
-
+
// Construction state
private final AtomicRequestMessage aqr;
private final RequestWorkItem workItem;
private final ConnectorWork cwi;
private final DataTierManagerImpl dtm;
- private List<Integer> convertToRuntimeType;
+ private boolean[] convertToRuntimeType;
private boolean[] convertToDesiredRuntimeType;
private Class<?>[] schema;
// Data state
private int index;
private int rowsProcessed;
- private volatile AtomicResultsMessage arm;
+ private AtomicResultsMessage arm;
private boolean closed;
private volatile boolean canceled;
private boolean executed;
@@ -102,12 +101,12 @@
List<SingleElementSymbol> symbols = this.aqr.getCommand().getProjectedSymbols();
this.schema = new Class[symbols.size()];
this.convertToDesiredRuntimeType = new boolean[symbols.size()];
- this.convertToRuntimeType = new ArrayList<Integer>(symbols.size());
+ this.convertToRuntimeType = new boolean[symbols.size()];
for (int i = 0; i < symbols.size(); i++) {
SingleElementSymbol symbol = symbols.get(i);
this.schema[i] = symbol.getType();
this.convertToDesiredRuntimeType[i] = true;
- this.convertToRuntimeType.add(i);
+ this.convertToRuntimeType[i] = true;
}
Assertion.isNull(workItem.getConnectorRequest(aqr.getAtomicRequestID()));
@@ -132,25 +131,26 @@
}
private List correctTypes(List row) throws TransformationException {
- for (int i = convertToRuntimeType.size() - 1; i >= 0; i--) {
- int idx = convertToRuntimeType.get(i);
- Object value = row.get(idx);
- if (value != null) {
- Object result = convertToRuntimeType(value, this.schema[idx]);
- if (DataTypeManager.isLOB(result.getClass())) {
- explicitClose = true;
+ //TODO: add a proper intermediate schema
+ for (int i = 0; i < row.size(); i++) {
+ Object value = row.get(i);
+ if (value == null) {
+ continue;
+ }
+ if (convertToRuntimeType[i]) {
+ boolean lob = !arm.supportsCloseWithLobs() && DataTypeManager.isLOB(value.getClass());
+ Object result = convertToRuntimeType(value, this.schema[i]);
+ if (value == result && !DataTypeManager.DefaultDataClasses.OBJECT.equals(this.schema[i])) {
+ convertToRuntimeType[i] = false;
+ } else {
+ if (lob && DataTypeManager.isLOB(result.getClass()) && DataTypeManager.isLOB(this.schema[i])) {
+ explicitClose = true;
+ }
+ row.set(i, result);
+ value = result;
}
- if (value == result && !DataTypeManager.DefaultDataClasses.OBJECT.equals(this.schema[idx])) {
- convertToRuntimeType.remove(i);
- continue;
- }
- row.set(idx, result);
}
- }
- //TODO: add a proper intermediate schema
- for (int i = 0; i < row.size(); i++) {
if (convertToDesiredRuntimeType[i]) {
- Object value = row.get(i);
if (value != null) {
Object result = DataTypeManager.transformValue(value, value.getClass(), this.schema[i]);
if (value == result) {
@@ -160,7 +160,7 @@
row.set(i, result);
}
} else {
- row.set(i, DataTypeManager.getCanonicalValue(row.get(i)));
+ row.set(i, DataTypeManager.getCanonicalValue(value));
}
}
return row;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/message/AtomicResultsMessage.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/message/AtomicResultsMessage.java 2010-09-08 21:22:26 UTC (rev 2553)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/message/AtomicResultsMessage.java 2010-09-09 15:59:30 UTC (rev 2554)
@@ -42,6 +42,8 @@
// by default we support implicit close.
private boolean supportsImplicitClose = true;
+
+ private boolean supportsCloseWithLobs;
private boolean isTransactional;
@@ -60,6 +62,14 @@
return this.supportsImplicitClose;
}
+ public boolean supportsCloseWithLobs() {
+ return supportsCloseWithLobs;
+ }
+
+ public void setSupportsCloseWithLobs(boolean supportsCloseWithLobs) {
+ this.supportsCloseWithLobs = supportsCloseWithLobs;
+ }
+
public void setSupportsImplicitClose(boolean supportsImplicitClose) {
this.supportsImplicitClose = supportsImplicitClose;
}
@@ -83,6 +93,7 @@
supportsImplicitClose = in.readBoolean();
warnings = (List<Exception>)in.readObject();
isTransactional = in.readBoolean();
+ supportsCloseWithLobs = in.readBoolean();
}
public void writeExternal(ObjectOutput out) throws IOException {
@@ -92,6 +103,7 @@
out.writeBoolean(supportsImplicitClose);
out.writeObject(warnings);
out.writeBoolean(isTransactional);
+ out.writeBoolean(supportsCloseWithLobs);
}
public boolean isTransactional() {
13 years, 8 months
- 1
- 0
teiid SVN: r2553 - in branches/7.1.x/engine/src: main/java/org/teiid/query/tempdata and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: shawkins
Date: 2010-09-08 17:22:26 -0400 (Wed, 08 Sep 2010)
New Revision: 2553
Modified:
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
Log:
TEIID-1254 adding detection of session scoped temp tables for determinism
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java 2010-09-08 20:07:17 UTC (rev 2552)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java 2010-09-08 21:22:26 UTC (rev 2553)
@@ -135,13 +135,8 @@
//if prepared plan does not exist, create one
prepPlan = new PreparedPlan();
LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query does not exist in cache: ", sqlQuery}); //$NON-NLS-1$
- }
-
- ProcessorPlan cachedPlan = prepPlan.getPlan();
-
- if (cachedPlan == null) {
- super.generatePlan();
- if (!this.addedLimit) { //TODO: this is a little problematic
+ super.generatePlan();
+ if (!this.addedLimit) { //TODO: this is a little problematic
prepPlan.setCommand(this.userCommand);
// Defect 13751: Clone the plan in its current state (i.e. before processing) so that it can be used for later queries
prepPlan.setPlan(processPlan.clone());
@@ -149,15 +144,17 @@
this.prepPlanCache.put(id, this.context.getDeterminismLevel(), prepPlan, userCommand.getCacheHint() != null?userCommand.getCacheHint().getTtl():null);
}
} else {
+ ProcessorPlan cachedPlan = prepPlan.getPlan();
+ this.userCommand = prepPlan.getCommand();
+ validateAccess(userCommand);
LogManager.logTrace(LogConstants.CTX_DQP, new Object[] { "Query exist in cache: ", sqlQuery }); //$NON-NLS-1$
processPlan = cachedPlan.clone();
//already in cache. obtain the values from cache
analysisRecord = prepPlan.getAnalysisRecord();
- this.userCommand = prepPlan.getCommand();
createCommandContext();
}
-
+
if (requestMsg.isBatchedUpdate()) {
handlePreparedBatchUpdate();
} else {
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 20:07:17 UTC (rev 2552)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 21:22:26 UTC (rev 2553)
@@ -24,6 +24,7 @@
import java.sql.Connection;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Properties;
import java.util.Set;
@@ -59,6 +60,7 @@
import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.eval.SecurityFunctionEvaluator;
+import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempCapabilitiesFinder;
import org.teiid.query.metadata.TempMetadataAdapter;
@@ -81,7 +83,9 @@
import org.teiid.query.sql.lang.SetQuery;
import org.teiid.query.sql.lang.StoredProcedure;
import org.teiid.query.sql.symbol.Constant;
+import org.teiid.query.sql.symbol.GroupSymbol;
import org.teiid.query.sql.symbol.Reference;
+import org.teiid.query.sql.visitor.GroupCollectorVisitor;
import org.teiid.query.sql.visitor.ReferenceCollectorVisitor;
import org.teiid.query.tempdata.TempTableStore;
import org.teiid.query.util.CommandContext;
@@ -380,15 +384,24 @@
List<Reference> references = ReferenceCollectorVisitor.getReferences(command);
- //there should be no reference (?) for query/update executed as statement
checkReferences(references);
this.analysisRecord = new AnalysisRecord(requestMsg.getShowPlan() != ShowPlan.OFF, requestMsg.getShowPlan() == ShowPlan.DEBUG);
resolveCommand(command);
+ validateAccess(userCommand);
+
createCommandContext();
-
+
+ Collection<GroupSymbol> groups = GroupCollectorVisitor.getGroups(command, true);
+ for (GroupSymbol groupSymbol : groups) {
+ if (groupSymbol.isTempTable()) {
+ this.context.setDeterminismLevel(FunctionMethod.SESSION_DETERMINISTIC);
+ break;
+ }
+ }
+
validateQuery(command);
command = QueryRewriter.rewrite(command, metadata, context);
@@ -448,8 +461,6 @@
postProcessXML();
- validateAccess(userCommand);
-
createProcessor();
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 20:07:17 UTC (rev 2552)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 21:22:26 UTC (rev 2553)
@@ -409,7 +409,6 @@
try {
String fullName = metadata.getFullName(group.getMetadataID());
//TODO: order by primary key nulls first - then have an insert ordered optimization
- //TODO: use the getCommand logic in RelationalPlanner to reuse commands for this.
String transformation = metadata.getVirtualPlan(group.getMetadataID()).getQuery();
QueryProcessor qp = context.getQueryProcessorFactory().createQueryProcessor(transformation, fullName, context);
qp.setNonBlocking(true);
Modified: branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
===================================================================
--- branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-09-08 20:07:17 UTC (rev 2552)
+++ branches/7.1.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2010-09-08 21:22:26 UTC (rev 2553)
@@ -36,6 +36,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.dqp.internal.process.CachedResults;
import org.teiid.dqp.internal.process.SessionAwareCache;
+import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.metadata.TempMetadataAdapter;
import org.teiid.query.tempdata.TempTableDataManager;
import org.teiid.query.tempdata.TempTableStore;
@@ -57,6 +58,7 @@
CommandContext cc = TestProcessor.createCommandContext();
cc.setTempTableStore(tempStore);
TestProcessor.doProcess(processorPlan, dataManager, expectedResults, cc);
+ assertTrue(cc.getDeterminismLevel() <= FunctionMethod.SESSION_DETERMINISTIC);
}
@Before public void setUp() {
13 years, 8 months
- 1
- 0
teiid SVN: r2552 - in branches/7.1.x: client/src/main/java/org/teiid/client and 28 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 16:07:17 -0400 (Wed, 08 Sep 2010)
New Revision: 2552
Removed:
branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java
branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java
branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
Modified:
branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java
branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java
branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java
branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java
branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java
branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java
branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java
branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java
branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java
branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1027: Consolidating the property files in engine and client.
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -32,9 +32,9 @@
import org.teiid.client.util.ExceptionUtil;
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.util.PropertiesUtils;
+import org.teiid.jdbc.JDBCPlugin;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
-import org.teiid.net.NetPlugin;
import org.teiid.net.ServerConnection;
import org.teiid.net.ServerConnectionFactory;
import org.teiid.net.TeiidURL;
@@ -64,7 +64,7 @@
private synchronized Admin getTarget() throws AdminComponentException {
if (closed) {
- throw new AdminComponentException(NetPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$
+ throw new AdminComponentException(JDBCPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$
}
return target;
}
@@ -186,7 +186,7 @@
String applicationName) throws AdminException {
if (userName == null || userName.trim().length() == 0) {
- throw new IllegalArgumentException(NetPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$
+ throw new IllegalArgumentException(JDBCPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$
}
final Properties p = new Properties();
Modified: branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/client/BatchSerializer.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -35,7 +35,7 @@
import java.util.Map;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.net.NetPlugin;
+import org.teiid.jdbc.JDBCPlugin;
@@ -380,7 +380,7 @@
break objectSearch;
}
}
- throw new IOException(NetPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$
+ throw new IOException(JDBCPlugin.Util.getString("BatchSerializer.datatype_mismatch", new Object[] {types[i], new Integer(i), objectClass})); //$NON-NLS-1$
}
}
}
Modified: branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/client/RequestMessage.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -33,7 +33,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.util.ExternalizeUtil;
-import org.teiid.net.NetPlugin;
+import org.teiid.jdbc.JDBCPlugin;
/**
@@ -221,7 +221,7 @@
if (!(txnAutoWrapMode.equals(TXN_WRAP_OFF)
|| txnAutoWrapMode.equals(TXN_WRAP_ON)
|| txnAutoWrapMode.equals(TXN_WRAP_DETECT))) {
- throw new TeiidProcessingException(NetPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$
+ throw new TeiidProcessingException(JDBCPlugin.Util.getString("RequestMessage.invalid_txnAutoWrap", txnAutoWrapMode)); //$NON-NLS-1$
}
}
this.txnAutoWrapMode = txnAutoWrapMode;
Modified: branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/client/lob/StreamingLobChunckProducer.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -29,7 +29,7 @@
import org.teiid.client.DQP;
import org.teiid.core.TeiidException;
import org.teiid.core.types.Streamable;
-import org.teiid.net.NetPlugin;
+import org.teiid.jdbc.JDBCPlugin;
public class StreamingLobChunckProducer implements LobChunkProducer {
@@ -71,7 +71,7 @@
Future<LobChunk> result = dqp.requestNextLobChunk(streamRequestId, requestId, streamable.getReferenceStreamId());
return result.get();
} catch (Exception e) {
- IOException ex = new IOException(NetPlugin.Util.getString("StreamImpl.Unable_to_read_data_from_stream", e.getMessage())); //$NON-NLS-1$
+ IOException ex = new IOException(JDBCPlugin.Util.getString("StreamImpl.Unable_to_read_data_from_stream", e.getMessage())); //$NON-NLS-1$
ex.initCause(e);
throw ex;
}
Deleted: branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/NetPlugin.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,35 +0,0 @@
-/*
- * 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.net;
-
-import java.util.ResourceBundle;
-
-import org.teiid.core.BundleUtil;
-
-public class NetPlugin {
-
- public static final String PLUGIN_ID = NetPlugin.class.getPackage().getName();
-
- public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
- PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
-}
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/TeiidURL.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -29,7 +29,9 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
+import org.teiid.jdbc.JDBCPlugin;
+
/**
* Class defines the URL in the Teiid.
*
@@ -92,7 +94,7 @@
public static final String FORMAT_SERVER = "mm[s]://server1:port1[,server2:port2]"; //$NON-NLS-1$
- public static final String INVALID_FORMAT_SERVER = NetPlugin.Util.getString("MMURL.INVALID_FORMAT", new Object[] {FORMAT_SERVER}); //$NON-NLS-1$
+ public static final String INVALID_FORMAT_SERVER = JDBCPlugin.Util.getString("MMURL.INVALID_FORMAT", new Object[] {FORMAT_SERVER}); //$NON-NLS-1$
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -49,10 +49,10 @@
import org.teiid.client.util.ResultsFuture;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidException;
+import org.teiid.jdbc.JDBCPlugin;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
import org.teiid.net.HostInfo;
-import org.teiid.net.NetPlugin;
import org.teiid.net.ServerConnection;
import org.teiid.net.TeiidURL;
@@ -103,7 +103,7 @@
public synchronized SocketServerInstance selectServerInstance()
throws CommunicationException, ConnectionException {
if (closed) {
- throw new CommunicationException(NetPlugin.Util.getString("SocketServerConnection.closed")); //$NON-NLS-1$
+ throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerConnection.closed")); //$NON-NLS-1$
}
if (this.serverInstance != null && (!failOver || this.serverInstance.isOpen())) {
return this.serverInstance;
@@ -145,7 +145,7 @@
if (e.getCause() instanceof CommunicationException) {
throw (CommunicationException)e.getCause();
}
- throw new CommunicationException(e, NetPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$
+ throw new CommunicationException(e, JDBCPlugin.Util.getString("PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to")); //$NON-NLS-1$
}
}
return this.serverInstance;
@@ -157,13 +157,13 @@
this.serverDiscovery.markInstanceAsBad(hostInfo);
if (knownHosts == 1) { //just a single host, use the exception
if (ex instanceof UnknownHostException) {
- throw new SingleInstanceCommunicationException(ex, NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Unknown_Host", hostInfo.getHostName())); //$NON-NLS-1$
+ throw new SingleInstanceCommunicationException(ex, JDBCPlugin.Util.getString("SocketServerInstance.Connection_Error.Unknown_Host", hostInfo.getHostName())); //$NON-NLS-1$
}
- throw new SingleInstanceCommunicationException(ex,NetPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage())); //$NON-NLS-1$
+ throw new SingleInstanceCommunicationException(ex,JDBCPlugin.Util.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostInfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage())); //$NON-NLS-1$
}
log.log(Level.FINE, "Unable to connect to host", ex); //$NON-NLS-1$
}
- throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$
+ throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NON-NLS-1$
}
private ILogon connect(HostInfo hostInfo) throws CommunicationException,
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -52,9 +52,9 @@
import org.teiid.core.crypto.Cryptor;
import org.teiid.core.crypto.DhKeyGenerator;
import org.teiid.core.crypto.NullCryptor;
+import org.teiid.jdbc.JDBCPlugin;
import org.teiid.net.CommunicationException;
import org.teiid.net.HostInfo;
-import org.teiid.net.NetPlugin;
/**
@@ -112,7 +112,7 @@
Object obj = this.socketChannel.read();
if (!(obj instanceof Handshake)) {
- throw new CommunicationException(NetPlugin.Util.getString("SocketServerInstanceImpl.handshake_error")); //$NON-NLS-1$
+ throw new CommunicationException(JDBCPlugin.Util.getString("SocketServerInstanceImpl.handshake_error")); //$NON-NLS-1$
}
handshake = (Handshake)obj;
break;
Modified: branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -43,7 +43,7 @@
import javax.net.ssl.TrustManagerFactory;
import org.teiid.core.util.Assertion;
-import org.teiid.net.NetPlugin;
+import org.teiid.jdbc.JDBCPlugin;
@@ -208,7 +208,7 @@
try {
stream = new FileInputStream(name);
} catch (FileNotFoundException e) {
- IOException exception = new IOException(NetPlugin.Util.getString("SocketHelper.keystore_not_found", name)); //$NON-NLS-1$
+ IOException exception = new IOException(JDBCPlugin.Util.getString("SocketHelper.keystore_not_found", name)); //$NON-NLS-1$
exception.initCause(e);
throw exception;
}
Modified: branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/resources/org/teiid/jdbc/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -91,7 +91,7 @@
MMDataSource.Alternate_Servers_format=The format for the alternateServers property is <server2>[:<port2>][,<server3>[:<port3>],...].
MMDataSource.alternateServer_is_invalid=The alternateServers property contains the following {0} error(s): {1}
StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
+
MMStatement.Invalid_During_Transaction=Call to method {0} not valid during a transaction.
StoredProcedureResultsImpl.ResultSet_cursor_is_after_the_last_row._1=ResultSet cursor is after the last row.
StoredProcedureResultsImpl.Invalid_parameter_index__{0}_2=Invalid parameter index: {0}
@@ -128,3 +128,24 @@
StatementImpl.show_update_count=SHOW does not return an update count
StatementImpl.set_result_set=SET does not return a result set.
+
+StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
+RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode.
+LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
+PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid
+
+admin_conn_closed = The Admin connection has been closed.
+invalid_parameter = The user parameter may not be null or empty.
+
+SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0}
+SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2}
+SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0}
+SocketServerInstanceImpl.handshake_error=Handshake error
+
+
+SocketServerConnection.closed=Server connection is closed
+SocketHelper.keystore_not_found=Key store ''{0}'' was not found.
+
+MMURL.INVALID_FORMAT=The required url format is {0}
+
+BatchSerializer.datatype_mismatch=The modeled datatype {0} for column {1} doesn''t match the runtime type "{2}". Please ensure that the column''s modeled datatype matches the expected data.
Deleted: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,44 +0,0 @@
-#
-# 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.
-#
-
-StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode.
-LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
-PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid
-
-admin_conn_closed = The Admin connection has been closed.
-invalid_parameter = The user parameter may not be null or empty.
-
-SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0}
-SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2}
-SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0}
-SocketServerInstanceImpl.handshake_error=Handshake error
-SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
-
-SSLAwareChannelHandler.channel_closed=Channel closed
-SocketServerConnection.closed=Server connection is closed
-SocketHelper.keystore_not_found=Key store ''{0}'' was not found.
-
-MMURL.INVALID_FORMAT=The required url format is {0}
-
-BatchSerializer.datatype_mismatch=The modeled datatype {0} for column {1} doesn''t match the runtime type "{2}". Please ensure that the column''s modeled datatype matches the expected data.
-
Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/LobManager.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -30,7 +30,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.Streamable;
-import org.teiid.dqp.DQPPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.symbol.Expression;
/**
@@ -64,7 +64,7 @@
lob = this.lobReferences.get(id);
}
if (lob == null) {
- throw new TeiidComponentException(DQPPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$
}
return lob;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -32,10 +32,10 @@
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.Streamable;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.symbol.Expression;
@@ -259,7 +259,7 @@
public Streamable<?> getLobReference(String id) throws TeiidComponentException {
if (lobManager == null) {
- throw new TeiidComponentException(DQPPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("ProcessWorker.wrongdata")); //$NON-NLS-1$
}
return lobManager.getLobReference(id);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -63,7 +63,7 @@
import org.teiid.core.util.Assertion;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.processor.relational.ListNestedSortComparator;
@@ -291,9 +291,9 @@
}
return batch;
} catch(IOException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$
} catch (ClassNotFoundException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", batchManager.id)); //$NON-NLS-1$
} finally {
this.batchManager.compactionLock.readLock().unlock();
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -38,7 +38,7 @@
import org.teiid.core.util.Assertion;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
/**
@@ -116,7 +116,7 @@
fileAccess.seek(fileOffset - entry.getKey());
return fileAccess.read(b, offSet, length);
} catch (IOException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$
} finally {
fileInfo.close();
}
@@ -130,7 +130,7 @@
long used = usedBufferSpace.addAndGet(length);
if (used > maxBufferSpace) {
usedBufferSpace.addAndGet(-length);
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.space_exhausted", maxBufferSpace)); //$NON-NLS-1$
}
Map.Entry<Long, FileInfo> entry = this.storageFiles.lastEntry();
boolean createNew = false;
@@ -159,7 +159,7 @@
fileAccess.seek(pointer);
fileAccess.write(bytes, offset, length);
} catch(IOException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_reading", fileInfo.file.getAbsoluteFile())); //$NON-NLS-1$
} finally {
fileInfo.close();
}
@@ -202,17 +202,17 @@
*/
public void initialize() throws TeiidComponentException {
if(this.directory == null) {
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.no_directory")); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.no_directory")); //$NON-NLS-1$
}
dirFile = new File(this.directory);
if(dirFile.exists()) {
if(! dirFile.isDirectory()) {
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.not_a_directory", dirFile.getAbsoluteFile())); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.not_a_directory", dirFile.getAbsoluteFile())); //$NON-NLS-1$
}
} else if(! dirFile.mkdirs()) {
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("FileStoreageManager.error_creating", dirFile.getAbsoluteFile())); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("FileStoreageManager.error_creating", dirFile.getAbsoluteFile())); //$NON-NLS-1$
}
}
@@ -240,7 +240,7 @@
}
return storageFile;
} catch(IOException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("FileStoreageManager.error_creating", name + "_" + fileNumber)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("FileStoreageManager.error_creating", name + "_" + fileNumber)); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Deleted: branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/DQPPlugin.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,39 +0,0 @@
-/*
- * 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.dqp;
-
-import java.util.ResourceBundle;
-
-import org.teiid.core.BundleUtil;
-
-
-/**
- * DQPPlugin
- */
-public class DQPPlugin {
-
- public static final String PLUGIN_ID = DQPPlugin.class.getPackage().getName();
- public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
- PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
-
-}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorManager.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -37,7 +37,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.message.AtomicRequestID;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.logging.CommandLogMessage;
@@ -48,6 +47,7 @@
import org.teiid.metadata.Datatype;
import org.teiid.metadata.MetadataFactory;
import org.teiid.metadata.MetadataStore;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
import org.teiid.query.optimizer.capabilities.SourceCapabilities.Scope;
@@ -90,12 +90,12 @@
if (ef.isSourceRequired()) {
Object conn = getConnectionFactory();
if (conn == null) {
- sb.append(DQPPlugin.Util.getString("datasource_not_found", this.connectionName)); //$NON-NLS-1$
+ sb.append(QueryPlugin.Util.getString("datasource_not_found", this.connectionName)); //$NON-NLS-1$
}
}
}
else {
- sb.append(DQPPlugin.Util.getString("translator_not_found", this.translatorName)); //$NON-NLS-1$
+ sb.append(QueryPlugin.Util.getString("translator_not_found", this.translatorName)); //$NON-NLS-1$
}
return sb.toString();
}
@@ -110,7 +110,7 @@
try {
unwrapped = ((WrappedConnection)connection).unwrap();
} catch (ResourceException e) {
- throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
+ throw new TranslatorException(QueryPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
}
}
@@ -168,7 +168,7 @@
* @throws TranslatorException
*/
public void start() {
- LogManager.logDetail(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("ConnectorManagerImpl.Initializing_connector", translatorName)); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("ConnectorManagerImpl.Initializing_connector", translatorName)); //$NON-NLS-1$
}
/**
@@ -257,7 +257,7 @@
private void checkStatus() throws TeiidComponentException {
if (stopped) {
- throw new TeiidComponentException(DQPPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("ConnectorManager.not_in_valid_state", this.translatorName)); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -34,7 +34,6 @@
import org.teiid.common.buffer.TupleBuffer;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.message.AtomicRequestID;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.AtomicResultsMessage;
@@ -44,6 +43,7 @@
import org.teiid.logging.LogManager;
import org.teiid.logging.CommandLogMessage.Event;
import org.teiid.metadata.RuntimeMetadata;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataAdapter;
import org.teiid.query.metadata.TempMetadataStore;
@@ -120,10 +120,10 @@
if(execution != null) {
execution.cancel();
}
- LogManager.logDetail(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("DQPCore.The_atomic_request_has_been_cancelled", this.id)); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("DQPCore.The_atomic_request_has_been_cancelled", this.id)); //$NON-NLS-1$
}
} catch (TranslatorException e) {
- LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPlugin.Util.getString("Cancel_request_failed", this.id)); //$NON-NLS-1$
+ LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, QueryPlugin.Util.getString("Cancel_request_failed", this.id)); //$NON-NLS-1$
}
}
@@ -170,7 +170,7 @@
}
manager.logSRCCommand(this.requestMsg, this.securityContext, Event.ERROR, null);
- String msg = DQPPlugin.Util.getString("ConnectorWorker.process_failed", this.id); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("ConnectorWorker.process_failed", this.id); //$NON-NLS-1$
if (isCancelled.get()) {
LogManager.logDetail(LogConstants.CTX_CONNECTOR, msg);
} else if (t instanceof TranslatorException || t instanceof TeiidProcessingException) {
@@ -202,7 +202,7 @@
try {
unwrapped = ((WrappedConnection)connection).unwrap();
} catch (ResourceException e) {
- throw new TranslatorException(DQPPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
+ throw new TranslatorException(QueryPlugin.Util.getString("failed_to_unwrap_connection")); //$NON-NLS-1$
}
}
@@ -300,7 +300,7 @@
this.lastBatch = true;
break;
} else if (this.rowCount > this.requestMsg.getMaxResultRows() && this.requestMsg.isExceptionOnMaxRows()) {
- String msg = DQPPlugin.Util.getString("ConnectorWorker.MaxResultRowsExceed", this.requestMsg.getMaxResultRows()); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("ConnectorWorker.MaxResultRowsExceed", this.requestMsg.getMaxResultRows()); //$NON-NLS-1$
throw new TranslatorException(msg);
}
}
@@ -326,7 +326,7 @@
if ( !lastBatch && currentRowCount == 0 ) {
// Defect 13366 - Should send all batches, even if they're zero size.
// Log warning if received a zero-size non-last batch from the connector.
- LogManager.logWarning(LogConstants.CTX_CONNECTOR, DQPPlugin.Util.getString("ConnectorWorker.zero_size_non_last_batch", requestMsg.getConnectorName())); //$NON-NLS-1$
+ LogManager.logWarning(LogConstants.CTX_CONNECTOR, QueryPlugin.Util.getString("ConnectorWorker.zero_size_non_last_batch", requestMsg.getConnectorName())); //$NON-NLS-1$
}
AtomicResultsMessage response = createResultsMessage(rows.toArray(new List[currentRowCount]), requestMsg.getCommand().getProjectedSymbols());
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/datamgr/ProcedureBatchHandler.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -30,12 +30,12 @@
import java.util.Collections;
import java.util.List;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.language.Argument;
import org.teiid.language.Call;
import org.teiid.language.Argument.Direction;
+import org.teiid.query.QueryPlugin;
+import org.teiid.translator.ProcedureExecution;
import org.teiid.translator.TranslatorException;
-import org.teiid.translator.ProcedureExecution;
class ProcedureBatchHandler {
@@ -67,7 +67,7 @@
List padRow(List row) throws TranslatorException {
if (row.size() != resultSetCols) {
- throw new TranslatorException(DQPPlugin.Util.getString("ConnectorWorker.ConnectorWorker_result_set_unexpected_columns", new Object[] {proc, new Integer(resultSetCols), new Integer(row.size())})); //$NON-NLS-1$
+ throw new TranslatorException(QueryPlugin.Util.getString("ConnectorWorker.ConnectorWorker_result_set_unexpected_columns", new Object[] {proc, new Integer(resultSetCols), new Integer(row.size())})); //$NON-NLS-1$
}
if (paramCols == 0) {
return row;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -25,7 +25,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -39,12 +38,12 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.process.multisource.MultiSourceElement;
import org.teiid.logging.AuditMessage;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.metadata.TempMetadataID;
import org.teiid.query.resolver.util.ResolverUtil;
@@ -262,7 +261,7 @@
// is not authorized in the exception message
handleValidationError(
- DQPPlugin.Util.getString("ERR.018.005.0095", new Object[]{DQPWorkContext.getWorkContext().getSessionId(), getActionLabel(actionCode)}), //$NON-NLS-1$
+ QueryPlugin.Util.getString("ERR.018.005.0095", new Object[]{DQPWorkContext.getWorkContext().getSessionId(), getActionLabel(actionCode)}), //$NON-NLS-1$
inaccessibleSymbols);
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedFinder.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -30,9 +30,9 @@
import org.teiid.core.CoreConstants;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.optimizer.capabilities.BasicSourceCapabilities;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
@@ -75,7 +75,7 @@
try {
ConnectorManager mgr = this.connectorRepo.getConnectorManager(sourceName);
if (mgr == null) {
- throw new TranslatorException(DQPPlugin.Util.getString("CachedFinder.no_connector_found", sourceName, modelName, sourceName)); //$NON-NLS-1$
+ throw new TranslatorException(QueryPlugin.Util.getString("CachedFinder.no_connector_found", sourceName, modelName, sourceName)); //$NON-NLS-1$
}
caps = mgr.getCapabilities();
break;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/CachedResults.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -37,9 +37,9 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.parser.ParseInfo;
@@ -143,7 +143,7 @@
}
return true;
} catch (TeiidComponentException e) {
- LogManager.logDetail(LogConstants.CTX_DQP, DQPPlugin.Util.getString("not_found_cache")); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_DQP, QueryPlugin.Util.getString("not_found_cache")); //$NON-NLS-1$
}
return false;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -61,7 +61,6 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.Streamable;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable;
import org.teiid.dqp.message.AtomicRequestMessage;
import org.teiid.dqp.message.RequestID;
@@ -74,6 +73,7 @@
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
import org.teiid.logging.CommandLogMessage.Event;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.processor.ProcessorDataManager;
import org.teiid.query.tempdata.TempTableDataManager;
import org.teiid.query.tempdata.TempTableStore;
@@ -461,7 +461,7 @@
RequestWorkItem getRequestWorkItem(RequestID reqID) throws TeiidProcessingException {
RequestWorkItem result = this.requests.get(reqID);
if (result == null) {
- throw new TeiidProcessingException(DQPPlugin.Util.getString("DQPCore.The_request_has_been_closed.", reqID));//$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("DQPCore.The_request_has_been_closed.", reqID));//$NON-NLS-1$
}
return result;
}
@@ -514,7 +514,7 @@
if (markCancelled) {
logMMCommand(workItem, Event.CANCEL, null);
} else {
- LogManager.logDetail(LogConstants.CTX_DQP, DQPPlugin.Util.getString("DQPCore.failed_to_cancel")); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.failed_to_cancel")); //$NON-NLS-1$
}
return markCancelled;
}
@@ -544,7 +544,7 @@
}
private void clearPlanCache(){
- LogManager.logInfo(LogConstants.CTX_DQP, DQPPlugin.Util.getString("DQPCore.Clearing_prepared_plan_cache")); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_DQP, QueryPlugin.Util.getString("DQPCore.Clearing_prepared_plan_cache")); //$NON-NLS-1$
this.prepPlanCache.clearAll();
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -50,7 +50,6 @@
import org.teiid.core.types.SQLXMLImpl;
import org.teiid.core.types.XMLType;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.datamgr.ConnectorManager;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.datamgr.ConnectorWork;
@@ -66,6 +65,7 @@
import org.teiid.metadata.ProcedureParameter;
import org.teiid.metadata.Schema;
import org.teiid.metadata.Table;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.CompositeMetadataStore;
import org.teiid.query.metadata.TempMetadataID;
import org.teiid.query.metadata.TransformationMetadata;
@@ -372,7 +372,7 @@
List<String> bindings = model.getSourceNames();
if (bindings == null || bindings.size() != 1) {
// this should not happen, but it did occur when setting up the SystemAdmin models
- throw new TeiidComponentException(DQPPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("DataTierManager.could_not_obtain_connector_binding", new Object[]{modelName, workItem.getDqpWorkContext().getVdbName(), workItem.getDqpWorkContext().getVdbVersion() })); //$NON-NLS-1$
}
connectorBindingId = bindings.get(0);
Assertion.isNotNull(connectorBindingId, "could not obtain connector id"); //$NON-NLS-1$
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/LobWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -37,8 +37,8 @@
import org.teiid.core.types.XMLType;
import org.teiid.core.util.Assertion;
import org.teiid.core.util.ReaderInputStream;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
public class LobWorkItem implements Work {
@@ -75,7 +75,7 @@
chunk = stream.getNextChunk();
shouldClose = chunk.isLast();
} catch (TeiidComponentException e) {
- LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$
+ LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$
ex = e;
} catch (IOException e) {
ex = e;
@@ -102,7 +102,7 @@
stream.close();
}
} catch (IOException e) {
- LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$
+ LogManager.logWarning(org.teiid.logging.LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.LobError")); //$NON-NLS-1$
}
parent.removeLobStream(streamRequestId);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -45,7 +45,6 @@
import org.teiid.core.id.IntegerIDFactory;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.datamgr.ConnectorManagerRepository;
import org.teiid.dqp.internal.process.multisource.MultiSourceCapabilitiesFinder;
import org.teiid.dqp.internal.process.multisource.MultiSourceMetadataWrapper;
@@ -57,6 +56,7 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.eval.SecurityFunctionEvaluator;
import org.teiid.query.metadata.QueryMetadataInterface;
@@ -185,7 +185,7 @@
globalTables = vdbMetadata.getAttachment(TempTableStore.class);
if (metadata == null) {
- throw new TeiidComponentException(DQPPlugin.Util.getString("DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}", this.vdbName, this.vdbVersion)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}", this.vdbName, this.vdbVersion)); //$NON-NLS-1$
}
this.metadata = new TempMetadataAdapter(metadata, new TempMetadataStore());
@@ -215,7 +215,7 @@
}
if ((this.requestMsg.getResultsMode() == ResultsMode.UPDATECOUNT && !returnsUpdateCount)
|| (this.requestMsg.getResultsMode() == ResultsMode.RESULTSET && !returnsResultSet)) {
- throw new QueryValidatorException(DQPPlugin.Util.getString(this.requestMsg.getResultsMode()==ResultsMode.RESULTSET?"Request.no_result_set":"Request.result_set")); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryValidatorException(QueryPlugin.Util.getString(this.requestMsg.getResultsMode()==ResultsMode.RESULTSET?"Request.no_result_set":"Request.result_set")); //$NON-NLS-1$ //$NON-NLS-2$
}
// Create command context, used in rewriting, planning, and processing
@@ -274,7 +274,7 @@
static void referenceCheck(List<Reference> references) throws QueryValidatorException {
if (references != null && !references.isEmpty()) {
- throw new QueryValidatorException(DQPPlugin.Util.getString("Request.Invalid_character_in_query")); //$NON-NLS-1$
+ throw new QueryValidatorException(QueryPlugin.Util.getString("Request.Invalid_character_in_query")); //$NON-NLS-1$
}
}
@@ -431,9 +431,9 @@
LogManager.logDetail(LogConstants.CTX_QUERY_PLANNER, analysisRecord.getAnnotations());
}
}
- LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { DQPPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_DQP, new Object[] { QueryPlugin.Util.getString("BasicInterceptor.ProcessTree_for__4"), requestId, processPlan }); //$NON-NLS-1$
} catch (QueryMetadataException e) {
- throw new QueryPlannerException(e, DQPPlugin.Util.getString("DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.", requestId)); //$NON-NLS-1$
+ throw new QueryPlannerException(e, QueryPlugin.Util.getString("DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.", requestId)); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -45,7 +45,6 @@
import org.teiid.core.TeiidException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.dqp.internal.process.ThreadReuseExecutor.PrioritizedRunnable;
import org.teiid.dqp.message.AtomicRequestID;
@@ -57,8 +56,8 @@
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
import org.teiid.logging.CommandLogMessage.Event;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.parser.ParseInfo;
import org.teiid.query.processor.BatchCollector;
@@ -173,7 +172,7 @@
state = ProcessingState.PROCESSING;
processNew();
if (isCanceled) {
- this.processingException = new TeiidProcessingException(QueryExecPlugin.Util.getString("QueryProcessor.request_cancelled", this.requestID)); //$NON-NLS-1$
+ this.processingException = new TeiidProcessingException(QueryPlugin.Util.getString("QueryProcessor.request_cancelled", this.requestID)); //$NON-NLS-1$
state = ProcessingState.CLOSE;
}
}
@@ -205,9 +204,9 @@
cause = cause.getCause();
}
StackTraceElement elem = cause.getStackTrace()[0];
- LogManager.logWarning(LogConstants.CTX_DQP, DQPPlugin.Util.getString("ProcessWorker.processing_error", e.getMessage(), requestID, e.getClass().getName(), elem)); //$NON-NLS-1$
+ LogManager.logWarning(LogConstants.CTX_DQP, QueryPlugin.Util.getString("ProcessWorker.processing_error", e.getMessage(), requestID, e.getClass().getName(), elem)); //$NON-NLS-1$
}else {
- LogManager.logError(LogConstants.CTX_DQP, e, DQPPlugin.Util.getString("ProcessWorker.error", requestID)); //$NON-NLS-1$
+ LogManager.logError(LogConstants.CTX_DQP, e, QueryPlugin.Util.getString("ProcessWorker.error", requestID)); //$NON-NLS-1$
}
}
@@ -314,7 +313,7 @@
try {
this.transactionService.rollback(transactionContext);
} catch (XATransactionException e1) {
- LogManager.logWarning(LogConstants.CTX_DQP, e1, DQPPlugin.Util.getString("ProcessWorker.failed_rollback")); //$NON-NLS-1$
+ LogManager.logWarning(LogConstants.CTX_DQP, e1, QueryPlugin.Util.getString("ProcessWorker.failed_rollback")); //$NON-NLS-1$
}
} else {
suspend();
@@ -376,7 +375,7 @@
cr.setAnalysisRecord(analysisRecord);
cr.setResults(resultsBuffer);
if (determinismLevel > FunctionMethod.SESSION_DETERMINISTIC) {
- LogManager.logInfo(LogConstants.CTX_DQP, DQPPlugin.Util.getString("RequestWorkItem.cache_nondeterministic", originalCommand)); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_DQP, QueryPlugin.Util.getString("RequestWorkItem.cache_nondeterministic", originalCommand)); //$NON-NLS-1$
}
dqpCore.getRsCache().put(cid, determinismLevel, cr, originalCommand.getCacheHint() != null?originalCommand.getCacheHint().getTtl():null);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -53,11 +53,11 @@
import org.teiid.client.xa.XATransactionException;
import org.teiid.client.xa.XidImpl;
import org.teiid.core.util.Assertion;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.dqp.internal.process.DQPCore.FutureWork;
import org.teiid.dqp.service.TransactionContext;
import org.teiid.dqp.service.TransactionService;
import org.teiid.dqp.service.TransactionContext.Scope;
+import org.teiid.query.QueryPlugin;
public class TransactionServerImpl implements TransactionService {
@@ -136,7 +136,7 @@
public int prepare(final String threadId, XidImpl xid, boolean singleTM) throws XATransactionException {
TransactionContext tc = checkXAState(threadId, xid, true, false);
if (!tc.getSuspendedBy().isEmpty()) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.suspended_exist", xid)); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.suspended_exist", xid)); //$NON-NLS-1$
}
// In the container this pass though
@@ -232,7 +232,7 @@
checkXAState(threadId, xid, false, false);
tc = transactions.getOrCreateTransactionContext(threadId);
if (tc.getTransactionType() != TransactionContext.Scope.NONE) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
}
tc.setTransactionTimeout(timeout);
tc.setXid(xid);
@@ -268,16 +268,16 @@
tc = checkXAState(threadId, xid, true, false);
TransactionContext threadContext = transactions.getOrCreateTransactionContext(threadId);
if (threadContext.getTransactionType() != TransactionContext.Scope.NONE) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
}
if (flags == XAResource.TMRESUME && !tc.getSuspendedBy().remove(threadId)) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.resume_failed", new Object[] {xid, threadId})); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.resume_failed", new Object[] {xid, threadId})); //$NON-NLS-1$
}
break;
}
default:
- throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_INVAL, QueryPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$
}
tc.setThreadId(threadId);
@@ -304,7 +304,7 @@
break;
}
default:
- throw new XATransactionException(XAException.XAER_INVAL, DQPPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_INVAL, QueryPlugin.Util.getString("TransactionServer.unknown_flags")); //$NON-NLS-1$
}
} finally {
tc.setThreadId(null);
@@ -316,15 +316,15 @@
TransactionContext tc = transactions.getTransactionContext(xid);
if (transactionExpected && tc == null) {
- throw new XATransactionException(XAException.XAER_NOTA, DQPPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_NOTA, QueryPlugin.Util.getString("TransactionServer.no_global_transaction", xid)); //$NON-NLS-1$
} else if (!transactionExpected) {
if (tc != null) {
- throw new XATransactionException(XAException.XAER_DUPID, DQPPlugin.Util.getString("TransactionServer.existing_global_transaction", new Object[] {xid})); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_DUPID, QueryPlugin.Util.getString("TransactionServer.existing_global_transaction", new Object[] {xid})); //$NON-NLS-1$
}
if (!threadBound) {
tc = transactions.getOrCreateTransactionContext(threadId);
if (tc.getTransactionType() != TransactionContext.Scope.NONE) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.existing_transaction", new Object[] {xid, threadId})); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.existing_transaction", new Object[] {xid, threadId})); //$NON-NLS-1$
}
}
return null;
@@ -332,10 +332,10 @@
if (threadBound) {
if (!threadId.equals(tc.getThreadId())) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.wrong_transaction", xid)); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.wrong_transaction", xid)); //$NON-NLS-1$
}
} else if (tc.getThreadId() != null) {
- throw new XATransactionException(XAException.XAER_PROTO, DQPPlugin.Util.getString("TransactionServer.concurrent_transaction", xid)); //$NON-NLS-1$
+ throw new XATransactionException(XAException.XAER_PROTO, QueryPlugin.Util.getString("TransactionServer.concurrent_transaction", xid)); //$NON-NLS-1$
}
return tc;
@@ -349,14 +349,14 @@
try {
if (tc.getTransactionType() != TransactionContext.Scope.NONE) {
if (tc.getTransactionType() != TransactionContext.Scope.LOCAL) {
- throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
+ throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
}
if (!transactionExpected) {
- throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
+ throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
}
transactionManager.resume(tc.getTransaction());
} else if (transactionExpected) {
- throw new InvalidTransactionException(DQPPlugin.Util.getString("TransactionServer.no_transaction", threadId)); //$NON-NLS-1$
+ throw new InvalidTransactionException(QueryPlugin.Util.getString("TransactionServer.no_transaction", threadId)); //$NON-NLS-1$
}
} catch (InvalidTransactionException e) {
throw new XATransactionException(e);
@@ -464,7 +464,7 @@
*/
public TransactionContext begin(TransactionContext context) throws XATransactionException{
if (context.getTransactionType() != TransactionContext.Scope.NONE) {
- throw new XATransactionException(DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
+ throw new XATransactionException(QueryPlugin.Util.getString("TransactionServer.existing_transaction")); //$NON-NLS-1$
}
beginDirect(context);
context.setTransactionType(TransactionContext.Scope.REQUEST);
Deleted: branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/execution/QueryExecPlugin.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,46 +0,0 @@
-/*
- * 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.query.execution;
-
-import java.util.ResourceBundle;
-
-import org.teiid.core.BundleUtil;
-
-/**
- * QueryPlugin
- * <p>Used here in <code>query</code> to have access to the new
- * logging framework for <code>LogManager</code>.</p>
- */
-public class QueryExecPlugin { // extends Plugin {
-
- /**
- * The plug-in identifier of this plugin
- */
- public static final String PLUGIN_ID = QueryExecPlugin.class.getPackage().getName();
-
- /**
- * Provides access to the plugin's log and to it's resources.
- */
- public static final BundleUtil Util = new BundleUtil(PLUGIN_ID,
- PLUGIN_ID + ".i18n", ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$
-}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/metadata/TransformationMetadata.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -49,7 +49,6 @@
import org.teiid.core.util.LRUCache;
import org.teiid.core.util.ObjectConverterUtil;
import org.teiid.core.util.StringUtil;
-import org.teiid.dqp.DQPPlugin;
import org.teiid.metadata.AbstractMetadataRecord;
import org.teiid.metadata.Column;
import org.teiid.metadata.ColumnSet;
@@ -126,7 +125,7 @@
public static final String DELIMITER_STRING = String.valueOf(DELIMITER_CHAR);
// error message cached to avoid i18n lookup each time
- public static String NOT_EXISTS_MESSAGE = StringUtil.Constants.SPACE+DQPPlugin.Util.getString("TransformationMetadata.does_not_exist._1"); //$NON-NLS-1$
+ public static String NOT_EXISTS_MESSAGE = StringUtil.Constants.SPACE+QueryPlugin.Util.getString("TransformationMetadata.does_not_exist._1"); //$NON-NLS-1$
private static Properties EMPTY_PROPS = new Properties();
@@ -457,7 +456,7 @@
Table tableRecord = (Table) groupID;
if (!tableRecord.isVirtual()) {
- throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6")+tableRecord.getFullName()); //$NON-NLS-1$
+ throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6")+tableRecord.getFullName()); //$NON-NLS-1$
}
String transQuery = tableRecord.getSelectTransformation();
QueryNode queryNode = new QueryNode(tableRecord.getFullName(), transQuery);
@@ -477,7 +476,7 @@
ArgCheck.isInstanceOf(Table.class, groupID);
Table tableRecordImpl = (Table)groupID;
if (!tableRecordImpl.isVirtual()) {
- throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8")+tableRecordImpl.getFullName()); //$NON-NLS-1$
+ throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8")+tableRecordImpl.getFullName()); //$NON-NLS-1$
}
return ((Table)groupID).getInsertPlan();
}
@@ -486,7 +485,7 @@
ArgCheck.isInstanceOf(Table.class, groupID);
Table tableRecordImpl = (Table)groupID;
if (!tableRecordImpl.isVirtual()) {
- throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10")+tableRecordImpl.getFullName()); //$NON-NLS-1$
+ throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10")+tableRecordImpl.getFullName()); //$NON-NLS-1$
}
return ((Table)groupID).getUpdatePlan();
}
@@ -495,7 +494,7 @@
ArgCheck.isInstanceOf(Table.class, groupID);
Table tableRecordImpl = (Table)groupID;
if (!tableRecordImpl.isVirtual()) {
- throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12")+tableRecordImpl.getFullName()); //$NON-NLS-1$
+ throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12")+tableRecordImpl.getFullName()); //$NON-NLS-1$
}
return ((Table)groupID).getDeletePlan();
}
@@ -506,7 +505,7 @@
switch(modelConstant) {
default:
- throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + modelConstant); //$NON-NLS-1$
+ throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + modelConstant); //$NON-NLS-1$
}
}
@@ -519,7 +518,7 @@
case SupportConstants.Group.UPDATE:
return tableRecord.supportsUpdate();
default:
- throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + groupConstant); //$NON-NLS-1$
+ throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + groupConstant); //$NON-NLS-1$
}
}
@@ -554,7 +553,7 @@
case SupportConstants.Element.SIGNED:
return columnRecord.isSigned();
default:
- throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$
+ throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$
}
} else if(elementID instanceof ProcedureParameter) {
ProcedureParameter columnRecord = (ProcedureParameter) elementID;
@@ -583,7 +582,7 @@
case SupportConstants.Element.SIGNED:
return true;
default:
- throw new UnsupportedOperationException(DQPPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$
+ throw new UnsupportedOperationException(QueryPlugin.Util.getString("TransformationMetadata.Unknown_support_constant___12") + elementConstant); //$NON-NLS-1$
}
} else {
@@ -592,7 +591,7 @@
}
private IllegalArgumentException createInvalidRecordTypeException(Object elementID) {
- return new IllegalArgumentException(DQPPlugin.Util.getString("TransformationMetadata.Invalid_type", elementID.getClass().getName())); //$NON-NLS-1$
+ return new IllegalArgumentException(QueryPlugin.Util.getString("TransformationMetadata.Invalid_type", elementID.getClass().getName())); //$NON-NLS-1$
}
public int getMaxSetSize(final Object modelID) throws TeiidComponentException, QueryMetadataException {
@@ -717,7 +716,7 @@
mappingDoc = reader.loadDocument(inputStream);
mappingDoc.setName(groupName);
} catch (Exception e){
- throw new TeiidComponentException(e, DQPPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1", groupName, mappingDoc)); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1", groupName, mappingDoc)); //$NON-NLS-1$
} finally {
try {
inputStream.close();
@@ -792,7 +791,7 @@
}
if (schema == null) {
- throw new QueryMetadataException(DQPPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1")+groupName); //$NON-NLS-1$
+ throw new QueryMetadataException(QueryPlugin.Util.getString("TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1")+groupName); //$NON-NLS-1$
}
schemas.add(schema);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -31,8 +31,8 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.id.IDGenerator;
import org.teiid.core.id.IntegerID;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.capabilities.SourceCapabilities;
@@ -195,7 +195,7 @@
} else if (type == Command.TYPE_DELETE) {
return ((Delete)command).getGroup();
}
- throw new TeiidRuntimeException(QueryExecPlugin.Util.getString("BatchedUpdatePlanner.unrecognized_command", command)); //$NON-NLS-1$
+ throw new TeiidRuntimeException(QueryPlugin.Util.getString("BatchedUpdatePlanner.unrecognized_command", command)); //$NON-NLS-1$
}
/**
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,8 +27,8 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.id.IDGenerator;
import org.teiid.core.util.Assertion;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.processor.ProcessorPlan;
@@ -288,7 +288,7 @@
break;
}
default:
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("ProcedurePlanner.bad_stmt", stmtType)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("ProcedurePlanner.bad_stmt", stmtType)); //$NON-NLS-1$
}
return instruction;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -36,8 +36,8 @@
import org.teiid.core.id.IntegerID;
import org.teiid.core.id.IntegerIDFactory;
import org.teiid.core.util.Assertion;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataID;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
@@ -446,7 +446,7 @@
break;
default:
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0007", NodeConstants.getNodeTypeString(node.getType()))); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0007", NodeConstants.getNodeTypeString(node.getType()))); //$NON-NLS-1$
}
if(processNode != null) {
@@ -537,7 +537,7 @@
String cbName = metadata.getFullName(modelID);
return cbName;
} catch(QueryMetadataException e) {
- throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0009")); //$NON-NLS-1$
+ throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0009")); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -46,7 +46,6 @@
import org.teiid.language.SQLConstants;
import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataAdapter;
@@ -260,7 +259,7 @@
}
if(! appliedHint) {
- String msg = QueryExecPlugin.Util.getString("ERR.015.004.0010", groupName); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("ERR.015.004.0010", groupName); //$NON-NLS-1$
if (this.analysisRecord.recordAnnotations()) {
this.analysisRecord.addAnnotation(new Annotation(Annotation.HINTS, msg, "ignoring hint", Priority.MEDIUM)); //$NON-NLS-1$
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,7 +27,7 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.core.TeiidComponentException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.SupportConstants;
@@ -482,7 +482,7 @@
return null;
}
} catch(QueryMetadataException e) {
- throw new TeiidComponentException(e, QueryExecPlugin.Util.getString("RulePushSelectCriteria.Error_getting_modelID")); //$NON-NLS-1$
+ throw new TeiidComponentException(e, QueryPlugin.Util.getString("RulePushSelectCriteria.Error_getting_modelID")); //$NON-NLS-1$
}
}
if (critNodeModelID == null) {
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -40,7 +40,7 @@
import org.teiid.core.TeiidRuntimeException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.util.Assertion;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.relational.plantree.NodeConstants;
import org.teiid.query.optimizer.relational.plantree.NodeEditor;
@@ -299,7 +299,7 @@
try {
return QueryRewriter.rewriteCriteria(criteria, null, null, metadata);
} catch(TeiidProcessingException e) {
- throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0023", criteria)); //$NON-NLS-1$
+ throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0023", criteria)); //$NON-NLS-1$
} catch (TeiidComponentException e) {
throw new TeiidRuntimeException(e);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAccessPatternValidation.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,8 +27,8 @@
import java.util.List;
import org.teiid.api.exception.query.QueryPlannerException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.relational.OptimizerRule;
@@ -115,7 +115,7 @@
}
Object groups = node.getGroups();
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0012", new Object[] {groups, accessPatterns})); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0012", new Object[] {groups, accessPatterns})); //$NON-NLS-1$
}
public String toString() {
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -36,8 +36,8 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.relational.OptimizerRule;
@@ -141,7 +141,7 @@
//quick check for satisfiability
if (!joinRegion.isSatisfiable()) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
}
planForDependencies(joinRegion);
@@ -378,7 +378,7 @@
private void planForDependencies(JoinRegion joinRegion) throws QueryPlannerException {
if (joinRegion.getJoinSourceNodes().isEmpty()) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
}
HashSet<GroupSymbol> currentGroups = new HashSet<GroupSymbol>();
@@ -437,7 +437,7 @@
}
if (!dependentNodes.isEmpty()) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanJoins.cantSatisfy", joinRegion.getUnsatisfiedAccessPatterns())); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -32,8 +32,8 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.relational.OptimizerRule;
@@ -118,7 +118,7 @@
defaults.add(defaultValue);
if (defaultValue == null && !coveredParams.contains(symbol)) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("RulePlanProcedures.no_values", symbol)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("RulePlanProcedures.no_values", symbol)); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -34,8 +34,8 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.util.Assertion;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.relational.OptimizerRule;
@@ -297,7 +297,7 @@
return currentNode.getFirstChild();
}
} catch(QueryMetadataException e) {
- throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0020", currentNode.getGroups())); //$NON-NLS-1$
+ throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0020", currentNode.getGroups())); //$NON-NLS-1$
}
} else if(currentNode.getType() == NodeConstants.Types.JOIN) {
//pushing below a join is not necessary under an access node
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleValidateWhereAll.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -25,8 +25,8 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.capabilities.CapabilitiesFinder;
import org.teiid.query.optimizer.relational.OptimizerRule;
@@ -71,7 +71,7 @@
if(CapabilitiesUtil.requiresCriteria(modelID, metadata, capFinder)
&& hasNoCriteria((Command) node.getProperty(NodeConstants.Info.ATOMIC_REQUEST))) {
String modelName = metadata.getFullName(modelID);
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("ERR.015.004.0024", modelName)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("ERR.015.004.0024", modelName)); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/CriteriaPlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -30,7 +30,7 @@
import org.teiid.api.exception.query.QueryMetadataException;
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
@@ -88,7 +88,7 @@
if (context == null) {
context = otherContext;
} else if (context != otherContext){
- throw new QueryPlannerException("ERR.015.004.0068", QueryExecPlugin.Util.getString("ERR.015.004.0068", criteria)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryPlannerException("ERR.015.004.0068", QueryPlugin.Util.getString("ERR.015.004.0068", criteria)); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -136,7 +136,7 @@
MappingNode elementRsNode = node.getSourceNode();
if (elementRsNode == null) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.invalid_element", elementSymbol)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.invalid_element", elementSymbol)); //$NON-NLS-1$
}
String elementRsFullName = elementRsNode.getFullyQualifiedName().toUpperCase();
@@ -153,7 +153,7 @@
continue;
}
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.invalid_context", elementSymbol, context.getFullyQualifiedName())); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.invalid_context", elementSymbol, context.getFullyQualifiedName())); //$NON-NLS-1$
}
return resultSets;
}
@@ -185,7 +185,7 @@
if (criteriaResultSets.size() != 1) {
//TODO: this assumption could be relaxed if we allow context to be from a document perspective, rather than from a result set
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.no_context", criteria)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.no_context", criteria)); //$NON-NLS-1$
}
return (MappingSourceNode)criteriaResultSets.iterator().next();
}
@@ -258,7 +258,7 @@
MappingNode node = MappingNode.findNode(planEnv.mappingDoc, fullyQualifiedNodeName.toUpperCase());
MappingSourceNode sourceNode = node.getSourceNode();
if (sourceNode == null) {
- String msg = QueryExecPlugin.Util.getString("XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class", fullyQualifiedNodeName); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class", fullyQualifiedNodeName); //$NON-NLS-1$
throw new QueryPlannerException(msg);
}
@@ -267,7 +267,7 @@
// Check for conflicting row limits on the same mapping class
int existingLimit = criteriaRsInfo.getUserRowLimit();
if (existingLimit > 0 && existingLimit != rowLimit) {
- String msg = QueryExecPlugin.Util.getString("XMLPlanner.Criteria_{0}_contains_conflicting_row_limits", wholeCrit); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("XMLPlanner.Criteria_{0}_contains_conflicting_row_limits", wholeCrit); //$NON-NLS-1$
throw new QueryPlannerException(msg);
}
@@ -300,13 +300,13 @@
//assumes that all non-xml group elements are temp elements
boolean hasTempElement = !metadata.isXMLGroup(group.getMetadataID());
if(!first && hasTempElement && resultSet == null) {
- throw new QueryPlannerException("ERR.015.004.0035", QueryExecPlugin.Util.getString("ERR.015.004.0035", conjunct)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryPlannerException("ERR.015.004.0035", QueryPlugin.Util.getString("ERR.015.004.0035", conjunct)); //$NON-NLS-1$ //$NON-NLS-2$
}
if (hasTempElement) {
String currentResultSet = metadata.getFullName(element.getGroupSymbol().getMetadataID());
if (resultSet != null && !resultSet.equalsIgnoreCase(currentResultSet)) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.multiple_staging", conjunct)); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.multiple_staging", conjunct)); //$NON-NLS-1$
}
resultSet = currentResultSet;
}
@@ -316,7 +316,7 @@
if (resultSet != null) {
Collection functions = ContextReplacerVisitor.replaceContextFunctions(conjunct);
if (!functions.isEmpty()) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("CriteriaPlanner.staging_context")); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("CriteriaPlanner.staging_context")); //$NON-NLS-1$
}
//should also throw an exception if it contains a row limit function
@@ -335,7 +335,7 @@
MappingNode contextNode = MappingNode.findNode(planEnv.mappingDoc, targetContext.getCanonicalName());
if (contextNode == null){
- throw new QueryPlannerException("ERR.015.004.0037", QueryExecPlugin.Util.getString("ERR.015.004.0037", targetContext)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryPlannerException("ERR.015.004.0037", QueryPlugin.Util.getString("ERR.015.004.0037", targetContext)); //$NON-NLS-1$ //$NON-NLS-2$
}
return contextNode;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/QueryUtil.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -36,8 +36,8 @@
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataAdapter;
@@ -83,7 +83,7 @@
try {
query = QueryParser.getQueryParser().parseCommand(queryNode.getQuery());
} catch (QueryParserException e) {
- throw new QueryPlannerException(e, QueryExecPlugin.Util.getString("ERR.015.004.0054", new Object[]{queryNode.getGroupName(), queryNode.getQuery()})); //$NON-NLS-1$
+ throw new QueryPlannerException(e, QueryPlugin.Util.getString("ERR.015.004.0054", new Object[]{queryNode.getGroupName(), queryNode.getQuery()})); //$NON-NLS-1$
}
}
return query;
@@ -143,7 +143,7 @@
ResolverUtil.resolveGroup(gs, metadata);
queryNode = metadata.getVirtualPlan(gs.getMetadataID());
} catch (QueryResolverException e) {
- throw new QueryPlannerException(e, "ERR.015.004.0029", QueryExecPlugin.Util.getString("ERR.015.004.0029", groupName)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryPlannerException(e, "ERR.015.004.0029", QueryPlugin.Util.getString("ERR.015.004.0029", groupName)); //$NON-NLS-1$ //$NON-NLS-2$
}
return queryNode;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLNodeMappingVisitor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,7 +27,7 @@
import org.teiid.api.exception.query.QueryPlannerException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
import org.teiid.query.metadata.QueryMetadataInterface;
@@ -123,7 +123,7 @@
Collection unmappedSymbols = mappingVisitor.getUnmappedSymbols();
if (unmappedSymbols != null && unmappedSymbols.size() > 0){
- throw new QueryPlannerException("ERR.015.004.0046", QueryExecPlugin.Util.getString("ERR.015.004.0046", new Object[] {unmappedSymbols, object})); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryPlannerException("ERR.015.004.0046", QueryPlugin.Util.getString("ERR.015.004.0046", new Object[] {unmappedSymbols, object})); //$NON-NLS-1$ //$NON-NLS-2$
}
return copy;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLPlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -33,8 +33,8 @@
import org.teiid.core.id.IDGenerator;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.mapping.xml.MappingDocument;
import org.teiid.query.mapping.xml.MappingNode;
import org.teiid.query.mapping.xml.MappingNodeLogger;
@@ -290,7 +290,7 @@
// in the orderby. static nodes do not qualify for ordering.
if (elementNode.getNameInSource() == null){
Object[] params = new Object[] {elementNode, orderBy};
- String msg = QueryExecPlugin.Util.getString("XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1", params); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1", params); //$NON-NLS-1$
throw new QueryPlannerException(msg);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/optimizer/xml/XMLQueryPlanner.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -37,7 +37,7 @@
import org.teiid.api.exception.query.QueryResolverException;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidRuntimeException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.mapping.xml.MappingBaseNode;
import org.teiid.query.mapping.xml.MappingDocument;
@@ -335,7 +335,7 @@
}
if (!singleParentage) {
- throw new QueryPlannerException(QueryExecPlugin.Util.getString("XMLQueryPlanner.cannot_plan", rsInfo.getCriteria())); //$NON-NLS-1$
+ throw new QueryPlannerException(QueryPlugin.Util.getString("XMLQueryPlanner.cannot_plan", rsInfo.getCriteria())); //$NON-NLS-1$
}
QueryUtil.handleBindings(command, planNode, planEnv);
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -38,7 +38,7 @@
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.processor.BatchCollector.BatchProducer;
import org.teiid.query.util.CommandContext;
@@ -142,7 +142,7 @@
while(currentTime < context.getTimeSliceEnd() || context.isNonBlocking()) {
if (requestCanceled) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("QueryProcessor.request_cancelled", getProcessID())); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("QueryProcessor.request_cancelled", getProcessID())); //$NON-NLS-1$
}
if (currentTime > context.getTimeoutEnd()) {
throw new TeiidProcessingException("Query timed out"); //$NON-NLS-1$
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,7 @@
package org.teiid.query.processor.proc;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_SQL;
import java.util.Collections;
import java.util.HashMap;
@@ -41,8 +41,8 @@
import org.teiid.dqp.internal.process.Request;
import org.teiid.language.SQLConstants.Reserved;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataStore;
import org.teiid.query.optimizer.QueryOptimizer;
@@ -129,7 +129,7 @@
Object value = procEnv.evaluateExpression(dynamicCommand.getSql());
if (value == null) {
- throw new QueryProcessingException(QueryExecPlugin.Util
+ throw new QueryProcessingException(QueryPlugin.Util
.getString("ExecDynamicSqlInstruction.0")); //$NON-NLS-1$
}
@@ -214,7 +214,7 @@
procEnv.push(dynamicProgram);
} catch (TeiidProcessingException e) {
Object[] params = {dynamicCommand, dynamicCommand.getSql(), e.getMessage()};
- throw new QueryProcessingException(e, QueryExecPlugin.Util.getString("ExecDynamicSqlInstruction.couldnt_execute", params)); //$NON-NLS-1$
+ throw new QueryProcessingException(e, QueryPlugin.Util.getString("ExecDynamicSqlInstruction.couldnt_execute", params)); //$NON-NLS-1$
}
}
@@ -274,7 +274,7 @@
if (dynamicExpectedColumns != null && !dynamicExpectedColumns.isEmpty()) {
if (dynamicExpectedColumns.size() != sourceProjectedSymbolList.size()) {
- throw new QueryProcessingException(QueryExecPlugin.Util
+ throw new QueryProcessingException(QueryPlugin.Util
.getString("ExecDynamicSqlInstruction.4")); //$NON-NLS-1$
}
// If there is only one project symbol, we won't validate the name.
@@ -305,7 +305,7 @@
Object[] params = new Object[] { sourceTypeName,
dynamicSymbol.getShortCanonicalName(),
dynamicTypeName };
- throw new QueryProcessingException(QueryExecPlugin.Util
+ throw new QueryProcessingException(QueryPlugin.Util
.getString("ExecDynamicSqlInstruction.6", params)); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/proc/ProcedurePlan.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,7 @@
package org.teiid.query.processor.proc;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_OUTPUT_COLS;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,8 +46,8 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.SupportConstants;
import org.teiid.query.processor.BatchIterator;
@@ -189,7 +189,7 @@
//check constraint
if (value == null && !metadata.elementSupports(param.getMetadataID(), SupportConstants.Element.NULL)) {
- throw new QueryValidatorException(QueryExecPlugin.Util.getString("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$
+ throw new QueryValidatorException(QueryPlugin.Util.getString("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$
}
setParameterValue(param, context, value);
}
@@ -531,7 +531,7 @@
private CursorState getCursorState(String rsKey) throws TeiidComponentException {
CursorState state = this.cursorStates.get(rsKey);
if (state == null) {
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("ERR.015.006.0037", rsKey)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("ERR.015.006.0037", rsKey)); //$NON-NLS-1$
}
return state;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,8 @@
package org.teiid.query.processor.relational;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_MODEL_NAME;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_SQL;
import java.util.ArrayList;
import java.util.Collections;
@@ -36,8 +37,8 @@
import org.teiid.common.buffer.TupleSource;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.rewriter.QueryRewriter;
import org.teiid.query.sql.lang.Command;
@@ -138,7 +139,7 @@
// Defect 16059 - Rewrite the command once the references have been replaced with values.
QueryRewriter.evaluateAndRewrite(atomicCommand, eval, context, metadata);
} catch (QueryValidatorException e) {
- throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("AccessNode.rewrite_failed", atomicCommand)); //$NON-NLS-1$
+ throw new TeiidProcessingException(e, QueryPlugin.Util.getString("AccessNode.rewrite_failed", atomicCommand)); //$NON-NLS-1$
}
return RelationalNodeUtil.shouldExecute(atomicCommand, true);
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/BatchedUpdateNode.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -34,8 +34,8 @@
import org.teiid.common.buffer.TupleSource;
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.sql.lang.BatchedUpdateCommand;
import org.teiid.query.sql.lang.Command;
import org.teiid.query.sql.util.VariableContext;
@@ -136,7 +136,7 @@
addBatchRow(Arrays.asList(new Object[] {tuple.get(0)}));
} else {
// Should never happen since the number of expected results is known
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("BatchedUpdateNode.unexpected_end_of_batch", commandCount, numExpectedCounts)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("BatchedUpdateNode.unexpected_end_of_batch", commandCount, numExpectedCounts)); //$NON-NLS-1$
}
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/ProjectNode.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,7 @@
package org.teiid.query.processor.relational;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_SELECT_COLS;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,8 +38,8 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.util.Assertion;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.processor.ProcessorDataManager;
import org.teiid.query.sql.symbol.AggregateSymbol;
import org.teiid.query.sql.symbol.AliasSymbol;
@@ -217,7 +217,7 @@
Expression expression = ((ExpressionSymbol)symbol).getExpression();
tuple.add(getEvaluator(this.elementMap).evaluate(expression, values));
} else {
- Assertion.failed(QueryExecPlugin.Util.getString("ERR.015.006.0034", symbol.getClass().getName())); //$NON-NLS-1$
+ Assertion.failed(QueryPlugin.Util.getString("ERR.015.006.0034", symbol.getClass().getName())); //$NON-NLS-1$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/TextTableNode.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -42,7 +42,7 @@
import org.teiid.core.types.ClobType;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.TransformationException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.processor.ProcessorDataManager;
import org.teiid.query.sql.lang.TextTable;
import org.teiid.query.sql.lang.TextTable.TextColumn;
@@ -179,13 +179,13 @@
index = nameIndexes.get(col.getName());
}
if (index >= vals.size()) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.no_value", col.getName(), textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.no_value", col.getName(), textLine, systemId)); //$NON-NLS-1$
}
val = vals.get(index);
try {
tuple.add(DataTypeManager.transformValue(val, table.getColumns().get(output).getSymbol().getType()));
} catch (TransformationException e) {
- throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("TextTableNode.conversion_error", col.getName(), textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(e, QueryPlugin.Util.getString("TextTableNode.conversion_error", col.getName(), textLine, systemId)); //$NON-NLS-1$
}
}
addBatchRow(tuple);
@@ -267,7 +267,7 @@
for (TextColumn col : table.getColumns()) {
Integer index = nameIndexes.get(col.getName().toUpperCase());
if (index == null) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.header_missing", col.getName(), systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.header_missing", col.getName(), systemId)); //$NON-NLS-1$
}
nameIndexes.put(col.getName(), index);
}
@@ -301,7 +301,7 @@
}
line = readLine();
if (line == null) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.unclosed", systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.unclosed", systemId)); //$NON-NLS-1$
}
}
char[] chars = line.toCharArray();
@@ -331,7 +331,7 @@
builder.append(chr);
} else {
if (builder.toString().trim().length() != 0) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$
}
qualified = true;
builder = new StringBuilder(); //start the entry over
@@ -342,11 +342,11 @@
} else {
if (escaped) {
//don't understand other escape sequences yet
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.unknown_escape", chr, textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.unknown_escape", chr, textLine, systemId)); //$NON-NLS-1$
}
if (wasQualified && !qualified) {
if (!Character.isWhitespace(chr)) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.character_not_allowed", textLine, systemId)); //$NON-NLS-1$
}
//else just ignore
} else {
@@ -371,7 +371,7 @@
private List<String> parseFixedWidth(String line)
throws TeiidProcessingException {
if (line.length() < lineWidth) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("TextTableNode.invalid_width", line.length(), lineWidth, textLine, systemId)); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("TextTableNode.invalid_width", line.length(), lineWidth, textLine, systemId)); //$NON-NLS-1$
}
ArrayList<String> result = new ArrayList<String>();
int beginIndex = 0;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/relational/XMLTableNode.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -46,7 +46,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.types.DataTypeManager;
import org.teiid.core.types.XMLType;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.function.FunctionDescriptor;
import org.teiid.query.sql.lang.XMLTable;
import org.teiid.query.sql.lang.XMLTable.XMLColumn;
@@ -132,7 +132,7 @@
try {
item = result.next();
} catch (XPathException e) {
- throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("XMLTableNode.error", e.getMessage())); //$NON-NLS-1$
+ throw new TeiidProcessingException(e, QueryPlugin.Util.getString("XMLTableNode.error", e.getMessage())); //$NON-NLS-1$
}
rowCount++;
if (item == null) {
@@ -164,7 +164,7 @@
continue;
}
if (pathIter.next() != null) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("XMLTableName.multi_value", proColumn.getName())); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("XMLTableName.multi_value", proColumn.getName())); //$NON-NLS-1$
}
Object value = Value.convertToJava(colItem);
if (value instanceof Item) {
@@ -184,7 +184,7 @@
value = FunctionDescriptor.importValue(value, proColumn.getSymbol().getType());
tuple.add(value);
} catch (XPathException e) {
- throw new TeiidProcessingException(e, QueryExecPlugin.Util.getString("XMLTableNode.path_error", proColumn.getName())); //$NON-NLS-1$
+ throw new TeiidProcessingException(e, QueryPlugin.Util.getString("XMLTableNode.path_error", proColumn.getName())); //$NON-NLS-1$
}
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AbortProcessingInstruction.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,7 +27,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.logging.LogManager;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
/**
@@ -42,7 +42,7 @@
* Default message included in the RuntimeException thrown from
* {@link #process}
*/
- public static final String DEFAULT_MESSAGE = QueryExecPlugin.Util.getString("ERR.015.006.0054"); //$NON-NLS-1$
+ public static final String DEFAULT_MESSAGE = QueryPlugin.Util.getString("ERR.015.006.0054"); //$NON-NLS-1$
/**
* Constructor for AbortProcessingInstruction.
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/AddNodeInstruction.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,12 @@
package org.teiid.query.processor.xml;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_DATA_COL;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_DEFAULT;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_NAMESPACE;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_NAMESPACE_DECL;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_OPTIONAL;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_TAG;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -34,7 +39,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.logging.LogManager;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.symbol.ElementSymbol;
@@ -139,9 +144,9 @@
}
if (!success){
- String elem = (isElement ? QueryExecPlugin.Util.getString("AddNodeInstruction.element__1" ) : QueryExecPlugin.Util.getString("AddNodeInstruction.attribute__2")); //$NON-NLS-1$ //$NON-NLS-2$
+ String elem = (isElement ? QueryPlugin.Util.getString("AddNodeInstruction.element__1" ) : QueryPlugin.Util.getString("AddNodeInstruction.attribute__2")); //$NON-NLS-1$ //$NON-NLS-2$
Object[] params = new Object[]{elem, this.descriptor.getQName(), this.descriptor.getNamespaceURI(), this.descriptor.getNamespaceURIs()};
- String msg = QueryExecPlugin.Util.getString("AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3", params); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3", params); //$NON-NLS-1$
throw new TeiidComponentException(msg);
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/MoveDocInstruction.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -28,7 +28,7 @@
import org.teiid.core.TeiidProcessingException;
import org.teiid.core.util.Assertion;
import org.teiid.logging.LogManager;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.xml.sax.SAXException;
@@ -70,7 +70,7 @@
doc.moveToLastChild();
break;
default:
- Assertion.failed(QueryExecPlugin.Util.getString("ERR.015.006.0051", direction)); //$NON-NLS-1$
+ Assertion.failed(QueryPlugin.Util.getString("ERR.015.006.0051", direction)); //$NON-NLS-1$
break;
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/NodeDescriptor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -25,7 +25,7 @@
import java.util.Properties;
import org.teiid.core.TeiidComponentException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.MappingAttribute;
import org.teiid.query.mapping.xml.MappingElement;
import org.teiid.query.mapping.xml.MappingNode;
@@ -287,7 +287,7 @@
} else if(namespacePrefix.equals(MappingNodeConstants.INSTANCES_NAMESPACE_PREFIX)) {
uri = MappingNodeConstants.INSTANCES_NAMESPACE;
}else {
- String msg = QueryExecPlugin.Util.getString("XMLPlanner.no_uri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$
+ String msg = QueryPlugin.Util.getString("XMLPlanner.no_uri", new Object[] {namespacePrefix, name}); //$NON-NLS-1$
throw new TeiidComponentException(msg);
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RecurseProgramCondition.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -27,7 +27,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.lang.Criteria;
@@ -92,7 +92,7 @@
//handle the case of exception on recursion limit reached
if (terminate && this.exceptionOnRecursionLimit){
- throw new TeiidComponentException("ERR.015.006.0039", QueryExecPlugin.Util.getString("ERR.015.006.0039")); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new TeiidComponentException("ERR.015.006.0039", QueryPlugin.Util.getString("ERR.015.006.0039")); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/RelationalPlanExecutor.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -31,7 +31,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
import org.teiid.logging.LogManager;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.mapping.xml.ResultSetInfo;
import org.teiid.query.processor.BatchIterator;
import org.teiid.query.processor.ProcessorDataManager;
@@ -123,7 +123,7 @@
// check if we walked over the row limit
if (this.currentRow != null && this.resultInfo.getUserRowLimit() > 0 && this.currentRowNumber > this.resultInfo.getUserRowLimit()) {
if (this.resultInfo.exceptionOnRowlimit()) {
- throw new TeiidProcessingException(QueryExecPlugin.Util.getString("row_limit_passed", new Object[] { new Integer(this.resultInfo.getUserRowLimit()), this.resultInfo.getResultSetName()})); //$NON-NLS-1$
+ throw new TeiidProcessingException(QueryPlugin.Util.getString("row_limit_passed", new Object[] { new Integer(this.resultInfo.getUserRowLimit()), this.resultInfo.getResultSetName()})); //$NON-NLS-1$
}
// well, we did not throw a exception, that means we need to limit it to current row
this.currentRow = null;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLContext.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -28,7 +28,7 @@
import org.teiid.core.TeiidComponentException;
import org.teiid.core.TeiidProcessingException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.sql.symbol.ElementSymbol;
import org.teiid.query.sql.util.VariableContext;
@@ -83,7 +83,7 @@
if (this.parentContext != null) {
return this.parentContext.getCurrentRow(aliasResultName);
}
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$
}
return executor.currentRow();
}
@@ -100,7 +100,7 @@
if (this.parentContext != null) {
return this.parentContext.getNextRow(aliasResultName);
}
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", aliasResultName)); //$NON-NLS-1$
}
return executor.nextRow();
}
@@ -138,7 +138,7 @@
if (this.parentContext != null) {
return this.parentContext.getOutputElements(resultName);
}
- throw new TeiidComponentException(QueryExecPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$
+ throw new TeiidComponentException(QueryPlugin.Util.getString("results_not_found", resultName)); //$NON-NLS-1$
}
return executor.getOutputElements();
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/processor/xml/XMLPlan.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -22,7 +22,7 @@
package org.teiid.query.processor.xml;
-import static org.teiid.query.analysis.AnalysisRecord.*;
+import static org.teiid.query.analysis.AnalysisRecord.PROP_OUTPUT_COLS;
import java.io.IOException;
import java.io.InputStream;
@@ -53,8 +53,8 @@
import org.teiid.core.types.XMLType;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.processor.ProcessorDataManager;
import org.teiid.query.processor.ProcessorPlan;
import org.teiid.query.sql.symbol.ElementSymbol;
@@ -225,7 +225,7 @@
if (xmlSchemas == null || xmlSchemas.isEmpty()){
// if there is no schema no need to validate
// return a warning saying there is no schema
- TeiidException noSchema = new TeiidComponentException("ERR.015.006.0042", QueryExecPlugin.Util.getString("ERR.015.006.0042")); //$NON-NLS-1$ //$NON-NLS-2$
+ TeiidException noSchema = new TeiidComponentException("ERR.015.006.0042", QueryPlugin.Util.getString("ERR.015.006.0042")); //$NON-NLS-1$ //$NON-NLS-2$
addWarning(noSchema);
return;
}
@@ -388,7 +388,7 @@
} catch (Exception e){
e.printStackTrace();
LogManager.logWarning(LogConstants.CTX_XML_PLAN, e,
- QueryExecPlugin.Util.getString("ERR.015.006.0001")); //$NON-NLS-1$
+ QueryPlugin.Util.getString("ERR.015.006.0001")); //$NON-NLS-1$
}
return "XMLPlan"; //$NON-NLS-1$
}
@@ -439,13 +439,13 @@
}
public void error(SAXParseException ex){
- addException(new TeiidComponentException("ERR.015.006.0049", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
+ addException(new TeiidComponentException("ERR.015.006.0049", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
}
public void fatalError(SAXParseException ex){
- addException(new TeiidComponentException("ERR.015.006.0048", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
+ addException(new TeiidComponentException("ERR.015.006.0048", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
}
public void warning(SAXParseException ex){
- addException(new TeiidComponentException("ERR.015.006.0049", QueryExecPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
+ addException(new TeiidComponentException("ERR.015.006.0049", QueryPlugin.Util.getString("ERR.015.006.0048", ex.getMessage()))); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -55,8 +55,8 @@
import org.teiid.core.util.Assertion;
import org.teiid.core.util.TimestampWithTimezone;
import org.teiid.language.SQLConstants.NonReserved;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.function.FunctionDescriptor;
import org.teiid.query.function.FunctionLibrary;
import org.teiid.query.function.FunctionMethods;
@@ -394,7 +394,7 @@
whileStatement.setCondition(crit);
if(crit.equals(TRUE_CRITERIA)) {
- throw new QueryValidatorException(QueryExecPlugin.Util.getString("QueryRewriter.infinite_while")); //$NON-NLS-1$
+ throw new QueryValidatorException(QueryPlugin.Util.getString("QueryRewriter.infinite_while")); //$NON-NLS-1$
} else if(crit.equals(FALSE_CRITERIA) || crit.equals(UNKNOWN_CRITERIA)) {
return null;
}
@@ -589,7 +589,7 @@
try {
ResolverVisitor.resolveLanguageObject(translatedCriteria, metadata);
} catch(TeiidException ex) {
- throw new QueryValidatorException(ex, "ERR.015.009.0002", QueryExecPlugin.Util.getString("ERR.015.009.0002", translatedCriteria)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryValidatorException(ex, "ERR.015.009.0002", QueryPlugin.Util.getString("ERR.015.009.0002", translatedCriteria)); //$NON-NLS-1$ //$NON-NLS-2$
}
return translatedCriteria;
@@ -1167,7 +1167,7 @@
return FALSE_CRITERIA;
} catch(ExpressionEvaluationException e) {
- throw new QueryValidatorException(e, "ERR.015.009.0001", QueryExecPlugin.Util.getString("ERR.015.009.0001", crit)); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryValidatorException(e, "ERR.015.009.0001", QueryPlugin.Util.getString("ERR.015.009.0001", crit)); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -1382,7 +1382,7 @@
Object result = descriptor.invokeFunction(new Object[] { const2.getValue(), const1.getValue() } );
combinedConst = new Constant(result, descriptor.getReturnType());
} catch(FunctionExecutionException e) {
- throw new QueryValidatorException(e, "ERR.015.009.0003", QueryExecPlugin.Util.getString("ERR.015.009.0003", e.getMessage())); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new QueryValidatorException(e, "ERR.015.009.0003", QueryPlugin.Util.getString("ERR.015.009.0003", e.getMessage())); //$NON-NLS-1$ //$NON-NLS-2$
}
} else {
Function conversion = new Function(descriptor.getName(), new Expression[] { rightExpr, const1 });
@@ -2495,7 +2495,7 @@
if (result == null) {
result = changingValue;
} else if (!result.equals(changingValue)) {
- throw new QueryValidatorException(QueryExecPlugin.Util.getString("VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state", expr)); //$NON-NLS-1$
+ throw new QueryValidatorException(QueryPlugin.Util.getString("VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state", expr)); //$NON-NLS-1$
}
}
}
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableDataManager.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -51,9 +51,9 @@
import org.teiid.language.SQLConstants.Reserved;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.analysis.AnalysisRecord;
import org.teiid.query.eval.Evaluator;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.mapping.relational.QueryNode;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.metadata.TempMetadataID;
@@ -188,7 +188,7 @@
Create create = (Create)command;
String tempTableName = create.getTable().getCanonicalName();
if (contextStore.hasTempTable(tempTableName)) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableStore.table_exist_error", tempTableName));//$NON-NLS-1$
}
contextStore.addTempTable(tempTableName, create, bufferManager, true);
return CollectionTupleSource.createUpdateCountTupleSource(0);
@@ -275,11 +275,11 @@
Object pk = metadata.getPrimaryKey(groupID);
String matViewName = metadata.getFullName(groupID);
if (pk == null) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_pk", matViewName)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_pk", matViewName)); //$NON-NLS-1$
}
List<?> ids = metadata.getElementIDsInKey(pk);
if (ids.size() > 1) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_composite", matViewName)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_composite", matViewName)); //$NON-NLS-1$
}
String matTableName = RelationalPlanner.MAT_PREFIX+matViewName.toUpperCase();
MatTableInfo info = globalStore.getMatTableInfo(matTableName);
@@ -288,10 +288,10 @@
}
TempTable tempTable = globalStore.getOrCreateTempTable(matTableName, new Query(), bufferManager, false);
if (!tempTable.isUpdatable()) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh_updatable", matViewName)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.row_refresh_updatable", matViewName)); //$NON-NLS-1$
}
Constant key = (Constant)proc.getParameter(2).getExpression();
- LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.row_refresh", matViewName, key)); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.row_refresh", matViewName, key)); //$NON-NLS-1$
String queryString = Reserved.SELECT + " * " + Reserved.FROM + ' ' + matViewName + ' ' + Reserved.WHERE + ' ' + //$NON-NLS-1$
metadata.getFullName(ids.iterator().next()) + " = ?" + ' ' + Reserved.OPTION + ' ' + Reserved.NOCACHE; //$NON-NLS-1$
QueryProcessor qp = context.getQueryProcessorFactory().createQueryProcessor(queryString, matViewName.toUpperCase(), context, key.getValue());
@@ -317,7 +317,7 @@
try {
Object groupID = metadata.getGroupID(name);
if (!metadata.hasMaterialization(groupID) || metadata.getMaterialization(groupID) != null) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableDataManager.not_implicit_matview", name)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableDataManager.not_implicit_matview", name)); //$NON-NLS-1$
}
return groupID;
} catch (QueryMetadataException e) {
@@ -381,7 +381,7 @@
GroupSymbol group, final String tableName,
TempTableStore globalStore, MatTableInfo info)
throws TeiidComponentException, TeiidProcessingException {
- LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.loading", tableName)); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.loading", tableName)); //$NON-NLS-1$
QueryMetadataInterface metadata = context.getMetadata();
Create create = new Create();
create.setTable(group);
@@ -428,10 +428,10 @@
}
table.setUpdatable(updatable);
} catch (TeiidComponentException e) {
- LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryExecPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$
+ LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$
throw e;
} catch (TeiidProcessingException e) {
- LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryExecPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$
+ LogManager.logError(LogConstants.CTX_MATVIEWS, e, QueryPlugin.Util.getString("TempTableDataManager.failed_load", tableName)); //$NON-NLS-1$
throw e;
} finally {
if (rowCount == -1) {
@@ -439,7 +439,7 @@
} else {
globalStore.swapTempTable(tableName, table);
info.setState(MatState.LOADED, true);
- LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryExecPlugin.Util.getString("TempTableDataManager.loaded", tableName, rowCount)); //$NON-NLS-1$
+ LogManager.logInfo(LogConstants.CTX_MATVIEWS, QueryPlugin.Util.getString("TempTableDataManager.loaded", tableName, rowCount)); //$NON-NLS-1$
}
}
return rowCount;
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/tempdata/TempTableStore.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -32,7 +32,7 @@
import org.teiid.api.exception.query.QueryProcessingException;
import org.teiid.common.buffer.BufferManager;
import org.teiid.core.TeiidComponentException;
-import org.teiid.query.execution.QueryExecPlugin;
+import org.teiid.query.QueryPlugin;
import org.teiid.query.metadata.TempMetadataID;
import org.teiid.query.metadata.TempMetadataStore;
import org.teiid.query.resolver.command.TempTableResolver;
@@ -210,7 +210,7 @@
}
}
if (columns == null) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("TempTableStore.table_doesnt_exist_error", tempTableID)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("TempTableStore.table_doesnt_exist_error", tempTableID)); //$NON-NLS-1$
}
Create create = new Create();
create.setTable(new GroupSymbol(tempTableID));
Modified: branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/java/org/teiid/query/util/CommandContext.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -38,7 +38,6 @@
import org.teiid.dqp.internal.process.SessionAwareCache.CacheID;
import org.teiid.query.QueryPlugin;
import org.teiid.query.eval.SecurityFunctionEvaluator;
-import org.teiid.query.execution.QueryExecPlugin;
import org.teiid.query.function.metadata.FunctionMethod;
import org.teiid.query.metadata.QueryMetadataInterface;
import org.teiid.query.optimizer.relational.PlanToProcessConverter;
@@ -325,7 +324,7 @@
if (recursionStack == null) {
recursionStack = new LinkedList<String>();
} else if (recursionStack.contains(value)) {
- throw new QueryProcessingException(QueryExecPlugin.Util.getString("ExecDynamicSqlInstruction.3", value)); //$NON-NLS-1$
+ throw new QueryProcessingException(QueryPlugin.Util.getString("ExecDynamicSqlInstruction.3", value)); //$NON-NLS-1$
}
recursionStack.push(value);
Deleted: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,118 +0,0 @@
-#
-# 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.
-#
-
-BasicInterceptor.ProcessTree_for__4=ProcessTree for
-
-
-ConnectorManager.not_in_valid_state=Connector is not in OPEN state
-
-ConnectorManagerImpl.Initializing_connector=Initializing connector {0}
-Cancel_request_failed=AtomicRequest {0} failed to cancel.
-
-ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}"
-ConnectorWorker.zero_size_non_last_batch=Connector returned a 0 row non-last batch: {0}.
-ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0}
-ConnectorWorker.ConnectorWorker_result_set_unexpected_columns=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching.
-
-
-DataTierManager.could_not_obtain_connector_binding=Could not obtain connection factory for model {0} in VDB name= {1}, version {2}
-
-
-DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}=Unable to load metadata for VDB name= {0}, version= {1}
-DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.=Unknown query metadata exception while registering query: {0}.
-DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache
-DQPCore.The_request_has_been_closed.=The request {0} has been closed.
-DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled.
-DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing
-
-
-
-
-ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly
-ProcessWorker.error=Unexpected exception for request {0}
-ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
-
-
-# ==========================================
-# Error Messages for the dqp Package
-# ==========================================
-#
-
-# application (000)
-
-# interceptor (001)
-
-# internal (002)
-
-# from server package of last release
-# #datatier (018.003)
-
-# #query (018.005)
-ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures.
-
-# services (003)
-
-Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements.
-
-ProcessWorker.wrongdata=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
-ProcessWorker.LobError=An error occurred during streaming of Lob Chunks to Client.
-
-TransactionServer.existing_transaction=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
-TransactionServer.no_transaction=No transaction found for client {0}.
-TransactionServer.concurrent_transaction=Concurrent enlistment in global transaction {0} is not supported.
-TransactionServer.no_global_transaction=Expected an existing global transaction {0} but there was none for client {1}
-TransactionServer.unknown_flags=Unknown flags
-TransactionServer.no_global_transaction=No global transaction found for {0}.
-TransactionServer.wrong_transaction=Client is not currently enlisted in transaction {0}.
-TransactionServer.resume_failed=Cannot resume, transaction {0} was not suspended by client {1}.
-TransactionServer.existing_global_transaction=Global transaction {0} already exists.
-TransactionServer.suspended_exist=Suspended work still exists on transaction {0}.
-
-
-
-TransformationMetadata.does_not_exist._1=does not exist.
-TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
-TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
-TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
-TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
-TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
-TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
-TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
-TransformationMetadata.Invalid_type=Invalid type: {0}.
-TransformationMetadata.does_not_exist._1=does not exist.
-TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
-TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
-TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
-TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
-TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
-TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
-TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
-TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
-TransformationMetadata.Invalid_type=Invalid type: {0}.
-
-CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2}
-translator_not_found=Translator {0} not accessible.
-datasource_not_found=Data Source {0} not accessible.
-
-RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated.
-not_found_cache=Results not found in cache
-failed_to_unwrap_connection=Failed to unwrap the source connection.
Deleted: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -1,120 +0,0 @@
-#
-# 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.
-#
-
-# Error messages for query (015) project to address internationalization
-# Format:
-#
-
-# optimizer (004)
-ERR.015.004.0007= Can''t convert plan node of type {0}
-ERR.015.004.0009= Error finding connectorBindingID for command
-ERR.015.004.0010= Unknown group specified in OPTION MAKEDEP/MAKENOTDEP: {0}
-ERR.015.004.0012= Group has an access pattern which has not been met: group(s) {0}; access pattern(s) {1}
-ERR.015.004.0020= Error getting model for {0}
-ERR.015.004.0023= Error rewriting criteria: {0}
-ERR.015.004.0024= Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria.
-ERR.015.004.0029= Could not resolve group symbol {0}
-ERR.015.004.0035= The criteria {0} has elements from the root staging table and the document nodes which is not allowed.
-ERR.015.004.0037= No mapping node found named, ''{0}', in use of ''context''
-ERR.015.004.0046= The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\".
-ERR.015.004.0054= Could not parse query transformation for {0}: {1}
-ERR.015.004.0068= Context functions within the same conjunct refer to different contexts: {0}
-
-# processor (006)
-ERR.015.006.0001= XMLPlan toString couldn''t print entire Program.
-ERR.015.006.0034= Unexpected symbol type while updating tuple: {0}
-ERR.015.006.0037= Tuple source does not exist: {0}
-ERR.015.006.0039= Instructed to abort processing when recursion limit reached.
-ERR.015.006.0042= No xml schema to validate document against
-ERR.015.006.0048= Fatal Error: {0}
-ERR.015.006.0049= Error: {0}
-ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0}
-ERR.015.006.0054= Instructed to abort processing as default of choice.
-
-# rewriter (009)
-ERR.015.009.0001= Error evaluating criteria: {0}
-ERR.015.009.0002= Error translating criteria on the user''s command, the criteria translated to {0} is not valid
-ERR.015.009.0003= Error simplifying mathematical expression: {0}
-QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed.
-
-BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0}
-ProcedurePlanner.bad_stmt=Error while planning update procedure, unknown statement type encountered: {0}
-RulePushSelectCriteria.Error_getting_modelID=Error getting modelID
-XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1}
-
-XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1}
-XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class.
-XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class.
-AccessNode.rewrite_failed=Failed to rewrite the command: {0}
-BatchedUpdateNode.unexpected_end_of_batch=Unexpectedly reached the end of the batched update counts at {0}, expected {1}.
-row_limit_passed=The row limit {0} has been exceeded for XML mapping class {1}.
-AddNodeInstruction.element__1=element
-AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3=Unable to add xml {0} {1}, namespace {2}, namespace declarations {3}
-QueryProcessor.request_cancelled=The request {0} has been cancelled.
-VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state=INPUT variables used in the expression should all have same CHANGING state: {0}
-
-ExecDynamicSqlInstruction.0=Evaluated dynamic SQL expression value was null.
-ExecDynamicSqlInstruction.3=There is a recursive invocation of group ''{0}''. Please correct the SQL.
-ExecDynamicSqlInstruction.4=The dynamic sql string contains an incorrect number of elements.
-ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''.
-ExecDynamicSqlInstruction.couldnt_execute=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2}
-
-RulePlanJoins.cantSatisfy=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0}
-TempTableStore.table_exist_error=Temporary table "{0}" already exists.
-TempTableStore.table_doesnt_exist_error=Temporary table "{0}" does not exist.
-
-XMLQueryPlanner.cannot_plan=Cannot create a query for MappingClass with user criteria {0}
-CriteriaPlanner.staging_context=Staging table criteria cannot contian context functions
-CriteriaPlanner.multiple_staging=Staging table criteria {0} was not specified against a single staging table
-CriteriaPlanner.invalid_context=Element {0} is not in the scope of the context {1}
-CriteriaPlanner.invalid_element=Element {0} is not a valid data node
-results_not_found=Results for the mapping class {0} are not found;
-RulePlanProcedures.no_values=No valid criteria specified for procedure parameter {0}
-ProcedurePlan.nonNullableParam=The procedure parameter is not nullable, but is set to null: {0}
-
-FileStoreageManager.error_creating=Error creating {0}
-FileStoreageManager.error_reading=Error reading {0}
-FileStoreageManager.no_directory=No directory specified for the file storage manager.
-FileStoreageManager.not_a_directory={0} is not a valid storage manager directory.
-FileStoreageManager.space_exhausted=Max buffer space of {0} bytes has been exceed. The current operation will be aborted.
-
-TextTableNode.no_value=No value found for column \"{0}\" in the row ending on text line {1} in {2}.
-TextTableNode.conversion_error=Could not convert value for column \"{0}\" in the row ending on text line {1} in {2}.
-TextTableNode.header_missing=HEADER entry missing for column name \"{0}\" in {1}.
-TextTableNode.unclosed=Text parse error: Unclosed qualifier at end of text in {0}.
-TextTableNode.character_not_allowed=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}.
-TextTableNode.unknown_escape=Text parse error: Unknown escape sequence \\{0} in text line {1} in {2}.
-TextTableNode.invalid_width=Text parse error: Fixed width line width {0} is smaller than the expected {1} on text line {2} in {3}.
-
-XMLTableNode.error=Error evaluating XQuery row context for XMLTable: {0}
-XMLTableNode.path_error=Error evaluating XMLTable column path expression for column: {0}
-XMLTableName.multi_value=Unexpected multi-valued result was returned for XMLTable column "{0}". Path expressions for non-XML type columns should return at most a single result.
-
-TempTableDataManager.failed_load=Failed to load materialized view table {0}.
-TempTableDataManager.loaded=Loaded materialized view table {0} with row count {1}.
-TempTableDataManager.loading=Loading materialized view table {0}
-TempTableDataManager.not_implicit_matview={0} does not target an internal materialized view.
-TempTableDataManager.row_refresh_pk=Materialized view {0} cannot have a row refreshed since there is no primary key.
-TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key.
-TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\".
-TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}.
-CriteriaPlanner.no_context=No root node found.
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -217,35 +217,38 @@
ERR.015.012.0067 = No scalar subqueries are allowed in the SELECT with no FROM clause.
ERR.015.012.0069 = INTO clause can not be used in XML query.
-# Log messages for query (015) project to address internationalization
-# Format:
-#
-
-# function (001)
-
-# mapping (002)
-
-# metadata (003)
-
# optimizer (004)
+ERR.015.004.0007= Can''t convert plan node of type {0}
+ERR.015.004.0009= Error finding connectorBindingID for command
+ERR.015.004.0010= Unknown group specified in OPTION MAKEDEP/MAKENOTDEP: {0}
+ERR.015.004.0012= Group has an access pattern which has not been met: group(s) {0}; access pattern(s) {1}
+ERR.015.004.0020= Error getting model for {0}
+ERR.015.004.0023= Error rewriting criteria: {0}
+ERR.015.004.0024= Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria.
+ERR.015.004.0029= Could not resolve group symbol {0}
+ERR.015.004.0035= The criteria {0} has elements from the root staging table and the document nodes which is not allowed.
+ERR.015.004.0037= No mapping node found named, ''{0}', in use of ''context''
+ERR.015.004.0046= The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\".
+ERR.015.004.0054= Could not parse query transformation for {0}: {1}
+ERR.015.004.0068= Context functions within the same conjunct refer to different contexts: {0}
-# parser (005)
-
# processor (006)
+ERR.015.006.0001= XMLPlan toString couldn''t print entire Program.
+ERR.015.006.0034= Unexpected symbol type while updating tuple: {0}
+ERR.015.006.0037= Tuple source does not exist: {0}
+ERR.015.006.0039= Instructed to abort processing when recursion limit reached.
+ERR.015.006.0042= No xml schema to validate document against
+ERR.015.006.0048= Fatal Error: {0}
+ERR.015.006.0049= Error: {0}
+ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0}
+ERR.015.006.0054= Instructed to abort processing as default of choice.
-# report (007)
-
-# resolver (008)
-
# rewriter (009)
+ERR.015.009.0001= Error evaluating criteria: {0}
+ERR.015.009.0002= Error translating criteria on the user''s command, the criteria translated to {0} is not valid
+ERR.015.009.0003= Error simplifying mathematical expression: {0}
-# sql (010)
-# util (011)
-
-# validator (012)
-
-
SQLParser.Unknown_join_type=Unknown join type: {0}
SQLParser.Aggregate_only_top_level=Aggregate expressions are allowed only as top level functions in the SELECT and HAVING clauses.
SQLParser.Unknown_agg_func=Unknown aggregate function: {0}
@@ -713,3 +716,147 @@
ValidationVisitor.group_in_both_dep=Table specified in both dependent and independent queries '{0}'
XMLQuery.resolvingError=Failed to resolve the query '{0}'
SQLParser.non_position_constant=Invalid order by at {0}
+
+
+QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed.
+
+BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0}
+ProcedurePlanner.bad_stmt=Error while planning update procedure, unknown statement type encountered: {0}
+RulePushSelectCriteria.Error_getting_modelID=Error getting modelID
+XMLPlanner.no_uri=Cannot find namespace URI for namespace {0} of element {1}
+
+XMLPlanner.The_XML_document_element_{0}_is_not_mapped_to_data_and_cannot_be_used_in_the_ORDER_BY_clause__{1}_1=The XML document element {0} is not mapped to data and cannot be used in the ORDER BY clause: {1}
+XMLPlanner.The_rowlimit_parameter_{0}_is_not_in_the_scope_of_any_mapping_class=The ''rowlimit'' or ''rowlimitexception'' function parameter ''{0}'' is not an XML node within the scope of any mapping class.
+XMLPlanner.Criteria_{0}_contains_conflicting_row_limits=The criteria ''{0}'' contains conflicting row limits for an XML mapping class.
+AccessNode.rewrite_failed=Failed to rewrite the command: {0}
+BatchedUpdateNode.unexpected_end_of_batch=Unexpectedly reached the end of the batched update counts at {0}, expected {1}.
+row_limit_passed=The row limit {0} has been exceeded for XML mapping class {1}.
+AddNodeInstruction.element__1=element
+AddNodeInstruction.Unable_to_add_xml_{0}_{1},_namespace_{2},_namespace_declarations_{3}_3=Unable to add xml {0} {1}, namespace {2}, namespace declarations {3}
+QueryProcessor.request_cancelled=The request {0} has been cancelled.
+VariableSubstitutionVisitor.Input_vars_should_have_same_changing_state=INPUT variables used in the expression should all have same CHANGING state: {0}
+
+ExecDynamicSqlInstruction.0=Evaluated dynamic SQL expression value was null.
+ExecDynamicSqlInstruction.3=There is a recursive invocation of group ''{0}''. Please correct the SQL.
+ExecDynamicSqlInstruction.4=The dynamic sql string contains an incorrect number of elements.
+ExecDynamicSqlInstruction.6=The datatype ''{0}'' for element ''{1}'' in the dynamic SQL cannot be implicitly converted to ''{2}''.
+ExecDynamicSqlInstruction.couldnt_execute=Couldn''t execute the dynamic SQL command "{0}" with the SQL statement "{1}" due to: {2}
+
+RulePlanJoins.cantSatisfy=Join region with unsatisfied access patterns cannot be satisfied by the join criteria, Access patterns: {0}
+TempTableStore.table_exist_error=Temporary table "{0}" already exists.
+TempTableStore.table_doesnt_exist_error=Temporary table "{0}" does not exist.
+
+XMLQueryPlanner.cannot_plan=Cannot create a query for MappingClass with user criteria {0}
+CriteriaPlanner.staging_context=Staging table criteria cannot contian context functions
+CriteriaPlanner.multiple_staging=Staging table criteria {0} was not specified against a single staging table
+CriteriaPlanner.invalid_context=Element {0} is not in the scope of the context {1}
+CriteriaPlanner.invalid_element=Element {0} is not a valid data node
+results_not_found=Results for the mapping class {0} are not found;
+RulePlanProcedures.no_values=No valid criteria specified for procedure parameter {0}
+ProcedurePlan.nonNullableParam=The procedure parameter is not nullable, but is set to null: {0}
+
+FileStoreageManager.error_creating=Error creating {0}
+FileStoreageManager.error_reading=Error reading {0}
+FileStoreageManager.no_directory=No directory specified for the file storage manager.
+FileStoreageManager.not_a_directory={0} is not a valid storage manager directory.
+FileStoreageManager.space_exhausted=Max buffer space of {0} bytes has been exceed. The current operation will be aborted.
+
+TextTableNode.no_value=No value found for column \"{0}\" in the row ending on text line {1} in {2}.
+TextTableNode.conversion_error=Could not convert value for column \"{0}\" in the row ending on text line {1} in {2}.
+TextTableNode.header_missing=HEADER entry missing for column name \"{0}\" in {1}.
+TextTableNode.unclosed=Text parse error: Unclosed qualifier at end of text in {0}.
+TextTableNode.character_not_allowed=Text parse error: Non-whitespace character found between the qualifier and the delimiter in text line {0} in {1}.
+TextTableNode.unknown_escape=Text parse error: Unknown escape sequence \\{0} in text line {1} in {2}.
+TextTableNode.invalid_width=Text parse error: Fixed width line width {0} is smaller than the expected {1} on text line {2} in {3}.
+
+XMLTableNode.error=Error evaluating XQuery row context for XMLTable: {0}
+XMLTableNode.path_error=Error evaluating XMLTable column path expression for column: {0}
+XMLTableName.multi_value=Unexpected multi-valued result was returned for XMLTable column "{0}". Path expressions for non-XML type columns should return at most a single result.
+
+TempTableDataManager.failed_load=Failed to load materialized view table {0}.
+TempTableDataManager.loaded=Loaded materialized view table {0} with row count {1}.
+TempTableDataManager.loading=Loading materialized view table {0}
+TempTableDataManager.not_implicit_matview={0} does not target an internal materialized view.
+TempTableDataManager.row_refresh_pk=Materialized view {0} cannot have a row refreshed since there is no primary key.
+TempTableDataManager.row_refresh_composite=Materialized view {0} cannot have a row refreshed because it uses a composite key.
+TempTableDataManager.row_refresh_updatable=Materialized view {0} cannot have a row refreshed because it's cache hint did not specify \"updatable\".
+TempTableDataManager.row_refresh=Refreshing row {1} for materialized view {0}.
+CriteriaPlanner.no_context=No root node found.
+
+BasicInterceptor.ProcessTree_for__4=ProcessTree for
+
+
+ConnectorManager.not_in_valid_state=Connector is not in OPEN state
+
+ConnectorManagerImpl.Initializing_connector=Initializing connector {0}
+Cancel_request_failed=AtomicRequest {0} failed to cancel.
+
+ConnectorWorker.MaxResultRowsExceed=The number of result rows has exceeded the maximum result rows "{0}"
+ConnectorWorker.zero_size_non_last_batch=Connector returned a 0 row non-last batch: {0}.
+ConnectorWorker.process_failed=Connector worker process failed for atomic-request={0}
+ConnectorWorker.ConnectorWorker_result_set_unexpected_columns=Could not process stored procedure results for {0}. Expected {1} result set columns, but was {2}. Please update your models to allow for stored procedure results batching.
+
+
+DataTierManager.could_not_obtain_connector_binding=Could not obtain connection factory for model {0} in VDB name= {1}, version {2}
+
+
+DQPCore.Unable_to_load_metadata_for_VDB_name__{0},_version__{1}=Unable to load metadata for VDB name= {0}, version= {1}
+DQPCore.Unknown_query_metadata_exception_while_registering_query__{0}.=Unknown query metadata exception while registering query: {0}.
+DQPCore.Clearing_prepared_plan_cache=Clearing prepared plan cache
+DQPCore.The_request_has_been_closed.=The request {0} has been closed.
+DQPCore.The_atomic_request_has_been_cancelled=The atomic request {0} has been canceled.
+DQPCore.failed_to_cancel=Failed to Cancel request, as request already finished processing
+
+ProcessWorker.failed_rollback=Failed to properly rollback autowrap transaction properly
+ProcessWorker.error=Unexpected exception for request {0}
+ProcessWorker.processing_error=Processing exception ''{0}'' for request {1}. Exception type {2} thrown from {3}. Enable more detailed logging to see the entire stacktrace.
+
+
+# #query (018.005)
+ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures.
+
+# services (003)
+
+Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements.
+
+ProcessWorker.wrongdata=Wrong type of data found or no data found; expecting streamable object from the buffer manager.
+ProcessWorker.LobError=An error occurred during streaming of Lob Chunks to Client.
+
+TransactionServer.existing_transaction=Client thread already involved in a transaction. Transaction nesting is not supported. The current transaction must be completed first.
+TransactionServer.no_transaction=No transaction found for client {0}.
+TransactionServer.concurrent_transaction=Concurrent enlistment in global transaction {0} is not supported.
+TransactionServer.no_global_transaction=Expected an existing global transaction {0} but there was none for client {1}
+TransactionServer.unknown_flags=Unknown flags
+TransactionServer.no_global_transaction=No global transaction found for {0}.
+TransactionServer.wrong_transaction=Client is not currently enlisted in transaction {0}.
+TransactionServer.resume_failed=Cannot resume, transaction {0} was not suspended by client {1}.
+TransactionServer.existing_global_transaction=Global transaction {0} already exists.
+TransactionServer.suspended_exist=Suspended work still exists on transaction {0}.
+
+TransformationMetadata.does_not_exist._1=does not exist.
+TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
+TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
+TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
+TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
+TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
+TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
+TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
+TransformationMetadata.Invalid_type=Invalid type: {0}.
+TransformationMetadata.does_not_exist._1=does not exist.
+TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
+TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
+TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
+TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
+TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__8=InsertPlan could not be found for physical group
+TransformationMetadata.InsertPlan_could_not_be_found_for_physical_group__10=InsertPlan could not be found for physical group
+TransformationMetadata.DeletePlan_could_not_be_found_for_physical_group__12=DeletePlan could not be found for physical group
+TransformationMetadata.Error_trying_to_read_schemas_for_the_document/table____1=Error trying to read schemas for the document/table :
+TransformationMetadata.Invalid_type=Invalid type: {0}.
+
+CachedFinder.no_connector_found=No connector with jndi-name {0} found for Model {1} with source name {2}
+translator_not_found=Translator {0} not accessible.
+datasource_not_found=Data Source {0} not accessible.
+
+RequestWorkItem.cache_nondeterministic=Caching command '{0}'' at a session level, but less deterministic functions were evaluated.
+not_found_cache=Results not found in cache
+failed_to_unwrap_connection=Failed to unwrap the source connection.
\ No newline at end of file
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/LocalServerConnection.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -43,9 +43,9 @@
import org.teiid.dqp.internal.process.DQPWorkContext;
import org.teiid.net.CommunicationException;
import org.teiid.net.ConnectionException;
-import org.teiid.net.NetPlugin;
import org.teiid.net.ServerConnection;
import org.teiid.net.TeiidURL;
+import org.teiid.runtime.RuntimePlugin;
public class LocalServerConnection implements ServerConnection {
@@ -95,7 +95,7 @@
public Object invoke(Object arg0, final Method arg1, final Object[] arg2) throws Throwable {
if (shutdown) {
- throw ExceptionUtil.convertException(arg1, new TeiidComponentException(NetPlugin.Util.getString("LocalTransportHandler.Transport_shutdown"))); //$NON-NLS-1$
+ throw ExceptionUtil.convertException(arg1, new TeiidComponentException(RuntimePlugin.Util.getString("LocalTransportHandler.Transport_shutdown"))); //$NON-NLS-1$
}
try {
if (passthrough && !arg1.getDeclaringClass().equals(ILogon.class)) {
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -54,8 +54,8 @@
import org.teiid.common.buffer.StorageManager;
import org.teiid.logging.LogConstants;
import org.teiid.logging.LogManager;
-import org.teiid.net.NetPlugin;
import org.teiid.net.socket.ObjectChannel;
+import org.teiid.runtime.RuntimePlugin;
/**
@@ -216,7 +216,7 @@
ChannelStateEvent e) throws Exception {
ChannelListener listener = this.listeners.remove(e.getChannel());
if (listener != null) {
- LogManager.logDetail(LogConstants.CTX_TRANSPORT, NetPlugin.Util.getString("SSLAwareChannelHandler.channel_closed")); //$NON-NLS-1$
+ LogManager.logDetail(LogConstants.CTX_TRANSPORT, RuntimePlugin.Util.getString("SSLAwareChannelHandler.channel_closed")); //$NON-NLS-1$
listener.disconnected();
}
}
Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java 2010-09-08 20:07:17 UTC (rev 2552)
@@ -37,10 +37,10 @@
import org.teiid.logging.LogManager;
import org.teiid.logging.MessageLevel;
import org.teiid.net.CommunicationException;
-import org.teiid.net.NetPlugin;
import org.teiid.net.socket.Handshake;
import org.teiid.net.socket.Message;
import org.teiid.net.socket.ObjectChannel;
+import org.teiid.runtime.RuntimePlugin;
/**
@@ -130,7 +130,7 @@
//ensure the key information
if (returnedPublicKey == null) {
- throw new CommunicationException(NetPlugin.Util.getString("SocketClientInstance.invalid_sessionkey")); //$NON-NLS-1$
+ throw new CommunicationException(RuntimePlugin.Util.getString("SocketClientInstance.invalid_sessionkey")); //$NON-NLS-1$
}
try {
Modified: branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
+++ branches/7.1.x/runtime/src/main/resources/org/teiid/runtime/i18n.properties 2010-09-08 20:07:17 UTC (rev 2552)
@@ -43,6 +43,9 @@
ServerWorkItem.Component_Not_Found=Component not found: {0}
SocketTransport.1=Bound to address {0} listening on port {1}
+LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
+SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
+SSLAwareChannelHandler.channel_closed=Channel closed
invlaid_vdb_file=Invalid VDB file deployment failed {0}
redeploying_vdb=Re-deploying VDB {0}
13 years, 8 months
- 1
- 0
teiid SVN: r2551 - in branches/7.1.x/client/src/main: resources/org/teiid/net and 1 other directory.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 15:43:37 -0400 (Wed, 08 Sep 2010)
New Revision: 2551
Modified:
branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
Log:
TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored.
Modified: branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java
===================================================================
--- branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 19:35:26 UTC (rev 2550)
+++ branches/7.1.x/client/src/main/java/org/teiid/adminapi/AdminFactory.java 2010-09-08 19:43:37 UTC (rev 2551)
@@ -64,7 +64,7 @@
private synchronized Admin getTarget() throws AdminComponentException {
if (closed) {
- throw new AdminComponentException(NetPlugin.Util.getString("ERR.014.001.0001")); //$NON-NLS-1$
+ throw new AdminComponentException(NetPlugin.Util.getString("admin_conn_closed")); //$NON-NLS-1$
}
return target;
}
@@ -186,7 +186,7 @@
String applicationName) throws AdminException {
if (userName == null || userName.trim().length() == 0) {
- throw new IllegalArgumentException(NetPlugin.Util.getString("ERR.014.001.0099")); //$NON-NLS-1$
+ throw new IllegalArgumentException(NetPlugin.Util.getString("invalid_parameter")); //$NON-NLS-1$
}
final Properties p = new Properties();
Modified: branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties
===================================================================
--- branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 19:35:26 UTC (rev 2550)
+++ branches/7.1.x/client/src/main/resources/org/teiid/net/i18n.properties 2010-09-08 19:43:37 UTC (rev 2551)
@@ -21,61 +21,21 @@
#
StreamImpl.Unable_to_read_data_from_stream=Unable to read data from the stream: {0}
-
RequestMessage.invalid_txnAutoWrap=''{0}'' is an invalid transaction autowrap mode.
-
LocalTransportHandler.Transport_shutdown=Tranport has been shutdown.
-
-
-
PlatformServerConnectionFactory.Unable_to_find_a_component_used_in_logging_on_to=Unable to find a component used authenticate on to Teiid
+admin_conn_closed = The Admin connection has been closed.
+invalid_parameter = The user parameter may not be null or empty.
-
-
-
-
-
-MSG.014.010.0010 = Usage: VMController <vm_name> <host_name> <startDeployServices> [<log_file>]
-MSG.014.010.0011 = If startDeployedServices = true, deployedServices will be started.
-
-ERR.014.001.0099 = The user parameter may not be null or empty.
-ERR.014.001.0100 = The user password may not be null or empty.
-ERR.014.001.0101 = NamingException while getting new initialcontext for LogonAPI.
-ERR.014.001.0102 = Error trying to connect to server: {0} at {1}
-ERR.014.001.0103 = CreateException while getting home interface for LogonAPI.
-ERR.014.001.0104 = RemoteException while getting home interface for LogonAPI.
-ERR.014.001.0105 = Unknown error while obtaining a reference to LogonAPI.
-ERR.014.001.0106 = NamingException while getting new initialcontext for AdminAPI.
-ERR.014.001.0107 = NamingException while getting home interface for AdminAPI.
-ERR.014.001.0108 = CreateException while getting home interface for AdminAPI.
-ERR.014.001.0109 = RemoteException while getting home interface for AdminAPI.
-ERR.014.001.0110 = Unknown error while obtaining a reference to AdminAPI for user <{0}>
-
-
-
SocketServerInstance.Connection_Error.Unknown_Host = Error establishing socket. Unknown host: {0}
SocketServerInstance.Connection_Error.Connect_Failed = Error establishing socket to host and port: {0}:{1}. Reason: {2}
-
-
-ERR.014.001.0001 = Lost communication with the AdminAPI - the connection has been closed.
-ERR.014.001.0002 = Lost communication with the AdminAPI.
-
-MSG.014.001.0001 = Starting AdminAPIConnection for session <{0}>
-
SocketServerInstancePool.No_valid_host_available=No valid host available. Attempted connections to: {0}
-
-
-
-
-
SocketServerInstanceImpl.handshake_error=Handshake error
SocketClientInstance.invalid_sessionkey=Invalid session key used during handshake
SSLAwareChannelHandler.channel_closed=Channel closed
-
SocketServerConnection.closed=Server connection is closed
-
SocketHelper.keystore_not_found=Key store ''{0}'' was not found.
MMURL.INVALID_FORMAT=The required url format is {0}
13 years, 8 months
- 1
- 0
teiid SVN: r2550 - in branches/7.1.x: engine/src/main/resources/org/teiid/dqp and 1 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 15:35:26 -0400 (Wed, 08 Sep 2010)
New Revision: 2550
Modified:
branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored.
Modified: branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
===================================================================
--- branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-08 19:19:37 UTC (rev 2549)
+++ branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-08 19:35:26 UTC (rev 2550)
@@ -126,13 +126,6 @@
# security.membership
-ERR.014.407.0013 = The name of a principal may not be null or zero-length.
-ERR.014.407.0014 = The name of a principal may not be greater than {0} characters.
-ERR.014.407.0015 = The type of this principal is out of range.
-ERR.014.407.0016 = Unable to make a copy of a null principal.
-ERR.014.407.0017 = Unable to use a null principal reference for merging.
-ERR.014.407.0018 = Unable to merge a {0} principal with a {1} principal.
-ERR.014.407.0019 = The two principals ("{0}" and "{1}") cannot be merged because they are not the same principal.
#JDBCUTIL
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 19:19:37 UTC (rev 2549)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 19:35:26 UTC (rev 2550)
@@ -65,191 +65,9 @@
# from server package of last release
# #datatier (018.003)
-ERR.018.003.0001 = Unexpected processor shutdown. {0} {1}
-ERR.018.003.0002 = Retrieved Blob is too large, Blobs have a max size of {0} bytes.
-ERR.018.003.0003 = Retrieved Clob is too large, Clobs have a max size of {0} characters.
-ERR.018.003.0004 = There was an error translating results.
-ERR.018.003.0005 = There was an error translating results for data type {0}
-ERR.018.003.0006 = Data type {0} could not be converted to {1}
-ERR.018.003.0007 = No connector configuration properties are specified for this connector.
-ERR.018.003.0008 = Connector:initService: The maximum result rows connector configuration property is invalid. Its value is {0}
-ERR.018.003.0009 = Connector:initService: Data Connector max threads value not specified in properties: {0}
-ERR.018.003.0010 = Connector:initService: Data Connector thread TTL value not specified in properties: {0}
-ERR.018.003.0011 = Could not construct ConnectorProcessorPool.
-ERR.018.003.0012 = Connector:initService: The maximum processor idle time connector configuration property is invalid. Its value is {0}
-ERR.018.003.0013 = Connector:initService: The cleanup interval connector configuration property is invalid. Its value is {0}
-ERR.018.003.0014 = Connector:initService: The Connector Service {0} could not be started. A processor could not be obtained from the processor pool.
-ERR.018.003.0015 = Connector:initService: The maximum threads connector configuration property is invalid. Its value is {0}
-ERR.018.003.0016 = Connector:initService: The thread TTL connector configuration property is invalid. Its value is {0}
-ERR.018.003.0017 = Unable to instantiate the VirtualDatabaseLoader class using the "{0}" loader class.
-ERR.018.003.0018 = Caching cannot be enabled for connectors that support cursor batching.
-ERR.018.003.0019 = Error creating cache for {0} with factory: {1}
-ERR.018.003.0020 = Failed to decrypt the database connection password.
-ERR.018.003.0021 = ConnectorWorker cannot process object of type other than AtomicQueryRequest.
-ERR.018.003.0022 = {0} {1} Unable to import transaction: {2}
-ERR.018.003.0023 = Unable to import transaction: {0}
-ERR.018.003.0024 = {0} {1} Unable to suspend transaction: {2}
-ERR.018.003.0025 = Unable to suspend transaction: {0}
-ERR.018.003.0026 = {0} {1} Unable to resume transaction: {2}
-ERR.018.003.0027 = Unable to resume transaction: {0}
-ERR.018.003.0028 = Could not get processor {0} for request: {1}
-ERR.018.003.0029 = Processor pool not set.
-ERR.018.003.0030 = connectorID cannot be null.
-ERR.018.003.0031 = serviceID cannot be null.
-ERR.018.003.0032 = ConnectorProcessor:init(): No configuration properties are specified for this processor.
-ERR.018.003.0033 = ConnectorProcessor:init():Connector translator class name not specified {0}
-ERR.018.003.0034 = ConnectorProcessor:init(): Connection class name not specified {0}
-ERR.018.003.0035 = ConnectorProcessor:init():The cache stats log Interval property was not defined correctly. It could not be parsed into an integer. Its value: {0}
-ERR.018.003.0036 = ConnectorProcessor:init():The Translator class name specified is not valid or was not found in the classpath. Class Name: {0}
-ERR.018.003.0037 = ConnectorProcessor:init():The Connection class name specified is not valid or was not found in the classpath. Class Name: {0}
-ERR.018.003.0038 = Unable to find class ''{0}'' - unexpected error message: {1}
-ERR.018.003.0039 = {0} {1} Could not deliver response.
-ERR.018.003.0040 = ConnectorProcessorPool:create:A ConnectorProcessor could not be created. An id could not be obtained from the DBIDGenerator for a new processor.
-ERR.018.003.0041 = No connector service properties specified.
-ERR.018.003.0042 = No connector processor class specified in properties.
-ERR.018.003.0043 = Could not init Connector processor: {0}
-ERR.018.003.0044 = {0} Heartbeat thread write error: {1}
-ERR.018.003.0045 = Connector connection returned EOF.
-ERR.018.003.0046 = Connector connection to the server lost.
-ERR.018.003.0047 = Unexpected exception in connector read worker while reading results.
-ERR.018.003.0048 = Connector read worker produced null results key for results: {0}
-ERR.018.003.0049 = Parameter cannot be null.
-ERR.018.003.0050 = Cannot add records after result set is closed.
-ERR.018.003.0051 = Error reading results from the connector : {0}. Exceeded maximum rows allowed to be read: {1}
-ERR.018.003.0052 = Unable to {0} transaction: {1}
-ERR.018.003.0053 = {0} {1} Unable to {2} transaction: {3}
-ERR.018.003.0054 = {0} {1} Unable to close XA connection.
-ERR.018.003.0055 = {0} {1} Error occurred while collecting results.
-ERR.018.003.0056 = {0} {1} Unable to rollback transaction: {2}
-ERR.018.003.0057 = {0} {1} Error in cleaning up tuple source storage after error.
-ERR.018.003.0058 = {0} {1} Could not obtain current configuration information, while trying to obtain connection factory name.
-ERR.018.003.0059 = {0} Unable to rollback transaction: {1}
-ERR.018.003.0060 = Unable to start subtxn.
-ERR.018.003.0061 = {0} Unable to start subtxn.
-ERR.018.003.0062 = {0} Error translating results for request id: {1}
-ERR.018.003.0063 = The class type: {0} is not a valid class name for a metadata element.
-ERR.018.003.0064 = The VirtualDatabaseMetadata reference is null for this BasicMetadataFacade.
-ERR.018.003.0065 = Unable to obtain Element for id: {0}
-ERR.018.003.0066 = Unable to obtain Group for id: {0}
-ERR.018.003.0067 = No Element id was found for name in source ''{0}'' in the Query: {1}
-ERR.018.003.0068 = Could not register request for {0}. No connectors exist for this database.
-ERR.018.003.0069 = RMI Error with ConnectorServiceProxy communication with service.
-ERR.018.003.0070 = Invalid service state while obtaining connectorID.
-ERR.018.003.0071 = Could not create SingeSourceRouter for {0}
-ERR.018.003.0072 = No single source router found for connectorBindingID = {0}
-ERR.018.003.0073 = Could not register request with connector as the connectors request queue is suspended.
-ERR.018.003.0074 = Connector service is not in valid state.
-ERR.018.003.0075 = Communication error between DataRouter and Connector service.
-ERR.018.003.0076 = Could not find Connector: {0} in registry.
-ERR.018.003.0077 = Error trying to get the SAPMetadataLoader. Sessiontoken should be a trusted token from which credential info is obtained.
-ERR.018.003.0078 = Error trying to get the connector proxy for the model: {0}
-ERR.018.003.0079 = Attempts to parse String: ''{0}'' to a java.util.Date failed for the following reasons:
-ERR.018.003.0080 = There were no format Strings found in this formatter object.
-ERR.018.003.0081 = Parse Attempt #{0} using format: ''{1}'' failed for the following reason: {2}
-ERR.018.003.0082 = Failed to convert String: ''{0}'' to a Date using one of the following format Strings that are specified in the properties for this Connector: {1}
-ERR.018.003.0083 = Could not get connectorID for {0}. No connectors available to handle request.
-ERR.018.003.0084 = Unknown transaction isolation level: {0}.
# #query (018.005)
-ERR.018.005.0001 = Invalid Type. Allowed values are NEW, UPDATE, CANCEL.
-ERR.018.005.0002 = Could not deliver exception response, originating exception preceeds.
-ERR.018.005.0003 = Could not register the request for {0} as request has been removed from QueryService.
-ERR.018.005.0004 = Could not deliver response for {0} as request has been removed from QueryService.
-ERR.018.005.0005 = Could not deliver response for {0} as the QueryProcessor could not be obtained.
-ERR.018.005.0006 = Could not deliver partial results for {0} as the atomic query request could not be obtained for nodeID {1}
-ERR.018.005.0007 = Could not deliver response for {0} as a matching atomic request could not be found.
-ERR.018.005.0008 = Could not obtain current configuration information, while trying to obtain connection factory name.
-ERR.018.005.0009 = Request {0} does not have a response receiver.
-ERR.018.005.0010 = Message for {0} could not be deliver.
-ERR.018.005.0011 = Unable to listen for extension source cache reload events.
-ERR.018.005.0012 = Unable to invoke user defined function in: {0}
-ERR.018.005.0013 = Failed to load class from ExtensionSourceManager: {0}
-ERR.018.005.0014 = Unexpected exception while processing XML data for user functions: {0}
-ERR.018.005.0015 = Failed getting first batch for {0}
-ERR.018.005.0016 = Failed to deliver response for {0}
-ERR.018.005.0017 = null QueryServiceInterface implmentation.
-ERR.018.005.0018 = Cannot deliver null response.
-ERR.018.005.0019 = Message or requestID cannot be null.
-ERR.018.005.0020 = Exception trying to determine processor timeslice from {0}
-ERR.018.005.0021 = Detected invalid user defined functions.
-ERR.018.005.0022 = Invalid function ''{0}'': {1}
-ERR.018.005.0023 = Exception trying to register metadata source.
-ERR.018.005.0024 = Exception trying to determine min fetch size.
-ERR.018.005.0025 = Exception trying to determine max fetch size.
-ERR.018.005.0026 = Transactions not allowed due to license restriction.
-ERR.018.005.0027 = Updates not allowed due to license restriction.
-ERR.018.005.0028 = Unable to set transaction timeout.
-ERR.018.005.0029 = Unable to create transaction for query {0}
-ERR.018.005.0030 = Unable to resume transaction.
-ERR.018.005.0031 = Unknown query metadata exception while register query
-ERR.018.005.0032 = Transaction is needed for this query, {0}, but none is started.
-ERR.018.005.0033 = Unable to export transaction for query {0}
-ERR.018.005.0034 = Unable to suspend transaction for query {0}
-ERR.018.005.0035 = RuntimeException caught while submitting query: {0}
-ERR.018.005.0036 = The number of the values does not match that of the parameters in the prepared statement.
-ERR.018.005.0037 = The type of the value does not match that of parameter {0}
-ERR.018.005.0038 = Error executing conversion function to convert value.
-ERR.018.005.0039 = Problem getting cursor batch for {0}
-ERR.018.005.0040 = The request {0} has been canceled by the administrator.
-ERR.018.005.0041 = The request {0} has been canceled.
-ERR.018.005.0042 = Failed to deliver cancellation error response for {0} as it does not have a response receiver.
-ERR.018.005.0043 = Error loading configuration while trying to load metadata for system queries.
-ERR.018.005.0044 = Error trying to access metadata for loading metadata for elements/keys of the group :{0}
-ERR.018.005.0045 = Error evaluating references while loading metadata for elements/keys of the group :{0}
-ERR.018.005.0046 = Failed checking whether the query requires a transaction.
-ERR.018.005.0047 = Unable to locate required QueryService instance: {0}
-ERR.018.005.0048 = Could not create a UserTransaction. No QueryServices available.
-ERR.018.005.0049 = RMI error with QueryServiceProxy communications with service.
-ERR.018.005.0050 = Error: Could not create a UserTransaction in Query Service, service is not initialized.
-ERR.018.005.0051 = Error: Could not create a UserTransaction in Query Service, service is closed.
-ERR.018.005.0052 = QueryServiceProxy could not create UserTransaction - No services were available (Dead: {0}, suspended: {1})
-ERR.018.005.0053 = Could not register query: {0}. No QueryServices available.
-ERR.018.005.0054 = Error: Could not register request with Query Service, service is not initialized.
-ERR.018.005.0055 = Error: Could not register request with Query Service, service is closed.
-ERR.018.005.0056 = QueryServiceProxy could not register query: {0} - No services were available (Dead: {1}, suspended: {2})
-ERR.018.005.0057 = Could not get cursor batch: {0}. No QueryServices available.
-ERR.018.005.0058 = Error: Could not get cursor batch from Query Service, service is not initialized.
-ERR.018.005.0059 = Error: Could not get cursor batch from Query Service, service is closed.
-ERR.018.005.0060 = QueryServiceProxy could not get cursor batch: {0} - No services were available (Dead: {1}, suspended: {2})
-ERR.018.005.0061 = Could not cancel query: {0}. No QueryServices available.
-ERR.018.005.0062 = Error: Could not cancel query with Query Service, service is not initialized.
-ERR.018.005.0063 = Error: Could not cancel query with Query Service, service is closed.
-ERR.018.005.0064 = QueryServiceProxy could not cancel query: {0} - No services were available to find request.
-ERR.018.005.0065 = Could not cancel queries for: {0}. No QueryServices available.
-ERR.018.005.0066 = Error: Could not cancel queries with Query Service, service is not initialized.
-ERR.018.005.0067 = Error: Could not cancel queries with Query Service, service is closed.
-ERR.018.005.0068 = Error: Could not get all queries from Query Service, service is not initialized.
-ERR.018.005.0069 = Error: Could not get all queries from Query Service, service is closed.
-ERR.018.005.0070 = Error: Could not get queries for session from Query Service, service is not initialized.
-ERR.018.005.0071 = Error: Could not get queries for session from Query Service, service is closed.
-ERR.018.005.0072 = Could not clear cache for: {0}. No QueryServices available.
-ERR.018.005.0073 = Error: Could not clear cache in Query Service, service is not initialized.
-ERR.018.005.0074 = Error: Could not clear cache in Query Service, service is closed.
-ERR.018.005.0075 = Could not forget transaction. No QueryServices available.
-ERR.018.005.0076 = Error: Could not forget transaction, service is not initialized.
-ERR.018.005.0077 = Error: Could not forget transaction, service is closed.
-ERR.018.005.0078 = Error: Could not recover transaction, service is not initialized.
-ERR.018.005.0079 = Error: Could not recover transaction, service is closed.
-ERR.018.005.0080 = Error: Could not rollback transaction, service is not initialized.
-ERR.018.005.0081 = Error: Could not rollback transaction, service is closed.
-ERR.018.005.0082 = Error: Could not start transaction, service is not initialized.
-ERR.018.005.0083 = Error: Could not start transaction, service is closed.
-ERR.018.005.0084 = Could not check if the query requires a transaction. No QueryServices are available.
-ERR.018.005.0085 = Error: Could not check if the query requires a transaction in Query Service, service is not initialized.
-ERR.018.005.0086 = Error: Could not check if the query requires a transaction in Query Service, service is closed.
-ERR.018.005.0087 = QueryServiceProxy could not check if the query requires a transaction - No services were available (Dead: {0}, suspended: {1})
-ERR.018.005.0088 = Group does not exist: {0}
-ERR.018.005.0089 = INSERT, UPDATE, and DELETE are not allowed on subscriptions.
-ERR.018.005.0090 = Subscription cannot contain work on multiple groups: {0}
-ERR.018.005.0091 = "The following data elements are not marked as subscribable and cannot be used in a subscription: {0}
-ERR.018.005.0092 = The session for user <{0}> is invalid.
-ERR.018.005.0093 = An error occured in the Authorization service.
-ERR.018.005.0094 = Unable to find Authorization service.
ERR.018.005.0095 = User <{0}> is not entitled to action <{1}> for 1 or more of the groups/elements/procedures.
-ERR.018.005.0096 = There was an error in the response.
-ERR.018.005.0097 = Exception trying to determine maximum number of code tables.
-ERR.018.005.0098 = Exception trying to determine maximum record size of a code table.
-ERR.018.005.0100 = Unable to load code table for because result sizes exceeds the allowed parameter - {0}.
# services (003)
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:19:37 UTC (rev 2549)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:35:26 UTC (rev 2550)
@@ -25,47 +25,17 @@
#
# function (001)
-ERR.015.001.0001 = Unknown function: {0}
ERR.015.001.0002 = Cannot find implementation for known function {0}
ERR.015.001.0003 = Error while evaluating function {0}
ERR.015.001.0004 = Unable to access function implementation for [{0}]
ERR.015.001.0005 = ERROR loading system functions: {0}
-ERR.015.001.0006 = Error occurred while adding {0} and {1}
-ERR.015.001.0007 = Unknown type signature for {0}({1}, {2})
-ERR.015.001.0008 = Error occurred while subtracting {0} from {1}
-ERR.015.001.0009 = Substring start value {0} out of valid range for {1}
-ERR.015.001.0010 = Error occurred while multiplying {0} and {1}
-ERR.015.001.0011 = Substring length {0} is invalid for {1}
-ERR.015.001.0012 = Error occurred while dividing {0} and {1}
-ERR.015.001.0013 = Unknown type signature for {0}({1}, {2}, {3})
-ERR.015.001.0014 = Error occurred while getting absolute value of {0}
-ERR.015.001.0015 = Unknown type signature for {0}({1})
-ERR.015.001.0016 = Error occurred while taking ceiling of {0}
ERR.015.001.0017 = Left count is invalid: {0}
-ERR.015.001.0018 = Error occurred while taking exp of {0}
-ERR.015.001.0019 = Right count is invalid: {0}
-ERR.015.001.0020 = Error occurred while taking floor of {0}
-ERR.015.001.0021 = Error evaluating ascii function - string passed has length 0.
-ERR.015.001.0022 = Error occurred while taking log of {0}
-ERR.015.001.0024 = Error occurred while taking log10 of {0}
ERR.015.001.0025 = Pad length must be > 0.
-ERR.015.001.0026 = Error occurred while doing {0} mod {1}
ERR.015.001.0027 = Pad string for lpad/rpad must have length greater than 0.
-ERR.015.001.0028 = Error occurred while doing {0} ^ {1}
-ERR.015.001.0029 = Pad string for rpad must have length greater than 1.
-ERR.015.001.0030 = Error occurred while taking sign({0})
ERR.015.001.0031 = Source and destination character lists must be the same length.
-ERR.015.001.0032 = Error occurred while taking sqrt of {0}
ERR.015.001.0033 = Error converting [{0}] of type {1} to type {2}
-ERR.015.001.0034 = Unknown target type for conversion: {0}
ERR.015.001.0035 = The context function may only be used in XML queries.
ERR.015.001.0035a = The rowlimit and rowlimitexception functions may only be used in XML queries.
-ERR.015.001.0036 = The DECODE string parameter cannot be null.
-ERR.015.001.0037 = Null decode delimiter encountered in DECODE function call.
-ERR.015.001.0038 = Unable to convert the comparison String: {0} in the decode function parameterto the return type: {1}
-ERR.015.001.0039 = Unable to convert the DECODE value: {0} to the proper return datatype.
-ERR.015.001.0040 = The second and third DECODE function arguments must be a literal String
-ERR.015.001.0041 = The DECODE function was unable to convert the object: {0} of type: {1} to the target output type: {2}
ERR.015.001.0042 = Illegal argument for formating: {0}
ERR.015.001.0043 = Parse Exception occurs for executing: {0} {1}
ERR.015.001.0044 = Function metadata source is of invalid type: {0}
@@ -74,7 +44,6 @@
ERR.015.001.0047 = Unexpected exception while loading {0}.{1} with args= {2}
ERR.015.001.0048 = Unable to represent average value from {0} / {1}
ERR.015.001.0050 = Unable to compute aggregate function {0} on data of type {1}
-ERR.015.001.0051 = Caught unexpected exception while computing {0}.
ERR.015.001.0052 = {0} must be non-null.
ERR.015.001.0053 = Method parameter must be non-null.
ERR.015.001.0054 = Type is unknown: {0}
@@ -82,26 +51,16 @@
ERR.015.001.0056 = {0} has invalid first character: {1}
ERR.015.001.0057 = {0} has invalid character: {1}
ERR.015.001.0058 = {0} cannot end with a ''.''
-ERR.015.001.0059 = IO Exception while reading XML metadata file: {0}
-ERR.015.001.0060 = Unexpected exception while reading XML data for user functions: {0}
ERR.015.001.0061 = <start> value of {0} is invalid, which should never be less than zero or bigger than the length of original string {1}
ERR.015.001.0062 = <length> value of {0} is invalid, which should never less be than zero.
ERR.015.001.0063 = Input String is an empty string but start value or/and length value is bigger than zero.
-ERR.015.001.0064 = Unknown type signature for evaluating function of: {0} ({1}, {2}, {3}, {4})
-ERR.015.001.0065 = Unknown type signature for evaluating function of: {0} ({1}, {2})
ERR.015.001.0066 = Unknown type signature for evaluating function of: {0} ({1})
-ERR.015.001.0067 = Unknown type signature for evaluating function of: {0} ({1}, {2}, {3})
-ERR.015.001.0068 = Unknown type signature for evaluating function of: {0} ({1}, {2}, {3})
ERR.015.001.0069 = Unknown type signature for evaluating function of: {0} ({1})
-ERR.015.001.0070 = Unknown type signature for evaluating function of: {0} ({1})
-ERR.015.001.0071 = Unknown type signature for evaluating function of: {0} ({1})
# mapping (002)
-ERR.015.002.0008 = Mapping file or stream must be specified prior to initializing mapping reader.
ERR.015.002.0009 = Search direction arg ''{0}'' is not one of the search constants defined in MappingNodeConstants.
ERR.015.002.0010 = Value for property ''{0}'' is null.
ERR.015.002.0011 = Invalid type: {0}
-ERR.015.002.0012 = QueryNode<error converting>
# parser (005)
@@ -199,7 +158,6 @@
ERR.015.010.0039= The WHEN part of the searched CASE expression must contain a criteria.
# util (011)
-ERR.015.011.0001 =
# validator (012)
ERR.015.012.0001 = The query defining an updatable virtual group cannot be a UNION query
@@ -213,8 +171,6 @@
ERR.015.012.0010 = The query defining an updatable simple virtual group should select all the required elements in its FROM clause {0}
ERR.015.012.0011 = There must be exactly one projected symbol in the subcommand of an IN clause.
ERR.015.012.0012 = An AssignmentStatement cannot change the value of a {0} or {1} variable.
-ERR.015.012.0013 = There must be exactly one projected symbol in the command of an AssignmentStatement.
-ERR.015.012.0014 = Variable used in the procedure''s AssignmentStatement does not match the type of value returned by the command.
ERR.015.012.0016 = Variable {0} not assigned any value in this procedure.
ERR.015.012.0017 = Variables declared the procedure''s DeclareStatement cannot be one of the special variables: {0}, {1} and {2}.
ERR.015.012.0019 = TranslateCriteria cannot be used in on an if or while statement.
@@ -231,7 +187,6 @@
ValidationVisitor.limit_not_valid_for_xml=The limit clause cannot be used on an XML document query.
ValidationVisitor.translated_or=Translated user criteria must not contain OR criteria
ValidationVisitor.union_insert = Select into is not allowed under a set operation: {0}.
-ERR.015.012.0028 = The following data elements are not supported in match criteria: {0}.
ERR.015.012.0029 = INSERT, UPDATE, and DELETE not allowed on XML documents
ERR.015.012.0030 = Commands used in stored procedure language not allowed on XML documents
ERR.015.012.0031 = Queries against XML documents can not have a GROUP By clause
@@ -239,31 +194,18 @@
ERR.015.012.0033 = Metadata does not allow updates on the group: {0}
ERR.015.012.0034 = Queries involving UNIONs, INTERSECTs and EXCEPTs not allowed on XML documents
ERR.015.012.0035 = Queries combined with the set operator {0} must have the same number of output elements.
-ERR.015.012.0036 = Queries combined with the set operator {0} must have elements with the same type in each position. The symbol ''{1}'' of type ''{2}'' does not match the symbol ''{3}'' of type ''{4}''.
ERR.015.012.0037 = Invalid symbol: {0}. When an aggregate function is used in the SELECT clause and no GROUP BY clause is specified, the SELECT clause may contain only aggregate functions and constants.
ERR.015.012.0038 = Invalid symbol: {0}. When a GROUP BY clause is used, all elements in the SELECT clause must be declared in the GROUP BY clause.
ERR.015.012.0039 = Nested aggregate expressions are not allowed: {0}
-ERR.015.012.0040 = Aggregate expression has unknown data type: {0}
ERR.015.012.0041 = The aggregate function {0} cannot be used with non-numeric expressions: {1}
AggregateValidationVisitor.non_comparable = The aggregate function {0} cannot be used with non-comparable expressions: {1}
AggregateValidationVisitor.non_xml = The XMLAGG aggregate function {0} requires an expression of type XML: {1}
AggregateValidationVisitor.non_boolean=The boolean aggregate functions ANY, SOME, EVERY require a boolean expression.
AggregateValidationVisitor.invalid_distinct=The enhanced numeric aggregate functions STDDEV_POP, STDDEV_SAMP, VAR_POP, VAR_SAMP cannot have DISTINCT specified.
-ERR.015.012.0042 = Cross join may not have criteria: {0}
-ERR.015.012.0043 = Join must have criteria declared in the ON clause: {0}
-ERR.015.012.0045 = Elements in this join criteria are not from a group involved in the join: {0}
-ERR.015.012.0046 = Join criteria must have at least one element on each side of criteria: {0}
-ERR.015.012.0047 = Elements in this join criteria are not from a group involved in the join: {0}
-ERR.015.012.0048 = When a HAVING clause is used without a GROUP BY clause, the HAVING clause may contain only constants and aggregate expressions.
-ERR.015.012.0049 = Invalid symbol {0} in HAVING clause. Any elements used in this clause outside an aggregate expression must be declared in the GROUP BY clause.
-ERR.015.012.0050 = Nested aggregate expressions are not allowed: {0}
-ERR.015.012.0051 = Number of values in the insert statement must match the number of elements.
ERR.015.012.0052 = The element [{0}] is in an INSERT but does not support updates.
ERR.015.012.0053 = Element in the group {0}, for which value is not specified in the insert command is neither nullable nor has a default value: {1}
ERR.015.012.0054 = Column variables do not reference columns on group "{0}": {1}
ERR.015.012.0055 = Element {0} does not allow nulls.
-ERR.015.012.0056 = Only constant expressions are allowed to be inserted. The expression ''{0}'' cannot be evaluated to a constant.
-ERR.015.012.0057 = Left side of update expression must be a single element and have a right expression of the same type: {0}
ERR.015.012.0058 = Left side of update expression may not be a variable or a reference to an external element: {0}
ERR.015.012.0059 = Left side of update expression must be an element that supports update: {0}
ERR.015.012.0060 = Element {0} does not allow nulls.
@@ -272,86 +214,36 @@
ERR.015.012.0063 = Multiple failures occurred during validation:
ERR.015.012.0064 = Validation succeeded
ERR.015.012.0065 = Nested Loop can not use the same cursor name as that of its parent.
-ERR.015.012.0066 = Cursor name can not be used outside the context of the Loop.
ERR.015.012.0067 = No scalar subqueries are allowed in the SELECT with no FROM clause.
ERR.015.012.0069 = INTO clause can not be used in XML query.
-ERR.015.012.0070 = The target table for a SELECT INTO or an INSERT with a query expression can only be a physical table or a temporary table.
# Log messages for query (015) project to address internationalization
# Format:
#
# function (001)
-MSG.015.001.0001 = The function {0} will not be added because a function with the same name and signature already exists.
-MSG.015.001.0002 = Function Validation
# mapping (002)
-MSG.015.002.0001 =
# metadata (003)
-MSG.015.003.0001 =
# optimizer (004)
-MSG.015.004.0001 = Rejecting dependent access node as it''s criteria is strong: {0}
-MSG.015.004.0002 = Rejecting dependent access node as parent join is CROSS or FULL OUTER: {0}
-MSG.015.004.0003 = Rejecting dependent access node as parent join has no join criteria: {0}
-MSG.015.004.0004 = Rejecting dependent access node as parent join has no equality expressions: {0}
-MSG.015.004.0005 = Rejecting dependent access node as it is on outer side of a join: {0}
-MSG.015.004.0006 = Neither access node can be made dependent because both have unsatisfied access patterns: {0} {1}
-MSG.015.004.0007 = Making access node dependent to satisfy access pattern: {0}
-MSG.015.004.0008 = Making access node dependent due to hint: {0}
-MSG.015.004.0009 = Rejecting dependent access node as access pattern forbids dependent join: {0}
-MSG.015.004.0010 = Rejecting weaker dependent access node sibling based on criteria: {0}
-MSG.015.004.0011 = Mapping document tree: {0}
-MSG.015.004.0012 = Optimizing location of staging table: {0}
-MSG.015.004.0013 = Could not find descendant twin for recursive node: {0}
-MSG.015.004.0014 = Found bound references list {0} for result set {1}
-MSG.015.004.0015 = Adding Reference for recursive processing to list for result set: {0} new expr: {1} old expr: {2}
-MSG.015.004.0016 = Found bound references list {0} for result set {1}
-MSG.015.004.0017 = Current program shouldn''t equal recursive program in recursive block: {0}
-MSG.015.004.0018 = ''context'' usage; current rs mapping node {0}
-MSG.015.004.0019 = ''context'' usage; building temp criteria loop, result Set {0} context result set {1}
-MSG.015.004.0020 = ''context'' usage; temp Criteria {0}
-MSG.015.004.0021 = ''context'' usage; next rs mapping node {0}
-MSG.015.004.0022 = ''context'' usage: mapping result set {0} to {1}
-MSG.015.004.0023 = adjusting From clause for ''context'' usage: Query {0} Criteria {1}
-MSG.015.004.0024 = finished adjusting From clause for ''context'' usage: Query {0} Criteria {1}
# parser (005)
-MSG.015.005.0001 =
# processor (006)
-MSG.015.006.0001 = AssignmentInstruction: The variable {0} in the variablecontext is updated with the value : {1}
-MSG.015.006.0002 = AssignmentInstruction: The variable {0} in the variablecontext is set to null, no rows were returned for the execution of command that assigns its value
-MSG.015.006.0003 = DeclareInstruction: Current variablecontext is updated with the variable: {0}
-MSG.015.006.0004 = Processing ExecSqlInstruction as part of processing the update procedure
-MSG.015.006.0005 = IFInstruction: The criteria on the if block evaluated to true, processing the if block
-MSG.015.006.0006 = IFInstruction: The criteria on the if block evaluated to false, processing the else block
-MSG.015.006.0007 = ProcedurePlan reset
-MSG.015.006.0008 = removed tuple source {0} for result set
-MSG.015.006.0009 = ProcedurePlan toString couldn''t print entire Program.
-MSG.015.006.0010 = Processing RaiseErrorInstruction as part of processing the update procedure
-MSG.015.006.0011 = RelationalPlan reset
-MSG.015.006.0012 = ABORT processing now.
-MSG.015.006.0013 = TAG elem {0} fixed value {1}
# report (007)
-MSG.015.007.0001 =
# resolver (008)
-MSG.015.008.0001 =
# rewriter (009)
-MSG.015.009.0001 =
# sql (010)
-MSG.015.010.0001 =
# util (011)
-MSG.015.011.0001 =
# validator (012)
-MSG.015.012.0001 =
SQLParser.Unknown_join_type=Unknown join type: {0}
13 years, 8 months
- 1
- 0
teiid SVN: r2549 - branches/7.1.x/engine/src/main/resources/org/teiid/query.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 15:19:37 -0400 (Wed, 08 Sep 2010)
New Revision: 2549
Modified:
branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored.
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:07:34 UTC (rev 2548)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:19:37 UTC (rev 2549)
@@ -22,7 +22,6 @@
# Error messages for query (015) project to address internationalization
# Format:
-# ERR.015.001.0001=Doh! You blew it!
#
# function (001)
13 years, 8 months
- 1
- 0
teiid SVN: r2548 - in branches/7.1.x: engine/src/main/resources/org/teiid/dqp and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 15:07:34 -0400 (Wed, 08 Sep 2010)
New Revision: 2548
Modified:
branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
Log:
TEIID-1027: verbose messages in the "i18N.properties" file. These are legacy messages did not get deleted when the code got refactored.
Modified: branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties
===================================================================
--- branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
+++ branches/7.1.x/common-core/src/main/resources/org/teiid/core/i18n.properties 2010-09-08 19:07:34 UTC (rev 2548)
@@ -96,17 +96,11 @@
InvalidPropertyException.message=Property ''{0}'' with value ''{1}'' is not a valid {2}.
# types (029)
-ERR.003.029.0001=Cannot transform value of invalid type {0}: expecting value of type {1}
ERR.003.029.0002=Types cannot be null: (source={0}, target={1})
ERR.003.029.0003=Type names cannot be null: (source={0}, target={1})
-ERR.003.029.0004=Transform cannot be null.
-ERR.003.029.0005=Transform source name cannot be null: {0}
-ERR.003.029.0006=Transform target name cannot be null: {0}
-ERR.003.029.0013=Failed to transform {0} to Boolean. Expected 0, 1, ''TRUE'', ''FALSE'', or ''UNKNOWN'' for ''{1}''
ERR.003.029.0014=Invalid BigDecimal format in String: {0}
ERR.003.029.0015=Invalid BigInteger format in String: {0}
ERR.003.029.0016=Invalid Byte format in String: {0}
-ERR.003.029.0017=Cannot convert string of length > 1 to character: {0}
ERR.003.029.0018=Failed to transform String to Date. Expected format = yyyy-mm-dd for {0}
ERR.003.029.0019=Invalid double format in String: {0}
ERR.003.029.0020=Invalid float format in String: {0}
@@ -115,12 +109,8 @@
ERR.003.029.0023=Invalid short format in String: {0}
ERR.003.029.0024=Failed to transform String to Timestamp. Expected format = yyyy-mm-dd hh:mm:ss.fffffffff for {0}
ERR.003.029.0025=Failed to transform String to Time. Expected format = hh:mm:ss for {0}
-ERR.003.029.0026=The {0} data type mapping may not be modified.
#CM_UTIL_ERR
-ERR.003.030.0068=Init failed: {0}
-ERR.003.030.0069=Init failed: Unable to retrieve pass key.
-ERR.003.030.0070=Encryption failed: {0} {1}
ERR.003.030.0071=Decryption failed: {0} {1}
ERR.003.030.0072=Attempt to encrypt null cleartext.
ERR.003.030.0073=Attempt to encrypt zero-length cleartext.
@@ -130,12 +120,9 @@
ERR.003.030.0077=Could not get instance of cipher for encryption, invalid padding specified: {0} {1} {2}
ERR.003.030.0078=Could not initialize cipher for decryption, invalid key specified: {0} {1}
ERR.003.030.0079=Could not get encrypt cipher''s encoded algorithm parameters due to encoding error: {0} {1}
-ERR.003.030.0080=Could not initialize cipher for decryption, invalid padding specified: {0}
ERR.003.030.0081=Encryption failed: {0}
# PROPERTIES_ERR
-ERR.003.021.0010=Unable to create an unmodifiable properties from a null original instance.
-ERR.003.021.0011=Unable to modify this Properties instance.
# security.membership
@@ -148,12 +135,6 @@
ERR.014.407.0019 = The two principals ("{0}" and "{1}") cannot be merged because they are not the same principal.
#JDBCUTIL
-ERR.003.030.0176=Missing JDBC driver class name.
-ERR.003.030.0177=Missing JDBC protocol name.
-ERR.003.030.0178=Missing JDBC database name.
-ERR.003.030.0179=Unable to load the JDBC driver class {0}
-ERR.003.030.0180=Driver {0} can not load {1}
-ERR.003.030.0181=Failed to connect to the Database at {0} check connection properties.
ExceptionHolder.converted_exception=Remote {1}: {0}
PropertiesUtils.failed_to_resolve_property=failed to completely resolve the property value for key {0}
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 19:07:34 UTC (rev 2548)
@@ -56,18 +56,12 @@
# Error Messages for the dqp Package
# ==========================================
#
-# example ERR.022.001.0001=Test Error Message for dqp Package
# application (000)
-ERR.022.000.0001=
# interceptor (001)
-ERR.022.001.0001=
# internal (002)
-ERR.022.002.0001=The configuration file for the embedded DQP could not be found.
-ERR.022.002.0002=Could not deliver response for {0} as request has been removed.
-ERR.022.002.0003=Failed getting first batch for {0}.
# from server package of last release
# #datatier (018.003)
@@ -258,7 +252,6 @@
ERR.018.005.0100 = Unable to load code table for because result sizes exceeds the allowed parameter - {0}.
# services (003)
-ERR.022.003.0001=
Request.Invalid_character_in_query=Bind variables (represented as "?") were found but are allowed only in prepared or callable statements.
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 19:07:34 UTC (rev 2548)
@@ -22,102 +22,38 @@
# Error messages for query (015) project to address internationalization
# Format:
-# ERR.015.001.0001=Doh! You blew it!
#
# optimizer (004)
-ERR.015.004.0002= Current program shouldn''t equal recursive program in recursive block: {0}
-ERR.015.004.0005= Unknown command type: {0}
-ERR.015.004.0006= Error finding max set size for model containing {0}
ERR.015.004.0007= Can''t convert plan node of type {0}
-ERR.015.004.0008= Error determining if command is accessing staging table: {0}
ERR.015.004.0009= Error finding connectorBindingID for command
ERR.015.004.0010= Unknown group specified in OPTION MAKEDEP/MAKENOTDEP: {0}
-ERR.015.004.0011= Unknown type ({0}) for Node
ERR.015.004.0012= Group has an access pattern which has not been met: group(s) {0}; access pattern(s) {1}
-ERR.015.004.0014= Could not find a valid join plan for this query.
-ERR.015.004.0015= The groups {0} and {1} have both an inner and outer join, which cannot be computed.
-ERR.015.004.0016= Unable to join between groups {0} and {1} as join contains both outer and inner joins.
-ERR.015.004.0017= Unexpected error evaluating no element criteria: {0}
-ERR.015.004.0019= Unknown criteria type: {0}
ERR.015.004.0020= Error getting model for {0}
-ERR.015.004.0021= Error checking model''s abilities for {0}
ERR.015.004.0023= Error rewriting criteria: {0}
ERR.015.004.0024= Unable to create a query plan that sends a criteria to \"{0}\". This connection factory requires criteria set to true indicating that a query against this model requires criteria.
ERR.015.004.0029= Could not resolve group symbol {0}
-ERR.015.004.0030= Could not parse query transformation {0}
-ERR.015.004.0033= Found two different contexts with {0}: {1} and {2}
-ERR.015.004.0034= Found two different criteria result sets for {0}: {1} and {2}
ERR.015.004.0035= The criteria {0} has elements from the root staging table and the document nodes which is not allowed.
ERR.015.004.0037= No mapping node found named, ''{0}', in use of ''context''
-ERR.015.004.0038= The criteria result set {0} is not in the scope of the context result set {1}
-ERR.015.004.0040= Couldn''t parse binding symbol {0}
-ERR.015.004.0041= Couldn''t resolve binding symbol {0}
-ERR.015.004.0042= The context argument, ''{0}'', is not in the scope of any mapping class of the XML document model.
-ERR.015.004.0043= Could not map symbols in ''context'' criteria: {0}
-ERR.015.004.0044= Could not combine criteria when processing context criteria: {0}
-ERR.015.004.0045= Could not find ancestor node with result set
ERR.015.004.0046= The XML document element(s) {0} are not mapped to data and cannot be used in the criteria \"{1}\".
-ERR.015.004.0047= The criteria: ''{0}'' maps to more than one source result set.
-ERR.015.004.0048= The criteria: ''{0}'' maps to no source result set.
-ERR.015.004.0051= Could not bind references of staging table {0}: {1}
-ERR.015.004.0053= Could not resolve staging table criteria {0}: {1}
ERR.015.004.0054= Could not parse query transformation for {0}: {1}
-ERR.015.004.0055= Planner cannot parse criteria string {0}
-ERR.015.004.0056= Planner cannot resolve criteria string {0}
-ERR.015.004.0057= Parent has more than 2 children
-ERR.015.004.0058= Unable to find a symbol with matching short name {0}
-ERR.015.004.0059= Node with no elements has no children
-ERR.015.004.0060= Failed to find a clause path to {0}
-ERR.015.004.0061= Found recursive node {0} without recursive root node.
-ERR.015.004.0063= No mapping node found in mapping document with result set name {0}
-ERR.015.004.0064= Metadata doesn''t have corresponding full name for element {0}
-ERR.015.004.0066= Cannot get fully resolved select elements.
-ERR.015.004.0067= The context mapping node argument cannot be null.
ERR.015.004.0068= Context functions within the same conjunct refer to different contexts: {0}
-ERR.015.004.0070= Could not resolve correlated reference symbol during planning.
-ERR.015.004.0071= Error checking if group is physical or virtual: {0}
# processor (006)
ERR.015.006.0001= XMLPlan toString couldn''t print entire Program.
-ERR.015.006.0003= ProcedurePlan toString couldn''t print entire Program.
-ERR.015.006.0017= Error trying to substitute the reference element :{0} with its value, unable to find the element in the variable context.
-ERR.015.006.0019= Error processing the AssignmentStatement in stored procedure language, expected to get a single row of data to be assigned to the variable {0} but got more.
-ERR.015.006.0020= Error trying to evaluate the criteria used on the IF statement.
-ERR.015.006.0021= Tuple Source not found for result set named {0}
-ERR.015.006.0022= Unable to remove tuple source for result set named {0}
-ERR.015.006.0023= Unexpected exception processing plan: {0}
-ERR.015.006.0024= Failed to evaluate expressions in atomic command
-ERR.015.006.0025= Unexpected error evaluating no element criteria: {0}
-ERR.015.006.0026= Error evaluating join expression while producing dependent join values
-ERR.015.006.0027= Unable to process this query without a criteria.
-ERR.015.006.0029= Exception finding temporary tuple source for subquery processor plan {0}
-ERR.015.006.0032= No input symbol was found for the output symbol: {0}
ERR.015.006.0034= Unexpected symbol type while updating tuple: {0}
-ERR.015.006.0035= Failed attempting to project {0} from {1}
ERR.015.006.0037= Tuple source does not exist: {0}
-ERR.015.006.0038= Unable to get schema from the tuple source
ERR.015.006.0039= Instructed to abort processing when recursion limit reached.
-ERR.015.006.0040= Validation features of xerces parser are not recognized, please make sure the xerces parser supports validation ({0})
-ERR.015.006.0041= Validation features of xerces parser are not supported, please make sure the xerces parser supports validation ({0})
ERR.015.006.0042= No xml schema to validate document against
-ERR.015.006.0046= Error while performing XSLT transformation on the XML results
-ERR.015.006.0047= Unexpected exception processing plan: {0}
ERR.015.006.0048= Fatal Error: {0}
ERR.015.006.0049= Error: {0}
-ERR.015.006.0050= Got invalid command type - expected processor plan {0}
ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0}
-ERR.015.006.0052= Got invalid command type - expected processor plan
ERR.015.006.0054= Instructed to abort processing as default of choice.
-ERR.015.006.0060= The query for the virtual document {0} produced more than one result document; each virtual document or virtual document query used by an XQuery may only return exactly one result document.
-ERR.015.006.0061= The query for the virtual document {0} produced zero result documents; each virtual document or virtual document query used by an XQuery must return exactly one result document.
# rewriter (009)
ERR.015.009.0001= Error evaluating criteria: {0}
ERR.015.009.0002= Error translating criteria on the user''s command, the criteria translated to {0} is not valid
ERR.015.009.0003= Error simplifying mathematical expression: {0}
-ERR.015.009.0004= Unable to {0} {1} of type [{2}] to the expected type [{3}].
-ERR.015.009.0005= Unexpected error evaluating {0}
QueryRewriter.infinite_while=Infinite loop detected, procedure will not be executed.
BatchedUpdatePlanner.unrecognized_command=The batch contained an unrecognized command: {0}
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/i18n.properties 2010-09-08 19:07:34 UTC (rev 2548)
@@ -104,7 +104,6 @@
ERR.015.002.0011 = Invalid type: {0}
ERR.015.002.0012 = QueryNode<error converting>
-ERR.015.004.0026= The following predicates must reference an XML element: {0}
# parser (005)
QueryParser.emptysql=Parser cannot parse an empty sql statement.
@@ -123,7 +122,6 @@
ERR.015.006.0016= Unknown expression type: {0}
ERR.015.006.0033= Unable to evaluate {0}: {1}
ERR.015.006.0055= Unable to evaluate LOOKUP function.
-ERR.015.006.0056= The subquery of this compare criteria has to be scalar, but returned more than one value: {0}
ERR.015.006.0057= Unknown subquery comparison predicate quantifier: {0}
ERR.015.006.0058= The command of this scalar subquery returned more than one value: {0}
@@ -131,74 +129,48 @@
ERR.015.007.0001= Item may not be null
# resolver (008)
-ERR.015.008.0001= Error executing conversion function to convert value
-ERR.015.008.0002= Unknown command type: {0}
ERR.015.008.0003= Only one XML document may be specified in the FROM clause of a query.
-ERR.015.008.0004= Query is invalid - it specifies a mixture of groups and documents in the FROM clause.
-ERR.015.008.0005= Failed parsing delete plan for {0}
ERR.015.008.0007= Incorrect number of parameters specified on the stored procedure {2} - expected {0} but got {1}
-ERR.015.008.0008= Failed parsing stored query transformation for {0}
ERR.015.008.0009= {1} is not allowed on the virtual group {0}: no {1} procedure was defined.
ERR.015.008.0010= INSERT statement must have the same number of elements and values specified. This statement has {0} elements and {1} values.
ERR.015.008.0011= Error parsing query plan transformation for {0}
ERR.015.008.0012= Unable to resolve update procedure as the virtual group context is ambiguous.
ERR.015.008.0013= Error parsing query plan transformation for {0}
-ERR.015.008.0014= The expression on the assignment statement is being assigned to a variable of differing type and no implicit conversion is available: {0}
ERR.015.008.0015= Unknown statement type: {0}
-ERR.015.008.0016= Failed parsing update plan for {0}
-ERR.015.008.0018= Left side of ''{0}'' must be an element.
ERR.015.008.0019= Unable to resolve element: {0}
ERR.015.008.0020= Element is ambiguous and must be qualified: {0}
-ERR.015.008.0021= No element IDs found for document {0}
ERR.015.008.0022= Failed parsing reference binding: {0}
-ERR.015.008.0023= Could not resolve binding reference: {0}
-ERR.015.008.0024= Could not resolve group for binding reference: {0}
ERR.015.008.0025= Binding reference cannot be a function: {0}
ERR.015.008.0026= Expression ''{0}'' has a parameter with non-determinable type information. The use of an explicit convert may be necessary.
ERR.015.008.0027= The expressions in this criteria are being compared but are of differing types ({0} and {1}) and no implicit conversion is available: {2}
-ERR.015.008.0028= The expressions in this criteria are being compared but are of differing types and no conversion can be performed on an aggregate symbol.
ERR.015.008.0029= This criteria must have string or CLOB expressions on each side: {0}
ERR.015.008.0030= Type cannot be null for expression: {0}
ERR.015.008.0031= This criteria must have values only of the same type as the left expression: {0}
ERR.015.008.0032= There must be exactly one projected symbol of the subquery: {0}
ERR.015.008.0033= The left expression must have a type convertible to the type of the subquery projected symbol: {0}
-ERR.015.008.0034= Expression type cannot be null: {0}
ERR.015.008.0035= Type was null for {0} in function {1}
ERR.015.008.0036= The function ''{0}'' has more than one possible signature.
ERR.015.008.0037= The conversion from {0} to {1} is not allowed.
-ERR.015.008.0038= Could not obtain conversion type value for {0}
ERR.015.008.0039= The function ''{0}'' is an unknown form. Check that the function name and number of arguments is correct.
ERR.015.008.0040= The function ''{0}'' is a valid function form, but the arguments do not match a known type signature and cannot be converted using implicit type conversions.
ERR.015.008.0041= Expected value of type ''{0}'' but ''{1}'' is of type ''{2}'' and no implicit conversion is available.
ERR.015.008.0042= Element ''{0}'' in ORDER BY is ambiguous and may refer to more than one element of SELECT clause.
ERR.015.008.0043= Element ''{0}'' in ORDER BY was not found in SELECT clause.
-ERR.015.008.0044= No element IDs found for group {0}
ERR.015.008.0045= Failed parsing insert plan for {0}
ERR.015.008.0046= The symbol {0} may only be used once in the FROM clause.
ERR.015.008.0047= The symbol {0} refers to a group not defined in the FROM clause.
-ERR.015.008.0048= SELECT DISTINCT is not allowed for XML queries.
ERR.015.008.0049= Bindings must be specified
-ERR.015.008.0050= Element specified is ambiguous, it exists in two or more groups on this command.
ERR.015.008.0051= Symbol {0} is specified with an unknown group context
-ERR.015.008.0052= Unknown metadata element: {0}
ERR.015.008.0053= Element "{0}" is ambiguous, it exists in two or more groups.
ERR.015.008.0054= Element "{0}" is not defined by any relevant group.
ERR.015.008.0055= Group specified is ambiguous, resubmit the query by fully qualifying the group name
ambiguous_procedure= Procedure ''{0}'' is ambiguous, use the fully qualified name instead
ERR.015.008.0056= Group does not exist
-ERR.015.008.0057= Variable {0} is not resolvable.
-ERR.015.008.0058= Variable {0} is declared with an invalid datatype {1}
-ERR.015.008.0059= Element {0} specified on the HAS/TRANSLATE criteria is not present on the virtual group being updated {1}
-ERR.015.008.0060= Element {0} specified is not present on the virtual group being updated {1}
ERR.015.008.0061= Unable to resolve stored procedure {0} the datatype for the parameter {1} is not specified.
ERR.015.008.0062= Unable to resolve return element referred to by LOOKUP function: {0}
ERR.015.008.0063= The first three arguments for the LOOKUP function must be specified as constants.
-ERR.015.008.0064= The expressions in this criteria are being compared but are aggregate functions of differing types, thus no conversion can be performed.
ERR.015.008.0065= Group {0} is not allowed in LOOKUP function.
-ERR.015.008.0066= Aggregate functions cannot be nested in scalar functions.
-ERR.015.008.0067= CASE expressions cannot contain aggregate functions: {0}
ERR.015.008.0068= Could not find a common type to which all {0} expressions can be implicitly converted: {1}
-ERR.015.008.0069= Error parsing doc() arg of XQuery.
ERR.015.008.0070= Aliased Select Symbols are not valid in XML Queries.
XMLQueryResolver.no_expressions_in_select=Expressions cannot be selected by XML Queries
@@ -206,36 +178,21 @@
ERR.015.010.0001= Invalid compare operator: {0}
ERR.015.010.0002= Invalid logical operator: {0}
ERR.015.010.0003= Cannot set null collection of elements on GroupBy
-ERR.015.010.0004= Cannot set null collection of elements on OrderBy
-ERR.015.010.0005= Cannot replace variables in ORDER BY with a different sized set of variables
ERR.015.010.0006= Invalid parameter type [{0}] must be IN, OUT, INOUT, RETURN_VALUE, RESULT_SET
-ERR.015.010.0007= Unable to obtain value for this parameter
-ERR.015.010.0008= Parameter is represented by an expression, not a constant: {0}
ERR.015.010.0009= No columns exist.
ERR.015.010.0010= Invalid column index: {0}
ERR.015.010.0011= Parameter cannot be null
-ERR.015.010.0012= No value iterator is available; the subquery for this Set Criteria has not yet been processed.
-ERR.015.010.0013= Unknown aggregate function: {0}. Must be in {1}
ERR.015.010.0014= Constant type should never be null
ERR.015.010.0015= Unknown constant type: {0}
ERR.015.010.0016= A group symbol may not resolve to a null metadata ID.
ERR.015.010.0017= The name of a symbol may not be null.
ERR.015.010.0018= Inconsistent number of elements in transformation projected symbols and virtual group.
-ERR.015.010.0019= VariableMap cannot be null
-ERR.015.010.0020= VariableContext cannot be null
ERR.015.010.0021= Elements cannot be null
ERR.015.010.0022= Functions cannot be null
ERR.015.010.0023= Groups cannot be null
-ERR.015.010.0024= Predicates cannot be null
-ERR.015.010.0025= References cannot be null
-ERR.015.010.0026= Unexpected exception while checking type of constant: {0}
-ERR.015.010.0027= TranslateCriteria cannot be null
-ERR.015.010.0028= Variables cannot be null
ERR.015.010.0029= Cannot create AliasSymbol wrapping AliasSymbol
-ERR.015.010.0030= Unexpected symbol type: {0}
ERR.015.010.0031= Illegal variable name ''{1}''. Variable names can only be prefixed with the special group name ''{0}''.
ERR.015.010.0032= Variable {0} was previously declared.
-ERR.015.010.0034= No value iterator is available; the subquery for this predicate criteria has not yet been processed.
ERR.015.010.0035= The <expression> cannot be null in CASE <expression>
ERR.015.010.0036= There must be at least one WHEN expression and one THEN expression. The number of WHEN and THEN expressions must be equal.
ERR.015.010.0037= The WHEN part of the CASE expression must contain an expression.
@@ -323,7 +280,6 @@
# Log messages for query (015) project to address internationalization
# Format:
-# MSG.015.001.0001=Entering foo()
#
# function (001)
13 years, 8 months
- 1
- 0
teiid SVN: r2547 - in branches/7.1.x: connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap and 2 other directories.
by teiid-commits＠lists.jboss.org
Author: rareddy
Date: 2010-09-08 14:46:49 -0400 (Wed, 08 Sep 2010)
New Revision: 2547
Modified:
branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties
branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
Log:
TEIID-1027: Removing duplicate keys
Modified: branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties
===================================================================
--- branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties 2010-09-08 17:16:13 UTC (rev 2546)
+++ branches/7.1.x/connectors/connector-ldap/src/main/resources/org/teiid/resource/adapter/ldap/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
@@ -26,45 +26,5 @@
LDAPConnection.adminUserPassPropNotFound=Ldap Admin password property not found.
LDAPConnection.directoryNamingError=Initializing LDAP directory context failed. Please check LDAP connection properties, including username and password: {0}
LDAPConnection.contextCloseError=The Connection failed to close LDAP context: {0}
-#
-IQueryToLdapSearchParser.noTablesInFromError=Cannot parse query - no tables defined in FROM clause.
-IQueryToLdapSearchParser.multiItemsInFromError=Cannot parse query - multiple items in FROM clause not supported.
-IQueryToLdapSearchParser.baseContextNameError=Base context name (DN) not specified in Name In Source or connector properties.
-IQueryToLdapSearchParser.groupCountExceededError=Query contained from clause that did not have exactly and only one group. Query not supported.
-IQueryToLdapSearchParser.criteriaNotParsableError=Compound criteria operator was not parsable.
-IQueryToLdapSearchParser.timestampClassNotFoundError=Timestamp class was not found.
-IQueryToLdapSearchParser.unsupportedElementError=Encountered an element type that is not supported. Revise the capabilities.
-IQueryToLdapSearchParser.missingNISError=An element (or expression) found in the query's compare criteria was missing a NameInSource definition (or name). Please ensure the name in source is defined for each element.
-IQueryToLdapSearchParser.criteriaNotSupportedError=Encountered a criteria that is not supported.
-IQueryToLdapSearchParser.searchDetailsLoggingError=Error writing LDAP search details to log
-#
-LDAPSyncQueryExecution.setControlsError=Failed to set standard sort controls. Please verify that the server supports sorting, and that the bind user has permission to use sort controls.
-LDAPSyncQueryExecution.createContextError=Failed to create LDAP search context from the specified context name. Check the table/group name in source to ensure the context exists.
-LDAPSyncQueryExecution.execSearchError=Execute search failed. Please check logs for search details.
-LDAPSyncQueryExecution.nullAttrError=Encountered null attribute name for a select symbol. Please check name in source for each column.
-LDAPSyncQueryExecution.attrValueFetchError=Failed to fetch attribute value for attribute {0}. Rowset cannot be constructed from incomplete LDAP results.
-LDAPSyncQueryExecution.supportedClassNotFoundError=Supported class not found.
-LDAPSyncQueryExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
-#
-LDAPUpdateExecution.createContextError=Failed to create copy of the initial LDAP context: {0}
-LDAPUpdateExecution.incorrectCommandError=Incorrect command type. Expecting INSERT, UPDATE, or DELETE.
-LDAPUpdateExecution.columnSourceNameDNNullError=value for column with source name DN is null - must be set to distinguishedName for new record
-LDAPUpdateExecution.columnSourceNameDNTypeError=value for column with source name DN is not a string - must be set to distinguishedName string for new record
-LDAPUpdateExecution.noInsertSourceNameDNError=no column in insert statement with source name DN - must be present and set to distinguishedName for new record
-LDAPUpdateExecution.insertFailed=Insert of {0} failed: {1}
-LDAPUpdateExecution.insertFailedUnexpected=Insert of {0} failed for unexpected reason
-LDAPUpdateExecution.deleteFailed=Delete of {0} failed: {1}
-LDAPUpdateExecution.deleteFailedUnexpected=Delete of {0} failed for unexpected reason
-LDAPUpdateExecution.updateFailed=Update of {0} failed: {1}
-LDAPUpdateExecution.updateFailedUnexpected=Update of {0} failed for unexpected reason
-LDAPUpdateExecution.valueNotLiteralError=specified value for attribute {0} is not a literal
-LDAPUpdateExecution.criteriaEmptyError=No criteria specified on update - must specify DN in WHERE clause
-LDAPUpdateExecution.criteriaNotSimpleError=criteria is not a simple comparison - expecting simple equals comparison on DN as only item in WHERE clause
-LDAPUpdateExecution.criteriaNotEqualsError=criteria is not an equals comparison - expecting simple equals comparison on DN as only item in WHERE clause
-LDAPUpdateExecution.criteriaLHSNotElementError=left side of criteria is not an element name - expecting simple equals comparison on DN as only item in WHERE clause
-LDAPUpdateExecution.criteriaSrcColumnError=criteria is on source column {0}, but should be on a source column named DN
-LDAPUpdateExecution.criteriaRHSNotLiteralError=right side of equals comparison against DN is not a literal - must be a string literal
-LDAPUpdateExecution.criteriaRHSNotStringError=right side of equals comparison against DN is not a string - must be a string literal
-LDAPUpdateExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
-#
+
Modified: branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties
===================================================================
--- branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties 2010-09-08 17:16:13 UTC (rev 2546)
+++ branches/7.1.x/connectors/translator-ldap/src/main/resources/org/teiid/translator/ldap/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
@@ -20,11 +20,43 @@
# 02110-1301 USA.
#
+IQueryToLdapSearchParser.noTablesInFromError=Cannot parse query - no tables defined in FROM clause.
+IQueryToLdapSearchParser.multiItemsInFromError=Cannot parse query - multiple items in FROM clause not supported.
+IQueryToLdapSearchParser.baseContextNameError=Base context name (DN) not specified in Name In Source or connector properties.
+IQueryToLdapSearchParser.groupCountExceededError=Query contained from clause that did not have exactly and only one group. Query not supported.
+IQueryToLdapSearchParser.criteriaNotParsableError=Compound criteria operator was not parsable.
+IQueryToLdapSearchParser.timestampClassNotFoundError=Timestamp class was not found.
+IQueryToLdapSearchParser.unsupportedElementError=Encountered an element type that is not supported. Revise the capabilities.
+IQueryToLdapSearchParser.missingNISError=An element (or expression) found in the query's compare criteria was missing a NameInSource definition (or name). Please ensure the name in source is defined for each element.
+IQueryToLdapSearchParser.criteriaNotSupportedError=Encountered a criteria that is not supported.
+IQueryToLdapSearchParser.searchDetailsLoggingError=Error writing LDAP search details to log
#
-LDAPConnection.urlPropNotFound=Ldap URL property not found.
-LDAPConnection.adminUserDNPropNotFound=Ldap Admin User DN property not found.
-LDAPConnection.adminUserPassPropNotFound=Ldap Admin password property not found.
-LDAPConnection.directoryNamingError=Initializing LDAP directory context failed. Please check LDAP connection properties, including username and password: {0}
-LDAPConnection.contextCloseError=The Connection failed to close LDAP context: {0}
+LDAPSyncQueryExecution.setControlsError=Failed to set standard sort controls. Please verify that the server supports sorting, and that the bind user has permission to use sort controls.
+LDAPSyncQueryExecution.createContextError=Failed to create LDAP search context from the specified context name. Check the table/group name in source to ensure the context exists.
+LDAPSyncQueryExecution.execSearchError=Execute search failed. Please check logs for search details.
+LDAPSyncQueryExecution.nullAttrError=Encountered null attribute name for a select symbol. Please check name in source for each column.
+LDAPSyncQueryExecution.attrValueFetchError=Failed to fetch attribute value for attribute {0}. Rowset cannot be constructed from incomplete LDAP results.
+LDAPSyncQueryExecution.supportedClassNotFoundError=Supported class not found.
+LDAPSyncQueryExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
#
+LDAPUpdateExecution.createContextError=Failed to create copy of the initial LDAP context: {0}
+LDAPUpdateExecution.incorrectCommandError=Incorrect command type. Expecting INSERT, UPDATE, or DELETE.
+LDAPUpdateExecution.columnSourceNameDNNullError=value for column with source name DN is null - must be set to distinguishedName for new record
+LDAPUpdateExecution.columnSourceNameDNTypeError=value for column with source name DN is not a string - must be set to distinguishedName string for new record
+LDAPUpdateExecution.noInsertSourceNameDNError=no column in insert statement with source name DN - must be present and set to distinguishedName for new record
+LDAPUpdateExecution.insertFailed=Insert of {0} failed: {1}
+LDAPUpdateExecution.insertFailedUnexpected=Insert of {0} failed for unexpected reason
+LDAPUpdateExecution.deleteFailed=Delete of {0} failed: {1}
+LDAPUpdateExecution.deleteFailedUnexpected=Delete of {0} failed for unexpected reason
+LDAPUpdateExecution.updateFailed=Update of {0} failed: {1}
+LDAPUpdateExecution.updateFailedUnexpected=Update of {0} failed for unexpected reason
+LDAPUpdateExecution.valueNotLiteralError=specified value for attribute {0} is not a literal
+LDAPUpdateExecution.criteriaEmptyError=No criteria specified on update - must specify DN in WHERE clause
+LDAPUpdateExecution.criteriaNotSimpleError=criteria is not a simple comparison - expecting simple equals comparison on DN as only item in WHERE clause
+LDAPUpdateExecution.criteriaNotEqualsError=criteria is not an equals comparison - expecting simple equals comparison on DN as only item in WHERE clause
+LDAPUpdateExecution.criteriaLHSNotElementError=left side of criteria is not an element name - expecting simple equals comparison on DN as only item in WHERE clause
+LDAPUpdateExecution.criteriaSrcColumnError=criteria is on source column {0}, but should be on a source column named DN
+LDAPUpdateExecution.criteriaRHSNotLiteralError=right side of equals comparison against DN is not a literal - must be a string literal
+LDAPUpdateExecution.criteriaRHSNotStringError=right side of equals comparison against DN is not a string - must be a string literal
+LDAPUpdateExecution.closeContextError=LDAP error occurred during attempt to close context : {0}
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 17:16:13 UTC (rev 2546)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/dqp/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
@@ -279,7 +279,6 @@
TransformationMetadata.does_not_exist._1=does not exist.
-TransformationMetadata.0={0} ambiguous, more than one entity matching the same name
TransformationMetadata.Error_trying_to_read_virtual_document_{0},_with_body__n{1}_1=Error trying to read virtual document {0}, with body \n{1}
TransformationMetadata.Unknown_support_constant___12=Unknown support constant:
TransformationMetadata.QueryPlan_could_not_be_found_for_physical_group__6=QueryPlan could not be found for physical group
Modified: branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties
===================================================================
--- branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 17:16:13 UTC (rev 2546)
+++ branches/7.1.x/engine/src/main/resources/org/teiid/query/execution/i18n.properties 2010-09-08 18:46:49 UTC (rev 2547)
@@ -81,12 +81,6 @@
# processor (006)
ERR.015.006.0001= XMLPlan toString couldn''t print entire Program.
ERR.015.006.0003= ProcedurePlan toString couldn''t print entire Program.
-ERR.015.006.0010= Unknown criteria type: {0}
-ERR.015.006.0011= Unable to evaluate {0} expression of {1}
-ERR.015.006.0012= Unknown compare criteria operator: {0}
-ERR.015.006.0014= Failed to create regular expression from match pattern: {0}. {1}
-ERR.015.006.0015= Unable to evaluate expression of {0}
-ERR.015.006.0016= Unknown expression type: {0}
ERR.015.006.0017= Error trying to substitute the reference element :{0} with its value, unable to find the element in the variable context.
ERR.015.006.0019= Error processing the AssignmentStatement in stored procedure language, expected to get a single row of data to be assigned to the variable {0} but got more.
ERR.015.006.0020= Error trying to evaluate the criteria used on the IF statement.
@@ -99,7 +93,6 @@
ERR.015.006.0027= Unable to process this query without a criteria.
ERR.015.006.0029= Exception finding temporary tuple source for subquery processor plan {0}
ERR.015.006.0032= No input symbol was found for the output symbol: {0}
-ERR.015.006.0033= Unable to evaluate {0}: {1}
ERR.015.006.0034= Unexpected symbol type while updating tuple: {0}
ERR.015.006.0035= Failed attempting to project {0} from {1}
ERR.015.006.0037= Tuple source does not exist: {0}
@@ -116,9 +109,6 @@
ERR.015.006.0051= Invalid direction for MoveDocInstruction: {0}
ERR.015.006.0052= Got invalid command type - expected processor plan
ERR.015.006.0054= Instructed to abort processing as default of choice.
-ERR.015.006.0056= The subquery of this compare criteria has to be scalar, but returned more than one value: {0}
-ERR.015.006.0057= Unknown subquery comparison predicate quantifier: {0}
-ERR.015.006.0058= The command of this scalar subquery returned more than one value: {0}
ERR.015.006.0060= The query for the virtual document {0} produced more than one result document; each virtual document or virtual document query used by an XQuery may only return exactly one result document.
ERR.015.006.0061= The query for the virtual document {0} produced zero result documents; each virtual document or virtual document query used by an XQuery must return exactly one result document.
13 years, 8 months
- 1
- 0