Merge storage refactor back to master (#5322)

* Make mph-gdtsqlite run travis (#3861)

* Implement a SQLite helper (#4075)

* Add support for in-memory and other types of stores (#4158)

* Add support for in-memory and other types of stores

* Temporarily add -x to know what's causing check.sh to fail

* Remove -x

* DO NOT MERGE TO MASTER: Remove commit math from check.sh temporarily

* Initial implementation of GDTCORDatabase (#4180)

* Initial implementation of GDTCORDatabase

* Style

* Check result of running a statement

* Simplify init

Also support >1 :memory: db

* Write test docs and fix one tsan issue (#4211)

* wip moving storage to sqlite

* Revert "wip moving storage to sqlite"

This reverts commit ee1895f.

* Address tsan issue and document tests

* Address implicit self retains

Don't know why these aren't surfaced locally, I have the warning on.

* Implement bulk sql execution (#4528)

* Change custom prioritization dictionary to bytes (#4534)

* Change custom prioritization dictionary to bytes

* Fix a missed change for customBytes

* Refactor GDT's storage to be an interface (#5022)

* Refactor GDT's storage to be an interface

- Events are now removed by eventID
  - Events now generate an ID when they are alloc/inited
  - Copying events also copies their eventID
  - Event hashing takes into account the eventID
  - A static method in GDTCOREvent creates  event IDs as the concat of <session counter><event counter during session>
  - Session counters are incremented and stored in user defaults at app start
- Storage instances register themselves with GDTCORRegistrar like prioritizers and uploaders
- Storage fakes are refactored to be registered with GDTCORRegistrar
- Added some missing docs and fixed some typos

* Remove an unintended change from assert macro

* Use a variable

* Additional docs and test fixes

* Move saving the counter value to a file

* Update docs

* Rename GDTCORStorage to GDTCORFlatFileStorage (#5079)

* Rename GDTCORStorage to GDTCORFlatFileStorage

* Fix the NSCoding keys

* Fixes to get building and unit tests passing

* Address lack of thread safety affecting lifecycle tests

* Style

* Transition customPrioritizationDict to customBytes

Adds a category  on GDTCOREvent to make checking network connection info easier.

* Remove all sqlite and database stufff or the purposes of merging back to maste (#5330)

* Update .travis.yml

Author: mikehaney24

GoogleDataTransport.podspec

@@ -20,7 +20,7 @@ Shared library for iOS SDK data transport needs.
   s.tvos.deployment_target = '10.0'
   s.watchos.deployment_target = '6.0'
 
-  # To develop or run the tests, >= 1.8.0.beta.1 must be installed.
+  # To develop or run the tests, >= 1.8.0 must be installed.
   s.cocoapods_version = '>= 1.4.0'
 
   s.static_framework = true

GoogleDataTransport/GDTCORLibrary/GDTCOREvent.m

@@ -26,6 +26,41 @@
 
 @implementation GDTCOREvent
 
++ (NSNumber *)nextEventID {
+  static unsigned long long nextEventID = 0;
+  static NSString *counterPath;
+  static dispatch_queue_t eventIDQueue;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    eventIDQueue = dispatch_queue_create("com.google.GDTCOREventIDQueue", DISPATCH_QUEUE_SERIAL);
+    counterPath = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES)[0];
+    counterPath = [NSString stringWithFormat:@"%@/google-sdks-events/count", counterPath];
+    NSError *error;
+    NSString *countText = [NSString stringWithContentsOfFile:counterPath
+                                                    encoding:NSUTF8StringEncoding
+                                                       error:&error];
+    const char *countChars = [countText UTF8String];
+    unsigned long long count = -1;
+    if (countChars) {
+      count = strtoull([countText UTF8String], NULL, 10);
+    }
+    nextEventID = error || count < 0 ? 0 : count;
+  });
+
+  __block NSNumber *result;
+  dispatch_sync(eventIDQueue, ^{
+    result = @(nextEventID);
+    nextEventID++;
+    NSError *error;
+    [[result stringValue] writeToFile:counterPath
+                           atomically:YES
+                             encoding:NSUTF8StringEncoding
+                                error:&error];
+    GDTCORAssert(error == nil, @"There was an error saving the new counter value to disk.");
+  });
+  return result;
+}
+
 - (nullable instancetype)initWithMappingID:(NSString *)mappingID target:(NSInteger)target {
   GDTCORAssert(mappingID.length > 0, @"Please give a valid mapping ID");
   GDTCORAssert(target > 0, @"A target cannot be negative or 0");
@@ -34,6 +69,7 @@ - (nullable instancetype)initWithMappingID:(NSString *)mappingID target:(NSInteg
   }
   self = [super init];
   if (self) {
+    _eventID = [GDTCOREvent nextEventID];
     _mappingID = mappingID;
     _target = target;
     _qosTier = GDTCOREventQosDefault;
@@ -44,23 +80,25 @@ - (nullable instancetype)initWithMappingID:(NSString *)mappingID target:(NSInteg
 
 - (instancetype)copy {
   GDTCOREvent *copy = [[GDTCOREvent alloc] initWithMappingID:_mappingID target:_target];
+  copy->_eventID = _eventID;
   copy.dataObject = _dataObject;
   copy.qosTier = _qosTier;
   copy.clockSnapshot = _clockSnapshot;
-  copy.customPrioritizationParams = _customPrioritizationParams;
+  copy.customBytes = _customBytes;
   copy->_GDTFilePath = _GDTFilePath;
   GDTCORLogDebug("Copying event %@ to event %@", self, copy);
   return copy;
 }
 
 - (NSUInteger)hash {
   // This loses some precision, but it's probably fine.
+  NSUInteger eventIDHash = [_eventID hash];
   NSUInteger mappingIDHash = [_mappingID hash];
   NSUInteger timeHash = [_clockSnapshot hash];
   NSInteger dataObjectHash = [_dataObject hash];
   NSUInteger fileURL = [_GDTFilePath hash];
 
-  return mappingIDHash ^ _target ^ _qosTier ^ timeHash ^ dataObjectHash ^ fileURL;
+  return eventIDHash ^ mappingIDHash ^ _target ^ _qosTier ^ timeHash ^ dataObjectHash ^ fileURL;
 }
 
 - (BOOL)isEqual:(id)object {
@@ -109,6 +147,9 @@ - (BOOL)writeToGDTPath:(NSString *)filePath error:(NSError **)error {
 
 #pragma mark - NSSecureCoding and NSCoding Protocols
 
+/** NSCoding key for eventID property. */
+static NSString *eventIDKey = @"_eventID";
+
 /** NSCoding key for mappingID property. */
 static NSString *mappingIDKey = @"_mappingID";
 
@@ -127,9 +168,6 @@ - (BOOL)writeToGDTPath:(NSString *)filePath error:(NSError **)error {
 /** NSCoding key for GDTFilePath property. */
 static NSString *kGDTFilePathKey = @"_GDTFilePath";
 
-/** NSCoding key for customPrioritizationParams property. */
-static NSString *customPrioritizationParams = @"_customPrioritizationParams";
-
 /** NSCoding key for backwards compatibility of GDTCORStoredEvent mappingID property.*/
 static NSString *kStoredEventMappingIDKey = @"GDTCORStoredEventMappingIDKey";
 
@@ -145,10 +183,8 @@ - (BOOL)writeToGDTPath:(NSString *)filePath error:(NSError **)error {
 /** NSCoding key for backwards compatibility of GDTCORStoredEvent dataFuture property.*/
 static NSString *kStoredEventDataFutureKey = @"GDTCORStoredEventDataFutureKey";
 
-/** NSCoding key for backwards compatibility of GDTCORStoredEvent customPrioritizationParams
- * property.*/
-static NSString *kStoredEventCustomPrioritizationParamsKey =
-    @"GDTCORStoredEventcustomPrioritizationParamsKey";
+/** NSCoding key for customData property. */
+static NSString *kCustomDataKey = @"GDTCOREventCustomDataKey";
 
 + (BOOL)supportsSecureCoding {
   return YES;
@@ -165,6 +201,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
   NSInteger target = [aDecoder decodeIntegerForKey:targetKey];
   self = [self initWithMappingID:mappingID target:target];
   if (self) {
+    _eventID = [aDecoder decodeObjectOfClass:[NSNumber class] forKey:eventIDKey];
     _qosTier = [aDecoder decodeIntegerForKey:qosTierKey];
     _clockSnapshot = [aDecoder decodeObjectOfClass:[GDTCORClock class] forKey:clockSnapshotKey];
     NSURL *fileURL = [aDecoder decodeObjectOfClass:[NSURL class] forKey:fileURLKey];
@@ -173,8 +210,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder {
     } else {
       _GDTFilePath = [aDecoder decodeObjectOfClass:[NSString class] forKey:kGDTFilePathKey];
     }
-    _customPrioritizationParams = [aDecoder decodeObjectOfClass:[NSDictionary class]
-                                                         forKey:customPrioritizationParams];
+    _customBytes = [aDecoder decodeObjectOfClass:[NSData class] forKey:kCustomDataKey];
   }
   return self;
 }
@@ -187,6 +223,10 @@ - (id)initWithCoderForStoredEventBackwardCompatibility:(NSCoder *)aDecoder
                                              forKey:kStoredEventTargetKey] integerValue];
   self = [self initWithMappingID:mappingID target:target];
   if (self) {
+    _eventID = [aDecoder decodeObjectOfClass:[NSNumber class] forKey:eventIDKey];
+    if (_eventID == nil) {
+      _eventID = [GDTCOREvent nextEventID];
+    }
     _qosTier = [[aDecoder decodeObjectOfClass:[NSNumber class]
                                        forKey:kStoredEventQosTierKey] integerValue];
     _clockSnapshot = [aDecoder decodeObjectOfClass:[GDTCORClock class]
@@ -196,20 +236,19 @@ - (id)initWithCoderForStoredEventBackwardCompatibility:(NSCoder *)aDecoder
     } else {
       _GDTFilePath = [aDecoder decodeObjectOfClass:[NSString class] forKey:kGDTFilePathKey];
     }
-    _customPrioritizationParams =
-        [aDecoder decodeObjectOfClass:[NSDictionary class]
-                               forKey:kStoredEventCustomPrioritizationParamsKey];
+    _customBytes = [aDecoder decodeObjectOfClass:[NSData class] forKey:kCustomDataKey];
   }
   return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder {
+  [aCoder encodeObject:_eventID forKey:eventIDKey];
   [aCoder encodeObject:_mappingID forKey:mappingIDKey];
   [aCoder encodeInteger:_target forKey:targetKey];
   [aCoder encodeInteger:_qosTier forKey:qosTierKey];
   [aCoder encodeObject:_clockSnapshot forKey:clockSnapshotKey];
   [aCoder encodeObject:_GDTFilePath forKey:kGDTFilePathKey];
-  [aCoder encodeObject:_customPrioritizationParams forKey:customPrioritizationParams];
+  [aCoder encodeObject:_customBytes forKey:kCustomDataKey];
 }
 
 @end