TEIID-3054 added support for negation, some cleanup and adding tracin…

…g to show which type of searching is being used
teiid · Jul 28, 2014 · 2ebfa94 · 2ebfa94
1 parent c9a7b36
commit 2ebfa94
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/...s/translator-object/src/main/java/org/teiid/translator/object/ObjectExecutionFactory.java b/...s/translator-object/src/main/java/org/teiid/translator/object/ObjectExecutionFactory.java
@@ -65,21 +65,6 @@ public ResultSetExecution createResultSetExecution(QueryExpression command,
 		return new ObjectExecution((Select) command, metadata, this, connection, executionContext);
 	}
 
-	@Override
-	public boolean supportsInnerJoins() {
-		return false;
-	}
-
-	@Override
-	public boolean supportsOuterJoins() {
-		return false;
-	}
-
-	@Override
-	public boolean supportsFullOuterJoins() {
-		return false;
-	}
-
 	@Override
     public boolean supportsCompareCriteriaEquals() {
 		return true;
@@ -94,6 +79,7 @@ public boolean supportsInCriteria() {
 	public boolean supportsOnlyLiteralComparison() {
 		return true;
 	}
+
 	public  List<Object> search(Select command, String cacheName, ObjectConnection connection,ExecutionContext executionContext) throws TranslatorException {
 		  SearchByKey sbk = new SearchByKey();
 		  Class<?> type = connection.getType(cacheName);

diff --git a/connectors/translator-object/src/main/java/org/teiid/translator/object/SearchByKey.java b/connectors/translator-object/src/main/java/org/teiid/translator/object/SearchByKey.java
@@ -45,6 +45,9 @@ public  class SearchByKey  {
 
 	public  List<Object> search(Select command, Class<?> rootClass, String cacheName, CacheContainerWrapper cache)
 			throws TranslatorException {
+		LogManager.logTrace(LogConstants.CTX_CONNECTOR,
+				"Perform search by key."); //$NON-NLS-1$
+
 		Condition criterion = command.getWhere();
 		List<Object> results = new ArrayList<Object>();
 

diff --git a/...ject/src/main/java/org/teiid/translator/object/infinispan/InfinispanExecutionFactory.java b/...ject/src/main/java/org/teiid/translator/object/infinispan/InfinispanExecutionFactory.java
@@ -80,6 +80,10 @@ public boolean supportsCompareCriteriaOrdered() {
 		return isFullTextSearchingSupported();
 	}
 
+	@Override
+	public boolean supportsNotCriteria() {
+		return isFullTextSearchingSupported();	}
+
 	@Override
 	public boolean supportsLikeCriteria() {
 		// at this point, i've been unable to get the Like to work.

diff --git a/.../translator-object/src/main/java/org/teiid/translator/object/infinispan/LuceneSearch.java b/.../translator-object/src/main/java/org/teiid/translator/object/infinispan/LuceneSearch.java
@@ -56,6 +56,9 @@ public final class LuceneSearch   {
 
 	public static List<Object> performSearch(Select command, Class<?> type, String cacheName, CacheContainerWrapper cache)
 			throws TranslatorException {
+		LogManager.logTrace(LogConstants.CTX_CONNECTOR,
+				"Perform lucene search."); //$NON-NLS-1$
+
 		//Map<?, ?> cache, 
 		SearchManager searchManager = Search
 				.getSearchManager((Cache<?, ?>) cache.getCache(cacheName) );