Added GetFileLastModified method to the DataStore interface.

Author: overcat

services/galexie/internal/integration_test.go

@@ -111,6 +111,12 @@ func (s *GalexieTestSuite) TestAppend() {
 	err := rootCmd.ExecuteContext(s.ctx)
 	require.NoError(err)
 
+	datastore, err := datastore.NewDataStore(s.ctx, s.config.DataStoreConfig)
+	require.NoError(err)
+
+	lastModified, err := datastore.GetFileLastModified(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr.zstd")
+	require.NoError(err)
+
 	// now run an append of overalapping range, it will resume past existing ledgers
 	rootCmd.SetArgs([]string{"append", "--start", "6", "--end", "9", "--config-file", s.tempConfigFile})
 	var errWriter bytes.Buffer
@@ -125,8 +131,10 @@ func (s *GalexieTestSuite) TestAppend() {
 	s.T().Log(output)
 	s.T().Log(errOutput)
 
-	datastore, err := datastore.NewDataStore(s.ctx, s.config.DataStoreConfig)
+	// check that the file was not modified
+	newLastModified, err := datastore.GetFileLastModified(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr.zstd")
 	require.NoError(err)
+	require.Equal(lastModified, newLastModified, "file should not be modified on append of overlapping range")
 
 	_, err = datastore.GetFile(s.ctx, "FFFFFFFF--0-9/FFFFFFF6--9.xdr.zstd")
 	require.NoError(err)

support/datastore/datastore.go

@@ -3,6 +3,7 @@ package datastore
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/stellar/go/support/errors"
 )
@@ -16,6 +17,7 @@ type DataStoreConfig struct {
 // DataStore defines an interface for interacting with data storage
 type DataStore interface {
 	GetFileMetadata(ctx context.Context, path string) (map[string]string, error)
+	GetFileLastModified(ctx context.Context, filePath string) (time.Time, error)
 	GetFile(ctx context.Context, path string) (io.ReadCloser, error)
 	PutFile(ctx context.Context, path string, in io.WriterTo, metaData map[string]string) error
 	PutFileIfNotExists(ctx context.Context, path string, in io.WriterTo, metaData map[string]string) (bool, error)

support/datastore/gcs_datastore.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"path"
 	"strings"
+	"time"
 
 	"cloud.google.com/go/storage"
 	"google.golang.org/api/googleapi"
@@ -65,18 +66,35 @@ func FromGCSClient(ctx context.Context, client *storage.Client, bucketPath strin
 	return &GCSDataStore{client: client, bucket: bucket, prefix: prefix, schema: schema}, nil
 }
 
-// GetFileMetadata retrieves the metadata for the specified file in the GCS bucket.
-func (b GCSDataStore) GetFileMetadata(ctx context.Context, filePath string) (map[string]string, error) {
+func (b GCSDataStore) GetFileAttrs(ctx context.Context, filePath string) (*storage.ObjectAttrs, error) {
 	filePath = path.Join(b.prefix, filePath)
 	attrs, err := b.bucket.Object(filePath).Attrs(ctx)
 	if err != nil {
 		if errors.Is(err, storage.ErrObjectNotExist) {
 			return nil, os.ErrNotExist
 		}
 	}
+	return attrs, nil
+}
+
+// GetFileMetadata retrieves the metadata for the specified file in the GCS bucket.
+func (b GCSDataStore) GetFileMetadata(ctx context.Context, filePath string) (map[string]string, error) {
+	attrs, err := b.GetFileAttrs(ctx, filePath)
+	if err != nil {
+		return nil, err
+	}
 	return attrs.Metadata, nil
 }
 
+// GetFileLastModified retrieves the last modified time of a file in the GCS bucket.
+func (b GCSDataStore) GetFileLastModified(ctx context.Context, filePath string) (time.Time, error) {
+	attrs, err := b.GetFileAttrs(ctx, filePath)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return attrs.Updated, nil
+}
+
 // GetFile retrieves a file from the GCS bucket.
 func (b GCSDataStore) GetFile(ctx context.Context, filePath string) (io.ReadCloser, error) {
 	filePath = path.Join(b.prefix, filePath)

support/datastore/s3_datastore.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"path"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
@@ -77,8 +78,7 @@ func FromS3Client(ctx context.Context, client *s3.Client, bucketPath string, sch
 	return S3DataStore{client: client, uploader: uploader, bucket: bucketName, prefix: prefix, schema: schema}, nil
 }
 
-// GetFileMetadata retrieves the metadata for the specified file in the S3-compatible bucket.
-func (b S3DataStore) GetFileMetadata(ctx context.Context, filePath string) (map[string]string, error) {
+func (b S3DataStore) HeadObject(ctx context.Context, filePath string) (*s3.HeadObjectOutput, error) {
 	filePath = path.Join(b.prefix, filePath)
 	input := &s3.HeadObjectInput{
 		Bucket: aws.String(b.bucket),
@@ -93,7 +93,25 @@ func (b S3DataStore) GetFileMetadata(ctx context.Context, filePath string) (map[
 		return nil, err
 	}
 
-	return output.Metadata, nil
+	return output, nil
+}
+
+// GetFileMetadata retrieves the metadata for the specified file in the S3-compatible bucket.
+func (b S3DataStore) GetFileMetadata(ctx context.Context, filePath string) (map[string]string, error) {
+	attrs, err := b.HeadObject(ctx, filePath)
+	if err != nil {
+		return nil, err
+	}
+	return attrs.Metadata, nil
+}
+
+// GetFileLastModified retrieves the last modified time of a file in the S3-compatible bucket.
+func (b S3DataStore) GetFileLastModified(ctx context.Context, filePath string) (time.Time, error) {
+	attrs, err := b.HeadObject(ctx, filePath)
+	if err != nil {
+		return time.Time{}, err
+	}
+	return *attrs.LastModified, nil
 }
 
 // GetFile retrieves a file from the S3-compatible bucket.