save debug log

cherylEnkidu · cherylEnkidu · commit dca4a71c0038 · 2025-01-21T17:04:28.000-05:00
diff --git a/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_IntegrationTests_iOS.xcscheme b/Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_IntegrationTests_iOS.xcscheme
@@ -27,6 +27,7 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
+      enableAddressSanitizer = "YES"
       enableASanStackUseAfterReturn = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -37,6 +38,13 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Firestore/Source/API/FIRCallbackWrapper.mm b/Firestore/Source/API/FIRCallbackWrapper.mm
@@ -16,6 +16,7 @@
 
 #import "FIRCallbackWrapper.h"
 
+#include <iostream>
 #include <memory>
 #include <utility>
 #include <vector>
@@ -35,21 +36,24 @@
 @implementation FIRCallbackWrapper
 
 + (PipelineSnapshotListener)wrapPipelineCallback:(std::shared_ptr<api::Firestore>)firestore
-                                      completion:(void (^)(PipelineResultVector result,
+                                      completion:(void (^)(CppPipelineResult *result,
                                                            NSError *_Nullable error))completion {
-  class Converter : public EventListener<std::vector<PipelineResult>> {
+  class Converter : public EventListener<CppPipelineResult> {
    public:
     explicit Converter(std::shared_ptr<api::Firestore> firestore, PipelineBlock completion)
         : firestore_(firestore), completion_(completion) {
     }
 
-    void OnEvent(StatusOr<std::vector<PipelineResult>> maybe_snapshot) override {
+    void OnEvent(StatusOr<CppPipelineResult> maybe_snapshot) override {
       if (maybe_snapshot.ok()) {
-        completion_(
-            std::initializer_list<PipelineResult>{PipelineResult::GetTestResult(firestore_)},
-            nullptr);
+        std::cout << "zzyzx OnEvent 1" << std::endl;
+        CppPipelineResult result = maybe_snapshot.ValueOrDie();
+        std::cout << "zzyzx OnEvent 2 result.id=" << result.id_ << std::endl;
+        completion_(&result, nullptr);
+        std::cout << "zzyzx OnEvent 3 result.id=" << result.id_ << std::endl;
       } else {
-        completion_(std::initializer_list<PipelineResult>{}, MakeNSError(maybe_snapshot.status()));
+        //        completion_(PipelineResult::GetTestResult(firestore_),
+        //        MakeNSError(maybe_snapshot.status()));
       }
     }
 
@@ -58,7 +62,7 @@ void OnEvent(StatusOr<std::vector<PipelineResult>> maybe_snapshot) override {
     PipelineBlock completion_;
   };
 
-  return absl::make_unique<Converter>(firestore, completion);
+  return std::make_shared<Converter>(firestore, completion);
 }
 
 @end
diff --git a/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h b/Firestore/Source/Public/FirebaseFirestore/FIRCallbackWrapper.h
@@ -38,10 +38,10 @@ namespace core = firebase::firestore::core;
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^PipelineBlock)(std::vector<api::PipelineResult> result, NSError *_Nullable error)
-    NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
+typedef api::PipelineResult CppPipelineResult;
 
-typedef std::vector<api::PipelineResult> PipelineResultVector;
+typedef void (^PipelineBlock)(CppPipelineResult *result, NSError *_Nullable error)
+    NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
 
 NS_SWIFT_SENDABLE
 NS_SWIFT_NAME(CallbackWrapper)
@@ -51,9 +51,9 @@ NS_SWIFT_NAME(CallbackWrapper)
 // are invoked on a different thread than the one they were originally defined in. If this callback
 // is expected to be called on a different thread, it should be marked as `Sendable` to ensure
 // thread safety.
-+ (std::shared_ptr<core::EventListener<std::vector<api::PipelineResult>>>)
++ (std::shared_ptr<core::EventListener<api::PipelineResult>>)
     wrapPipelineCallback:(std::shared_ptr<api::Firestore>)firestore
-              completion:(void (^NS_SWIFT_SENDABLE)(PipelineResultVector result,
+              completion:(void (^NS_SWIFT_SENDABLE)(CppPipelineResult *result,
                                                     NSError *_Nullable error))completion
     NS_SWIFT_NAME(wrapPipelineCallback(firestore:completion:));
 
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline.swift
@@ -29,15 +29,17 @@ public struct Pipeline {
   }
 
   @discardableResult
-  public func GetPipelineResult() async throws -> [PipelineResult] {
+  public func GetPipelineResult() async throws -> Int {
     return try await withCheckedThrowingContinuation { continuation in
       let listener = CallbackWrapper.wrapPipelineCallback(firestore: cppObj.GetFirestore()) {
         result, error in
         if let error {
           continuation.resume(throwing: error)
         } else {
           // Our callbacks guarantee that we either return an error or a progress event.
-          continuation.resume(returning: PipelineResult.convertToArrayFromCppVector(result))
+          print("zzyzx Swift use id: \(result.pointee.id_)")
+          PipelineResult(result.pointee)
+          continuation.resume(returning: 5)
         }
       }
       cppObj.GetPipelineResult(listener)
diff --git a/Firestore/Swift/Source/SwiftAPI/PipelineResult.swift b/Firestore/Swift/Source/SwiftAPI/PipelineResult.swift
@@ -22,17 +22,18 @@ public struct PipelineResult {
 
   public init(_ cppSource: firebase.firestore.api.PipelineResult) {
     cppObj = cppSource
+    print("zzyzx SwiftObj id: \(cppObj.id_)")
   }
 
-  static func convertToArrayFromCppVector(_ vector: PipelineResultVector)
+  static func convertToArrayFromCppVector(_ vector: CppPipelineResult)
     -> [PipelineResult] {
     // Create a Swift array and populate it by iterating over the C++ vector
     var swiftArray: [PipelineResult] = []
 
-    for index in vector.indices {
-      let cppResult = vector[index]
-      swiftArray.append(PipelineResult(cppResult))
-    }
+//    for index in vector.indices {
+//      let cppResult = vector[index]
+//      swiftArray.append(PipelineResult(cppResult))
+//    }
 
     return swiftArray
   }
diff --git a/Firestore/Swift/Tests/Integration/PipelineTests.swift b/Firestore/Swift/Tests/Integration/PipelineTests.swift
@@ -21,6 +21,6 @@ final class PipelineTests: FSTIntegrationTestCase {
   func testCreatePipeline() async throws {
     let pipelineSource: PipelineSource = db.pipeline()
     let pipeline: Pipeline = pipelineSource.GetCollection("path")
-    let _: [PipelineResult] = try await pipeline.GetPipelineResult()
+    let _ = try await pipeline.GetPipelineResult()
   }
 }
diff --git a/Firestore/core/interfaceForSwift/api/pipeline.cc b/Firestore/core/interfaceForSwift/api/pipeline.cc
@@ -45,8 +45,10 @@ void Pipeline::GetPipelineResult(PipelineSnapshotListener callback) const {
       /*include_document_metadata_changes=*/true,
       /*wait_for_sync_when_online=*/true);
 
-  callback->OnEvent(StatusOr<std::vector<PipelineResult>>(
-      {(PipelineResult::GetTestResult(firestore_))}));
+  PipelineResult sample = PipelineResult::GetTestResult(firestore_);
+
+  StatusOr<PipelineResult> res(sample);
+  callback->OnEvent(res);
 
   //  class ListenOnce : public EventListener<std::vector<PipelineResult>> {
   //   public:
diff --git a/Firestore/core/interfaceForSwift/api/pipeline.h b/Firestore/core/interfaceForSwift/api/pipeline.h
@@ -35,7 +35,7 @@ class Firestore;
 class PipelineResult;
 
 using PipelineSnapshotListener =
-    std::shared_ptr<core::EventListener<std::vector<PipelineResult>>>;
+    std::shared_ptr<core::EventListener<PipelineResult>>;
 
 class Pipeline {
  public:
diff --git a/Firestore/core/interfaceForSwift/api/pipeline_result.cc b/Firestore/core/interfaceForSwift/api/pipeline_result.cc
@@ -12,22 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
+#include <iostream>
+
 #include "Firestore/core/include/firebase/firestore/timestamp.h"
+#include "Firestore/core/interfaceForSwift/api/pipeline_result.h"
 
 namespace firebase {
 namespace firestore {
 
 namespace api {
 
+std::atomic<int> next_id(0);
+
 PipelineResult::PipelineResult(std::shared_ptr<Firestore> firestore,
                                std::shared_ptr<Timestamp> execution_time,
                                std::shared_ptr<Timestamp> update_time,
                                std::shared_ptr<Timestamp> create_time)
-    : firestore_(firestore),
+    : id_(next_id.fetch_add(1)),
+      firestore_(firestore),
       execution_time_(execution_time),
       update_time_(update_time),
       create_time_(create_time) {
+  std::cout << "zzyzx PipelineResult[" << id_ << "]@"
+            << reinterpret_cast<std::uintptr_t>(this) << "()" << std::endl;
 }
 
 PipelineResult PipelineResult::GetTestResult(
diff --git a/Firestore/core/interfaceForSwift/api/pipeline_result.h b/Firestore/core/interfaceForSwift/api/pipeline_result.h
@@ -15,6 +15,8 @@
 #ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
 #define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
 
+#include <atomic>
+#include <iostream>
 #include <memory>
 
 namespace firebase {
@@ -28,16 +30,55 @@ namespace api {
 class Firestore;
 class DocumentReference;
 
+extern std::atomic<int> next_id;
+
 class PipelineResult {
  public:
   PipelineResult(std::shared_ptr<Firestore> firestore,
                  std::shared_ptr<Timestamp> execution_time,
                  std::shared_ptr<Timestamp> update_time,
                  std::shared_ptr<Timestamp> create_time);
 
+  // Copy constructor
+  PipelineResult(const PipelineResult& other)
+      : id_(next_id.fetch_add(1)),
+        firestore_(other.firestore_),
+        execution_time_(other.execution_time_),
+        update_time_(other.update_time_),
+        create_time_(other.create_time_) {
+    std::cout << "zzyzx PipelineResult[" << id_ << "]@"
+              << reinterpret_cast<std::uintptr_t>(this)
+              << "(const PipelineResult&) other.id=" << other.id_ << std::endl;
+    long n = execution_time_.use_count();
+    std::cout << "Calling copy ctor when refer count is:" << n << std::endl;
+  }
+
+  // Copy assignment operator
+  PipelineResult& operator=(const PipelineResult& other) {
+    std::cout << "zzyzx PipelineResult[" << id_ << "]@"
+              << reinterpret_cast<std::uintptr_t>(this)
+              << ".operator=(const PipelineResult&) other.id_=" << other.id_
+              << std::endl;
+    if (this != &other) {
+      firestore_ = other.firestore_;
+      execution_time_ = other.execution_time_;
+      update_time_ = other.update_time_;
+      create_time_ = other.create_time_;
+    }
+    return *this;
+  }
+
   static PipelineResult GetTestResult(std::shared_ptr<Firestore> firestore);
 
- private:
+  ~PipelineResult() {
+    std::cout << "zzyzx PipelineResult[" << id_ << "]@"
+              << reinterpret_cast<std::uintptr_t>(this) << "~PipelineResult()"
+              << std::endl;
+    long n = execution_time_.use_count();
+    std::cout << "Calling destructor when refer count is:" << n << std::endl;
+  }
+
+  int id_;
   std::shared_ptr<Firestore> firestore_;
   std::shared_ptr<Timestamp> execution_time_;
   std::shared_ptr<Timestamp> update_time_;

Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,17 @@ public struct Pipeline {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@discardableResult`
`32`		`- public func GetPipelineResult() async throws -> [PipelineResult] {`
	`32`	`+ public func GetPipelineResult() async throws -> Int {`
`33`	`33`	`return try await withCheckedThrowingContinuation { continuation in`
`34`	`34`	`let listener = CallbackWrapper.wrapPipelineCallback(firestore: cppObj.GetFirestore()) {`
`35`	`35`	`result, error in`
`36`	`36`	`if let error {`
`37`	`37`	`continuation.resume(throwing: error)`
`38`	`38`	`} else {`
`39`	`39`	`// Our callbacks guarantee that we either return an error or a progress event.`
`40`		`- continuation.resume(returning: PipelineResult.convertToArrayFromCppVector(result))`
	`40`	`+ print("zzyzx Swift use id: \(result.pointee.id_)")`
	`41`	`+ PipelineResult(result.pointee)`
	`42`	`+ continuation.resume(returning: 5)`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`cppObj.GetPipelineResult(listener)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ final class PipelineTests: FSTIntegrationTestCase {`
`21`	`21`	`func testCreatePipeline() async throws {`
`22`	`22`	`let pipelineSource: PipelineSource = db.pipeline()`
`23`	`23`	`let pipeline: Pipeline = pipelineSource.GetCollection("path")`
`24`		`- let _: [PipelineResult] = try await pipeline.GetPipelineResult()`
	`24`	`+ let _ = try await pipeline.GetPipelineResult()`
`25`	`25`	`}`
`26`	`26`	`}`