merge in base 2

Author: cherylEnkidu

Firestore/Source/Public/FirebaseFirestore/FIRPipelineBridge.h

@@ -222,9 +222,6 @@ NS_SWIFT_NAME(__PipelineResultBridge)
 
 - (nullable id)get:(id)field;
 
-- (nullable id)get:(id)field
-    serverTimestampBehavior:(FIRServerTimestampBehavior)serverTimestampBehavior;
-
 @end
 
 NS_SWIFT_SENDABLE

Firestore/Swift/Source/SwiftAPI/Pipeline/PipelineResult.swift

@@ -22,28 +22,16 @@ import Foundation
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 public struct PipelineResult: @unchecked Sendable {
   let bridge: __PipelineResultBridge
-  private let serverTimestamp: ServerTimestampBehavior
 
   init(_ bridge: __PipelineResultBridge) {
     self.bridge = bridge
-    serverTimestamp = .none
     ref = self.bridge.reference
     id = self.bridge.documentID
     data = self.bridge.data().mapValues { Helper.convertObjCToSwift($0) }
     createTime = self.bridge.create_time
     updateTime = self.bridge.update_time
   }
 
-  init(_ bridge: __PipelineResultBridge, _ behavior: ServerTimestampBehavior) {
-    self.bridge = bridge
-    serverTimestamp = behavior
-    ref = self.bridge.reference
-    id = self.bridge.documentID
-    data = self.bridge.data(with: serverTimestamp)
-    createTime = self.bridge.create_time
-    updateTime = self.bridge.update_time
-  }
-
   /// The reference of the document, if the query returns the `__name__` field.
   public let ref: DocumentReference?
 
@@ -63,29 +51,20 @@ public struct PipelineResult: @unchecked Sendable {
   /// - Parameter fieldPath: The field path (e.g., "foo" or "foo.bar").
   /// - Returns: The data at the specified field location or `nil` if no such field exists.
   public func get(_ fieldName: String) -> Sendable? {
-    return Helper.convertObjCToSwift(bridge.get(
-      fieldName,
-      serverTimestampBehavior: serverTimestamp
-    ))
+    return Helper.convertObjCToSwift(bridge.get(fieldName))
   }
 
   /// Retrieves the field specified by `fieldPath`.
   /// - Parameter fieldPath: The field path (e.g., "foo" or "foo.bar").
   /// - Returns: The data at the specified field location or `nil` if no such field exists.
   public func get(_ fieldPath: FieldPath) -> Sendable? {
-    return Helper.convertObjCToSwift(bridge.get(
-      fieldPath,
-      serverTimestampBehavior: serverTimestamp
-    ))
+    return Helper.convertObjCToSwift(bridge.get(fieldPath))
   }
 
   /// Retrieves the field specified by `fieldPath`.
   /// - Parameter fieldPath: The field path (e.g., "foo" or "foo.bar").
   /// - Returns: The data at the specified field location or `nil` if no such field exists.
   public func get(_ field: Field) -> Sendable? {
-    return Helper.convertObjCToSwift(bridge.get(
-      field.fieldName,
-      serverTimestampBehavior: serverTimestamp
-    ))
+    return Helper.convertObjCToSwift(bridge.get(field.fieldName))
   }
 }

Firestore/core/src/api/stages.h

@@ -29,7 +29,6 @@
 #include "Firestore/core/src/api/api_fwd.h"
 #include "Firestore/core/src/api/expressions.h"
 #include "Firestore/core/src/api/ordering.h"
-#include "Firestore/core/src/core/listen_options.h"
 #include "Firestore/core/src/model/model_fwd.h"
 #include "Firestore/core/src/model/resource_path.h"
 #include "Firestore/core/src/nanopb/message.h"
@@ -63,13 +62,8 @@ class EvaluateContext {
     return *serializer_;
   }
 
-  const core::ListenOptions& listen_options() const {
-    return listen_options_;
-  }
-
  private:
   remote::Serializer* serializer_;
-  core::ListenOptions listen_options_;
 };
 
 // Subclass of Stage that supports cache evaluation.

Firestore/core/src/core/query_listener.cc

@@ -196,4 +196,4 @@ void QueryListener::RaiseInitialEvent(const ViewSnapshot& snapshot) {
 
 }  // namespace core
 }  // namespace firestore
-}  // namespace firebase
+}  // namespace firebase