/*****************************************************************************
- * RRDtool 1.4.0 Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
return -1;
}
- status = rrdc_flush_if_daemon(opt_daemon, argv[optind]);
- if (opt_daemon) free (opt_daemon);
- if (status) return (-1);
-
cf = argv[optind + 1];
- status = rrd_fetch_r(argv[optind], cf, start, end, step,
- ds_cnt, ds_namv, data);
+ rrdc_connect (opt_daemon);
+ if (rrdc_is_connected (opt_daemon))
+ status = rrdc_fetch (argv[optind], cf, start, end, step,
+ ds_cnt, ds_namv, data);
+
+ else
+ status = rrd_fetch_r(argv[optind], cf, start, end, step,
+ ds_cnt, ds_namv, data);
+
if (status != 0)
return (-1);
return (0);
#ifdef HAVE_LIBDBI
/* handle libdbi datasources */
- if (strncmp("sql",filename,3)==0) {
- if (filename[3]==filename[4]) {
+ if (strncmp("sql//",filename,5)==0) {
return rrd_fetch_fn_libdbi(filename,cf_idx,start,end,step,ds_cnt,ds_namv,data);
- }
}
#endif
/* find the rra which best matches the requirements */
for (i = 0; (unsigned) i < rrd.stat_head->rra_cnt; i++) {
- if (cf_conv(rrd.rra_def[i].cf_nam) == cf_idx) {
+ enum cf_en rratype=cf_conv(rrd.rra_def[i].cf_nam);
+ /* handle this RRA */
+ if (
+ /* if we found a direct match */
+ (rratype == cf_idx)
+ ||
+ /*if we found a DS with interval 1
+ and CF (requested,available) are MIN,MAX,AVERAGE,LAST
+ */
+ (
+ /* only if we are on interval 1 */
+ (rrd.rra_def[i].pdp_cnt==1)
+ && (
+ /* and requested CF is MIN,MAX,AVERAGE,LAST */
+ (cf_idx == CF_MINIMUM)
+ ||(cf_idx == CF_MAXIMUM)
+ ||(cf_idx == CF_AVERAGE)
+ ||(cf_idx == CF_LAST)
+ )
+ && (
+ /* and found CF is MIN,MAX,AVERAGE,LAST */
+ (rratype == CF_MINIMUM)
+ ||(rratype == CF_MAXIMUM)
+ ||(rratype == CF_AVERAGE)
+ ||(rratype == CF_LAST)
+ )
+ )
+ ){
cal_end = (rrd.live_head->last_up - (rrd.live_head->last_up
% (rrd.rra_def[i].pdp_cnt