[teiid-commits] teiid SVN: r4229 - in branches/7.4.x: engine/src/main/java/org/teiid/query/processor/relational and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: jolee
Date: 2012-07-09 16:48:44 -0400 (Mon, 09 Jul 2012)
New Revision: 4229

Modified:
   branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java
   branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
   branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
   branches/7.4.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
Log:
TEIID-2089 Issue with enhanced merge join and additional logging enhancements (slimmed for backport)

Modified: branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java
===================================================================
--- branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java	2012-07-09 19:19:58 UTC (rev 4228)
+++ branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java	2012-07-09 20:48:44 UTC (rev 4229)
@@ -35,7 +35,7 @@
 	private Serializable messageKey;
 
 	public String toString() {
-		return "MessageHolder: contents=" + contents; //$NON-NLS-1$
+		return "MessageHolder: key=" + messageKey + " contents=" + contents; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public void setContents(Object contents) {

Modified: branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java
===================================================================
--- branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java	2012-07-09 19:19:58 UTC (rev 4228)
+++ branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java	2012-07-09 20:48:44 UTC (rev 4229)
@@ -65,4 +65,9 @@
 		out.writeObject(methodName);
 		ExternalizeUtil.writeArray(out, args);
 	}
+	
+	@Override
+	public String toString() {
+		return "Invoke " + targetClass + "." + methodName; //$NON-NLS-1$ //$NON-NLS-2$
+	}
 }
\ No newline at end of file

Modified: branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
===================================================================
--- branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java	2012-07-09 19:19:58 UTC (rev 4228)
+++ branches/7.4.x/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java	2012-07-09 20:48:44 UTC (rev 4229)
@@ -40,6 +40,7 @@
 import org.teiid.core.TeiidProcessingException;
 import org.teiid.core.util.Assertion;
 import org.teiid.language.SortSpecification.NullOrdering;
+import org.teiid.logging.LogConstants;
 import org.teiid.logging.LogManager;
 import org.teiid.logging.MessageLevel;
 import org.teiid.query.sql.lang.OrderBy;
@@ -173,10 +174,6 @@
 		this(ts, new OrderBy(expressions, types).getOrderByItems(), mode, bufferManager, connectionID, schema);
 	}
 
-	public boolean isDone() {
-    	return this.doneReading && this.phase == DONE;
-    }
-    
     public TupleBuffer sort()
         throws TeiidComponentException, TeiidProcessingException {
 
@@ -200,11 +197,18 @@
             initialSort();
         }
     	
+    	for (TupleBuffer tb : activeTupleBuffers) {
+			tb.close();
+		}
+    	
     	return activeTupleBuffers;
     }
 
 	private TupleBuffer createTupleBuffer() throws TeiidComponentException {
 		TupleBuffer tb = bufferManager.createTupleBuffer(this.schema, this.groupName, TupleSourceType.PROCESSOR);
+		if (LogManager.isMessageToBeRecorded(LogConstants.CTX_DQP, MessageLevel.DETAIL)) {
+			LogManager.logDetail(LogConstants.CTX_DQP, "Created intermediate sort buffer ", tb.getId()); //$NON-NLS-1$
+		}
 		tb.setForwardOnly(true);
 		return tb;
 	}

Modified: branches/7.4.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java
===================================================================
--- branches/7.4.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java	2012-07-09 19:19:58 UTC (rev 4228)
+++ branches/7.4.x/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java	2012-07-09 20:48:44 UTC (rev 4229)
@@ -75,10 +75,10 @@
     }
     
     public void send(Message message, Serializable messageKey) {
+    	message.setMessageKey(messageKey);
     	if (LogManager.isMessageToBeRecorded(LogConstants.CTX_TRANSPORT, MessageLevel.DETAIL)) {
-            LogManager.logDetail(LogConstants.CTX_TRANSPORT, " message: " + message + " for message:" + messageKey); //$NON-NLS-1$ //$NON-NLS-2$
+            LogManager.logDetail(LogConstants.CTX_TRANSPORT, "send message: " + message); //$NON-NLS-1$
         }
-    	message.setMessageKey(messageKey);
     	objectSocket.write(message);
     }