generate child table in filter mode

davies · Nov 12, 2015 · 39a63a4 · nongli · Nov 13, 2015 · davies
1 parent eff5de2
commit 39a63a4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/tools/driver.c b/tools/driver.c
@@ -488,8 +488,10 @@ main (int ac, char **av)
 		}
 		if (pT->flags & FL_CHILD)
 		{
-			if (tabid == i)
-				ReportErrorNoLine(QERR_TABLE_CHILD, pT->name, 1);
+			if (tabid == i) {
+                tabid ++;
+                set_flg("_CHILD_ONLY");
+            }
 			continue;	/* children are generated by the parent call */	
 		}
 		if ((tabid != -1) && (i != tabid))

diff --git a/tools/params.h b/tools/params.h
@@ -66,10 +66,11 @@ option_t options[] =
 {"VCOUNT",		OPT_INT|OPT_ADV,	22, "set number of validation rows to be produced", NULL, "50"}, 
 {"VSUFFIX",		OPT_STR|OPT_ADV,	23, "set file suffix for data validation", NULL, ".vld"}, 
 {"RNGSEED",		OPT_INT|OPT_ADV,	24, "set RNG seed", NULL, "19620718"}, 
+{"_CHILD_ONLY", OPT_FLG,	        25, "output the child table only", NULL, "N"},
 {NULL}
 };
 
-char *params[23 + 2];
+char *params[24 + 2];
 #else
 extern option_t options[];
 extern char *params[];

diff --git a/tools/r_params.h b/tools/r_params.h
@@ -67,6 +67,7 @@ char	*get_str(char *var);
 void	set_str(char *param, char *value);
 int		get_int(char *var);
 void	set_int(char *var, char *val);
+void    set_flg(char *var);
 int		is_set(char *flag);
 void	clr_flg(char *flag);
 int		find_table(char *szParamName, char *tname);

diff --git a/tools/w_catalog_sales.c b/tools/w_catalog_sales.c
@@ -217,18 +217,20 @@ mk_detail(void *row, int bPrint)
 	/** 
 	* having gone to the trouble to make the sale, now let's see if it gets returned
 	*/
-	genrand_integer(&nTemp, DIST_UNIFORM, 0, 99, 0, CR_IS_RETURNED);
-	if (nTemp < CR_RETURN_PCT)
-	{
-		mk_w_catalog_returns(NULL, 1);
-      if (bPrint)
-         pr_w_catalog_returns(NULL);
-	}
+    if (!is_set("FILTER") || is_set("_CHILD_ONLY")) {
+        genrand_integer(&nTemp, DIST_UNIFORM, 0, 99, 0, CR_IS_RETURNED);
+        if (nTemp < CR_RETURN_PCT)
+        {
+            mk_w_catalog_returns(NULL, 1);
+          if (bPrint)
+             pr_w_catalog_returns(NULL);
+        }
+    }
 
    /**
    * now we print out the order and lineitem together as a single row
    */
-   if (bPrint)
+   if (bPrint && (!is_set("FILTER") || !is_set("_CHILD_ONLY")))
       pr_w_catalog_sales(NULL);
 
    return;

diff --git a/tools/w_store_sales.c b/tools/w_store_sales.c
@@ -144,7 +144,7 @@ tdef *pT = getSimpleTdefsByNumber(STORE_SALES);
 	 * skip the returns since we can't send two tables to stdout at the same time
 	 * TODO: add logic to generate the returns tables to stdout on their own
 	 */	
-	if (!is_set("FILTER"))
+	if (!is_set("FILTER") || is_set("_CHILD_ONLY"))
 	{
     genrand_integer(&nTemp, DIST_UNIFORM, 0, 99, 0, SR_IS_RETURNED);
     if (nTemp < SR_RETURN_PCT)
@@ -154,7 +154,7 @@ tdef *pT = getSimpleTdefsByNumber(STORE_SALES);
         pr_w_store_returns(&ReturnRow);
     }  	
   }
-   if (bPrint)
+   if (bPrint && (!is_set("FILTER") || !is_set("_CHILD_ONLY")))
       pr_w_store_sales(NULL);
 
 	return;

diff --git a/tools/w_web_sales.c b/tools/w_web_sales.c
@@ -189,18 +189,20 @@ mk_detail (void *row, int bPrint)
       /** 
       * having gone to the trouble to make the sale, now let's see if it gets returned
       */
-      genrand_integer(&nTemp, DIST_UNIFORM, 0, 99, 0, WR_IS_RETURNED);
-      if (nTemp < WR_RETURN_PCT)
-      {
-         mk_w_web_returns(&w_web_returns, 1);
-         if (bPrint)
-			 pr_w_web_returns(&w_web_returns);
+      if (!is_set("FILTER") || is_set("_CHILD_ONLY")) {
+          genrand_integer(&nTemp, DIST_UNIFORM, 0, 99, 0, WR_IS_RETURNED);
+          if (nTemp < WR_RETURN_PCT)
+          {
+             mk_w_web_returns(&w_web_returns, 1);
+             if (bPrint)
+                 pr_w_web_returns(&w_web_returns);
+          }
       }
 
       /**
       * now we print out the order and lineitem together as a single row
       */
-      if (bPrint)
+      if (bPrint && (!is_set("FILTER") || !is_set("_CHILD_ONLY")))
 		  pr_w_web_sales(NULL);
 
 	  return;