DATA-3441 Update data export command

cli/app.go

@@ -188,11 +188,11 @@ var commonFilterFlags = []cli.Flag{
 	},
 	&cli.StringFlag{
 		Name:  dataFlagStart,
-		Usage: "ISO-8601 timestamp indicating the start of the interval filter",
+		Usage: "ISO-8601 timestamp in RFC3339 format indicating the start of the interval filter",
 	},
 	&cli.StringFlag{
 		Name:  dataFlagEnd,
-		Usage: "ISO-8601 timestamp indicating the end of the interval filter",
+		Usage: "ISO-8601 timestamp in RFC3339 format indicating the end of the interval filter",
 	},
 	&cli.StringSliceFlag{
 		Name: dataFlagBboxLabels,
@@ -641,7 +641,7 @@ var app = &cli.App{
 							Usage: "download tabular data",
 							UsageText: createUsageText("data export tabular", []string{
 								dataFlagDestination,
-								dataFlagPartName,
+								dataFlagPartID,
 								dataFlagResourceName,
 								dataFlagResourceSubtype,
 								dataFlagMethod,
@@ -674,11 +674,11 @@ var app = &cli.App{
 								},
 								&cli.StringFlag{
 									Name:  "start",
-									Usage: "ISO-8601 timestamp indicating the start of the interval",
+									Usage: "ISO-8601 timestamp in RFC3339 format indicating the start of the interval",
 								},
 								&cli.StringFlag{
 									Name:  "end",
-									Usage: "ISO-8601 timestamp indicating the end of the interval",
+									Usage: "ISO-8601 timestamp in RFC3339 format indicating the end of the interval",
 								},
 							},
 							Action: createCommandWithT[dataExportTabularArgs](DataExportTabularAction),
@@ -703,12 +703,12 @@ var app = &cli.App{
 								&cli.StringFlag{
 									Name:     dataFlagStart,
 									Required: true,
-									Usage:    "ISO-8601 timestamp indicating the start of the interval filter",
+									Usage:    "ISO-8601 timestamp in RFC3339 format indicating the start of the interval filter",
 								},
 								&cli.StringFlag{
 									Name:     dataFlagEnd,
 									Required: true,
-									Usage:    "ISO-8601 timestamp indicating the end of the interval filter",
+									Usage:    "ISO-8601 timestamp in RFC3339 format indicating the end of the interval filter",
 								},
 								&cli.StringSliceFlag{
 									Name:  dataFlagLocationIDs,

cli/data.go

@@ -269,28 +269,13 @@ func createDataFilter(c *cli.Context) (*datapb.Filter, error) {
 	if len(args.BBoxLabels) != 0 {
 		filter.BboxLabels = args.BBoxLabels
 	}
-	var start *timestamppb.Timestamp
-	var end *timestamppb.Timestamp
-	timeLayout := time.RFC3339
-	if args.Start != "" {
-		t, err := time.Parse(timeLayout, args.Start)
-		if err != nil {
-			return nil, errors.Wrap(err, "could not parse start flag")
-		}
-		start = timestamppb.New(t)
-	}
-	if args.End != "" {
-		t, err := time.Parse(timeLayout, args.End)
+	if args.Start != "" || args.End != "" {
+		interval, err := createCaptureInterval(args.Start, args.End)
 		if err != nil {
-			return nil, errors.Wrap(err, "could not parse end flag")
-		}
-		end = timestamppb.New(t)
-	}
-	if start != nil || end != nil {
-		filter.Interval = &datapb.CaptureInterval{
-			Start: start,
-			End:   end,
+			return nil, err
 		}
+
+		filter.Interval = interval
 	}
 	return filter, nil
 }
@@ -312,29 +297,40 @@ func createExportTabularRequest(c *cli.Context) (*datapb.ExportTabularDataReques
 		request.MethodName = args.Method
 	}
 
+	interval, err := createCaptureInterval(args.Start, args.End)
+	if err != nil {
+		return nil, err
+	}
+
+	request.Interval = interval
+
+	return request, nil
+}
+
+func createCaptureInterval(startStr, endStr string) (*datapb.CaptureInterval, error) {
 	var start *timestamppb.Timestamp
 	var end *timestamppb.Timestamp
 	timeLayout := time.RFC3339
-	if args.Start != "" {
-		t, err := time.Parse(timeLayout, args.Start)
+
+	if startStr != "" {
+		t, err := time.Parse(timeLayout, startStr)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not parse start flag")
 		}
 		start = timestamppb.New(t)
 	}
-	if args.End != "" {
-		t, err := time.Parse(timeLayout, args.End)
+	if endStr != "" {
+		t, err := time.Parse(timeLayout, endStr)
 		if err != nil {
 			return nil, errors.Wrap(err, "could not parse end flag")
 		}
 		end = timestamppb.New(t)
 	}
-	request.Interval = &datapb.CaptureInterval{
+
+	return &datapb.CaptureInterval{
 		Start: start,
 		End:   end,
-	}
-
-	return request, nil
+	}, nil
 }
 
 func (c *viamClient) dataExportBinaryAction(cCtx *cli.Context, args dataExportBinaryArgs) error {
@@ -720,7 +716,6 @@ func (c *viamClient) tabularData(dest string, request *datapb.ExportTabularDataR
 			}
 
 			writer := bufio.NewWriter(dataFile)
-			numWrites := uint64(0)
 
 			dataRowChan := make(chan []byte)
 			errChan := make(chan error, 1)
@@ -792,7 +787,7 @@ func (c *viamClient) tabularData(dest string, request *datapb.ExportTabularDataR
 						return nil
 					}
 
-					if err = writeData(writer, dataRow, &numWrites); err != nil {
+					if err = writeData(writer, dataRow); err != nil {
 						exportErr = errors.Wrap(err, "error writing data")
 						return exportErr
 					}
@@ -817,9 +812,7 @@ func (c *viamClient) tabularData(dest string, request *datapb.ExportTabularDataR
 	return nil
 }
 
-func writeData(writer *bufio.Writer, dataRow []byte, numWrites *uint64) error {
-	*numWrites++
-
+func writeData(writer *bufio.Writer, dataRow []byte) error {
 	_, err := writer.Write(dataRow)
 	if err != nil {
 		return err
@@ -831,12 +824,10 @@ func writeData(writer *bufio.Writer, dataRow []byte, numWrites *uint64) error {
 	}
 
 	// Periodically flush to keep buffer size down.
-	if *numWrites == uint64(10_000) {
+	if uint64(writer.Size()) > uint64(10_000_000) {
 		if err = writer.Flush(); err != nil {
 			return err
 		}
-
-		*numWrites = 0
 	}
 
 	return nil