Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions doc/v3-migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,21 @@ auto subscriber = pubsub::Subscriber(pubsub::MakeSubscriberConnection(

### Spanner

<details>
<summary>All sessions are now Multiplexed Sessions</summary>

All SessionPool related options are marked deprecated and are now ignored by the
Spanner library and will be removed in the future:

- `EnableMultiplexedSessionOption`
- `SessionPoolMinSessionsOption`
- `SessionPoolMaxSessionsPerChannelOption`
- `SessionPoolMaxIdleSessionsOption`
- `SessionPoolActionOnExhaustionOption`
- `SessionPoolKeepAliveIntervalOption`

</details>

<details>
<summary>Removed <code>spanner::MakeTestRow</code>
</summary>
Expand Down
3 changes: 3 additions & 0 deletions google/cloud/spanner/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ this library.
<!-- inject-quickstart-start -->

```cc
#include "google/cloud/internal/disable_deprecation_warnings.inc"

#include "google/cloud/spanner/client.h"
#include <iostream>

Expand Down Expand Up @@ -45,6 +47,7 @@ int main(int argc, char* argv[]) {

return 0;
}
#include "google/cloud/internal/diagnostics_pop.inc"
```

<!-- inject-quickstart-end -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/admin/database_admin_options.h"
#include "google/cloud/spanner/admin/instance_admin_client.h"
Expand Down Expand Up @@ -541,3 +541,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/admin/database_admin_options.h"
#include "google/cloud/spanner/backoff_policy.h"
Expand Down Expand Up @@ -275,3 +275,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/benchmarks/benchmarks_config.h"
#include "google/cloud/spanner/client.h"
Expand Down Expand Up @@ -1434,3 +1434,4 @@ int main(int argc, char* argv[]) {
: "database dropped\n");
return exit_status;
}
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/benchmarks/benchmarks_config.h"
#include "google/cloud/spanner/client.h"
Expand Down Expand Up @@ -511,3 +511,4 @@ int main(int argc, char* argv[]) {
: "database dropped\n");
return 0;
}
#include "google/cloud/internal/diagnostics_pop.inc"
3 changes: 2 additions & 1 deletion google/cloud/spanner/client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/client.h"
#include "google/cloud/spanner/internal/connection_impl.h"
#include "google/cloud/spanner/internal/spanner_stub_factory.h"
Expand Down Expand Up @@ -432,3 +432,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
3 changes: 2 additions & 1 deletion google/cloud/spanner/client_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/client.h"
#include "google/cloud/mocks/mock_stream_range.h"
#include "google/cloud/spanner/connection.h"
Expand Down Expand Up @@ -1339,3 +1339,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
3 changes: 2 additions & 1 deletion google/cloud/spanner/commit_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/commit_options.h"
#include "google/cloud/spanner/options.h"

Expand Down Expand Up @@ -48,3 +48,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
3 changes: 2 additions & 1 deletion google/cloud/spanner/connection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/connection.h"
#include "google/cloud/spanner/query_partition.h"
#include "google/cloud/spanner/read_partition.h"
Expand Down Expand Up @@ -115,3 +115,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/client.h"
#include "google/cloud/spanner/database.h"
Expand Down Expand Up @@ -1769,3 +1769,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/client.h"
#include "google/cloud/spanner/database.h"
#include "google/cloud/spanner/testing/database_integration_test.h"
Expand Down Expand Up @@ -148,6 +148,8 @@ TEST_F(ClientStressTest, ParseArgs) {

/// @test Stress test the library using ExecuteQuery calls.
TEST_F(ClientStressTest, UpsertAndSelect) {
// TODO(#15939): Update emulator and enable this test.
if (UsingEmulator()) GTEST_SKIP();
int const task_count = TaskCount();

auto select_task = [](Client client) {
Expand Down Expand Up @@ -216,6 +218,8 @@ TEST_F(ClientStressTest, UpsertAndSelect) {

/// @test Stress test the library using Read calls.
TEST_F(ClientStressTest, UpsertAndRead) {
// TODO(#15939): Update emulator and enable this test.
if (UsingEmulator()) GTEST_SKIP();
int const task_count = TaskCount();

auto read_task = [](Client client) {
Expand Down Expand Up @@ -302,3 +306,4 @@ int main(int argc, char* argv[]) {

return RUN_ALL_TESTS();
}
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/admin/database_admin_client.h"
#include "google/cloud/spanner/client.h"
#include "google/cloud/spanner/database.h"
Expand Down Expand Up @@ -1003,3 +1003,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/internal/defaults.h"
#include "google/cloud/spanner/internal/session_pool.h"
#include "google/cloud/spanner/internal/spanner_stub_factory.h"
Expand Down Expand Up @@ -124,3 +124,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner_internal
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
3 changes: 2 additions & 1 deletion google/cloud/spanner/internal/connection_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/internal/disable_deprecation_warnings.inc"
#include "google/cloud/spanner/internal/connection_impl.h"
#include "google/cloud/spanner/internal/defaults.h"
#include "google/cloud/spanner/internal/logging_result_set_reader.h"
Expand Down Expand Up @@ -1446,3 +1446,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace spanner_internal
} // namespace cloud
} // namespace google
#include "google/cloud/internal/diagnostics_pop.inc"
Loading
Loading