WARNING: Fix a big bug in Load_File() method: all previous MQSLoad versions can corrupt messages during loading !!!

MQSLoad.java

@@ -1,7 +1,7 @@
 // $RCSfile: MQSLoad.java,v $
-// $Revision: 1.9 $
+// $Revision: 1.13 $
 // $Name:  $
-// $Date: 2007/06/05 09:22:43 $
+// $Date: 2008/11/14 00:00:51 $
 // $Author: agibert $
 
 /*
@@ -45,10 +45,11 @@ public class MQSLoad
         private String		Message_Break = "\r\n";
         private String		Message_Tail = "";
         private boolean		Keep_Message_Break = false;
-        private String		MQSLoad_Revision = "$Revision: 1.9 $";
+        private String		MQSLoad_Revision = "$Revision: 1.13 $";
 	private String    	MQSLoad_Tag      = "$Name:  $";
-	private	String    	MQSLoad_Date     = "$Date: 2007/06/05 09:22:43 $";
+	private	String    	MQSLoad_Date     = "$Date: 2008/11/14 00:00:51 $";
 	private	String 		MQSLoad_Author   = "$Author: agibert $";
+        private Integer		Sleep_Time 	 = 0;
 
 
 
@@ -251,6 +252,18 @@ public class MQSLoad
                         			throw new Exception();
                         		}
                 		}
+                		else if ( args[argc].equals( "-st"))
+				{
+					if( argc < ( args.length + 1))
+					{
+						Sleep_Time = Integer.parseInt( args[++argc]);
+					}
+					else
+					{
+						System.out.println( "Invalid number of command line options...");
+						throw new Exception();
+					}
+				}
 				else if ( args[argc].equals( "-kmb"))
                 		{
                 			Keep_Message_Break = true;
@@ -398,6 +411,32 @@ public class MQSLoad
 	
 	
 	
+	//-------------------------------------------------------------------------------------------------------------------------
+	//
+	//-------------------------------------------------------------------------------------------------------------------------
+
+	private void Stand_By(int timer)
+	{
+	        if( timer > 0)
+		{
+			try
+			{
+			        synchronized( this)
+				{ 
+					wait( timer);				
+				}
+			}
+			catch(InterruptedException  ie)
+			{
+				ie.printStackTrace();
+			}
+		}
+	}
+
+
+
+
+
 	//-------------------------------------------------------------------------------------------------------------------------
 	//
 	//-------------------------------------------------------------------------------------------------------------------------
@@ -418,6 +457,7 @@ public class MQSLoad
 	                output_msg.format = MQC.MQFMT_STRING;
 	                
 	                
+			/* Default window size */
 	                window_size = 1024 * 64;
 	                prefetch_size = Field_Break.length() + Message_Break.length();
 	                buffer_size = window_size + prefetch_size;
@@ -431,14 +471,20 @@ public class MQSLoad
 				read_size = Input_File.read( buffer_byte, buffer_offset, buffer_size - buffer_offset);
 //				System.out.println( "Load buffer read_size: (" + read_size + ")   asked: (" + (buffer_size - buffer_offset) + ")");
 				
-				if( read_size > 0)
+				if( read_size == -1)
 				{
+				        read_size = 0;
+				}
+
+				/* Compute current buffer and window size */
 				cur_window_size = Math.min( ( read_size + buffer_offset), window_size);
 				cur_buffer_size = ( read_size + buffer_offset);
 
 				buffer_string = new String( buffer_byte, 0, cur_buffer_size);
 				cur_pos = 0;
 					
+//				System.out.println( "  CurWS: (" + cur_window_size + ")   CurBS: (" + cur_buffer_size + ")   Buffer: [" + buffer_string + "]");
+
 				while( cur_pos < cur_window_size)
 				{
 //				        System.out.println( "- CurPos: (" + cur_pos + ")");
@@ -480,10 +526,13 @@ public class MQSLoad
 						}
 								
 						output_msg.writeString( out_string);
+//						System.out.println( "* Msg: [" + out_string + "]");
+						
 					}
 						
 					if( next_message <= cur_window_size)
 					{
+					        /* A message break has been found: send the data... */
 //					        System.out.println( "* Write Msg   CurPos: (" + cur_pos + ")");
 						output_msg.writeString( Message_Tail);
 
@@ -499,17 +548,21 @@ public class MQSLoad
 						cur_pos += Message_Break.length();
 		                                        
 						Counter_Print( msg_nb++);
+
+						Stand_By( Sleep_Time);
 					}
 				}
 				
-					if( cur_buffer_size > cur_window_size)
+				buffer_offset = cur_buffer_size - cur_pos;
+//				System.out.println( "% CurPos: (" + cur_pos + ")   BufOff: (" + buffer_offset + ")");
+
+				if( buffer_offset > 0)
 				{
-						buffer_offset = cur_buffer_size - cur_window_size;
+				        /* Copy back prefetch area */
-						System.arraycopy( buffer_byte, cur_window_size, buffer_byte, 0, buffer_offset);
+					System.arraycopy( buffer_byte, cur_pos, buffer_byte, 0, buffer_offset);
 				}
 			}
-			}
+			while( cur_buffer_size > 0);
-			while( read_size > 0);
 
 			if( out_string != null)
 			{
@@ -518,6 +571,8 @@ public class MQSLoad
                                 MQSPut_Msg( output_msg);
                                 
                                 Counter_Print( msg_nb++);
+
+				Stand_By( Sleep_Time);
         		}
 
 	                System.out.println( "\n");
@@ -550,10 +605,10 @@ public class MQSLoad
 		{
 			System.out.println("MQSLoad: " + MQSLoad_Tag + " / " + MQSLoad_Date + " / " + MQSLoad_Author);
                                       
-                        if( ( args.length < 2) || ( args.length > 6))
+                        if( ( args.length < 2) || ( args.length > 8))
                         {
-                                System.out.println( "Usage: MQSLoad [-qm \"Output_QueueMng_Name\"] [-fb \"field_break\"] [-mb \"message_break\"] [-mt \"message_tail\"] [-kmb] <Output_MsgQueue_Name> <Input_File_Name>");
+                                System.out.println( "Usage: MQSLoad [-qm \"Output_QueueMng_Name\"] [-st \"sleep_time\"] [-fb \"field_break\"] [-mb \"message_break\"] [-mt \"message_tail\"] [-kmb] <Output_MsgQueue_Name> <Input_File_Name>");
-                                System.out.println( "       Default: Output QueueMng Name: (" + QMng_Name + ")   Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
+                                System.out.println( "       Default: Output QueueMng Name: (" + QMng_Name + ")   Sleep Time: (" + Sleep_Time + ")   Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
 
 				System.exit( 1);
                         }
@@ -564,7 +619,7 @@ public class MQSLoad
                                 Arg_Parse( args);
                     
                                 System.out.println( "Output QueueMng Name: (" + QMng_Name + ")   Output MsgQueue Name: (" + MsgQ_Name + ")   Input File Name: (" + File_Name + ")");
-                                System.out.println( "Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
+                                System.out.println( "Sleep Time: (" + Sleep_Time + ")   Field Break: (" + Str_UnFormat( Field_Break) + ")   Message Break: (" + Str_UnFormat( Message_Break) + ")   Message Tail: (" + Str_UnFormat( Message_Tail) + ")   Keep Message Break: (" + Keep_Message_Break + ")");
                 
                                 MQSInit();
 
@@ -580,7 +635,7 @@ public class MQSLoad
 		                                msg_nb = Load_File( input_file);
 		                                time_end = System.currentTimeMillis();
 		                                
-		                                time_elapsed = ( time_end - time_begin) / 100.0;
+		                                time_elapsed = ( time_end - time_begin) / 1000.0;
 		                               	speed = msg_nb / time_elapsed;
 		                               	
 		                               	nf.setMinimumFractionDigits(2);

ReadMe.txt

@@ -1,8 +1,8 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 1.7 $
+# $Revision: 1.8 $
 # $Name:  $
-# $Date: 2002/05/21 15:22:00 $
+# $Date: 2007/12/11 16:46:37 $
-# $Author: giberta1 $
+# $Author: agibert $
 
 
 
@@ -24,7 +24,7 @@ Installation:
 Notes:
 ------
 
-	- MQSLoad has been tested with MQ/Series 5.2,
+	- MQSLoad has been tested with MQ/Series 5.2, 5.3 and WMQ 6.0
 
 	- "-fb" and "-mb" arguments accept a string with formated escape character:
 		+ "\n" for newline,

ReleaseNotes.txt

@@ -1,7 +1,7 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 1.7 $
+# $Revision: 1.11 $
 # $Name:  $
-# $Date: 2007/06/05 09:21:44 $
+# $Date: 2008/11/14 00:00:51 $
 # $Author: agibert $
 
 
@@ -9,7 +9,33 @@
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.2.0 - A. Gibert - 05/06/07
+MQSLoad V 1.3.2 - A. Gibert - 2008/11/14
+--------------------------------------------------------------------------------
+
+- WARNING: Fix a big bug in Load_File() method: all previous MQSLoad versions
+can corrupt messages during loading !!!
+- Fix elapsed time computation !
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.3.1 - A. Gibert - 2008/01/03
+--------------------------------------------------------------------------------
+
+Fix usage print out.
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.3.0 - C. Colin / A. Gibert - 2007/12/10
+--------------------------------------------------------------------------------
+
+Add sleep time option "-st".
+
+
+
+--------------------------------------------------------------------------------
+MQSLoad V 1.2.0 - A. Gibert - 2007/06/05
 --------------------------------------------------------------------------------
 
 Add queue manager name option "-qm".
@@ -17,7 +43,7 @@ Add queue manager name option "-qm".
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.4 - A. Gibert - 21/05/02
+MQSLoad V 1.1.4 - A. Gibert - 2002/05/21
 --------------------------------------------------------------------------------
 
 Add message tail option "-mt",
@@ -27,7 +53,7 @@ Add version, date and author print out.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.2 - A. Gibert - 06/05/02
+MQSLoad V 1.1.2 - A. Gibert - 2002/05/06
 --------------------------------------------------------------------------------
 
 Add return code handling.
@@ -35,7 +61,7 @@ Add return code handling.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.1 - A. Gibert - 02/05/02
+MQSLoad V 1.1.1 - A. Gibert - 2002/05/02
 --------------------------------------------------------------------------------
 
 Add Keep Message Break support,
@@ -44,7 +70,7 @@ Add -kmb option.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.1.0 - A. Gibert - 23/04/02
+MQSLoad V 1.1.0 - A. Gibert - 2002/04/23
 --------------------------------------------------------------------------------
 
 Add string field break and string message break support,
@@ -59,7 +85,7 @@ Add GPL and FDL licenses files.
 
 
 --------------------------------------------------------------------------------
-MQSLoad V 1.0.0 - A. Gibert - 12/07/01
+MQSLoad V 1.0.0 - A. Gibert - 2001/07/12
 --------------------------------------------------------------------------------
 
 First release,