Skip to content

Refactor event fileURLs to be derived #5137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 18, 2020
Merged

Refactor event fileURLs to be derived #5137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7964f83
Refactor event fileURLs to be derived
mikehaney24 Mar 18, 2020
1f9507d
Convert a couple of tests, actually use a non-absolute URL in GDTCORE…
mikehaney24 Mar 18, 2020
e96f99f
Make sure to use the event fileURL property as the source of truth.
mikehaney24 Mar 18, 2020
63a46b5
Fix KVC not working for the removed property
mikehaney24 Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make sure to use the event fileURL property as the source of truth. 
Add some additional logs and improve the integration test
  • Loading branch information
@mikehaney24
mikehaney24 committed Mar 18, 2020
commit e96f99fefd7cc40d71e82f4624663c9a5ab977e4
5 changes: 4 additions & 1 deletion GoogleDataTransport/GDTCORLibrary/GDTCOREvent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ - (void)setDataObject:(id<GDTCOREventDataObject>)dataObject {
}

- (NSURL *)fileURL {
return [[NSURL alloc] initWithString:_GDTFilePath relativeToURL:GDTCORRootDirectory()];
if (!_GDTFilePath) {
_GDTFilePath = [NSString stringWithFormat:@"event-%lu", (unsigned long)self.hash];
}
return [GDTCORRootDirectory() URLByAppendingPathComponent:_GDTFilePath];
}

#pragma mark - Private methods
Expand Down
6 changes: 1 addition & 5 deletions GoogleDataTransport/GDTCORLibrary/GDTCORStorage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,12 @@ - (NSURL *)saveEventBytesToDisk:(GDTCOREvent *)event
eventHash:(NSUInteger)eventHash
error:(NSError **)error {
NSString *eventFileName = [NSString stringWithFormat:@"event-%lu", (unsigned long)eventHash];
NSURL *fileURL = [[NSURL alloc] initWithString:eventFileName relativeToURL:GDTCORRootDirectory()];
GDTCORAssert(![[NSFileManager defaultManager] fileExistsAtPath:fileURL.path],
@"An event shouldn't already exist at this path: %@", fileURL.path);

NSError *writingError;
[event writeToGDTPath:eventFileName error:&writingError];
if (writingError) {
GDTCORLogDebug(@"There was an error saving an event to disk: %@", writingError);
}
return fileURL;
return event.fileURL;
}

/** Adds the event to internal tracking collections.
Expand Down
5 changes: 3 additions & 2 deletions GoogleDataTransport/GDTCORTests/Integration/GDTCORIntegrationTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ - (void)testEndToEndEvent {
[testServer registerTestPaths];
[testServer start];

// Create eventgers.
// Create events.
self.transport1 = [[GDTCORTransport alloc] initWithMappingID:@"eventMap1"
transformers:nil
target:kGDTCORIntegrationTestTarget];
Expand Down Expand Up @@ -168,7 +168,8 @@ - (void)testEndToEndEvent {

/** Generates a bunch of random events. */
- (void)generateEvents {
for (int i = 0; i < arc4random_uniform(10) + 1; i++) {
int limit = arc4random_uniform(10) + 1;
for (int i = 0; i < limit; i++) {
// Choose a random transport, and randomly choose if it's a telemetry event.
GDTCORTransport *transport = arc4random_uniform(2) ? self.transport1 : self.transport2;
BOOL isTelemetryEvent = arc4random_uniform(2);
Expand Down