fixes to load.c

Author: VadimTk

src/load.c

@@ -455,7 +455,7 @@ LoadWare()
 		MakeAddress(w_street_1, w_street_2, w_city, w_state, w_zip);
 
 		w_tax = ((float) RandomNumber(10L, 20L)) / 100.0;
-		w_ytd = 3000000.00;
+		w_ytd = 300000.00
 
 		if (option_debug)
 			printf("WID = %ld, Name= %16s, Tax = %5.2f\n",
@@ -1139,7 +1139,7 @@ Orders(d_id, w_id)
 				                order_line
 				                values(:o_id,:o_d_id,:o_w_id,:ol,
 						       :ol_i_id,:ol_supply_w_id, NULL,
-						       :ol_quantity,:ol_amount,:ol_dist_info);*/
+						       :ol_quantity,:tmp_float,:ol_dist_info);*/
 
 			    memset(param, 0, sizeof(MYSQL_BIND) * 9); /* initialize */
 			    param[0].buffer_type = MYSQL_TYPE_LONG;
@@ -1157,7 +1157,7 @@ Orders(d_id, w_id)
 			    param[6].buffer_type = MYSQL_TYPE_LONG;
 			    param[6].buffer = &ol_quantity;
 			    param[7].buffer_type = MYSQL_TYPE_FLOAT;
-			    param[7].buffer = &ol_amount;
+			    param[7].buffer = &tmp_float;
 			    param[8].buffer_type = MYSQL_TYPE_STRING;
 			    param[8].buffer = ol_dist_info;
 			    param[8].buffer_length = strlen(ol_dist_info);
@@ -1170,7 +1170,7 @@ Orders(d_id, w_id)
 				    values(:o_id,:o_d_id,:o_w_id,:ol,
 					   :ol_i_id,:ol_supply_w_id, 
 					   :timestamp,
-					   :ol_quantity,:tmp_float,:ol_dist_info);*/
+					   :ol_quantity,:ol_amount,:ol_dist_info);*/
 
 			    memset(param, 0, sizeof(MYSQL_BIND) * 10); /* initialize */
 			    param[0].buffer_type = MYSQL_TYPE_LONG;
@@ -1191,7 +1191,7 @@ Orders(d_id, w_id)
 			    param[7].buffer_type = MYSQL_TYPE_LONG;
 			    param[7].buffer = &ol_quantity;
 			    param[8].buffer_type = MYSQL_TYPE_FLOAT;
-			    param[8].buffer = &tmp_float;
+			    param[8].buffer = &ol_amount;
 			    param[9].buffer_type = MYSQL_TYPE_STRING;
 			    param[9].buffer = ol_dist_info;
 			    param[9].buffer_length = strlen(ol_dist_info);

src/main.c

@@ -53,6 +53,7 @@ char node_string[NUM_NODE_MAX][DB_STRING_MAX];
 int time_count;
 int PRINT_INTERVAL=10;
 int multi_schema = 0;
+int multi_schema_offset = 0; 
 
 int success[5];
 int late[5];
@@ -152,7 +153,7 @@ int main( int argc, char *argv[] )
 
   /* Parse args */
 
-    while ( (c = getopt(argc, argv, "h:P:d:u:p:w:c:r:l:i:f:t:m:S:")) != -1) {
+    while ( (c = getopt(argc, argv, "h:P:d:u:p:w:c:r:l:i:f:t:m:o:S:")) != -1) {
         switch (c) {
         case 'h':
             printf ("option h with value '%s'\n", optarg);
@@ -198,6 +199,10 @@ int main( int argc, char *argv[] )
             printf ("option m (multiple schemas) with value '%s'\n", optarg);
             multi_schema = atoi(optarg);
             break;
+        case 'o':
+            printf ("option o (multiple schemas offset) with value '%s'\n", optarg);
+            multi_schema_offset = atoi(optarg);
+            break;
         case 'i':
             printf ("option i with value '%s'\n", optarg);
             PRINT_INTERVAL = atoi(optarg);
@@ -700,11 +705,13 @@ int thread_main (thread_arg* arg)
   }
 
   if (multi_schema) {
-	sprintf(db_string_full,"%s_%d",db_string, t_num % multi_schema);
+	sprintf(db_string_full,"%s_%d",db_string, (t_num % multi_schema) + multi_schema_offset);
   }else {
 	sprintf(db_string_full,"%s",db_string);
   }
 
+  printf("Using schema: %s\n", db_string_full);
+
   if(is_local==1){
     /* exec sql connect :connect_string; */
     resp = mysql_real_connect(ctx[t_num], "localhost", db_user, db_password, db_string_full, port, db_socket, 0);