diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 288e394897..f8a8575314 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c + digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index a5010f77d4..b19a8dbfdd 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -1,34 +1,6 @@ -gcp-docuploader==0.6.3 -google-crc32c==1.3.0 -googleapis-common-protos==1.56.3 -gcp-releasetool==1.9.1 -cryptography==38.0.3 -cachetools==4.2.4 -cffi==1.15.1 -jeepney==0.7.1 -jinja2==3.0.3 -markupsafe==2.0.1 -keyring==23.4.1 -packaging==21.3 -protobuf==3.19.5 -pyjwt==2.4.0 -pyparsing==3.0.9 -pycparser==2.21 -pyperclip==1.8.2 -python-dateutil==2.8.2 -requests==2.27.1 -certifi==2022.12.7 -importlib-metadata==4.8.3 -zipp==3.6.0 -google_api_core==2.8.2 -google-cloud-storage==2.0.0 -google-resumable-media==2.3.3 -google-cloud-core==2.3.1 -typing-extensions==4.1.1 -urllib3==1.26.12 -zipp==3.6.0 -rsa==4.9 -six==1.16.0 -attrs==22.1.0 -google-auth==2.14.1 -idna==3.4 \ No newline at end of file +gcp-docuploader +gcp-releasetool +wheel +setuptools +typing-extensions +click<8.1.0 \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 15c404aa5a..4895c9631f 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -1,27 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --allow-unsafe --generate-hashes requirements.in # attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool cachetools==4.2.4 \ --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 - # via - # -r requirements.in - # google-auth + # via google-auth certifi==2022.12.7 \ --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - # via - # -r requirements.in - # requests + # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -87,9 +81,7 @@ cffi==1.15.1 \ --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 - # via - # -r requirements.in - # cryptography + # via cryptography charset-normalizer==2.0.12 \ --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df @@ -98,6 +90,7 @@ click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb # via + # -r requirements.in # gcp-docuploader # gcp-releasetool colorlog==6.7.0 \ @@ -132,12 +125,11 @@ cryptography==38.0.3 \ --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via - # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in gcp-releasetool==1.9.1 \ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ @@ -147,13 +139,12 @@ google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 # via - # -r requirements.in # google-cloud-core # google-cloud-storage google-auth==2.14.1 \ + --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-core @@ -161,15 +152,11 @@ google-auth==2.14.1 \ google-cloud-core==2.3.1 \ --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 - # via - # -r requirements.in - # gcp-docuploader + # via gcp-docuploader google-crc32c==1.3.0 \ --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ @@ -214,52 +201,37 @@ google-crc32c==1.3.0 \ --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 - # via - # -r requirements.in - # google-resumable-media + # via google-resumable-media google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage googleapis-common-protos==1.56.3 \ --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 - # via - # -r requirements.in - # google-api-core + # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 - # via - # -r requirements.in - # requests + # via requests importlib-metadata==4.8.3 \ --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via keyring +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 # via - # -r requirements.in - # keyring -jeepney==0.7.1 \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f - # via - # -r requirements.in # keyring # secretstorage jinja2==3.0.3 \ --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool keyring==23.4.1 \ --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool markupsafe==2.0.1 \ --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ @@ -330,49 +302,39 @@ markupsafe==2.0.1 \ --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 - # via - # -r requirements.in - # jinja2 + # via jinja2 packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via gcp-releasetool +protobuf==3.20.2 \ + --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ + --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ + --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ + --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ + --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ + --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ + --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ + --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ + --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ + --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ + --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ + --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ + --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ + --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ + --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ + --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ + --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ + --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ + --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ + --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ + --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ + --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 # via - # -r requirements.in - # gcp-releasetool -protobuf==3.19.5 \ - --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ - --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ - --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ - --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ - --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ - --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ - --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ - --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ - --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ - --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \ - --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ - --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ - --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ - --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ - --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ - --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ - --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ - --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ - --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ - --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ - --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ - --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ - --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ - --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ - --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ - --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de - # via - # -r requirements.in # gcp-docuploader # gcp-releasetool # google-api-core # google-cloud-storage - # googleapis-common-protos pyasn1==0.4.8 \ --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba @@ -386,71 +348,61 @@ pyasn1-modules==0.2.8 \ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 - # via - # -r requirements.in - # cffi + # via cffi pyjwt==2.4.0 \ --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - # via - # -r requirements.in - # packaging + # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool requests==2.27.1 \ --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-storage rsa==4.9 \ --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 - # via - # -r requirements.in - # google-auth + # via google-auth secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring +setuptools==65.6.3 \ + --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ + --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 + # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via - # -r requirements.in # gcp-docuploader # google-auth # python-dateutil -typing-extensions==4.1.1 \ - --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ - --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - # via - # -r requirements.in - # requests + # via requests +wheel==0.38.4 \ + --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ + --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 + # via -r requirements.in zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc - # via - # -r requirements.in - # importlib-metadata + # via importlib-metadata diff --git a/CHANGELOG.md b/CHANGELOG.md index 64aa224d37..aa2a8cc160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.28.3](https://github.com/googleapis/java-bigquerystorage/compare/v2.28.2...v2.28.3) (2023-01-20) + + +### Bug Fixes + +* Fix deadlock issue in ConnectionWorkerPool ([#1938](https://github.com/googleapis/java-bigquerystorage/issues/1938)) ([caf1e76](https://github.com/googleapis/java-bigquerystorage/commit/caf1e7603153b1b8de90d6294ac15c711076d8f4)) +* **java:** Skip fixing poms for special modules ([#1744](https://github.com/googleapis/java-bigquerystorage/issues/1744)) ([#1946](https://github.com/googleapis/java-bigquerystorage/issues/1946)) ([2863542](https://github.com/googleapis/java-bigquerystorage/commit/286354231eaf8e329bbea05e0c45b28e14f4a1e7)) +* Update BQTableSchemaToProtoDescriptor to unblock a protobuf change. ([#1942](https://github.com/googleapis/java-bigquerystorage/issues/1942)) ([62cc80a](https://github.com/googleapis/java-bigquerystorage/commit/62cc80a216ff4969a30e5fe93ff74b2c582e4677)) +* We should isolate the client used in StreamWriter and the client used in ConnectionWorker ([#1933](https://github.com/googleapis/java-bigquerystorage/issues/1933)) ([3530672](https://github.com/googleapis/java-bigquerystorage/commit/3530672f0bddfacb973fb0fc1d30aabb4ffefccb)) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.2 ([#1949](https://github.com/googleapis/java-bigquerystorage/issues/1949)) ([23ec7fa](https://github.com/googleapis/java-bigquerystorage/commit/23ec7fa2c70c720fb995bdfac9416a29d77de2e2)) + ## [2.28.2](https://github.com/googleapis/java-bigquerystorage/compare/v2.28.1...v2.28.2) (2023-01-18) diff --git a/README.md b/README.md index fa5a31e151..5c8c5d12da 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigquerystorage' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-bigquerystorage:2.28.1' +implementation 'com.google.cloud:google-cloud-bigquerystorage:2.28.2' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.28.1" +libraryDependencies += "com.google.cloud" % "google-cloud-bigquerystorage" % "2.28.2" ``` ## Authentication diff --git a/google-cloud-bigquerystorage-bom/pom.xml b/google-cloud-bigquerystorage-bom/pom.xml index b11807833e..5619d949d3 100644 --- a/google-cloud-bigquerystorage-bom/pom.xml +++ b/google-cloud-bigquerystorage-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage-bom - 2.28.2 + 2.28.3 pom com.google.cloud @@ -52,37 +52,37 @@ com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.28.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 diff --git a/google-cloud-bigquerystorage/clirr-ignored-differences.xml b/google-cloud-bigquerystorage/clirr-ignored-differences.xml index b33dced533..c5f0600724 100644 --- a/google-cloud-bigquerystorage/clirr-ignored-differences.xml +++ b/google-cloud-bigquerystorage/clirr-ignored-differences.xml @@ -86,4 +86,26 @@ com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool ConnectionWorkerPool(long, long, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteClient, boolean) + + 7005 + com/google/cloud/bigquery/storage/v1/ConnectionWorker + ConnectionWorker(java.lang.String, com.google.cloud.bigquery.storage.v1.ProtoSchema, long, long, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteClient, boolean) + ConnectionWorker(java.lang.String, com.google.cloud.bigquery.storage.v1.ProtoSchema, long, long, java.time.Duration, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings) + + + 7005 + com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool + ConnectionWorkerPool(long, long, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteClient, boolean) + ConnectionWorkerPool(long, long, java.time.Duration, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings) + + + 7004 + com/google/cloud/bigquery/storage/v1/ConnectionWorker + ConnectionWorker(java.lang.String, com.google.cloud.bigquery.storage.v1.ProtoSchema, long, long, java.time.Duration, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteClient, boolean) + + + 7004 + com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool + ConnectionWorkerPool(long, long, java.time.Duration, com.google.api.gax.batching.FlowController$LimitExceededBehavior, java.lang.String, com.google.cloud.bigquery.storage.v1.BigQueryWriteClient, boolean) + diff --git a/google-cloud-bigquerystorage/pom.xml b/google-cloud-bigquerystorage/pom.xml index 342384fd8b..80751faeb8 100644 --- a/google-cloud-bigquerystorage/pom.xml +++ b/google-cloud-bigquerystorage/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.28.3 jar BigQuery Storage https://github.com/googleapis/java-bigquerystorage @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 google-cloud-bigquerystorage diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java index 3eed1bfc35..15ed5afe6a 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java @@ -25,6 +25,7 @@ import com.google.protobuf.Descriptors; import com.google.protobuf.Descriptors.Descriptor; import com.google.protobuf.Descriptors.FileDescriptor; +import com.google.protobuf.ExtensionLite; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -160,7 +161,12 @@ private static FieldDescriptorProto convertBQTableFieldToProtoField( if (!BigQuerySchemaUtil.isProtoCompatible(fieldName)) { fieldDescriptor.setName(BigQuerySchemaUtil.generatePlaceholderFieldName(fieldName)); fieldDescriptor.setOptions( - FieldOptions.newBuilder().setExtension(AnnotationsProto.columnName, fieldName).build()); + FieldOptions.newBuilder() + .setExtension( + (ExtensionLite) AnnotationsProto.columnName, + // Remove ExtensionLite after protobuf linkage error is resolved. + fieldName) + .build()); } return fieldDescriptor.build(); } diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java index 50086e95e2..4e17850511 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorker.java @@ -171,11 +171,6 @@ public class ConnectionWorker implements AutoCloseable { */ private BigQueryWriteClient client; - /* - * If true, the client above is created by this writer and should be closed. - */ - private boolean ownsBigQueryWriteClient = false; - /* * Wraps the underlying bi-directional stream connection with server. */ @@ -209,8 +204,7 @@ public ConnectionWorker( Duration maxRetryDuration, FlowController.LimitExceededBehavior limitExceededBehavior, String traceId, - BigQueryWriteClient client, - boolean ownsBigQueryWriteClient) + BigQueryWriteSettings clientSettings) throws IOException { this.lock = new ReentrantLock(); this.hasMessageInWaitingQueue = lock.newCondition(); @@ -229,8 +223,8 @@ public ConnectionWorker( this.traceId = traceId; this.waitingRequestQueue = new LinkedList(); this.inflightRequestQueue = new LinkedList(); - this.client = client; - this.ownsBigQueryWriteClient = ownsBigQueryWriteClient; + // Always recreate a client for connection worker. + this.client = BigQueryWriteClient.create(clientSettings); this.appendThread = new Thread( @@ -382,13 +376,11 @@ public void close() { log.warning( "Append handler join is interrupted. Stream: " + streamName + " Error: " + e.toString()); } - if (this.ownsBigQueryWriteClient) { - this.client.close(); - try { - // Backend request has a 2 minute timeout, so wait a little longer than that. - this.client.awaitTermination(150, TimeUnit.SECONDS); - } catch (InterruptedException ignored) { - } + this.client.close(); + try { + // Backend request has a 2 minute timeout, so wait a little longer than that. + this.client.awaitTermination(150, TimeUnit.SECONDS); + } catch (InterruptedException ignored) { } } @@ -650,6 +642,7 @@ private void requestCallback(AppendRowsResponse response) { if (response.hasError()) { Exceptions.StorageException storageException = Exceptions.toStorageException(response.getError(), null); + log.fine(String.format("Got error message: %s", response.toString())); if (storageException != null) { requestWrapper.appendResult.setException(storageException); } else if (response.getRowErrorsCount() > 0) { diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java index 121b1d0e28..7bcb358eea 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPool.java @@ -28,6 +28,7 @@ import java.io.IOException; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public class ConnectionWorkerPool { private static final Logger log = Logger.getLogger(ConnectionWorkerPool.class.getName()); /* - * Max allowed inflight requests in the stream. Method append is blocked at this. + * Max allowed inflight requests in the stream.getInflightWaitSeconds Method append is blocked at this. */ private final long maxInflightRequests; @@ -68,12 +69,10 @@ public class ConnectionWorkerPool { private final FlowController.LimitExceededBehavior limitExceededBehavior; /** Map from write stream to corresponding connection. */ - private final Map streamWriterToConnection = - new ConcurrentHashMap<>(); + private final Map streamWriterToConnection = new HashMap<>(); /** Map from a connection to a set of write stream that have sent requests onto it. */ - private final Map> connectionToWriteStream = - new ConcurrentHashMap<>(); + private final Map> connectionToWriteStream = new HashMap<>(); /** Collection of all the created connections. */ private final Set connectionWorkerPool = @@ -149,12 +148,7 @@ public class ConnectionWorkerPool { /* * A client used to interact with BigQuery. */ - private BigQueryWriteClient client; - - /* - * If true, the client above is created by this writer and should be closed. - */ - private boolean ownsBigQueryWriteClient = false; + private BigQueryWriteSettings clientSettings; /** * The current maximum connection count. This value is gradually increased till the user defined @@ -204,15 +198,13 @@ public ConnectionWorkerPool( java.time.Duration maxRetryDuration, FlowController.LimitExceededBehavior limitExceededBehavior, String traceId, - BigQueryWriteClient client, - boolean ownsBigQueryWriteClient) { + BigQueryWriteSettings clientSettings) { this.maxInflightRequests = maxInflightRequests; this.maxInflightBytes = maxInflightBytes; this.maxRetryDuration = maxRetryDuration; this.limitExceededBehavior = limitExceededBehavior; this.traceId = traceId; - this.client = client; - this.ownsBigQueryWriteClient = ownsBigQueryWriteClient; + this.clientSettings = clientSettings; this.currentMaxConnectionCount = settings.minConnectionsPerRegion(); } @@ -234,14 +226,13 @@ public ApiFuture append(StreamWriter streamWriter, ProtoRows public ApiFuture append( StreamWriter streamWriter, ProtoRows rows, long offset) { // We are in multiplexing mode after entering the following logic. - ConnectionWorker connectionWorker = - streamWriterToConnection.compute( - streamWriter, - (key, existingStream) -> { - // Though compute on concurrent map is atomic, we still do explicit locking as we - // may have concurrent close(...) triggered. - lock.lock(); - try { + ConnectionWorker connectionWorker; + lock.lock(); + try { + connectionWorker = + streamWriterToConnection.compute( + streamWriter, + (key, existingStream) -> { // Stick to the existing stream if it's not overwhelmed. if (existingStream != null && !existingStream.getLoad().isOverwhelmed()) { return existingStream; @@ -259,10 +250,10 @@ public ApiFuture append( createdOrExistingConnection, (ConnectionWorker k) -> new HashSet<>()); connectionToWriteStream.get(createdOrExistingConnection).add(streamWriter); return createdOrExistingConnection; - } finally { - lock.unlock(); - } - }); + }); + } finally { + lock.unlock(); + } Stopwatch stopwatch = Stopwatch.createStarted(); ApiFuture responseFuture = connectionWorker.append( @@ -308,6 +299,7 @@ private ConnectionWorker createOrReuseConnectionWorker( } return createConnectionWorker(streamWriter.getStreamName(), streamWriter.getProtoSchema()); } else { + // Stick to the original connection if all the connections are overwhelmed. if (existingConnectionWorker != null) { return existingConnectionWorker; @@ -355,8 +347,6 @@ private ConnectionWorker createConnectionWorker(String streamName, ProtoSchema w // Though atomic integer is super lightweight, add extra if check in case adding future logic. testValueCreateConnectionCount.getAndIncrement(); } - // currently we use different header for the client in each connection worker to be different - // as the backend require the header to have the same write_stream field as request body. ConnectionWorker connectionWorker = new ConnectionWorker( streamName, @@ -366,8 +356,7 @@ private ConnectionWorker createConnectionWorker(String streamName, ProtoSchema w maxRetryDuration, limitExceededBehavior, traceId, - client, - ownsBigQueryWriteClient); + clientSettings); connectionWorkerPool.add(connectionWorker); log.info( String.format( @@ -402,8 +391,11 @@ public void close(StreamWriter streamWriter) { log.info( String.format( "During closing of writeStream for %s with writer id %s, we decided to close %s " - + "connections", - streamWriter.getStreamName(), streamWriter.getWriterId(), connectionToRemove.size())); + + "connections, pool size after removal $s", + streamWriter.getStreamName(), + streamWriter.getWriterId(), + connectionToRemove.size(), + connectionToWriteStream.size() - 1)); connectionToWriteStream.keySet().removeAll(connectionToRemove); } finally { lock.unlock(); @@ -447,16 +439,12 @@ String getTraceId() { return traceId; } - boolean ownsBigQueryWriteClient() { - return ownsBigQueryWriteClient; - } - FlowController.LimitExceededBehavior limitExceededBehavior() { return limitExceededBehavior; } - BigQueryWriteClient bigQueryWriteClient() { - return client; + BigQueryWriteSettings bigQueryWriteSettings() { + return clientSettings; } static String toTableName(String streamName) { diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java index ff7dad474d..edc7240ad7 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java @@ -184,7 +184,7 @@ public static SingleConnectionOrConnectionPool ofConnectionPool( private StreamWriter(Builder builder) throws IOException { this.streamName = builder.streamName; this.writerSchema = builder.writerSchema; - boolean ownsBigQueryWriteClient = builder.client == null; + BigQueryWriteSettings clientSettings = getBigQueryWriteSettings(builder); if (!builder.enableConnectionPool) { this.location = builder.location; this.singleConnectionOrConnectionPool = @@ -197,8 +197,7 @@ private StreamWriter(Builder builder) throws IOException { builder.maxRetryDuration, builder.limitExceededBehavior, builder.traceId, - getBigQueryWriteClient(builder), - ownsBigQueryWriteClient)); + clientSettings)); } else { if (!isDefaultStream(streamName)) { log.warning( @@ -208,7 +207,9 @@ private StreamWriter(Builder builder) throws IOException { "Trying to enable connection pool in non-default stream."); } - BigQueryWriteClient client = getBigQueryWriteClient(builder); + // We need a client to perform some getWriteStream calls. + BigQueryWriteClient client = + builder.client != null ? builder.client : new BigQueryWriteClient(clientSettings); String location = builder.location; if (location == null || location.isEmpty()) { // Location is not passed in, try to fetch from RPC @@ -256,14 +257,11 @@ private StreamWriter(Builder builder) throws IOException { builder.maxRetryDuration, builder.limitExceededBehavior, builder.traceId, - client, - ownsBigQueryWriteClient); + client.getSettings()); })); validateFetchedConnectonPool(builder); - // Shut down the passed in client. Internally we will create another client inside connection - // pool for every new connection worker. - if (client != singleConnectionOrConnectionPool.connectionWorkerPool().bigQueryWriteClient() - && ownsBigQueryWriteClient) { + // If the client is not from outside, then shutdown the client we created. + if (builder.client == null) { client.shutdown(); try { client.awaitTermination(150, TimeUnit.SECONDS); @@ -293,19 +291,16 @@ static boolean isDefaultStream(String streamName) { return streamMatcher.find(); } - private BigQueryWriteClient getBigQueryWriteClient(Builder builder) throws IOException { - if (builder.client == null) { - BigQueryWriteSettings stubSettings = - BigQueryWriteSettings.newBuilder() - .setCredentialsProvider(builder.credentialsProvider) - .setTransportChannelProvider(builder.channelProvider) - .setBackgroundExecutorProvider(builder.executorProvider) - .setEndpoint(builder.endpoint) - .build(); - testOnlyClientCreatedTimes++; - return BigQueryWriteClient.create(stubSettings); + private BigQueryWriteSettings getBigQueryWriteSettings(Builder builder) throws IOException { + if (builder.client != null) { + return builder.client.getSettings(); } else { - return builder.client; + return BigQueryWriteSettings.newBuilder() + .setCredentialsProvider(builder.credentialsProvider) + .setTransportChannelProvider(builder.channelProvider) + .setBackgroundExecutorProvider(builder.executorProvider) + .setEndpoint(builder.endpoint) + .build(); } } @@ -316,10 +311,6 @@ private void validateFetchedConnectonPool(StreamWriter.Builder builder) { this.singleConnectionOrConnectionPool.connectionWorkerPool().getTraceId(), builder.traceId)) { paramsValidatedFailed = "Trace id"; - } else if (!Objects.equals( - this.singleConnectionOrConnectionPool.connectionWorkerPool().ownsBigQueryWriteClient(), - builder.client == null)) { - paramsValidatedFailed = "Whether using passed in clients"; } else if (!Objects.equals( this.singleConnectionOrConnectionPool.connectionWorkerPool().limitExceededBehavior(), builder.limitExceededBehavior)) { diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPoolTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPoolTest.java index 961ad3fdc1..980772b2ff 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPoolTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerPoolTest.java @@ -25,6 +25,9 @@ import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.cloud.bigquery.storage.test.Test.FooType; import com.google.cloud.bigquery.storage.v1.ConnectionWorkerPool.Settings; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.Uninterruptibles; import com.google.protobuf.DescriptorProtos; import com.google.protobuf.Int64Value; @@ -35,6 +38,8 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; @@ -48,7 +53,7 @@ public class ConnectionWorkerPoolTest { private FakeBigQueryWrite testBigQueryWrite; private FakeScheduledExecutorService fakeExecutor; private static MockServiceHelper serviceHelper; - private BigQueryWriteClient client; + private BigQueryWriteSettings clientSettings; private static final String TEST_TRACE_ID = "home:job1"; private static final String TEST_STREAM_1 = "projects/p1/datasets/d1/tables/t1/streams/_default"; @@ -63,12 +68,11 @@ public void setUp() throws Exception { serviceHelper.start(); fakeExecutor = new FakeScheduledExecutorService(); testBigQueryWrite.setExecutor(fakeExecutor); - client = - BigQueryWriteClient.create( - BigQueryWriteSettings.newBuilder() - .setCredentialsProvider(NoCredentialsProvider.create()) - .setTransportChannelProvider(serviceHelper.createChannelProvider()) - .build()); + clientSettings = + BigQueryWriteSettings.newBuilder() + .setCredentialsProvider(NoCredentialsProvider.create()) + .setTransportChannelProvider(serviceHelper.createChannelProvider()) + .build(); ConnectionWorker.Load.setOverwhelmedCountsThreshold(0.5); ConnectionWorker.Load.setOverwhelmedBytesThreshold(0.6); } @@ -315,6 +319,46 @@ public void testMultiStreamAppend_appendWhileClosing() throws Exception { assertThat(connectionWorkerPool.getTotalConnectionCount()).isEqualTo(0); } + @Test + public void testCloseWhileAppending_noDeadlockHappen() throws Exception { + ConnectionWorkerPool.setOptions( + Settings.builder().setMaxConnectionsPerRegion(10).setMinConnectionsPerRegion(5).build()); + ConnectionWorkerPool connectionWorkerPool = + createConnectionWorkerPool( + /*maxRequests=*/ 1500, /*maxBytes=*/ 100000, java.time.Duration.ofSeconds(5)); + + // Sets the sleep time to simulate requests stuck in connection. + testBigQueryWrite.setResponseSleep(Duration.ofMillis(20L)); + StreamWriter writeStream1 = getTestStreamWriter(TEST_STREAM_1); + + ListeningExecutorService threadPool = + MoreExecutors.listeningDecorator( + Executors.newCachedThreadPool( + new ThreadFactoryBuilder() + .setDaemon(true) + .setNameFormat("AsyncStreamReadThread") + .build())); + + long appendCount = 10; + for (long i = 0; i < appendCount; i++) { + testBigQueryWrite.addResponse(createAppendResponse(i)); + } + List> futures = new ArrayList<>(); + + for (int i = 0; i < 500; i++) { + futures.add( + threadPool.submit( + () -> { + sendFooStringTestMessage( + writeStream1, connectionWorkerPool, new String[] {String.valueOf(0)}, 0); + })); + } + connectionWorkerPool.close(writeStream1); + for (int i = 0; i < 500; i++) { + futures.get(i).get(); + } + } + @Test public void testToTableName() { assertThat(ConnectionWorkerPool.toTableName("projects/p/datasets/d/tables/t/streams/s")) @@ -325,6 +369,56 @@ public void testToTableName() { IllegalArgumentException.class, () -> ConnectionWorkerPool.toTableName("projects/p/")); } + @Test + public void testCloseExternalClient() + throws IOException, InterruptedException, ExecutionException { + // Try append 100 requests. + long appendCount = 100L; + // testBigQueryWrite is used to + for (long i = 0; i < appendCount * 2; i++) { + testBigQueryWrite.addResponse(createAppendResponse(i)); + } + testBigQueryWrite.addResponse(WriteStream.newBuilder().setLocation("us").build()); + List> futures = new ArrayList<>(); + BigQueryWriteClient externalClient = + BigQueryWriteClient.create( + BigQueryWriteSettings.newBuilder() + .setCredentialsProvider(NoCredentialsProvider.create()) + .setTransportChannelProvider(serviceHelper.createChannelProvider()) + .build()); + // Create some stream writers. + List streamWriterList = new ArrayList<>(); + for (int i = 0; i < 4; i++) { + StreamWriter sw = + StreamWriter.newBuilder( + String.format("projects/p1/datasets/d1/tables/t%s/streams/_default", i), + externalClient) + .setWriterSchema(createProtoSchema()) + .setTraceId(TEST_TRACE_ID) + .setEnableConnectionPool(true) + .build(); + streamWriterList.add(sw); + } + + for (long i = 0; i < appendCount; i++) { + StreamWriter sw = streamWriterList.get((int) (i % streamWriterList.size())); + // Round robinly insert requests to different tables. + futures.add(sw.append(createProtoRows(new String[] {String.valueOf(i)}), i)); + } + externalClient.close(); + externalClient.awaitTermination(1, TimeUnit.MINUTES); + // Send more requests, the connections should still work. + for (long i = appendCount; i < appendCount * 2; i++) { + StreamWriter sw = streamWriterList.get((int) (i % streamWriterList.size())); + futures.add(sw.append(createProtoRows(new String[] {String.valueOf(i)}), i)); + } + for (int i = 0; i < appendCount * 2; i++) { + AppendRowsResponse response = futures.get(i).get(); + assertThat(response.getAppendResult().getOffset().getValue()).isEqualTo(i); + } + assertThat(testBigQueryWrite.getAppendRequests().size()).isEqualTo(appendCount * 2); + } + private AppendRowsResponse createAppendResponse(long offset) { return AppendRowsResponse.newBuilder() .setAppendResult( @@ -333,9 +427,11 @@ private AppendRowsResponse createAppendResponse(long offset) { } private StreamWriter getTestStreamWriter(String streamName) throws IOException { - return StreamWriter.newBuilder(streamName, client) + return StreamWriter.newBuilder(streamName) .setWriterSchema(createProtoSchema()) .setTraceId(TEST_TRACE_ID) + .setCredentialsProvider(NoCredentialsProvider.create()) + .setChannelProvider(serviceHelper.createChannelProvider()) .build(); } @@ -380,7 +476,6 @@ ConnectionWorkerPool createConnectionWorkerPool( maxRetryDuration, FlowController.LimitExceededBehavior.Block, TEST_TRACE_ID, - client, - /*ownsBigQueryWriteClient=*/ false); + clientSettings); } } diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java index 8db4b072b1..3d3d3f5a7c 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/ConnectionWorkerTest.java @@ -309,8 +309,7 @@ private ConnectionWorker createConnectionWorker( maxRetryDuration, FlowController.LimitExceededBehavior.Block, TEST_TRACE_ID, - client, - /*ownsBigQueryWriteClient=*/ false); + client.getSettings()); } private ProtoSchema createProtoSchema(String protoName) { diff --git a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryReadClientTest.java b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryReadClientTest.java index a551146bbc..3323e4e7ab 100644 --- a/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryReadClientTest.java +++ b/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1beta2/BigQueryReadClientTest.java @@ -287,7 +287,7 @@ public void readRowsNoRetryForResourceExhaustedWithRetryInfo() throws ExecutionException, InterruptedException { RetryInfo retryInfo = RetryInfo.newBuilder() - .setRetryDelay(Duration.newBuilder().setSeconds(123).setNanos(456).build()) + .setRetryDelay(Duration.newBuilder().setSeconds(2).setNanos(456).build()) .build(); Metadata metadata = new Metadata(); diff --git a/grpc-google-cloud-bigquerystorage-v1/pom.xml b/grpc-google-cloud-bigquerystorage-v1/pom.xml index ebea7dd0b9..400d4466e0 100644 --- a/grpc-google-cloud-bigquerystorage-v1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 grpc-google-cloud-bigquerystorage-v1 GRPC library for grpc-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml index aa14da081b..02ebcf133b 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 grpc-google-cloud-bigquerystorage-v1beta1 GRPC library for grpc-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml index 3b84d2d6a4..34029a3f76 100644 --- a/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/grpc-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 grpc-google-cloud-bigquerystorage-v1beta2 GRPC library for grpc-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/pom.xml b/pom.xml index 8d08251cf3..907c89d6f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigquerystorage-parent pom - 2.28.2 + 2.28.3 BigQuery Storage Parent https://github.com/googleapis/java-bigquerystorage @@ -76,44 +76,44 @@ com.google.cloud google-cloud-shared-dependencies - 3.1.1 + 3.1.2 pom import com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 com.google.api.grpc grpc-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.28.3 org.json diff --git a/proto-google-cloud-bigquerystorage-v1/pom.xml b/proto-google-cloud-bigquerystorage-v1/pom.xml index 9c06521ac4..bc1f8e5f90 100644 --- a/proto-google-cloud-bigquerystorage-v1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1 - 2.28.2 + 2.28.3 proto-google-cloud-bigquerystorage-v1 PROTO library for proto-google-cloud-bigquerystorage-v1 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsRequest.java index 288b9e9058..5b1024f620 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsRequest.java @@ -443,7 +443,9 @@ public com.google.cloud.bigquery.storage.v1.ProtoSchema getWriterSchema() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ProtoSchemaOrBuilder getWriterSchemaOrBuilder() { - return getWriterSchema(); + return writerSchema_ == null + ? com.google.cloud.bigquery.storage.v1.ProtoSchema.getDefaultInstance() + : writerSchema_; } public static final int ROWS_FIELD_NUMBER = 2; @@ -500,7 +502,9 @@ public com.google.cloud.bigquery.storage.v1.ProtoRows getRows() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ProtoRowsOrBuilder getRowsOrBuilder() { - return getRows(); + return rows_ == null + ? com.google.cloud.bigquery.storage.v1.ProtoRows.getDefaultInstance() + : rows_; } private byte memoizedIsInitialized = -1; @@ -731,16 +735,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (writerSchemaBuilder_ == null) { - writerSchema_ = null; - } else { - writerSchema_ = null; + bitField0_ = 0; + writerSchema_ = null; + if (writerSchemaBuilder_ != null) { + writerSchemaBuilder_.dispose(); writerSchemaBuilder_ = null; } - if (rowsBuilder_ == null) { - rows_ = null; - } else { - rows_ = null; + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } return this; @@ -772,20 +775,25 @@ public com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData build() public com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData buildPartial() { com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData result = new com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData(this); - if (writerSchemaBuilder_ == null) { - result.writerSchema_ = writerSchema_; - } else { - result.writerSchema_ = writerSchemaBuilder_.build(); - } - if (rowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = rowsBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writerSchema_ = + writerSchemaBuilder_ == null ? writerSchema_ : writerSchemaBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rows_ = rowsBuilder_ == null ? rows_ : rowsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -877,13 +885,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getWriterSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRowsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -903,6 +911,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1.ProtoSchema writerSchema_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1.ProtoSchema, @@ -923,7 +933,7 @@ public Builder mergeFrom( * @return Whether the writerSchema field is set. */ public boolean hasWriterSchema() { - return writerSchemaBuilder_ != null || writerSchema_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -964,11 +974,11 @@ public Builder setWriterSchema(com.google.cloud.bigquery.storage.v1.ProtoSchema throw new NullPointerException(); } writerSchema_ = value; - onChanged(); } else { writerSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -986,11 +996,11 @@ public Builder setWriterSchema( com.google.cloud.bigquery.storage.v1.ProtoSchema.Builder builderForValue) { if (writerSchemaBuilder_ == null) { writerSchema_ = builderForValue.build(); - onChanged(); } else { writerSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1006,19 +1016,19 @@ public Builder setWriterSchema( */ public Builder mergeWriterSchema(com.google.cloud.bigquery.storage.v1.ProtoSchema value) { if (writerSchemaBuilder_ == null) { - if (writerSchema_ != null) { - writerSchema_ = - com.google.cloud.bigquery.storage.v1.ProtoSchema.newBuilder(writerSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && writerSchema_ != null + && writerSchema_ + != com.google.cloud.bigquery.storage.v1.ProtoSchema.getDefaultInstance()) { + getWriterSchemaBuilder().mergeFrom(value); } else { writerSchema_ = value; } - onChanged(); } else { writerSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1033,14 +1043,13 @@ public Builder mergeWriterSchema(com.google.cloud.bigquery.storage.v1.ProtoSchem * .google.cloud.bigquery.storage.v1.ProtoSchema writer_schema = 1; */ public Builder clearWriterSchema() { - if (writerSchemaBuilder_ == null) { - writerSchema_ = null; - onChanged(); - } else { - writerSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + writerSchema_ = null; + if (writerSchemaBuilder_ != null) { + writerSchemaBuilder_.dispose(); writerSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -1055,7 +1064,7 @@ public Builder clearWriterSchema() { * .google.cloud.bigquery.storage.v1.ProtoSchema writer_schema = 1; */ public com.google.cloud.bigquery.storage.v1.ProtoSchema.Builder getWriterSchemaBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getWriterSchemaFieldBuilder().getBuilder(); } @@ -1128,7 +1137,7 @@ public com.google.cloud.bigquery.storage.v1.ProtoSchemaOrBuilder getWriterSchema * @return Whether the rows field is set. */ public boolean hasRows() { - return rowsBuilder_ != null || rows_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -1171,11 +1180,11 @@ public Builder setRows(com.google.cloud.bigquery.storage.v1.ProtoRows value) { throw new NullPointerException(); } rows_ = value; - onChanged(); } else { rowsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1194,11 +1203,11 @@ public Builder setRows( com.google.cloud.bigquery.storage.v1.ProtoRows.Builder builderForValue) { if (rowsBuilder_ == null) { rows_ = builderForValue.build(); - onChanged(); } else { rowsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1215,19 +1224,18 @@ public Builder setRows( */ public Builder mergeRows(com.google.cloud.bigquery.storage.v1.ProtoRows value) { if (rowsBuilder_ == null) { - if (rows_ != null) { - rows_ = - com.google.cloud.bigquery.storage.v1.ProtoRows.newBuilder(rows_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && rows_ != null + && rows_ != com.google.cloud.bigquery.storage.v1.ProtoRows.getDefaultInstance()) { + getRowsBuilder().mergeFrom(value); } else { rows_ = value; } - onChanged(); } else { rowsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -1243,14 +1251,13 @@ public Builder mergeRows(com.google.cloud.bigquery.storage.v1.ProtoRows value) { * .google.cloud.bigquery.storage.v1.ProtoRows rows = 2; */ public Builder clearRows() { - if (rowsBuilder_ == null) { - rows_ = null; - onChanged(); - } else { - rows_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1266,7 +1273,7 @@ public Builder clearRows() { * .google.cloud.bigquery.storage.v1.ProtoRows rows = 2; */ public com.google.cloud.bigquery.storage.v1.ProtoRows.Builder getRowsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRowsFieldBuilder().getBuilder(); } @@ -1432,7 +1439,9 @@ public RowsCase getRowsCase() { } public static final int WRITE_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object writeStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writeStream_ = ""; /** * * @@ -1550,7 +1559,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } public static final int PROTO_ROWS_FIELD_NUMBER = 4; @@ -1606,7 +1615,9 @@ public com.google.cloud.bigquery.storage.v1.AppendRowsRequest.ProtoData getProto } public static final int TRACE_ID_FIELD_NUMBER = 6; - private volatile java.lang.Object traceId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object traceId_ = ""; /** * * @@ -1671,6 +1682,7 @@ private static final class MissingValueInterpretationsDefaultEntryHolder { .getNumber()); } + @SuppressWarnings("serial") private com.google.protobuf.MapField missingValueInterpretations_; @@ -2263,19 +2275,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; writeStream_ = ""; - - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } if (protoRowsBuilder_ != null) { protoRowsBuilder_.clear(); } traceId_ = ""; - internalGetMutableMissingValueInterpretations().clear(); rowsCase_ = 0; rows_ = null; @@ -2306,26 +2316,37 @@ public com.google.cloud.bigquery.storage.v1.AppendRowsRequest build() { public com.google.cloud.bigquery.storage.v1.AppendRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1.AppendRowsRequest result = new com.google.cloud.bigquery.storage.v1.AppendRowsRequest(this); + if (bitField0_ != 0) { + buildPartial0(result); + } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.AppendRowsRequest result) { int from_bitField0_ = bitField0_; - result.writeStream_ = writeStream_; - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writeStream_ = writeStream_; } - if (rowsCase_ == 4) { - if (protoRowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = protoRowsBuilder_.build(); - } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.traceId_ = traceId_; } - result.traceId_ = traceId_; - result.missingValueInterpretations_ = internalGetMissingValueInterpretations(); - result.missingValueInterpretations_.makeImmutable(); + if (((from_bitField0_ & 0x00000010) != 0)) { + result.missingValueInterpretations_ = internalGetMissingValueInterpretations(); + result.missingValueInterpretations_.makeImmutable(); + } + } + + private void buildPartialOneofs(com.google.cloud.bigquery.storage.v1.AppendRowsRequest result) { result.rowsCase_ = rowsCase_; - onBuilt(); - return result; + result.rows_ = this.rows_; + if (rowsCase_ == 4 && protoRowsBuilder_ != null) { + result.rows_ = protoRowsBuilder_.build(); + } } @java.lang.Override @@ -2376,6 +2397,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AppendRowsRequest return this; if (!other.getWriteStream().isEmpty()) { writeStream_ = other.writeStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOffset()) { @@ -2383,10 +2405,12 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AppendRowsRequest } if (!other.getTraceId().isEmpty()) { traceId_ = other.traceId_; + bitField0_ |= 0x00000008; onChanged(); } internalGetMutableMissingValueInterpretations() .mergeFrom(other.internalGetMissingValueInterpretations()); + bitField0_ |= 0x00000010; switch (other.getRowsCase()) { case PROTO_ROWS: { @@ -2432,13 +2456,13 @@ public Builder mergeFrom( case 10: { writeStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 34: @@ -2450,7 +2474,7 @@ public Builder mergeFrom( case 50: { traceId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 50 case 58: @@ -2466,6 +2490,7 @@ public Builder mergeFrom( .put( missingValueInterpretations__.getKey(), missingValueInterpretations__.getValue()); + bitField0_ |= 0x00000010; break; } // case 58 default: @@ -2589,8 +2614,8 @@ public Builder setWriteStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2615,8 +2640,8 @@ public Builder setWriteStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriteStream() { - writeStream_ = getDefaultInstance().getWriteStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -2646,8 +2671,8 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2673,7 +2698,7 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -2714,11 +2739,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2736,11 +2761,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2757,17 +2782,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2783,14 +2809,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 2; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -2806,7 +2831,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 2; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getOffsetFieldBuilder().getBuilder(); } @@ -3074,7 +3099,6 @@ public Builder clearProtoRows() { } rowsCase_ = 4; onChanged(); - ; return protoRowsBuilder_; } @@ -3142,8 +3166,8 @@ public Builder setTraceId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - traceId_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3160,8 +3184,8 @@ public Builder setTraceId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTraceId() { - traceId_ = getDefaultInstance().getTraceId(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -3183,8 +3207,8 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - traceId_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -3203,8 +3227,6 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { private com.google.protobuf.MapField internalGetMutableMissingValueInterpretations() { - onChanged(); - ; if (missingValueInterpretations_ == null) { missingValueInterpretations_ = com.google.protobuf.MapField.newMapField( @@ -3213,6 +3235,8 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { if (!missingValueInterpretations_.isMutable()) { missingValueInterpretations_ = missingValueInterpretations_.copy(); } + bitField0_ |= 0x00000010; + onChanged(); return missingValueInterpretations_; } @@ -3477,6 +3501,7 @@ public int getMissingValueInterpretationsValueOrThrow(java.lang.String key) { } public Builder clearMissingValueInterpretations() { + bitField0_ = (bitField0_ & ~0x00000010); internalGetMutableMissingValueInterpretations().getMutableMap().clear(); return this; } @@ -3517,6 +3542,7 @@ public Builder removeMissingValueInterpretations(java.lang.String key) { java.lang.String, com.google.cloud.bigquery.storage.v1.AppendRowsRequest.MissingValueInterpretation> getMutableMissingValueInterpretations() { + bitField0_ |= 0x00000010; return internalGetAdaptedMissingValueInterpretationsMap( internalGetMutableMissingValueInterpretations().getMutableMap()); } @@ -3554,6 +3580,7 @@ public Builder putMissingValueInterpretations( internalGetMutableMissingValueInterpretations() .getMutableMap() .put(key, missingValueInterpretationsValueConverter.doBackward(value)); + bitField0_ |= 0x00000010; return this; } /** @@ -3588,12 +3615,14 @@ public Builder putAllMissingValueInterpretations( internalGetAdaptedMissingValueInterpretationsMap( internalGetMutableMissingValueInterpretations().getMutableMap()) .putAll(values); + bitField0_ |= 0x00000010; return this; } /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableMissingValueInterpretationsValue() { + bitField0_ |= 0x00000010; return internalGetMutableMissingValueInterpretations().getMutableMap(); } /** @@ -3626,6 +3655,7 @@ public Builder putMissingValueInterpretationsValue(java.lang.String key, int val } internalGetMutableMissingValueInterpretations().getMutableMap().put(key, value); + bitField0_ |= 0x00000010; return this; } /** @@ -3655,6 +3685,7 @@ public Builder putMissingValueInterpretationsValue(java.lang.String key, int val public Builder putAllMissingValueInterpretationsValue( java.util.Map values) { internalGetMutableMissingValueInterpretations().getMutableMap().putAll(values); + bitField0_ |= 0x00000010; return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsResponse.java index 3be57bdb3c..5100da26ef 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AppendRowsResponse.java @@ -204,7 +204,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } private byte memoizedIsInitialized = -1; @@ -414,10 +414,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + bitField0_ = 0; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } return this; @@ -450,15 +450,21 @@ public com.google.cloud.bigquery.storage.v1.AppendRowsResponse.AppendResult buil public com.google.cloud.bigquery.storage.v1.AppendRowsResponse.AppendResult buildPartial() { com.google.cloud.bigquery.storage.v1.AppendRowsResponse.AppendResult result = new com.google.cloud.bigquery.storage.v1.AppendRowsResponse.AppendResult(this); - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.AppendRowsResponse.AppendResult result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -542,7 +548,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -562,6 +568,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Int64Value offset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int64Value, @@ -581,7 +589,7 @@ public Builder mergeFrom( * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -618,11 +626,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -638,11 +646,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -657,17 +665,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -681,14 +690,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 1; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -702,7 +710,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 1; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOffsetFieldBuilder().getBuilder(); } @@ -1062,10 +1070,14 @@ public com.google.cloud.bigquery.storage.v1.TableSchema getUpdatedSchema() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableSchemaOrBuilder getUpdatedSchemaOrBuilder() { - return getUpdatedSchema(); + return updatedSchema_ == null + ? com.google.cloud.bigquery.storage.v1.TableSchema.getDefaultInstance() + : updatedSchema_; } public static final int ROW_ERRORS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List rowErrors_; /** * @@ -1145,7 +1157,9 @@ public com.google.cloud.bigquery.storage.v1.RowErrorOrBuilder getRowErrorsOrBuil } public static final int WRITE_STREAM_FIELD_NUMBER = 5; - private volatile java.lang.Object writeStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writeStream_ = ""; /** * * @@ -1458,16 +1472,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (appendResultBuilder_ != null) { appendResultBuilder_.clear(); } if (errorBuilder_ != null) { errorBuilder_.clear(); } - if (updatedSchemaBuilder_ == null) { - updatedSchema_ = null; - } else { - updatedSchema_ = null; + updatedSchema_ = null; + if (updatedSchemaBuilder_ != null) { + updatedSchemaBuilder_.dispose(); updatedSchemaBuilder_ = null; } if (rowErrorsBuilder_ == null) { @@ -1476,9 +1490,8 @@ public Builder clear() { rowErrors_ = null; rowErrorsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); writeStream_ = ""; - responseCase_ = 0; response_ = null; return this; @@ -1508,39 +1521,49 @@ public com.google.cloud.bigquery.storage.v1.AppendRowsResponse build() { public com.google.cloud.bigquery.storage.v1.AppendRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1.AppendRowsResponse result = new com.google.cloud.bigquery.storage.v1.AppendRowsResponse(this); - int from_bitField0_ = bitField0_; - if (responseCase_ == 1) { - if (appendResultBuilder_ == null) { - result.response_ = response_; - } else { - result.response_ = appendResultBuilder_.build(); - } - } - if (responseCase_ == 2) { - if (errorBuilder_ == null) { - result.response_ = response_; - } else { - result.response_ = errorBuilder_.build(); - } - } - if (updatedSchemaBuilder_ == null) { - result.updatedSchema_ = updatedSchema_; - } else { - result.updatedSchema_ = updatedSchemaBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.AppendRowsResponse result) { if (rowErrorsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { rowErrors_ = java.util.Collections.unmodifiableList(rowErrors_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.rowErrors_ = rowErrors_; } else { result.rowErrors_ = rowErrorsBuilder_.build(); } - result.writeStream_ = writeStream_; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.AppendRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updatedSchema_ = + updatedSchemaBuilder_ == null ? updatedSchema_ : updatedSchemaBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.writeStream_ = writeStream_; + } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1.AppendRowsResponse result) { result.responseCase_ = responseCase_; - onBuilt(); - return result; + result.response_ = this.response_; + if (responseCase_ == 1 && appendResultBuilder_ != null) { + result.response_ = appendResultBuilder_.build(); + } + if (responseCase_ == 2 && errorBuilder_ != null) { + result.response_ = errorBuilder_.build(); + } } @java.lang.Override @@ -1596,7 +1619,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AppendRowsResponse if (!other.rowErrors_.isEmpty()) { if (rowErrors_.isEmpty()) { rowErrors_ = other.rowErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureRowErrorsIsMutable(); rowErrors_.addAll(other.rowErrors_); @@ -1609,7 +1632,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AppendRowsResponse rowErrorsBuilder_.dispose(); rowErrorsBuilder_ = null; rowErrors_ = other.rowErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); rowErrorsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getRowErrorsFieldBuilder() @@ -1621,6 +1644,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AppendRowsResponse } if (!other.getWriteStream().isEmpty()) { writeStream_ = other.writeStream_; + bitField0_ |= 0x00000010; onChanged(); } switch (other.getResponseCase()) { @@ -1680,7 +1704,7 @@ public Builder mergeFrom( case 26: { input.readMessage(getUpdatedSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: @@ -1699,7 +1723,7 @@ public Builder mergeFrom( case 42: { writeStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -1963,7 +1987,6 @@ public Builder clearAppendResult() { } responseCase_ = 1; onChanged(); - ; return appendResultBuilder_; } @@ -2281,7 +2304,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { } responseCase_ = 2; onChanged(); - ; return errorBuilder_; } @@ -2305,7 +2327,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { * @return Whether the updatedSchema field is set. */ public boolean hasUpdatedSchema() { - return updatedSchemaBuilder_ != null || updatedSchema_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -2346,11 +2368,11 @@ public Builder setUpdatedSchema(com.google.cloud.bigquery.storage.v1.TableSchema throw new NullPointerException(); } updatedSchema_ = value; - onChanged(); } else { updatedSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2368,11 +2390,11 @@ public Builder setUpdatedSchema( com.google.cloud.bigquery.storage.v1.TableSchema.Builder builderForValue) { if (updatedSchemaBuilder_ == null) { updatedSchema_ = builderForValue.build(); - onChanged(); } else { updatedSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2388,19 +2410,19 @@ public Builder setUpdatedSchema( */ public Builder mergeUpdatedSchema(com.google.cloud.bigquery.storage.v1.TableSchema value) { if (updatedSchemaBuilder_ == null) { - if (updatedSchema_ != null) { - updatedSchema_ = - com.google.cloud.bigquery.storage.v1.TableSchema.newBuilder(updatedSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updatedSchema_ != null + && updatedSchema_ + != com.google.cloud.bigquery.storage.v1.TableSchema.getDefaultInstance()) { + getUpdatedSchemaBuilder().mergeFrom(value); } else { updatedSchema_ = value; } - onChanged(); } else { updatedSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2415,14 +2437,13 @@ public Builder mergeUpdatedSchema(com.google.cloud.bigquery.storage.v1.TableSche * .google.cloud.bigquery.storage.v1.TableSchema updated_schema = 3; */ public Builder clearUpdatedSchema() { - if (updatedSchemaBuilder_ == null) { - updatedSchema_ = null; - onChanged(); - } else { - updatedSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updatedSchema_ = null; + if (updatedSchemaBuilder_ != null) { + updatedSchemaBuilder_.dispose(); updatedSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -2437,7 +2458,7 @@ public Builder clearUpdatedSchema() { * .google.cloud.bigquery.storage.v1.TableSchema updated_schema = 3; */ public com.google.cloud.bigquery.storage.v1.TableSchema.Builder getUpdatedSchemaBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdatedSchemaFieldBuilder().getBuilder(); } @@ -2493,10 +2514,10 @@ public com.google.cloud.bigquery.storage.v1.TableSchemaOrBuilder getUpdatedSchem java.util.Collections.emptyList(); private void ensureRowErrorsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { rowErrors_ = new java.util.ArrayList(rowErrors_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -2734,7 +2755,7 @@ public Builder addAllRowErrors( public Builder clearRowErrors() { if (rowErrorsBuilder_ == null) { rowErrors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { rowErrorsBuilder_.clear(); @@ -2870,7 +2891,7 @@ public com.google.cloud.bigquery.storage.v1.RowError.Builder addRowErrorsBuilder com.google.cloud.bigquery.storage.v1.RowError, com.google.cloud.bigquery.storage.v1.RowError.Builder, com.google.cloud.bigquery.storage.v1.RowErrorOrBuilder>( - rowErrors_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + rowErrors_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); rowErrors_ = null; } return rowErrorsBuilder_; @@ -2940,8 +2961,8 @@ public Builder setWriteStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writeStream_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2958,8 +2979,8 @@ public Builder setWriteStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriteStream() { - writeStream_ = getDefaultInstance().getWriteStream(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -2981,8 +3002,8 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writeStream_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowRecordBatch.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowRecordBatch.java index aca08fafbd..0c762b10f7 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowRecordBatch.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowRecordBatch.java @@ -68,7 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_RECORD_BATCH_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedRecordBatch_; + private com.google.protobuf.ByteString serializedRecordBatch_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -86,7 +87,7 @@ public com.google.protobuf.ByteString getSerializedRecordBatch() { } public static final int ROW_COUNT_FIELD_NUMBER = 2; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -314,10 +315,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; - rowCount_ = 0L; - return this; } @@ -345,12 +345,23 @@ public com.google.cloud.bigquery.storage.v1.ArrowRecordBatch build() { public com.google.cloud.bigquery.storage.v1.ArrowRecordBatch buildPartial() { com.google.cloud.bigquery.storage.v1.ArrowRecordBatch result = new com.google.cloud.bigquery.storage.v1.ArrowRecordBatch(this); - result.serializedRecordBatch_ = serializedRecordBatch_; - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ArrowRecordBatch result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedRecordBatch_ = serializedRecordBatch_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -432,13 +443,13 @@ public Builder mergeFrom( case 10: { serializedRecordBatch_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -458,6 +469,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; /** @@ -491,8 +504,8 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedRecordBatch_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -508,7 +521,7 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedRecordBatch() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedRecordBatch_ = getDefaultInstance().getSerializedRecordBatch(); onChanged(); return this; @@ -553,6 +566,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -572,7 +586,7 @@ public Builder setRowCount(long value) { */ @java.lang.Deprecated public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000002); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSchema.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSchema.java index a6e50b8406..f571fa4dbe 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSchema.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSchema.java @@ -72,7 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_SCHEMA_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedSchema_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -290,8 +290,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedSchema_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -319,11 +319,20 @@ public com.google.cloud.bigquery.storage.v1.ArrowSchema build() { public com.google.cloud.bigquery.storage.v1.ArrowSchema buildPartial() { com.google.cloud.bigquery.storage.v1.ArrowSchema result = new com.google.cloud.bigquery.storage.v1.ArrowSchema(this); - result.serializedSchema_ = serializedSchema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ArrowSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedSchema_ = serializedSchema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -402,7 +411,7 @@ public Builder mergeFrom( case 10: { serializedSchema_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -422,6 +431,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** * @@ -454,8 +465,8 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedSchema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -471,7 +482,7 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedSchema() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedSchema_ = getDefaultInstance().getSerializedSchema(); onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSerializationOptions.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSerializationOptions.java index 2051432d34..fc83b90b07 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSerializationOptions.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ArrowSerializationOptions.java @@ -230,7 +230,7 @@ private CompressionCodec(int value) { } public static final int BUFFER_COMPRESSION_FIELD_NUMBER = 2; - private int bufferCompression_; + private int bufferCompression_ = 0; /** * * @@ -266,9 +266,8 @@ public int getBufferCompressionValue() { @java.lang.Override public com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec getBufferCompression() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec result = - com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec.valueOf( + com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec.forNumber( bufferCompression_); return result == null ? com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec @@ -480,8 +479,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; bufferCompression_ = 0; - return this; } @@ -510,11 +509,21 @@ public com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions build() { public com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions buildPartial() { com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions result = new com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions(this); - result.bufferCompression_ = bufferCompression_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.bufferCompression_ = bufferCompression_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -594,7 +603,7 @@ public Builder mergeFrom( case 16: { bufferCompression_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 16 default: @@ -614,6 +623,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int bufferCompression_ = 0; /** * @@ -649,8 +660,8 @@ public int getBufferCompressionValue() { * @return This builder for chaining. */ public Builder setBufferCompressionValue(int value) { - bufferCompression_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -671,9 +682,8 @@ public Builder setBufferCompressionValue(int value) { @java.lang.Override public com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec getBufferCompression() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec result = - com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec.valueOf( + com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec.forNumber( bufferCompression_); return result == null ? com.google.cloud.bigquery.storage.v1.ArrowSerializationOptions.CompressionCodec @@ -700,7 +710,7 @@ public Builder setBufferCompression( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; bufferCompression_ = value.getNumber(); onChanged(); return this; @@ -720,7 +730,7 @@ public Builder setBufferCompression( * @return This builder for chaining. */ public Builder clearBufferCompression() { - + bitField0_ = (bitField0_ & ~0x00000001); bufferCompression_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroRows.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroRows.java index 135b584e25..e95d285764 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroRows.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroRows.java @@ -68,7 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_BINARY_ROWS_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedBinaryRows_; + private com.google.protobuf.ByteString serializedBinaryRows_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -86,7 +87,7 @@ public com.google.protobuf.ByteString getSerializedBinaryRows() { } public static final int ROW_COUNT_FIELD_NUMBER = 2; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -313,10 +314,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; - rowCount_ = 0L; - return this; } @@ -344,12 +344,23 @@ public com.google.cloud.bigquery.storage.v1.AvroRows build() { public com.google.cloud.bigquery.storage.v1.AvroRows buildPartial() { com.google.cloud.bigquery.storage.v1.AvroRows result = new com.google.cloud.bigquery.storage.v1.AvroRows(this); - result.serializedBinaryRows_ = serializedBinaryRows_; - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.AvroRows result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedBinaryRows_ = serializedBinaryRows_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -430,13 +441,13 @@ public Builder mergeFrom( case 10: { serializedBinaryRows_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -456,6 +467,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; /** @@ -489,8 +502,8 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedBinaryRows_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -506,7 +519,7 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedBinaryRows() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedBinaryRows_ = getDefaultInstance().getSerializedBinaryRows(); onChanged(); return this; @@ -551,6 +564,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -570,7 +584,7 @@ public Builder setRowCount(long value) { */ @java.lang.Deprecated public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000002); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSchema.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSchema.java index a2bae181fd..66c7ccbd57 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSchema.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSchema.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SCHEMA_FIELD_NUMBER = 1; - private volatile java.lang.Object schema_; + + @SuppressWarnings("serial") + private volatile java.lang.Object schema_ = ""; /** * * @@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; schema_ = ""; - return this; } @@ -344,11 +346,20 @@ public com.google.cloud.bigquery.storage.v1.AvroSchema build() { public com.google.cloud.bigquery.storage.v1.AvroSchema buildPartial() { com.google.cloud.bigquery.storage.v1.AvroSchema result = new com.google.cloud.bigquery.storage.v1.AvroSchema(this); - result.schema_ = schema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.AvroSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.schema_ = schema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -397,6 +408,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.AvroSchema other) return this; if (!other.getSchema().isEmpty()) { schema_ = other.schema_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -428,7 +440,7 @@ public Builder mergeFrom( case 10: { schema_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -448,6 +460,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object schema_ = ""; /** * @@ -512,8 +526,8 @@ public Builder setSchema(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -530,8 +544,8 @@ public Builder setSchema(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSchema() { - schema_ = getDefaultInstance().getSchema(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -553,8 +567,8 @@ public Builder setSchemaBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSerializationOptions.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSerializationOptions.java index b286fb2dd3..e3a2b26bae 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSerializationOptions.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/AvroSerializationOptions.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ENABLE_DISPLAY_NAME_ATTRIBUTE_FIELD_NUMBER = 1; - private boolean enableDisplayNameAttribute_; + private boolean enableDisplayNameAttribute_ = false; /** * * @@ -288,8 +288,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; enableDisplayNameAttribute_ = false; - return this; } @@ -318,11 +318,21 @@ public com.google.cloud.bigquery.storage.v1.AvroSerializationOptions build() { public com.google.cloud.bigquery.storage.v1.AvroSerializationOptions buildPartial() { com.google.cloud.bigquery.storage.v1.AvroSerializationOptions result = new com.google.cloud.bigquery.storage.v1.AvroSerializationOptions(this); - result.enableDisplayNameAttribute_ = enableDisplayNameAttribute_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.AvroSerializationOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.enableDisplayNameAttribute_ = enableDisplayNameAttribute_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -402,7 +412,7 @@ public Builder mergeFrom( case 8: { enableDisplayNameAttribute_ = input.readBool(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -422,6 +432,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private boolean enableDisplayNameAttribute_; /** * @@ -467,6 +479,7 @@ public boolean getEnableDisplayNameAttribute() { public Builder setEnableDisplayNameAttribute(boolean value) { enableDisplayNameAttribute_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -489,7 +502,7 @@ public Builder setEnableDisplayNameAttribute(boolean value) { * @return This builder for chaining. */ public Builder clearEnableDisplayNameAttribute() { - + bitField0_ = (bitField0_ & ~0x00000001); enableDisplayNameAttribute_ = false; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsRequest.java index ce75b039eb..b8b7cbb5bb 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -125,6 +127,8 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int WRITE_STREAMS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList writeStreams_; /** * @@ -401,10 +405,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - writeStreams_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -434,17 +438,31 @@ public com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest build public com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest buildPartial() { com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest result = new com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest(this); - int from_bitField0_ = bitField0_; - result.parent_ = parent_; - if (((bitField0_ & 0x00000001) != 0)) { - writeStreams_ = writeStreams_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.writeStreams_ = writeStreams_; onBuilt(); return result; } + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest result) { + if (((bitField0_ & 0x00000002) != 0)) { + writeStreams_ = writeStreams_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.writeStreams_ = writeStreams_; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -496,12 +514,13 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.writeStreams_.isEmpty()) { if (writeStreams_.isEmpty()) { writeStreams_ = other.writeStreams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureWriteStreamsIsMutable(); writeStreams_.addAll(other.writeStreams_); @@ -537,7 +556,7 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -636,8 +655,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -656,8 +675,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -681,8 +700,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -691,9 +710,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureWriteStreamsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { writeStreams_ = new com.google.protobuf.LazyStringArrayList(writeStreams_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** @@ -828,7 +847,7 @@ public Builder addAllWriteStreams(java.lang.Iterable values) { */ public Builder clearWriteStreams() { writeStreams_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsResponse.java index fb10a13fb9..e84d1c14cd 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/BatchCommitWriteStreamsResponse.java @@ -117,10 +117,12 @@ public com.google.protobuf.Timestamp getCommitTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { - return getCommitTime(); + return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_; } public static final int STREAM_ERRORS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List streamErrors_; /** * @@ -426,10 +428,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (commitTimeBuilder_ == null) { - commitTime_ = null; - } else { - commitTime_ = null; + bitField0_ = 0; + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } if (streamErrorsBuilder_ == null) { @@ -438,7 +440,7 @@ public Builder clear() { streamErrors_ = null; streamErrorsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -468,23 +470,33 @@ public com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse buil public com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse buildPartial() { com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse result = new com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse(this); - int from_bitField0_ = bitField0_; - if (commitTimeBuilder_ == null) { - result.commitTime_ = commitTime_; - } else { - result.commitTime_ = commitTimeBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse result) { if (streamErrorsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { streamErrors_ = java.util.Collections.unmodifiableList(streamErrors_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.streamErrors_ = streamErrors_; } else { result.streamErrors_ = streamErrorsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.BatchCommitWriteStreamsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build(); + } } @java.lang.Override @@ -543,7 +555,7 @@ public Builder mergeFrom( if (!other.streamErrors_.isEmpty()) { if (streamErrors_.isEmpty()) { streamErrors_ = other.streamErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureStreamErrorsIsMutable(); streamErrors_.addAll(other.streamErrors_); @@ -556,7 +568,7 @@ public Builder mergeFrom( streamErrorsBuilder_.dispose(); streamErrorsBuilder_ = null; streamErrors_ = other.streamErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); streamErrorsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getStreamErrorsFieldBuilder() @@ -595,7 +607,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -651,7 +663,7 @@ public Builder mergeFrom( * @return Whether the commitTime field is set. */ public boolean hasCommitTime() { - return commitTimeBuilder_ != null || commitTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -692,11 +704,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } commitTime_ = value; - onChanged(); } else { commitTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -713,11 +725,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (commitTimeBuilder_ == null) { commitTime_ = builderForValue.build(); - onChanged(); } else { commitTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -733,17 +745,18 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { if (commitTimeBuilder_ == null) { - if (commitTime_ != null) { - commitTime_ = - com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && commitTime_ != null + && commitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCommitTimeBuilder().mergeFrom(value); } else { commitTime_ = value; } - onChanged(); } else { commitTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -758,14 +771,13 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp commit_time = 1; */ public Builder clearCommitTime() { - if (commitTimeBuilder_ == null) { - commitTime_ = null; - onChanged(); - } else { - commitTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -780,7 +792,7 @@ public Builder clearCommitTime() { * .google.protobuf.Timestamp commit_time = 1; */ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getCommitTimeFieldBuilder().getBuilder(); } @@ -836,11 +848,11 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { java.util.Collections.emptyList(); private void ensureStreamErrorsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { streamErrors_ = new java.util.ArrayList( streamErrors_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1102,7 +1114,7 @@ public Builder addAllStreamErrors( public Builder clearStreamErrors() { if (streamErrorsBuilder_ == null) { streamErrors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { streamErrorsBuilder_.clear(); @@ -1256,7 +1268,7 @@ public com.google.cloud.bigquery.storage.v1.StorageError.Builder addStreamErrors com.google.cloud.bigquery.storage.v1.StorageError, com.google.cloud.bigquery.storage.v1.StorageError.Builder, com.google.cloud.bigquery.storage.v1.StorageErrorOrBuilder>( - streamErrors_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + streamErrors_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); streamErrors_ = null; } return streamErrorsBuilder_; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateReadSessionRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateReadSessionRequest.java index 9d261af006..dc95ce68cd 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateReadSessionRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateReadSessionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -173,11 +175,13 @@ public com.google.cloud.bigquery.storage.v1.ReadSession getReadSession() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ReadSessionOrBuilder getReadSessionOrBuilder() { - return getReadSession(); + return readSession_ == null + ? com.google.cloud.bigquery.storage.v1.ReadSession.getDefaultInstance() + : readSession_; } public static final int MAX_STREAM_COUNT_FIELD_NUMBER = 3; - private int maxStreamCount_; + private int maxStreamCount_ = 0; /** * * @@ -203,7 +207,7 @@ public int getMaxStreamCount() { } public static final int PREFERRED_MIN_STREAM_COUNT_FIELD_NUMBER = 4; - private int preferredMinStreamCount_; + private int preferredMinStreamCount_ = 0; /** * * @@ -456,18 +460,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (readSessionBuilder_ == null) { - readSession_ = null; - } else { - readSession_ = null; + readSession_ = null; + if (readSessionBuilder_ != null) { + readSessionBuilder_.dispose(); readSessionBuilder_ = null; } maxStreamCount_ = 0; - preferredMinStreamCount_ = 0; - return this; } @@ -496,18 +497,31 @@ public com.google.cloud.bigquery.storage.v1.CreateReadSessionRequest build() { public com.google.cloud.bigquery.storage.v1.CreateReadSessionRequest buildPartial() { com.google.cloud.bigquery.storage.v1.CreateReadSessionRequest result = new com.google.cloud.bigquery.storage.v1.CreateReadSessionRequest(this); - result.parent_ = parent_; - if (readSessionBuilder_ == null) { - result.readSession_ = readSession_; - } else { - result.readSession_ = readSessionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.maxStreamCount_ = maxStreamCount_; - result.preferredMinStreamCount_ = preferredMinStreamCount_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.CreateReadSessionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.readSession_ = + readSessionBuilder_ == null ? readSession_ : readSessionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.maxStreamCount_ = maxStreamCount_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.preferredMinStreamCount_ = preferredMinStreamCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -557,6 +571,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.CreateReadSessionR return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasReadSession()) { @@ -597,25 +612,25 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getReadSessionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { maxStreamCount_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 case 32: { preferredMinStreamCount_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 32 default: @@ -635,6 +650,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -705,8 +722,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -725,8 +742,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -750,8 +767,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -776,7 +793,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the readSession field is set. */ public boolean hasReadSession() { - return readSessionBuilder_ != null || readSession_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -817,11 +834,11 @@ public Builder setReadSession(com.google.cloud.bigquery.storage.v1.ReadSession v throw new NullPointerException(); } readSession_ = value; - onChanged(); } else { readSessionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -839,11 +856,11 @@ public Builder setReadSession( com.google.cloud.bigquery.storage.v1.ReadSession.Builder builderForValue) { if (readSessionBuilder_ == null) { readSession_ = builderForValue.build(); - onChanged(); } else { readSessionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -859,19 +876,19 @@ public Builder setReadSession( */ public Builder mergeReadSession(com.google.cloud.bigquery.storage.v1.ReadSession value) { if (readSessionBuilder_ == null) { - if (readSession_ != null) { - readSession_ = - com.google.cloud.bigquery.storage.v1.ReadSession.newBuilder(readSession_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && readSession_ != null + && readSession_ + != com.google.cloud.bigquery.storage.v1.ReadSession.getDefaultInstance()) { + getReadSessionBuilder().mergeFrom(value); } else { readSession_ = value; } - onChanged(); } else { readSessionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -886,14 +903,13 @@ public Builder mergeReadSession(com.google.cloud.bigquery.storage.v1.ReadSession * */ public Builder clearReadSession() { - if (readSessionBuilder_ == null) { - readSession_ = null; - onChanged(); - } else { - readSession_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + readSession_ = null; + if (readSessionBuilder_ != null) { + readSessionBuilder_.dispose(); readSessionBuilder_ = null; } - + onChanged(); return this; } /** @@ -908,7 +924,7 @@ public Builder clearReadSession() { * */ public com.google.cloud.bigquery.storage.v1.ReadSession.Builder getReadSessionBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getReadSessionFieldBuilder().getBuilder(); } @@ -1007,6 +1023,7 @@ public int getMaxStreamCount() { public Builder setMaxStreamCount(int value) { maxStreamCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1030,7 +1047,7 @@ public Builder setMaxStreamCount(int value) { * @return This builder for chaining. */ public Builder clearMaxStreamCount() { - + bitField0_ = (bitField0_ & ~0x00000004); maxStreamCount_ = 0; onChanged(); return this; @@ -1079,6 +1096,7 @@ public int getPreferredMinStreamCount() { public Builder setPreferredMinStreamCount(int value) { preferredMinStreamCount_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -1100,7 +1118,7 @@ public Builder setPreferredMinStreamCount(int value) { * @return This builder for chaining. */ public Builder clearPreferredMinStreamCount() { - + bitField0_ = (bitField0_ & ~0x00000008); preferredMinStreamCount_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateWriteStreamRequest.java index 06c958602e..e5729811d1 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/CreateWriteStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -173,7 +175,9 @@ public com.google.cloud.bigquery.storage.v1.WriteStream getWriteStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStreamOrBuilder getWriteStreamOrBuilder() { - return getWriteStream(); + return writeStream_ == null + ? com.google.cloud.bigquery.storage.v1.WriteStream.getDefaultInstance() + : writeStream_; } private byte memoizedIsInitialized = -1; @@ -388,12 +392,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (writeStreamBuilder_ == null) { - writeStream_ = null; - } else { - writeStream_ = null; + writeStream_ = null; + if (writeStreamBuilder_ != null) { + writeStreamBuilder_.dispose(); writeStreamBuilder_ = null; } return this; @@ -424,16 +427,25 @@ public com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest build() { public com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest(this); - result.parent_ = parent_; - if (writeStreamBuilder_ == null) { - result.writeStream_ = writeStream_; - } else { - result.writeStream_ = writeStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.writeStream_ = + writeStreamBuilder_ == null ? writeStream_ : writeStreamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -483,6 +495,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.CreateWriteStreamR return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasWriteStream()) { @@ -517,13 +530,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getWriteStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -543,6 +556,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -613,8 +628,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -633,8 +648,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -658,8 +673,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -684,7 +699,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the writeStream field is set. */ public boolean hasWriteStream() { - return writeStreamBuilder_ != null || writeStream_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -725,11 +740,11 @@ public Builder setWriteStream(com.google.cloud.bigquery.storage.v1.WriteStream v throw new NullPointerException(); } writeStream_ = value; - onChanged(); } else { writeStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -747,11 +762,11 @@ public Builder setWriteStream( com.google.cloud.bigquery.storage.v1.WriteStream.Builder builderForValue) { if (writeStreamBuilder_ == null) { writeStream_ = builderForValue.build(); - onChanged(); } else { writeStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -767,19 +782,19 @@ public Builder setWriteStream( */ public Builder mergeWriteStream(com.google.cloud.bigquery.storage.v1.WriteStream value) { if (writeStreamBuilder_ == null) { - if (writeStream_ != null) { - writeStream_ = - com.google.cloud.bigquery.storage.v1.WriteStream.newBuilder(writeStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && writeStream_ != null + && writeStream_ + != com.google.cloud.bigquery.storage.v1.WriteStream.getDefaultInstance()) { + getWriteStreamBuilder().mergeFrom(value); } else { writeStream_ = value; } - onChanged(); } else { writeStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -794,14 +809,13 @@ public Builder mergeWriteStream(com.google.cloud.bigquery.storage.v1.WriteStream * */ public Builder clearWriteStream() { - if (writeStreamBuilder_ == null) { - writeStream_ = null; - onChanged(); - } else { - writeStream_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + writeStream_ = null; + if (writeStreamBuilder_ != null) { + writeStreamBuilder_.dispose(); writeStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -816,7 +830,7 @@ public Builder clearWriteStream() { * */ public com.google.cloud.bigquery.storage.v1.WriteStream.Builder getWriteStreamBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getWriteStreamFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamRequest.java index 0510458917..1e38042536 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -320,8 +322,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -350,11 +352,21 @@ public com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest build() { public com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -405,6 +417,7 @@ public Builder mergeFrom( return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -436,7 +449,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -456,6 +469,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -526,8 +541,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -546,8 +561,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -571,8 +586,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamResponse.java index 7f9339c49a..684efc11b1 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FinalizeWriteStreamResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROW_COUNT_FIELD_NUMBER = 1; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -281,8 +281,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowCount_ = 0L; - return this; } @@ -311,11 +311,21 @@ public com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse build() public com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse buildPartial() { com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse result = new com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse(this); - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.FinalizeWriteStreamResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -396,7 +406,7 @@ public Builder mergeFrom( case 8: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -416,6 +426,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long rowCount_; /** * @@ -447,6 +459,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -462,7 +475,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000001); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsRequest.java index f7a8da087d..9db3a8d3e3 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int WRITE_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object writeStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writeStream_ = ""; /** * * @@ -166,7 +168,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } private byte memoizedIsInitialized = -1; @@ -381,12 +383,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; writeStream_ = ""; - - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } return this; @@ -416,16 +417,23 @@ public com.google.cloud.bigquery.storage.v1.FlushRowsRequest build() { public com.google.cloud.bigquery.storage.v1.FlushRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1.FlushRowsRequest result = new com.google.cloud.bigquery.storage.v1.FlushRowsRequest(this); - result.writeStream_ = writeStream_; - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.FlushRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writeStream_ = writeStream_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -474,6 +482,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.FlushRowsRequest o return this; if (!other.getWriteStream().isEmpty()) { writeStream_ = other.writeStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOffset()) { @@ -508,13 +517,13 @@ public Builder mergeFrom( case 10: { writeStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -534,6 +543,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object writeStream_ = ""; /** * @@ -601,8 +612,8 @@ public Builder setWriteStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -620,8 +631,8 @@ public Builder setWriteStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriteStream() { - writeStream_ = getDefaultInstance().getWriteStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -644,8 +655,8 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -669,7 +680,7 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -706,11 +717,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -726,11 +737,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -745,17 +756,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -769,14 +781,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 2; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -790,7 +801,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 2; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getOffsetFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsResponse.java index 5b1185353d..3f7e6f8aaf 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/FlushRowsResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int OFFSET_FIELD_NUMBER = 1; - private long offset_; + private long offset_ = 0L; /** * * @@ -281,8 +281,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; offset_ = 0L; - return this; } @@ -310,11 +310,20 @@ public com.google.cloud.bigquery.storage.v1.FlushRowsResponse build() { public com.google.cloud.bigquery.storage.v1.FlushRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1.FlushRowsResponse result = new com.google.cloud.bigquery.storage.v1.FlushRowsResponse(this); - result.offset_ = offset_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.FlushRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.offset_ = offset_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -393,7 +402,7 @@ public Builder mergeFrom( case 8: { offset_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -413,6 +422,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long offset_; /** * @@ -444,6 +455,7 @@ public long getOffset() { public Builder setOffset(long value) { offset_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -459,7 +471,7 @@ public Builder setOffset(long value) { * @return This builder for chaining. */ public Builder clearOffset() { - + bitField0_ = (bitField0_ & ~0x00000001); offset_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/GetWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/GetWriteStreamRequest.java index c556b9b455..d4efa4d8c7 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/GetWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/GetWriteStreamRequest.java @@ -69,7 +69,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -124,7 +126,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int VIEW_FIELD_NUMBER = 3; - private int view_; + private int view_ = 0; /** * * @@ -155,9 +157,8 @@ public int getViewValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStreamView getView() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStreamView result = - com.google.cloud.bigquery.storage.v1.WriteStreamView.valueOf(view_); + com.google.cloud.bigquery.storage.v1.WriteStreamView.forNumber(view_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStreamView.UNRECOGNIZED : result; @@ -374,10 +375,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - view_ = 0; - return this; } @@ -405,12 +405,23 @@ public com.google.cloud.bigquery.storage.v1.GetWriteStreamRequest build() { public com.google.cloud.bigquery.storage.v1.GetWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1.GetWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1.GetWriteStreamRequest(this); - result.name_ = name_; - result.view_ = view_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.GetWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.view_ = view_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -459,6 +470,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.GetWriteStreamRequ return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.view_ != 0) { @@ -493,13 +505,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 24: { view_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 24 default: @@ -519,6 +531,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -589,8 +603,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -609,8 +623,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -634,8 +648,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -671,8 +685,8 @@ public int getViewValue() { * @return This builder for chaining. */ public Builder setViewValue(int value) { - view_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -690,9 +704,8 @@ public Builder setViewValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStreamView getView() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStreamView result = - com.google.cloud.bigquery.storage.v1.WriteStreamView.valueOf(view_); + com.google.cloud.bigquery.storage.v1.WriteStreamView.forNumber(view_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStreamView.UNRECOGNIZED : result; @@ -714,7 +727,7 @@ public Builder setView(com.google.cloud.bigquery.storage.v1.WriteStreamView valu if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; view_ = value.getNumber(); onChanged(); return this; @@ -732,7 +745,7 @@ public Builder setView(com.google.cloud.bigquery.storage.v1.WriteStreamView valu * @return This builder for chaining. */ public Builder clearView() { - + bitField0_ = (bitField0_ & ~0x00000002); view_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoRows.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoRows.java index 69fd820a99..99335688c5 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoRows.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoRows.java @@ -60,6 +60,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_ROWS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List serializedRows_; /** * @@ -309,8 +311,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedRows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -338,14 +340,24 @@ public com.google.cloud.bigquery.storage.v1.ProtoRows build() { public com.google.cloud.bigquery.storage.v1.ProtoRows buildPartial() { com.google.cloud.bigquery.storage.v1.ProtoRows result = new com.google.cloud.bigquery.storage.v1.ProtoRows(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(com.google.cloud.bigquery.storage.v1.ProtoRows result) { if (((bitField0_ & 0x00000001) != 0)) { serializedRows_ = java.util.Collections.unmodifiableList(serializedRows_); bitField0_ = (bitField0_ & ~0x00000001); } result.serializedRows_ = serializedRows_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ProtoRows result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchema.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchema.java index 1e138c8487..f7b7c709ed 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchema.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ProtoSchema.java @@ -132,7 +132,9 @@ public com.google.protobuf.DescriptorProtos.DescriptorProto getProtoDescriptor() @java.lang.Override public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getProtoDescriptorOrBuilder() { - return getProtoDescriptor(); + return protoDescriptor_ == null + ? com.google.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance() + : protoDescriptor_; } private byte memoizedIsInitialized = -1; @@ -343,10 +345,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (protoDescriptorBuilder_ == null) { - protoDescriptor_ = null; - } else { - protoDescriptor_ = null; + bitField0_ = 0; + protoDescriptor_ = null; + if (protoDescriptorBuilder_ != null) { + protoDescriptorBuilder_.dispose(); protoDescriptorBuilder_ = null; } return this; @@ -376,15 +378,21 @@ public com.google.cloud.bigquery.storage.v1.ProtoSchema build() { public com.google.cloud.bigquery.storage.v1.ProtoSchema buildPartial() { com.google.cloud.bigquery.storage.v1.ProtoSchema result = new com.google.cloud.bigquery.storage.v1.ProtoSchema(this); - if (protoDescriptorBuilder_ == null) { - result.protoDescriptor_ = protoDescriptor_; - } else { - result.protoDescriptor_ = protoDescriptorBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ProtoSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.protoDescriptor_ = + protoDescriptorBuilder_ == null ? protoDescriptor_ : protoDescriptorBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -468,7 +476,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getProtoDescriptorFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -488,6 +496,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.DescriptorProtos.DescriptorProto protoDescriptor_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.DescriptorProtos.DescriptorProto, @@ -513,7 +523,7 @@ public Builder mergeFrom( * @return Whether the protoDescriptor field is set. */ public boolean hasProtoDescriptor() { - return protoDescriptorBuilder_ != null || protoDescriptor_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -564,11 +574,11 @@ public Builder setProtoDescriptor(com.google.protobuf.DescriptorProtos.Descripto throw new NullPointerException(); } protoDescriptor_ = value; - onChanged(); } else { protoDescriptorBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -591,11 +601,11 @@ public Builder setProtoDescriptor( com.google.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) { if (protoDescriptorBuilder_ == null) { protoDescriptor_ = builderForValue.build(); - onChanged(); } else { protoDescriptorBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -617,19 +627,19 @@ public Builder setProtoDescriptor( public Builder mergeProtoDescriptor( com.google.protobuf.DescriptorProtos.DescriptorProto value) { if (protoDescriptorBuilder_ == null) { - if (protoDescriptor_ != null) { - protoDescriptor_ = - com.google.protobuf.DescriptorProtos.DescriptorProto.newBuilder(protoDescriptor_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && protoDescriptor_ != null + && protoDescriptor_ + != com.google.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance()) { + getProtoDescriptorBuilder().mergeFrom(value); } else { protoDescriptor_ = value; } - onChanged(); } else { protoDescriptorBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -649,14 +659,13 @@ public Builder mergeProtoDescriptor( * .google.protobuf.DescriptorProto proto_descriptor = 1; */ public Builder clearProtoDescriptor() { - if (protoDescriptorBuilder_ == null) { - protoDescriptor_ = null; - onChanged(); - } else { - protoDescriptor_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + protoDescriptor_ = null; + if (protoDescriptorBuilder_ != null) { + protoDescriptorBuilder_.dispose(); protoDescriptorBuilder_ = null; } - + onChanged(); return this; } /** @@ -677,7 +686,7 @@ public Builder clearProtoDescriptor() { */ public com.google.protobuf.DescriptorProtos.DescriptorProto.Builder getProtoDescriptorBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getProtoDescriptorFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsRequest.java index fecb354a4b..4cb269fab4 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int READ_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object readStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object readStream_ = ""; /** * * @@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getReadStreamBytes() { } public static final int OFFSET_FIELD_NUMBER = 2; - private long offset_; + private long offset_ = 0L; /** * * @@ -346,10 +348,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; readStream_ = ""; - offset_ = 0L; - return this; } @@ -377,12 +378,23 @@ public com.google.cloud.bigquery.storage.v1.ReadRowsRequest build() { public com.google.cloud.bigquery.storage.v1.ReadRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1.ReadRowsRequest result = new com.google.cloud.bigquery.storage.v1.ReadRowsRequest(this); - result.readStream_ = readStream_; - result.offset_ = offset_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ReadRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.readStream_ = readStream_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offset_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -431,6 +443,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadRowsRequest ot return this; if (!other.getReadStream().isEmpty()) { readStream_ = other.readStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getOffset() != 0L) { @@ -465,13 +478,13 @@ public Builder mergeFrom( case 10: { readStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { offset_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -491,6 +504,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object readStream_ = ""; /** * @@ -558,8 +573,8 @@ public Builder setReadStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - readStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -577,8 +592,8 @@ public Builder setReadStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearReadStream() { - readStream_ = getDefaultInstance().getReadStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -601,8 +616,8 @@ public Builder setReadStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - readStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -642,6 +657,7 @@ public long getOffset() { public Builder setOffset(long value) { offset_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -659,7 +675,7 @@ public Builder setOffset(long value) { * @return This builder for chaining. */ public Builder clearOffset() { - + bitField0_ = (bitField0_ & ~0x00000002); offset_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsResponse.java index 1fad335b1b..5904b2253a 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadRowsResponse.java @@ -264,7 +264,7 @@ public com.google.cloud.bigquery.storage.v1.ArrowRecordBatch getArrowRecordBatch } public static final int ROW_COUNT_FIELD_NUMBER = 6; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -326,7 +326,9 @@ public com.google.cloud.bigquery.storage.v1.StreamStats getStats() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.StreamStatsOrBuilder getStatsOrBuilder() { - return getStats(); + return stats_ == null + ? com.google.cloud.bigquery.storage.v1.StreamStats.getDefaultInstance() + : stats_; } public static final int THROTTLE_STATE_FIELD_NUMBER = 5; @@ -377,7 +379,9 @@ public com.google.cloud.bigquery.storage.v1.ThrottleState getThrottleState() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ThrottleStateOrBuilder getThrottleStateOrBuilder() { - return getThrottleState(); + return throttleState_ == null + ? com.google.cloud.bigquery.storage.v1.ThrottleState.getDefaultInstance() + : throttleState_; } public static final int AVRO_SCHEMA_FIELD_NUMBER = 7; @@ -799,6 +803,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (avroRowsBuilder_ != null) { avroRowsBuilder_.clear(); } @@ -806,17 +811,14 @@ public Builder clear() { arrowRecordBatchBuilder_.clear(); } rowCount_ = 0L; - - if (statsBuilder_ == null) { - stats_ = null; - } else { - stats_ = null; + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); statsBuilder_ = null; } - if (throttleStateBuilder_ == null) { - throttleState_ = null; - } else { - throttleState_ = null; + throttleState_ = null; + if (throttleStateBuilder_ != null) { + throttleStateBuilder_.dispose(); throttleStateBuilder_ = null; } if (avroSchemaBuilder_ != null) { @@ -856,49 +858,45 @@ public com.google.cloud.bigquery.storage.v1.ReadRowsResponse build() { public com.google.cloud.bigquery.storage.v1.ReadRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1.ReadRowsResponse result = new com.google.cloud.bigquery.storage.v1.ReadRowsResponse(this); - if (rowsCase_ == 3) { - if (avroRowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = avroRowsBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (rowsCase_ == 4) { - if (arrowRecordBatchBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = arrowRecordBatchBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ReadRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowCount_ = rowCount_; } - result.rowCount_ = rowCount_; - if (statsBuilder_ == null) { - result.stats_ = stats_; - } else { - result.stats_ = statsBuilder_.build(); + if (((from_bitField0_ & 0x00000008) != 0)) { + result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build(); } - if (throttleStateBuilder_ == null) { - result.throttleState_ = throttleState_; - } else { - result.throttleState_ = throttleStateBuilder_.build(); + if (((from_bitField0_ & 0x00000010) != 0)) { + result.throttleState_ = + throttleStateBuilder_ == null ? throttleState_ : throttleStateBuilder_.build(); } - if (schemaCase_ == 7) { - if (avroSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = avroSchemaBuilder_.build(); - } + } + + private void buildPartialOneofs(com.google.cloud.bigquery.storage.v1.ReadRowsResponse result) { + result.rowsCase_ = rowsCase_; + result.rows_ = this.rows_; + if (rowsCase_ == 3 && avroRowsBuilder_ != null) { + result.rows_ = avroRowsBuilder_.build(); } - if (schemaCase_ == 8) { - if (arrowSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = arrowSchemaBuilder_.build(); - } + if (rowsCase_ == 4 && arrowRecordBatchBuilder_ != null) { + result.rows_ = arrowRecordBatchBuilder_.build(); } - result.rowsCase_ = rowsCase_; result.schemaCase_ = schemaCase_; - onBuilt(); - return result; + result.schema_ = this.schema_; + if (schemaCase_ == 7 && avroSchemaBuilder_ != null) { + result.schema_ = avroSchemaBuilder_.build(); + } + if (schemaCase_ == 8 && arrowSchemaBuilder_ != null) { + result.schema_ = arrowSchemaBuilder_.build(); + } } @java.lang.Override @@ -1017,7 +1015,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 18 case 26: @@ -1036,13 +1034,13 @@ public Builder mergeFrom( case 42: { input.readMessage(getThrottleStateFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 48 case 58: @@ -1102,6 +1100,8 @@ public Builder clearSchema() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1.AvroRows, com.google.cloud.bigquery.storage.v1.AvroRows.Builder, @@ -1308,7 +1308,6 @@ public com.google.cloud.bigquery.storage.v1.AvroRowsOrBuilder getAvroRowsOrBuild } rowsCase_ = 3; onChanged(); - ; return avroRowsBuilder_; } @@ -1523,7 +1522,6 @@ public Builder clearArrowRecordBatch() { } rowsCase_ = 4; onChanged(); - ; return arrowRecordBatchBuilder_; } @@ -1558,6 +1556,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1573,7 +1572,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000004); rowCount_ = 0L; onChanged(); return this; @@ -1597,7 +1596,7 @@ public Builder clearRowCount() { * @return Whether the stats field is set. */ public boolean hasStats() { - return statsBuilder_ != null || stats_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1634,11 +1633,11 @@ public Builder setStats(com.google.cloud.bigquery.storage.v1.StreamStats value) throw new NullPointerException(); } stats_ = value; - onChanged(); } else { statsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1654,11 +1653,11 @@ public Builder setStats( com.google.cloud.bigquery.storage.v1.StreamStats.Builder builderForValue) { if (statsBuilder_ == null) { stats_ = builderForValue.build(); - onChanged(); } else { statsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1672,19 +1671,18 @@ public Builder setStats( */ public Builder mergeStats(com.google.cloud.bigquery.storage.v1.StreamStats value) { if (statsBuilder_ == null) { - if (stats_ != null) { - stats_ = - com.google.cloud.bigquery.storage.v1.StreamStats.newBuilder(stats_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && stats_ != null + && stats_ != com.google.cloud.bigquery.storage.v1.StreamStats.getDefaultInstance()) { + getStatsBuilder().mergeFrom(value); } else { stats_ = value; } - onChanged(); } else { statsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1697,14 +1695,13 @@ public Builder mergeStats(com.google.cloud.bigquery.storage.v1.StreamStats value * .google.cloud.bigquery.storage.v1.StreamStats stats = 2; */ public Builder clearStats() { - if (statsBuilder_ == null) { - stats_ = null; - onChanged(); - } else { - stats_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); statsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1717,7 +1714,7 @@ public Builder clearStats() { * .google.cloud.bigquery.storage.v1.StreamStats stats = 2; */ public com.google.cloud.bigquery.storage.v1.StreamStats.Builder getStatsBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getStatsFieldBuilder().getBuilder(); } @@ -1784,7 +1781,7 @@ public com.google.cloud.bigquery.storage.v1.StreamStatsOrBuilder getStatsOrBuild * @return Whether the throttleState field is set. */ public boolean hasThrottleState() { - return throttleStateBuilder_ != null || throttleState_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1823,11 +1820,11 @@ public Builder setThrottleState(com.google.cloud.bigquery.storage.v1.ThrottleSta throw new NullPointerException(); } throttleState_ = value; - onChanged(); } else { throttleStateBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1844,11 +1841,11 @@ public Builder setThrottleState( com.google.cloud.bigquery.storage.v1.ThrottleState.Builder builderForValue) { if (throttleStateBuilder_ == null) { throttleState_ = builderForValue.build(); - onChanged(); } else { throttleStateBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1863,19 +1860,19 @@ public Builder setThrottleState( */ public Builder mergeThrottleState(com.google.cloud.bigquery.storage.v1.ThrottleState value) { if (throttleStateBuilder_ == null) { - if (throttleState_ != null) { - throttleState_ = - com.google.cloud.bigquery.storage.v1.ThrottleState.newBuilder(throttleState_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && throttleState_ != null + && throttleState_ + != com.google.cloud.bigquery.storage.v1.ThrottleState.getDefaultInstance()) { + getThrottleStateBuilder().mergeFrom(value); } else { throttleState_ = value; } - onChanged(); } else { throttleStateBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1889,14 +1886,13 @@ public Builder mergeThrottleState(com.google.cloud.bigquery.storage.v1.ThrottleS * .google.cloud.bigquery.storage.v1.ThrottleState throttle_state = 5; */ public Builder clearThrottleState() { - if (throttleStateBuilder_ == null) { - throttleState_ = null; - onChanged(); - } else { - throttleState_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + throttleState_ = null; + if (throttleStateBuilder_ != null) { + throttleStateBuilder_.dispose(); throttleStateBuilder_ = null; } - + onChanged(); return this; } /** @@ -1910,7 +1906,7 @@ public Builder clearThrottleState() { * .google.cloud.bigquery.storage.v1.ThrottleState throttle_state = 5; */ public com.google.cloud.bigquery.storage.v1.ThrottleState.Builder getThrottleStateBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getThrottleStateFieldBuilder().getBuilder(); } @@ -2184,7 +2180,6 @@ public com.google.cloud.bigquery.storage.v1.AvroSchemaOrBuilder getAvroSchemaOrB } schemaCase_ = 7; onChanged(); - ; return avroSchemaBuilder_; } @@ -2412,7 +2407,6 @@ public com.google.cloud.bigquery.storage.v1.ArrowSchemaOrBuilder getArrowSchemaO } schemaCase_ = 8; onChanged(); - ; return arrowSchemaBuilder_; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadSession.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadSession.java index cf54ca88de..b334cb75a5 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadSession.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadSession.java @@ -203,7 +203,9 @@ public com.google.protobuf.Timestamp getSnapshotTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getSnapshotTimeOrBuilder() { - return getSnapshotTime(); + return snapshotTime_ == null + ? com.google.protobuf.Timestamp.getDefaultInstance() + : snapshotTime_; } private byte memoizedIsInitialized = -1; @@ -413,10 +415,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - } else { - snapshotTime_ = null; + bitField0_ = 0; + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } return this; @@ -447,15 +449,22 @@ public com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers build() { public com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers buildPartial() { com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers result = new com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers(this); - if (snapshotTimeBuilder_ == null) { - result.snapshotTime_ = snapshotTime_; - } else { - result.snapshotTime_ = snapshotTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.snapshotTime_ = + snapshotTimeBuilder_ == null ? snapshotTime_ : snapshotTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -538,7 +547,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getSnapshotTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -558,6 +567,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp snapshotTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -576,7 +587,7 @@ public Builder mergeFrom( * @return Whether the snapshotTime field is set. */ public boolean hasSnapshotTime() { - return snapshotTimeBuilder_ != null || snapshotTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -613,11 +624,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } snapshotTime_ = value; - onChanged(); } else { snapshotTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -632,11 +643,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (snapshotTimeBuilder_ == null) { snapshotTime_ = builderForValue.build(); - onChanged(); } else { snapshotTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -650,19 +661,18 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForV */ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { if (snapshotTimeBuilder_ == null) { - if (snapshotTime_ != null) { - snapshotTime_ = - com.google.protobuf.Timestamp.newBuilder(snapshotTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && snapshotTime_ != null + && snapshotTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getSnapshotTimeBuilder().mergeFrom(value); } else { snapshotTime_ = value; } - onChanged(); } else { snapshotTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -675,14 +685,13 @@ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp snapshot_time = 1; */ public Builder clearSnapshotTime() { - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - onChanged(); - } else { - snapshotTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -695,7 +704,7 @@ public Builder clearSnapshotTime() { * .google.protobuf.Timestamp snapshot_time = 1; */ public com.google.protobuf.Timestamp.Builder getSnapshotTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getSnapshotTimeFieldBuilder().getBuilder(); } @@ -1243,6 +1252,8 @@ public OutputFormatSerializationOptionsCase getOutputFormatSerializationOptionsC } public static final int SELECTED_FIELDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList selectedFields_; /** * @@ -1456,7 +1467,9 @@ public com.google.protobuf.ByteString getSelectedFieldsBytes(int index) { } public static final int ROW_RESTRICTION_FIELD_NUMBER = 2; - private volatile java.lang.Object rowRestriction_; + + @SuppressWarnings("serial") + private volatile java.lang.Object rowRestriction_ = ""; /** * * @@ -1910,10 +1923,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; selectedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); rowRestriction_ = ""; - if (arrowSerializationOptionsBuilder_ != null) { arrowSerializationOptionsBuilder_.clear(); } @@ -1951,30 +1964,44 @@ public com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions build() public com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions buildPartial() { com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions result = new com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions result) { if (((bitField0_ & 0x00000001) != 0)) { selectedFields_ = selectedFields_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.selectedFields_ = selectedFields_; - result.rowRestriction_ = rowRestriction_; - if (outputFormatSerializationOptionsCase_ == 3) { - if (arrowSerializationOptionsBuilder_ == null) { - result.outputFormatSerializationOptions_ = outputFormatSerializationOptions_; - } else { - result.outputFormatSerializationOptions_ = arrowSerializationOptionsBuilder_.build(); - } - } - if (outputFormatSerializationOptionsCase_ == 4) { - if (avroSerializationOptionsBuilder_ == null) { - result.outputFormatSerializationOptions_ = outputFormatSerializationOptions_; - } else { - result.outputFormatSerializationOptions_ = avroSerializationOptionsBuilder_.build(); - } + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowRestriction_ = rowRestriction_; } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions result) { result.outputFormatSerializationOptionsCase_ = outputFormatSerializationOptionsCase_; - onBuilt(); - return result; + result.outputFormatSerializationOptions_ = this.outputFormatSerializationOptions_; + if (outputFormatSerializationOptionsCase_ == 3 + && arrowSerializationOptionsBuilder_ != null) { + result.outputFormatSerializationOptions_ = arrowSerializationOptionsBuilder_.build(); + } + if (outputFormatSerializationOptionsCase_ == 4 + && avroSerializationOptionsBuilder_ != null) { + result.outputFormatSerializationOptions_ = avroSerializationOptionsBuilder_.build(); + } } @java.lang.Override @@ -2040,6 +2067,7 @@ public Builder mergeFrom( } if (!other.getRowRestriction().isEmpty()) { rowRestriction_ = other.rowRestriction_; + bitField0_ |= 0x00000002; onChanged(); } switch (other.getOutputFormatSerializationOptionsCase()) { @@ -2094,7 +2122,7 @@ public Builder mergeFrom( case 18: { rowRestriction_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: @@ -2737,8 +2765,8 @@ public Builder setRowRestriction(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2761,8 +2789,8 @@ public Builder setRowRestriction(java.lang.String value) { * @return This builder for chaining. */ public Builder clearRowRestriction() { - rowRestriction_ = getDefaultInstance().getRowRestriction(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -2790,8 +2818,8 @@ public Builder setRowRestrictionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -3036,7 +3064,6 @@ public Builder clearArrowSerializationOptions() { } outputFormatSerializationOptionsCase_ = 3; onChanged(); - ; return arrowSerializationOptionsBuilder_; } @@ -3277,7 +3304,6 @@ public Builder clearAvroSerializationOptions() { } outputFormatSerializationOptionsCase_ = 4; onChanged(); - ; return avroSerializationOptionsBuilder_; } @@ -3396,7 +3422,9 @@ public SchemaCase getSchemaCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -3501,11 +3529,11 @@ public com.google.protobuf.Timestamp getExpireTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() { - return getExpireTime(); + return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_; } public static final int DATA_FORMAT_FIELD_NUMBER = 3; - private int dataFormat_; + private int dataFormat_ = 0; /** * * @@ -3540,9 +3568,8 @@ public int getDataFormatValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.DataFormat getDataFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.DataFormat result = - com.google.cloud.bigquery.storage.v1.DataFormat.valueOf(dataFormat_); + com.google.cloud.bigquery.storage.v1.DataFormat.forNumber(dataFormat_); return result == null ? com.google.cloud.bigquery.storage.v1.DataFormat.UNRECOGNIZED : result; } @@ -3661,7 +3688,9 @@ public com.google.cloud.bigquery.storage.v1.ArrowSchemaOrBuilder getArrowSchemaO } public static final int TABLE_FIELD_NUMBER = 6; - private volatile java.lang.Object table_; + + @SuppressWarnings("serial") + private volatile java.lang.Object table_ = ""; /** * * @@ -3770,7 +3799,9 @@ public com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers getTableM @java.lang.Override public com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiersOrBuilder getTableModifiersOrBuilder() { - return getTableModifiers(); + return tableModifiers_ == null + ? com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers.getDefaultInstance() + : tableModifiers_; } public static final int READ_OPTIONS_FIELD_NUMBER = 8; @@ -3825,10 +3856,14 @@ public com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions getRead @java.lang.Override public com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptionsOrBuilder getReadOptionsOrBuilder() { - return getReadOptions(); + return readOptions_ == null + ? com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions.getDefaultInstance() + : readOptions_; } public static final int STREAMS_FIELD_NUMBER = 10; + + @SuppressWarnings("serial") private java.util.List streams_; /** * @@ -3928,7 +3963,7 @@ public com.google.cloud.bigquery.storage.v1.ReadStreamOrBuilder getStreamsOrBuil } public static final int ESTIMATED_TOTAL_BYTES_SCANNED_FIELD_NUMBER = 12; - private long estimatedTotalBytesScanned_; + private long estimatedTotalBytesScanned_ = 0L; /** * * @@ -3949,7 +3984,7 @@ public long getEstimatedTotalBytesScanned() { } public static final int ESTIMATED_ROW_COUNT_FIELD_NUMBER = 14; - private long estimatedRowCount_; + private long estimatedRowCount_ = 0L; /** * * @@ -3969,7 +4004,9 @@ public long getEstimatedRowCount() { } public static final int TRACE_ID_FIELD_NUMBER = 13; - private volatile java.lang.Object traceId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object traceId_ = ""; /** * * @@ -4362,16 +4399,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (expireTimeBuilder_ == null) { - expireTime_ = null; - } else { - expireTime_ = null; + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } dataFormat_ = 0; - if (avroSchemaBuilder_ != null) { avroSchemaBuilder_.clear(); } @@ -4379,17 +4414,14 @@ public Builder clear() { arrowSchemaBuilder_.clear(); } table_ = ""; - - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - } else { - tableModifiers_ = null; + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - if (readOptionsBuilder_ == null) { - readOptions_ = null; - } else { - readOptions_ = null; + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } if (streamsBuilder_ == null) { @@ -4398,13 +4430,10 @@ public Builder clear() { streams_ = null; streamsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); estimatedTotalBytesScanned_ = 0L; - estimatedRowCount_ = 0L; - traceId_ = ""; - schemaCase_ = 0; schema_ = null; return this; @@ -4434,54 +4463,70 @@ public com.google.cloud.bigquery.storage.v1.ReadSession build() { public com.google.cloud.bigquery.storage.v1.ReadSession buildPartial() { com.google.cloud.bigquery.storage.v1.ReadSession result = new com.google.cloud.bigquery.storage.v1.ReadSession(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - if (expireTimeBuilder_ == null) { - result.expireTime_ = expireTime_; - } else { - result.expireTime_ = expireTimeBuilder_.build(); - } - result.dataFormat_ = dataFormat_; - if (schemaCase_ == 4) { - if (avroSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = avroSchemaBuilder_.build(); - } - } - if (schemaCase_ == 5) { - if (arrowSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = arrowSchemaBuilder_.build(); - } - } - result.table_ = table_; - if (tableModifiersBuilder_ == null) { - result.tableModifiers_ = tableModifiers_; - } else { - result.tableModifiers_ = tableModifiersBuilder_.build(); - } - if (readOptionsBuilder_ == null) { - result.readOptions_ = readOptions_; - } else { - result.readOptions_ = readOptionsBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.ReadSession result) { if (streamsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000100) != 0)) { streams_ = java.util.Collections.unmodifiableList(streams_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); } result.streams_ = streams_; } else { result.streams_ = streamsBuilder_.build(); } - result.estimatedTotalBytesScanned_ = estimatedTotalBytesScanned_; - result.estimatedRowCount_ = estimatedRowCount_; - result.traceId_ = traceId_; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ReadSession result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.expireTime_ = expireTimeBuilder_ == null ? expireTime_ : expireTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.dataFormat_ = dataFormat_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.table_ = table_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.tableModifiers_ = + tableModifiersBuilder_ == null ? tableModifiers_ : tableModifiersBuilder_.build(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.readOptions_ = + readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000200) != 0)) { + result.estimatedTotalBytesScanned_ = estimatedTotalBytesScanned_; + } + if (((from_bitField0_ & 0x00000400) != 0)) { + result.estimatedRowCount_ = estimatedRowCount_; + } + if (((from_bitField0_ & 0x00000800) != 0)) { + result.traceId_ = traceId_; + } + } + + private void buildPartialOneofs(com.google.cloud.bigquery.storage.v1.ReadSession result) { result.schemaCase_ = schemaCase_; - onBuilt(); - return result; + result.schema_ = this.schema_; + if (schemaCase_ == 4 && avroSchemaBuilder_ != null) { + result.schema_ = avroSchemaBuilder_.build(); + } + if (schemaCase_ == 5 && arrowSchemaBuilder_ != null) { + result.schema_ = arrowSchemaBuilder_.build(); + } } @java.lang.Override @@ -4532,6 +4577,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadSession other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasExpireTime()) { @@ -4542,6 +4588,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadSession other) } if (!other.getTable().isEmpty()) { table_ = other.table_; + bitField0_ |= 0x00000020; onChanged(); } if (other.hasTableModifiers()) { @@ -4554,7 +4601,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadSession other) if (!other.streams_.isEmpty()) { if (streams_.isEmpty()) { streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureStreamsIsMutable(); streams_.addAll(other.streams_); @@ -4567,7 +4614,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadSession other) streamsBuilder_.dispose(); streamsBuilder_ = null; streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); streamsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getStreamsFieldBuilder() @@ -4585,6 +4632,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadSession other) } if (!other.getTraceId().isEmpty()) { traceId_ = other.traceId_; + bitField0_ |= 0x00000800; onChanged(); } switch (other.getSchemaCase()) { @@ -4632,19 +4680,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { dataFormat_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: @@ -4662,19 +4710,19 @@ public Builder mergeFrom( case 50: { table_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 58: { input.readMessage(getTableModifiersFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 58 case 66: { input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 66 case 82: @@ -4694,19 +4742,19 @@ public Builder mergeFrom( case 96: { estimatedTotalBytesScanned_ = input.readInt64(); - + bitField0_ |= 0x00000200; break; } // case 96 case 106: { traceId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000800; break; } // case 106 case 112: { estimatedRowCount_ = input.readInt64(); - + bitField0_ |= 0x00000400; break; } // case 112 default: @@ -4806,8 +4854,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4824,8 +4872,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -4847,8 +4895,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -4876,7 +4924,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the expireTime field is set. */ public boolean hasExpireTime() { - return expireTimeBuilder_ != null || expireTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -4923,11 +4971,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } expireTime_ = value; - onChanged(); } else { expireTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -4947,11 +4995,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (expireTimeBuilder_ == null) { expireTime_ = builderForValue.build(); - onChanged(); } else { expireTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -4970,17 +5018,18 @@ public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { if (expireTimeBuilder_ == null) { - if (expireTime_ != null) { - expireTime_ = - com.google.protobuf.Timestamp.newBuilder(expireTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && expireTime_ != null + && expireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getExpireTimeBuilder().mergeFrom(value); } else { expireTime_ = value; } - onChanged(); } else { expireTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -4998,14 +5047,13 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { * */ public Builder clearExpireTime() { - if (expireTimeBuilder_ == null) { - expireTime_ = null; - onChanged(); - } else { - expireTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -5023,7 +5071,7 @@ public Builder clearExpireTime() { * */ public com.google.protobuf.Timestamp.Builder getExpireTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getExpireTimeFieldBuilder().getBuilder(); } @@ -5116,8 +5164,8 @@ public int getDataFormatValue() { * @return This builder for chaining. */ public Builder setDataFormatValue(int value) { - dataFormat_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -5137,9 +5185,8 @@ public Builder setDataFormatValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.DataFormat getDataFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.DataFormat result = - com.google.cloud.bigquery.storage.v1.DataFormat.valueOf(dataFormat_); + com.google.cloud.bigquery.storage.v1.DataFormat.forNumber(dataFormat_); return result == null ? com.google.cloud.bigquery.storage.v1.DataFormat.UNRECOGNIZED : result; } /** @@ -5161,7 +5208,7 @@ public Builder setDataFormat(com.google.cloud.bigquery.storage.v1.DataFormat val if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; dataFormat_ = value.getNumber(); onChanged(); return this; @@ -5181,7 +5228,7 @@ public Builder setDataFormat(com.google.cloud.bigquery.storage.v1.DataFormat val * @return This builder for chaining. */ public Builder clearDataFormat() { - + bitField0_ = (bitField0_ & ~0x00000004); dataFormat_ = 0; onChanged(); return this; @@ -5411,7 +5458,6 @@ public com.google.cloud.bigquery.storage.v1.AvroSchemaOrBuilder getAvroSchemaOrB } schemaCase_ = 4; onChanged(); - ; return avroSchemaBuilder_; } @@ -5639,7 +5685,6 @@ public com.google.cloud.bigquery.storage.v1.ArrowSchemaOrBuilder getArrowSchemaO } schemaCase_ = 5; onChanged(); - ; return arrowSchemaBuilder_; } @@ -5713,8 +5758,8 @@ public Builder setTable(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - table_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -5733,8 +5778,8 @@ public Builder setTable(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTable() { - table_ = getDefaultInstance().getTable(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -5758,8 +5803,8 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - table_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -5785,7 +5830,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { * @return Whether the tableModifiers field is set. */ public boolean hasTableModifiers() { - return tableModifiersBuilder_ != null || tableModifiers_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -5829,11 +5874,11 @@ public Builder setTableModifiers( throw new NullPointerException(); } tableModifiers_ = value; - onChanged(); } else { tableModifiersBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -5852,11 +5897,11 @@ public Builder setTableModifiers( com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers.Builder builderForValue) { if (tableModifiersBuilder_ == null) { tableModifiers_ = builderForValue.build(); - onChanged(); } else { tableModifiersBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -5874,20 +5919,20 @@ public Builder setTableModifiers( public Builder mergeTableModifiers( com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers value) { if (tableModifiersBuilder_ == null) { - if (tableModifiers_ != null) { - tableModifiers_ = - com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers.newBuilder( - tableModifiers_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && tableModifiers_ != null + && tableModifiers_ + != com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers + .getDefaultInstance()) { + getTableModifiersBuilder().mergeFrom(value); } else { tableModifiers_ = value; } - onChanged(); } else { tableModifiersBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -5903,14 +5948,13 @@ public Builder mergeTableModifiers( * */ public Builder clearTableModifiers() { - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - onChanged(); - } else { - tableModifiers_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - + onChanged(); return this; } /** @@ -5927,7 +5971,7 @@ public Builder clearTableModifiers() { */ public com.google.cloud.bigquery.storage.v1.ReadSession.TableModifiers.Builder getTableModifiersBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getTableModifiersFieldBuilder().getBuilder(); } @@ -6002,7 +6046,7 @@ public Builder clearTableModifiers() { * @return Whether the readOptions field is set. */ public boolean hasReadOptions() { - return readOptionsBuilder_ != null || readOptions_ != null; + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -6044,11 +6088,11 @@ public Builder setReadOptions( throw new NullPointerException(); } readOptions_ = value; - onChanged(); } else { readOptionsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -6066,11 +6110,11 @@ public Builder setReadOptions( com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions.Builder builderForValue) { if (readOptionsBuilder_ == null) { readOptions_ = builderForValue.build(); - onChanged(); } else { readOptionsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -6087,20 +6131,20 @@ public Builder setReadOptions( public Builder mergeReadOptions( com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions value) { if (readOptionsBuilder_ == null) { - if (readOptions_ != null) { - readOptions_ = - com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions.newBuilder( - readOptions_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000080) != 0) + && readOptions_ != null + && readOptions_ + != com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions + .getDefaultInstance()) { + getReadOptionsBuilder().mergeFrom(value); } else { readOptions_ = value; } - onChanged(); } else { readOptionsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -6115,14 +6159,13 @@ public Builder mergeReadOptions( * */ public Builder clearReadOptions() { - if (readOptionsBuilder_ == null) { - readOptions_ = null; - onChanged(); - } else { - readOptions_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -6138,7 +6181,7 @@ public Builder clearReadOptions() { */ public com.google.cloud.bigquery.storage.v1.ReadSession.TableReadOptions.Builder getReadOptionsBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } @@ -6195,10 +6238,10 @@ public Builder clearReadOptions() { java.util.Collections.emptyList(); private void ensureStreamsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000100) != 0)) { streams_ = new java.util.ArrayList(streams_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000100; } } @@ -6480,7 +6523,7 @@ public Builder addAllStreams( public Builder clearStreams() { if (streamsBuilder_ == null) { streams_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); onChanged(); } else { streamsBuilder_.clear(); @@ -6644,7 +6687,7 @@ public com.google.cloud.bigquery.storage.v1.ReadStream.Builder addStreamsBuilder com.google.cloud.bigquery.storage.v1.ReadStream, com.google.cloud.bigquery.storage.v1.ReadStream.Builder, com.google.cloud.bigquery.storage.v1.ReadStreamOrBuilder>( - streams_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + streams_, ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean()); streams_ = null; } return streamsBuilder_; @@ -6687,6 +6730,7 @@ public long getEstimatedTotalBytesScanned() { public Builder setEstimatedTotalBytesScanned(long value) { estimatedTotalBytesScanned_ = value; + bitField0_ |= 0x00000200; onChanged(); return this; } @@ -6705,7 +6749,7 @@ public Builder setEstimatedTotalBytesScanned(long value) { * @return This builder for chaining. */ public Builder clearEstimatedTotalBytesScanned() { - + bitField0_ = (bitField0_ & ~0x00000200); estimatedTotalBytesScanned_ = 0L; onChanged(); return this; @@ -6746,6 +6790,7 @@ public long getEstimatedRowCount() { public Builder setEstimatedRowCount(long value) { estimatedRowCount_ = value; + bitField0_ |= 0x00000400; onChanged(); return this; } @@ -6763,7 +6808,7 @@ public Builder setEstimatedRowCount(long value) { * @return This builder for chaining. */ public Builder clearEstimatedRowCount() { - + bitField0_ = (bitField0_ & ~0x00000400); estimatedRowCount_ = 0L; onChanged(); return this; @@ -6842,8 +6887,8 @@ public Builder setTraceId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - traceId_ = value; + bitField0_ |= 0x00000800; onChanged(); return this; } @@ -6863,8 +6908,8 @@ public Builder setTraceId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTraceId() { - traceId_ = getDefaultInstance().getTraceId(); + bitField0_ = (bitField0_ & ~0x00000800); onChanged(); return this; } @@ -6889,8 +6934,8 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - traceId_ = value; + bitField0_ |= 0x00000800; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadStream.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadStream.java index 431d0d45fc..7e30032b1c 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadStream.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ReadStream.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.cloud.bigquery.storage.v1.ReadStream build() { public com.google.cloud.bigquery.storage.v1.ReadStream buildPartial() { com.google.cloud.bigquery.storage.v1.ReadStream result = new com.google.cloud.bigquery.storage.v1.ReadStream(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ReadStream result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.ReadStream other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -516,8 +530,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -534,8 +548,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -557,8 +571,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/RowError.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/RowError.java index 7706e7c307..9157400c4c 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/RowError.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/RowError.java @@ -204,7 +204,7 @@ private RowErrorCode(int value) { } public static final int INDEX_FIELD_NUMBER = 1; - private long index_; + private long index_ = 0L; /** * * @@ -222,7 +222,7 @@ public long getIndex() { } public static final int CODE_FIELD_NUMBER = 2; - private int code_; + private int code_ = 0; /** * * @@ -251,16 +251,17 @@ public int getCodeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode result = - com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.UNRECOGNIZED : result; } public static final int MESSAGE_FIELD_NUMBER = 3; - private volatile java.lang.Object message_; + + @SuppressWarnings("serial") + private volatile java.lang.Object message_ = ""; /** * * @@ -527,12 +528,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; index_ = 0L; - code_ = 0; - message_ = ""; - return this; } @@ -560,13 +559,26 @@ public com.google.cloud.bigquery.storage.v1.RowError build() { public com.google.cloud.bigquery.storage.v1.RowError buildPartial() { com.google.cloud.bigquery.storage.v1.RowError result = new com.google.cloud.bigquery.storage.v1.RowError(this); - result.index_ = index_; - result.code_ = code_; - result.message_ = message_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.RowError result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.index_ = index_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.code_ = code_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.message_ = message_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -620,6 +632,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.RowError other) { } if (!other.getMessage().isEmpty()) { message_ = other.message_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -651,19 +664,19 @@ public Builder mergeFrom( case 8: { index_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 16: { code_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { message_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -683,6 +696,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long index_; /** * @@ -714,6 +729,7 @@ public long getIndex() { public Builder setIndex(long value) { index_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -729,7 +745,7 @@ public Builder setIndex(long value) { * @return This builder for chaining. */ public Builder clearIndex() { - + bitField0_ = (bitField0_ & ~0x00000001); index_ = 0L; onChanged(); return this; @@ -764,8 +780,8 @@ public int getCodeValue() { * @return This builder for chaining. */ public Builder setCodeValue(int value) { - code_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -782,9 +798,8 @@ public Builder setCodeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode result = - com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1.RowError.RowErrorCode.UNRECOGNIZED : result; @@ -805,7 +820,7 @@ public Builder setCode(com.google.cloud.bigquery.storage.v1.RowError.RowErrorCod if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; code_ = value.getNumber(); onChanged(); return this; @@ -822,7 +837,7 @@ public Builder setCode(com.google.cloud.bigquery.storage.v1.RowError.RowErrorCod * @return This builder for chaining. */ public Builder clearCode() { - + bitField0_ = (bitField0_ & ~0x00000002); code_ = 0; onChanged(); return this; @@ -889,8 +904,8 @@ public Builder setMessage(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - message_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -906,8 +921,8 @@ public Builder setMessage(java.lang.String value) { * @return This builder for chaining. */ public Builder clearMessage() { - message_ = getDefaultInstance().getMessage(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -928,8 +943,8 @@ public Builder setMessageBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - message_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamRequest.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamRequest.java index 577b797c10..9af974a7e1 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int FRACTION_FIELD_NUMBER = 2; - private double fraction_; + private double fraction_ = 0D; /** * * @@ -355,10 +357,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - fraction_ = 0D; - return this; } @@ -386,12 +387,23 @@ public com.google.cloud.bigquery.storage.v1.SplitReadStreamRequest build() { public com.google.cloud.bigquery.storage.v1.SplitReadStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1.SplitReadStreamRequest result = new com.google.cloud.bigquery.storage.v1.SplitReadStreamRequest(this); - result.name_ = name_; - result.fraction_ = fraction_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.SplitReadStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.fraction_ = fraction_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -440,6 +452,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.SplitReadStreamReq return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getFraction() != 0D) { @@ -474,13 +487,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 17: { fraction_ = input.readDouble(); - + bitField0_ |= 0x00000002; break; } // case 17 default: @@ -500,6 +513,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -567,8 +582,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -586,8 +601,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -610,8 +625,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -659,6 +674,7 @@ public double getFraction() { public Builder setFraction(double value) { fraction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -680,7 +696,7 @@ public Builder setFraction(double value) { * @return This builder for chaining. */ public Builder clearFraction() { - + bitField0_ = (bitField0_ & ~0x00000002); fraction_ = 0D; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamResponse.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamResponse.java index e5605d8da3..68c466fe8b 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamResponse.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/SplitReadStreamResponse.java @@ -116,7 +116,9 @@ public com.google.cloud.bigquery.storage.v1.ReadStream getPrimaryStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ReadStreamOrBuilder getPrimaryStreamOrBuilder() { - return getPrimaryStream(); + return primaryStream_ == null + ? com.google.cloud.bigquery.storage.v1.ReadStream.getDefaultInstance() + : primaryStream_; } public static final int REMAINDER_STREAM_FIELD_NUMBER = 2; @@ -167,7 +169,9 @@ public com.google.cloud.bigquery.storage.v1.ReadStream getRemainderStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.ReadStreamOrBuilder getRemainderStreamOrBuilder() { - return getRemainderStream(); + return remainderStream_ == null + ? com.google.cloud.bigquery.storage.v1.ReadStream.getDefaultInstance() + : remainderStream_; } private byte memoizedIsInitialized = -1; @@ -387,16 +391,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - } else { - primaryStream_ = null; + bitField0_ = 0; + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - } else { - remainderStream_ = null; + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } return this; @@ -427,20 +430,26 @@ public com.google.cloud.bigquery.storage.v1.SplitReadStreamResponse build() { public com.google.cloud.bigquery.storage.v1.SplitReadStreamResponse buildPartial() { com.google.cloud.bigquery.storage.v1.SplitReadStreamResponse result = new com.google.cloud.bigquery.storage.v1.SplitReadStreamResponse(this); - if (primaryStreamBuilder_ == null) { - result.primaryStream_ = primaryStream_; - } else { - result.primaryStream_ = primaryStreamBuilder_.build(); - } - if (remainderStreamBuilder_ == null) { - result.remainderStream_ = remainderStream_; - } else { - result.remainderStream_ = remainderStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1.SplitReadStreamResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.primaryStream_ = + primaryStreamBuilder_ == null ? primaryStream_ : primaryStreamBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.remainderStream_ = + remainderStreamBuilder_ == null ? remainderStream_ : remainderStreamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -523,13 +532,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getPrimaryStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRemainderStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -549,6 +558,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1.ReadStream primaryStream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1.ReadStream, @@ -569,7 +580,7 @@ public Builder mergeFrom( * @return Whether the primaryStream field is set. */ public boolean hasPrimaryStream() { - return primaryStreamBuilder_ != null || primaryStream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -610,11 +621,11 @@ public Builder setPrimaryStream(com.google.cloud.bigquery.storage.v1.ReadStream throw new NullPointerException(); } primaryStream_ = value; - onChanged(); } else { primaryStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -632,11 +643,11 @@ public Builder setPrimaryStream( com.google.cloud.bigquery.storage.v1.ReadStream.Builder builderForValue) { if (primaryStreamBuilder_ == null) { primaryStream_ = builderForValue.build(); - onChanged(); } else { primaryStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -652,19 +663,19 @@ public Builder setPrimaryStream( */ public Builder mergePrimaryStream(com.google.cloud.bigquery.storage.v1.ReadStream value) { if (primaryStreamBuilder_ == null) { - if (primaryStream_ != null) { - primaryStream_ = - com.google.cloud.bigquery.storage.v1.ReadStream.newBuilder(primaryStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && primaryStream_ != null + && primaryStream_ + != com.google.cloud.bigquery.storage.v1.ReadStream.getDefaultInstance()) { + getPrimaryStreamBuilder().mergeFrom(value); } else { primaryStream_ = value; } - onChanged(); } else { primaryStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -679,14 +690,13 @@ public Builder mergePrimaryStream(com.google.cloud.bigquery.storage.v1.ReadStrea * .google.cloud.bigquery.storage.v1.ReadStream primary_stream = 1; */ public Builder clearPrimaryStream() { - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - onChanged(); - } else { - primaryStream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -701,7 +711,7 @@ public Builder clearPrimaryStream() { * .google.cloud.bigquery.storage.v1.ReadStream primary_stream = 1; */ public com.google.cloud.bigquery.storage.v1.ReadStream.Builder getPrimaryStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPrimaryStreamFieldBuilder().getBuilder(); } @@ -772,7 +782,7 @@ public com.google.cloud.bigquery.storage.v1.ReadStreamOrBuilder getPrimaryStream * @return Whether the remainderStream field is set. */ public boolean hasRemainderStream() { - return remainderStreamBuilder_ != null || remainderStream_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -811,11 +821,11 @@ public Builder setRemainderStream(com.google.cloud.bigquery.storage.v1.ReadStrea throw new NullPointerException(); } remainderStream_ = value; - onChanged(); } else { remainderStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -832,11 +842,11 @@ public Builder setRemainderStream( com.google.cloud.bigquery.storage.v1.ReadStream.Builder builderForValue) { if (remainderStreamBuilder_ == null) { remainderStream_ = builderForValue.build(); - onChanged(); } else { remainderStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -851,19 +861,19 @@ public Builder setRemainderStream( */ public Builder mergeRemainderStream(com.google.cloud.bigquery.storage.v1.ReadStream value) { if (remainderStreamBuilder_ == null) { - if (remainderStream_ != null) { - remainderStream_ = - com.google.cloud.bigquery.storage.v1.ReadStream.newBuilder(remainderStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && remainderStream_ != null + && remainderStream_ + != com.google.cloud.bigquery.storage.v1.ReadStream.getDefaultInstance()) { + getRemainderStreamBuilder().mergeFrom(value); } else { remainderStream_ = value; } - onChanged(); } else { remainderStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -877,14 +887,13 @@ public Builder mergeRemainderStream(com.google.cloud.bigquery.storage.v1.ReadStr * .google.cloud.bigquery.storage.v1.ReadStream remainder_stream = 2; */ public Builder clearRemainderStream() { - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - onChanged(); - } else { - remainderStream_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -898,7 +907,7 @@ public Builder clearRemainderStream() { * .google.cloud.bigquery.storage.v1.ReadStream remainder_stream = 2; */ public com.google.cloud.bigquery.storage.v1.ReadStream.Builder getRemainderStreamBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRemainderStreamFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageError.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageError.java index 4db7536e17..5d5ebe5b04 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageError.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StorageError.java @@ -396,7 +396,7 @@ private StorageErrorCode(int value) { } public static final int CODE_FIELD_NUMBER = 1; - private int code_; + private int code_ = 0; /** * * @@ -425,16 +425,17 @@ public int getCodeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode result = - com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.UNRECOGNIZED : result; } public static final int ENTITY_FIELD_NUMBER = 2; - private volatile java.lang.Object entity_; + + @SuppressWarnings("serial") + private volatile java.lang.Object entity_ = ""; /** * * @@ -483,7 +484,9 @@ public com.google.protobuf.ByteString getEntityBytes() { } public static final int ERROR_MESSAGE_FIELD_NUMBER = 3; - private volatile java.lang.Object errorMessage_; + + @SuppressWarnings("serial") + private volatile java.lang.Object errorMessage_ = ""; /** * * @@ -755,12 +758,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; code_ = 0; - entity_ = ""; - errorMessage_ = ""; - return this; } @@ -788,13 +789,26 @@ public com.google.cloud.bigquery.storage.v1.StorageError build() { public com.google.cloud.bigquery.storage.v1.StorageError buildPartial() { com.google.cloud.bigquery.storage.v1.StorageError result = new com.google.cloud.bigquery.storage.v1.StorageError(this); - result.code_ = code_; - result.entity_ = entity_; - result.errorMessage_ = errorMessage_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.StorageError result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.code_ = code_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.entity_ = entity_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.errorMessage_ = errorMessage_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -846,10 +860,12 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.StorageError other } if (!other.getEntity().isEmpty()) { entity_ = other.entity_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getErrorMessage().isEmpty()) { errorMessage_ = other.errorMessage_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -881,19 +897,19 @@ public Builder mergeFrom( case 8: { code_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { entity_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { errorMessage_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -913,6 +929,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int code_ = 0; /** * @@ -942,8 +960,8 @@ public int getCodeValue() { * @return This builder for chaining. */ public Builder setCodeValue(int value) { - code_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -960,9 +978,8 @@ public Builder setCodeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode result = - com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1.StorageError.StorageErrorCode.UNRECOGNIZED : result; @@ -984,7 +1001,7 @@ public Builder setCode( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; code_ = value.getNumber(); onChanged(); return this; @@ -1001,7 +1018,7 @@ public Builder setCode( * @return This builder for chaining. */ public Builder clearCode() { - + bitField0_ = (bitField0_ & ~0x00000001); code_ = 0; onChanged(); return this; @@ -1068,8 +1085,8 @@ public Builder setEntity(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - entity_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1085,8 +1102,8 @@ public Builder setEntity(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEntity() { - entity_ = getDefaultInstance().getEntity(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1107,8 +1124,8 @@ public Builder setEntityBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - entity_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1174,8 +1191,8 @@ public Builder setErrorMessage(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - errorMessage_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1191,8 +1208,8 @@ public Builder setErrorMessage(java.lang.String value) { * @return This builder for chaining. */ public Builder clearErrorMessage() { - errorMessage_ = getDefaultInstance().getErrorMessage(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1213,8 +1230,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - errorMessage_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamStats.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamStats.java index 87d1573963..7193f96a84 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamStats.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/StreamStats.java @@ -146,7 +146,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int AT_RESPONSE_START_FIELD_NUMBER = 1; - private double atResponseStart_; + private double atResponseStart_ = 0D; /** * * @@ -173,7 +173,7 @@ public double getAtResponseStart() { } public static final int AT_RESPONSE_END_FIELD_NUMBER = 2; - private double atResponseEnd_; + private double atResponseEnd_ = 0D; /** * * @@ -400,10 +400,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; atResponseStart_ = 0D; - atResponseEnd_ = 0D; - return this; } @@ -431,12 +430,23 @@ public com.google.cloud.bigquery.storage.v1.StreamStats.Progress build() { public com.google.cloud.bigquery.storage.v1.StreamStats.Progress buildPartial() { com.google.cloud.bigquery.storage.v1.StreamStats.Progress result = new com.google.cloud.bigquery.storage.v1.StreamStats.Progress(this); - result.atResponseStart_ = atResponseStart_; - result.atResponseEnd_ = atResponseEnd_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.StreamStats.Progress result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.atResponseStart_ = atResponseStart_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.atResponseEnd_ = atResponseEnd_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -520,13 +530,13 @@ public Builder mergeFrom( case 9: { atResponseStart_ = input.readDouble(); - + bitField0_ |= 0x00000001; break; } // case 9 case 17: { atResponseEnd_ = input.readDouble(); - + bitField0_ |= 0x00000002; break; } // case 17 default: @@ -546,6 +556,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private double atResponseStart_; /** * @@ -595,6 +607,7 @@ public double getAtResponseStart() { public Builder setAtResponseStart(double value) { atResponseStart_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -619,7 +632,7 @@ public Builder setAtResponseStart(double value) { * @return This builder for chaining. */ public Builder clearAtResponseStart() { - + bitField0_ = (bitField0_ & ~0x00000001); atResponseStart_ = 0D; onChanged(); return this; @@ -658,6 +671,7 @@ public double getAtResponseEnd() { public Builder setAtResponseEnd(double value) { atResponseEnd_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -674,7 +688,7 @@ public Builder setAtResponseEnd(double value) { * @return This builder for chaining. */ public Builder clearAtResponseEnd() { - + bitField0_ = (bitField0_ & ~0x00000002); atResponseEnd_ = 0D; onChanged(); return this; @@ -789,7 +803,9 @@ public com.google.cloud.bigquery.storage.v1.StreamStats.Progress getProgress() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.StreamStats.ProgressOrBuilder getProgressOrBuilder() { - return getProgress(); + return progress_ == null + ? com.google.cloud.bigquery.storage.v1.StreamStats.Progress.getDefaultInstance() + : progress_; } private byte memoizedIsInitialized = -1; @@ -994,10 +1010,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (progressBuilder_ == null) { - progress_ = null; - } else { - progress_ = null; + bitField0_ = 0; + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } return this; @@ -1027,15 +1043,20 @@ public com.google.cloud.bigquery.storage.v1.StreamStats build() { public com.google.cloud.bigquery.storage.v1.StreamStats buildPartial() { com.google.cloud.bigquery.storage.v1.StreamStats result = new com.google.cloud.bigquery.storage.v1.StreamStats(this); - if (progressBuilder_ == null) { - result.progress_ = progress_; - } else { - result.progress_ = progressBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.StreamStats result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.progress_ = progressBuilder_ == null ? progress_ : progressBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1114,7 +1135,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getProgressFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 18 default: @@ -1134,6 +1155,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1.StreamStats.Progress progress_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1.StreamStats.Progress, @@ -1152,7 +1175,7 @@ public Builder mergeFrom( * @return Whether the progress field is set. */ public boolean hasProgress() { - return progressBuilder_ != null || progress_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1189,11 +1212,11 @@ public Builder setProgress(com.google.cloud.bigquery.storage.v1.StreamStats.Prog throw new NullPointerException(); } progress_ = value; - onChanged(); } else { progressBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1209,11 +1232,11 @@ public Builder setProgress( com.google.cloud.bigquery.storage.v1.StreamStats.Progress.Builder builderForValue) { if (progressBuilder_ == null) { progress_ = builderForValue.build(); - onChanged(); } else { progressBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1227,19 +1250,19 @@ public Builder setProgress( */ public Builder mergeProgress(com.google.cloud.bigquery.storage.v1.StreamStats.Progress value) { if (progressBuilder_ == null) { - if (progress_ != null) { - progress_ = - com.google.cloud.bigquery.storage.v1.StreamStats.Progress.newBuilder(progress_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && progress_ != null + && progress_ + != com.google.cloud.bigquery.storage.v1.StreamStats.Progress.getDefaultInstance()) { + getProgressBuilder().mergeFrom(value); } else { progress_ = value; } - onChanged(); } else { progressBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1252,14 +1275,13 @@ public Builder mergeProgress(com.google.cloud.bigquery.storage.v1.StreamStats.Pr * .google.cloud.bigquery.storage.v1.StreamStats.Progress progress = 2; */ public Builder clearProgress() { - if (progressBuilder_ == null) { - progress_ = null; - onChanged(); - } else { - progress_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } - + onChanged(); return this; } /** @@ -1272,7 +1294,7 @@ public Builder clearProgress() { * .google.cloud.bigquery.storage.v1.StreamStats.Progress progress = 2; */ public com.google.cloud.bigquery.storage.v1.StreamStats.Progress.Builder getProgressBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getProgressFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableFieldSchema.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableFieldSchema.java index db75cb4463..717717bb91 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableFieldSchema.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableFieldSchema.java @@ -634,7 +634,9 @@ private Mode(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -687,7 +689,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int TYPE_FIELD_NUMBER = 2; - private int type_; + private int type_ = 0; /** * * @@ -720,16 +722,15 @@ public int getTypeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type result = - com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.UNRECOGNIZED : result; } public static final int MODE_FIELD_NUMBER = 3; - private int mode_; + private int mode_ = 0; /** * * @@ -762,15 +763,16 @@ public int getModeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode getMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode result = - com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.valueOf(mode_); + com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.forNumber(mode_); return result == null ? com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.UNRECOGNIZED : result; } public static final int FIELDS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List fields_; /** * @@ -856,7 +858,9 @@ public com.google.cloud.bigquery.storage.v1.TableFieldSchemaOrBuilder getFieldsO } public static final int DESCRIPTION_FIELD_NUMBER = 6; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -905,7 +909,7 @@ public com.google.protobuf.ByteString getDescriptionBytes() { } public static final int MAX_LENGTH_FIELD_NUMBER = 7; - private long maxLength_; + private long maxLength_ = 0L; /** * * @@ -930,7 +934,7 @@ public long getMaxLength() { } public static final int PRECISION_FIELD_NUMBER = 8; - private long precision_; + private long precision_ = 0L; /** * * @@ -970,7 +974,7 @@ public long getPrecision() { } public static final int SCALE_FIELD_NUMBER = 9; - private long scale_; + private long scale_ = 0L; /** * * @@ -1258,27 +1262,21 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - type_ = 0; - mode_ = 0; - if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); } else { fields_ = null; fieldsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); description_ = ""; - maxLength_ = 0L; - precision_ = 0L; - scale_ = 0L; - return this; } @@ -1306,25 +1304,50 @@ public com.google.cloud.bigquery.storage.v1.TableFieldSchema build() { public com.google.cloud.bigquery.storage.v1.TableFieldSchema buildPartial() { com.google.cloud.bigquery.storage.v1.TableFieldSchema result = new com.google.cloud.bigquery.storage.v1.TableFieldSchema(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.type_ = type_; - result.mode_ = mode_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.TableFieldSchema result) { if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.fields_ = fields_; } else { result.fields_ = fieldsBuilder_.build(); } - result.description_ = description_; - result.maxLength_ = maxLength_; - result.precision_ = precision_; - result.scale_ = scale_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.TableFieldSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.mode_ = mode_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.description_ = description_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.maxLength_ = maxLength_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.precision_ = precision_; + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.scale_ = scale_; + } } @java.lang.Override @@ -1375,6 +1398,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.TableFieldSchema o return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.type_ != 0) { @@ -1387,7 +1411,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.TableFieldSchema o if (!other.fields_.isEmpty()) { if (fields_.isEmpty()) { fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureFieldsIsMutable(); fields_.addAll(other.fields_); @@ -1400,7 +1424,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.TableFieldSchema o fieldsBuilder_.dispose(); fieldsBuilder_ = null; fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); fieldsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFieldsFieldBuilder() @@ -1412,6 +1436,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.TableFieldSchema o } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000010; onChanged(); } if (other.getMaxLength() != 0L) { @@ -1452,19 +1477,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { type_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 24: { mode_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: @@ -1484,25 +1509,25 @@ public Builder mergeFrom( case 50: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 50 case 56: { maxLength_ = input.readInt64(); - + bitField0_ |= 0x00000020; break; } // case 56 case 64: { precision_ = input.readInt64(); - + bitField0_ |= 0x00000040; break; } // case 64 case 72: { scale_ = input.readInt64(); - + bitField0_ |= 0x00000080; break; } // case 72 default: @@ -1591,8 +1616,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1610,8 +1635,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1634,8 +1659,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1673,8 +1698,8 @@ public int getTypeValue() { * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1693,9 +1718,8 @@ public Builder setTypeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type result = - com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1.TableFieldSchema.Type.UNRECOGNIZED : result; @@ -1718,7 +1742,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1.TableFieldSchema.Typ if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; type_ = value.getNumber(); onChanged(); return this; @@ -1737,7 +1761,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1.TableFieldSchema.Typ * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000002); type_ = 0; onChanged(); return this; @@ -1776,8 +1800,8 @@ public int getModeValue() { * @return This builder for chaining. */ public Builder setModeValue(int value) { - mode_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1796,9 +1820,8 @@ public Builder setModeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode getMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode result = - com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.valueOf(mode_); + com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.forNumber(mode_); return result == null ? com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mode.UNRECOGNIZED : result; @@ -1821,7 +1844,7 @@ public Builder setMode(com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mod if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; mode_ = value.getNumber(); onChanged(); return this; @@ -1840,7 +1863,7 @@ public Builder setMode(com.google.cloud.bigquery.storage.v1.TableFieldSchema.Mod * @return This builder for chaining. */ public Builder clearMode() { - + bitField0_ = (bitField0_ & ~0x00000004); mode_ = 0; onChanged(); return this; @@ -1850,10 +1873,10 @@ public Builder clearMode() { java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { fields_ = new java.util.ArrayList(fields_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -2105,7 +2128,7 @@ public Builder addAllFields( public Builder clearFields() { if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { fieldsBuilder_.clear(); @@ -2252,7 +2275,7 @@ public com.google.cloud.bigquery.storage.v1.TableFieldSchema.Builder addFieldsBu com.google.cloud.bigquery.storage.v1.TableFieldSchema, com.google.cloud.bigquery.storage.v1.TableFieldSchema.Builder, com.google.cloud.bigquery.storage.v1.TableFieldSchemaOrBuilder>( - fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + fields_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -2319,8 +2342,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2336,8 +2359,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -2358,8 +2381,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2409,6 +2432,7 @@ public long getMaxLength() { public Builder setMaxLength(long value) { maxLength_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2431,7 +2455,7 @@ public Builder setMaxLength(long value) { * @return This builder for chaining. */ public Builder clearMaxLength() { - + bitField0_ = (bitField0_ & ~0x00000020); maxLength_ = 0L; onChanged(); return this; @@ -2512,6 +2536,7 @@ public long getPrecision() { public Builder setPrecision(long value) { precision_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2549,7 +2574,7 @@ public Builder setPrecision(long value) { * @return This builder for chaining. */ public Builder clearPrecision() { - + bitField0_ = (bitField0_ & ~0x00000040); precision_ = 0L; onChanged(); return this; @@ -2586,6 +2611,7 @@ public long getScale() { public Builder setScale(long value) { scale_ = value; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -2601,7 +2627,7 @@ public Builder setScale(long value) { * @return This builder for chaining. */ public Builder clearScale() { - + bitField0_ = (bitField0_ & ~0x00000080); scale_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableSchema.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableSchema.java index 1e791443fa..46f703afbf 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableSchema.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/TableSchema.java @@ -70,6 +70,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FIELDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List fields_; /** * @@ -340,6 +342,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); } else { @@ -374,7 +377,16 @@ public com.google.cloud.bigquery.storage.v1.TableSchema build() { public com.google.cloud.bigquery.storage.v1.TableSchema buildPartial() { com.google.cloud.bigquery.storage.v1.TableSchema result = new com.google.cloud.bigquery.storage.v1.TableSchema(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1.TableSchema result) { if (fieldsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); @@ -384,8 +396,10 @@ public com.google.cloud.bigquery.storage.v1.TableSchema buildPartial() { } else { result.fields_ = fieldsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1.TableSchema result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ThrottleState.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ThrottleState.java index 3d67311550..4e10be31ab 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ThrottleState.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/ThrottleState.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int THROTTLE_PERCENT_FIELD_NUMBER = 1; - private int throttlePercent_; + private int throttlePercent_ = 0; /** * * @@ -281,8 +281,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; throttlePercent_ = 0; - return this; } @@ -310,11 +310,20 @@ public com.google.cloud.bigquery.storage.v1.ThrottleState build() { public com.google.cloud.bigquery.storage.v1.ThrottleState buildPartial() { com.google.cloud.bigquery.storage.v1.ThrottleState result = new com.google.cloud.bigquery.storage.v1.ThrottleState(this); - result.throttlePercent_ = throttlePercent_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.ThrottleState result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.throttlePercent_ = throttlePercent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -393,7 +402,7 @@ public Builder mergeFrom( case 8: { throttlePercent_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -413,6 +422,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int throttlePercent_; /** * @@ -446,6 +457,7 @@ public int getThrottlePercent() { public Builder setThrottlePercent(int value) { throttlePercent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -462,7 +474,7 @@ public Builder setThrottlePercent(int value) { * @return This builder for chaining. */ public Builder clearThrottlePercent() { - + bitField0_ = (bitField0_ & ~0x00000001); throttlePercent_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/WriteStream.java b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/WriteStream.java index 9988699989..f788332701 100644 --- a/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/WriteStream.java +++ b/proto-google-cloud-bigquerystorage-v1/src/main/java/com/google/cloud/bigquery/storage/v1/WriteStream.java @@ -389,7 +389,9 @@ private WriteMode(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -440,7 +442,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int TYPE_FIELD_NUMBER = 2; - private int type_; + private int type_ = 0; /** * * @@ -473,9 +475,8 @@ public int getTypeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStream.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStream.Type result = - com.google.cloud.bigquery.storage.v1.WriteStream.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1.WriteStream.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStream.Type.UNRECOGNIZED : result; @@ -530,7 +531,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int COMMIT_TIME_FIELD_NUMBER = 4; @@ -588,7 +589,7 @@ public com.google.protobuf.Timestamp getCommitTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { - return getCommitTime(); + return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_; } public static final int TABLE_SCHEMA_FIELD_NUMBER = 5; @@ -651,11 +652,13 @@ public com.google.cloud.bigquery.storage.v1.TableSchema getTableSchema() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.TableSchemaOrBuilder getTableSchemaOrBuilder() { - return getTableSchema(); + return tableSchema_ == null + ? com.google.cloud.bigquery.storage.v1.TableSchema.getDefaultInstance() + : tableSchema_; } public static final int WRITE_MODE_FIELD_NUMBER = 7; - private int writeMode_; + private int writeMode_ = 0; /** * * @@ -688,16 +691,17 @@ public int getWriteModeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode getWriteMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode result = - com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.valueOf(writeMode_); + com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.forNumber(writeMode_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.UNRECOGNIZED : result; } public static final int LOCATION_FIELD_NUMBER = 8; - private volatile java.lang.Object location_; + + @SuppressWarnings("serial") + private volatile java.lang.Object location_ = ""; /** * * @@ -1021,32 +1025,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - type_ = 0; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (commitTimeBuilder_ == null) { - commitTime_ = null; - } else { - commitTime_ = null; + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - if (tableSchemaBuilder_ == null) { - tableSchema_ = null; - } else { - tableSchema_ = null; + tableSchema_ = null; + if (tableSchemaBuilder_ != null) { + tableSchemaBuilder_.dispose(); tableSchemaBuilder_ = null; } writeMode_ = 0; - location_ = ""; - return this; } @@ -1074,29 +1072,39 @@ public com.google.cloud.bigquery.storage.v1.WriteStream build() { public com.google.cloud.bigquery.storage.v1.WriteStream buildPartial() { com.google.cloud.bigquery.storage.v1.WriteStream result = new com.google.cloud.bigquery.storage.v1.WriteStream(this); - result.name_ = name_; - result.type_ = type_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - if (commitTimeBuilder_ == null) { - result.commitTime_ = commitTime_; - } else { - result.commitTime_ = commitTimeBuilder_.build(); - } - if (tableSchemaBuilder_ == null) { - result.tableSchema_ = tableSchema_; - } else { - result.tableSchema_ = tableSchemaBuilder_.build(); - } - result.writeMode_ = writeMode_; - result.location_ = location_; onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1.WriteStream result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.tableSchema_ = + tableSchemaBuilder_ == null ? tableSchema_ : tableSchemaBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.writeMode_ = writeMode_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.location_ = location_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1145,6 +1153,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.WriteStream other) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.type_ != 0) { @@ -1164,6 +1173,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1.WriteStream other) } if (!other.getLocation().isEmpty()) { location_ = other.location_; + bitField0_ |= 0x00000040; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -1195,43 +1205,43 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { type_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage(getTableSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 56: { writeMode_ = input.readEnum(); - + bitField0_ |= 0x00000020; break; } // case 56 case 66: { location_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000040; break; } // case 66 default: @@ -1251,6 +1261,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -1315,8 +1327,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1333,8 +1345,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1356,8 +1368,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1395,8 +1407,8 @@ public int getTypeValue() { * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1415,9 +1427,8 @@ public Builder setTypeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStream.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStream.Type result = - com.google.cloud.bigquery.storage.v1.WriteStream.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1.WriteStream.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStream.Type.UNRECOGNIZED : result; @@ -1440,7 +1451,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1.WriteStream.Type val if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; type_ = value.getNumber(); onChanged(); return this; @@ -1459,7 +1470,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1.WriteStream.Type val * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000002); type_ = 0; onChanged(); return this; @@ -1486,7 +1497,7 @@ public Builder clearType() { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1529,11 +1540,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1551,11 +1562,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1572,17 +1583,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1598,14 +1610,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1621,7 +1632,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1698,7 +1709,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the commitTime field is set. */ public boolean hasCommitTime() { - return commitTimeBuilder_ != null || commitTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1745,11 +1756,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } commitTime_ = value; - onChanged(); } else { commitTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1769,11 +1780,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (commitTimeBuilder_ == null) { commitTime_ = builderForValue.build(); - onChanged(); } else { commitTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1792,17 +1803,18 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { if (commitTimeBuilder_ == null) { - if (commitTime_ != null) { - commitTime_ = - com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && commitTime_ != null + && commitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCommitTimeBuilder().mergeFrom(value); } else { commitTime_ = value; } - onChanged(); } else { commitTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1820,14 +1832,13 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCommitTime() { - if (commitTimeBuilder_ == null) { - commitTime_ = null; - onChanged(); - } else { - commitTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1845,7 +1856,7 @@ public Builder clearCommitTime() { * */ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getCommitTimeFieldBuilder().getBuilder(); } @@ -1926,7 +1937,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { * @return Whether the tableSchema field is set. */ public boolean hasTableSchema() { - return tableSchemaBuilder_ != null || tableSchema_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1973,11 +1984,11 @@ public Builder setTableSchema(com.google.cloud.bigquery.storage.v1.TableSchema v throw new NullPointerException(); } tableSchema_ = value; - onChanged(); } else { tableSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1998,11 +2009,11 @@ public Builder setTableSchema( com.google.cloud.bigquery.storage.v1.TableSchema.Builder builderForValue) { if (tableSchemaBuilder_ == null) { tableSchema_ = builderForValue.build(); - onChanged(); } else { tableSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2021,19 +2032,19 @@ public Builder setTableSchema( */ public Builder mergeTableSchema(com.google.cloud.bigquery.storage.v1.TableSchema value) { if (tableSchemaBuilder_ == null) { - if (tableSchema_ != null) { - tableSchema_ = - com.google.cloud.bigquery.storage.v1.TableSchema.newBuilder(tableSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && tableSchema_ != null + && tableSchema_ + != com.google.cloud.bigquery.storage.v1.TableSchema.getDefaultInstance()) { + getTableSchemaBuilder().mergeFrom(value); } else { tableSchema_ = value; } - onChanged(); } else { tableSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -2051,14 +2062,13 @@ public Builder mergeTableSchema(com.google.cloud.bigquery.storage.v1.TableSchema * */ public Builder clearTableSchema() { - if (tableSchemaBuilder_ == null) { - tableSchema_ = null; - onChanged(); - } else { - tableSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + tableSchema_ = null; + if (tableSchemaBuilder_ != null) { + tableSchemaBuilder_.dispose(); tableSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -2076,7 +2086,7 @@ public Builder clearTableSchema() { * */ public com.google.cloud.bigquery.storage.v1.TableSchema.Builder getTableSchemaBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getTableSchemaFieldBuilder().getBuilder(); } @@ -2167,8 +2177,8 @@ public int getWriteModeValue() { * @return This builder for chaining. */ public Builder setWriteModeValue(int value) { - writeMode_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -2187,9 +2197,8 @@ public Builder setWriteModeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode getWriteMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode result = - com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.valueOf(writeMode_); + com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.forNumber(writeMode_); return result == null ? com.google.cloud.bigquery.storage.v1.WriteStream.WriteMode.UNRECOGNIZED : result; @@ -2212,7 +2221,7 @@ public Builder setWriteMode(com.google.cloud.bigquery.storage.v1.WriteStream.Wri if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000020; writeMode_ = value.getNumber(); onChanged(); return this; @@ -2231,7 +2240,7 @@ public Builder setWriteMode(com.google.cloud.bigquery.storage.v1.WriteStream.Wri * @return This builder for chaining. */ public Builder clearWriteMode() { - + bitField0_ = (bitField0_ & ~0x00000020); writeMode_ = 0; onChanged(); return this; @@ -2304,8 +2313,8 @@ public Builder setLocation(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - location_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -2323,8 +2332,8 @@ public Builder setLocation(java.lang.String value) { * @return This builder for chaining. */ public Builder clearLocation() { - location_ = getDefaultInstance().getLocation(); + bitField0_ = (bitField0_ & ~0x00000040); onChanged(); return this; } @@ -2347,8 +2356,8 @@ public Builder setLocationBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - location_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml index 0ae0a22aa8..77ef0efc59 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta1 - 0.152.2 + 0.152.3 proto-google-cloud-bigquerystorage-v1beta1 PROTO library for proto-google-cloud-bigquerystorage-v1beta1 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java index f1375b5811..da4ef6cee6 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ArrowProto.java @@ -95,7 +95,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_SCHEMA_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedSchema_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -314,8 +314,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedSchema_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -345,11 +345,21 @@ public com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema build() public com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema result = new com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema(this); - result.serializedSchema_ = serializedSchema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedSchema_ = serializedSchema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -433,7 +443,7 @@ public Builder mergeFrom( case 10: { serializedSchema_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -453,6 +463,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** @@ -486,8 +498,8 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedSchema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -503,7 +515,7 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedSchema() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedSchema_ = getDefaultInstance().getSerializedSchema(); onChanged(); return this; @@ -657,7 +669,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_RECORD_BATCH_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedRecordBatch_; + private com.google.protobuf.ByteString serializedRecordBatch_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -675,7 +688,7 @@ public com.google.protobuf.ByteString getSerializedRecordBatch() { } public static final int ROW_COUNT_FIELD_NUMBER = 2; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -904,10 +917,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; - rowCount_ = 0L; - return this; } @@ -938,12 +950,24 @@ public com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowRecordBatch bui public com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowRecordBatch buildPartial() { com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowRecordBatch result = new com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowRecordBatch(this); - result.serializedRecordBatch_ = serializedRecordBatch_; - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowRecordBatch result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedRecordBatch_ = serializedRecordBatch_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1031,13 +1055,13 @@ public Builder mergeFrom( case 10: { serializedRecordBatch_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -1057,6 +1081,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; /** @@ -1090,8 +1116,8 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedRecordBatch_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1107,7 +1133,7 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedRecordBatch() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedRecordBatch_ = getDefaultInstance().getSerializedRecordBatch(); onChanged(); return this; @@ -1144,6 +1170,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1159,7 +1186,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000002); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java index 03a2cb7997..08acffd2a4 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/AvroProto.java @@ -109,7 +109,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SCHEMA_FIELD_NUMBER = 1; - private volatile java.lang.Object schema_; + + @SuppressWarnings("serial") + private volatile java.lang.Object schema_ = ""; /** * * @@ -359,8 +361,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; schema_ = ""; - return this; } @@ -389,11 +391,21 @@ public com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroSchema build() { public com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroSchema result = new com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroSchema(this); - result.schema_ = schema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.schema_ = schema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -446,6 +458,7 @@ public Builder mergeFrom( return this; if (!other.getSchema().isEmpty()) { schema_ = other.schema_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -477,7 +490,7 @@ public Builder mergeFrom( case 10: { schema_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -497,6 +510,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object schema_ = ""; /** * @@ -561,8 +576,8 @@ public Builder setSchema(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -579,8 +594,8 @@ public Builder setSchema(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSchema() { - schema_ = getDefaultInstance().getSchema(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -602,8 +617,8 @@ public Builder setSchemaBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -756,7 +771,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_BINARY_ROWS_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedBinaryRows_; + private com.google.protobuf.ByteString serializedBinaryRows_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -774,7 +790,7 @@ public com.google.protobuf.ByteString getSerializedBinaryRows() { } public static final int ROW_COUNT_FIELD_NUMBER = 2; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -1000,10 +1016,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; - rowCount_ = 0L; - return this; } @@ -1032,12 +1047,24 @@ public com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows build() { public com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows buildPartial() { com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows result = new com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows(this); - result.serializedBinaryRows_ = serializedBinaryRows_; - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedBinaryRows_ = serializedBinaryRows_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1122,13 +1149,13 @@ public Builder mergeFrom( case 10: { serializedBinaryRows_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -1148,6 +1175,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; /** @@ -1181,8 +1210,8 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedBinaryRows_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1198,7 +1227,7 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedBinaryRows() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedBinaryRows_ = getDefaultInstance().getSerializedBinaryRows(); onChanged(); return this; @@ -1235,6 +1264,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1250,7 +1280,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000002); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java index 2dde184b73..7c7526758c 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/ReadOptions.java @@ -183,6 +183,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SELECTED_FIELDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList selectedFields_; /** * @@ -256,7 +258,9 @@ public com.google.protobuf.ByteString getSelectedFieldsBytes(int index) { } public static final int ROW_RESTRICTION_FIELD_NUMBER = 2; - private volatile java.lang.Object rowRestriction_; + + @SuppressWarnings("serial") + private volatile java.lang.Object rowRestriction_ = ""; /** * * @@ -536,10 +540,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; selectedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); rowRestriction_ = ""; - return this; } @@ -570,15 +574,29 @@ public com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions bu public com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions buildPartial() { com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions result = new com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions result) { if (((bitField0_ & 0x00000001) != 0)) { selectedFields_ = selectedFields_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.selectedFields_ = selectedFields_; - result.rowRestriction_ = rowRestriction_; - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowRestriction_ = rowRestriction_; + } } @java.lang.Override @@ -645,6 +663,7 @@ public Builder mergeFrom( } if (!other.getRowRestriction().isEmpty()) { rowRestriction_ = other.rowRestriction_; + bitField0_ |= 0x00000002; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -683,7 +702,7 @@ public Builder mergeFrom( case 18: { rowRestriction_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -979,8 +998,8 @@ public Builder setRowRestriction(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1002,8 +1021,8 @@ public Builder setRowRestriction(java.lang.String value) { * @return This builder for chaining. */ public Builder clearRowRestriction() { - rowRestriction_ = getDefaultInstance().getRowRestriction(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1030,8 +1049,8 @@ public Builder setRowRestrictionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java index 2723ebb6ca..ce164d7694 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/Storage.java @@ -430,7 +430,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -680,8 +682,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -709,11 +711,20 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream build() { public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.Stream result = new com.google.cloud.bigquery.storage.v1beta1.Storage.Stream(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta1.Storage.Stream result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -764,6 +775,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta1.Storage.Strea return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -795,7 +807,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -815,6 +827,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -879,8 +893,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -897,8 +911,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -920,8 +934,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1135,11 +1149,13 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream getStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder getStreamOrBuilder() { - return getStream(); + return stream_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.getDefaultInstance() + : stream_; } public static final int OFFSET_FIELD_NUMBER = 2; - private long offset_; + private long offset_ = 0L; /** * * @@ -1372,14 +1388,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (streamBuilder_ == null) { - stream_ = null; - } else { - stream_ = null; + bitField0_ = 0; + stream_ = null; + if (streamBuilder_ != null) { + streamBuilder_.dispose(); streamBuilder_ = null; } offset_ = 0L; - return this; } @@ -1409,16 +1424,24 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition build() public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition result = new com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition(this); - if (streamBuilder_ == null) { - result.stream_ = stream_; - } else { - result.stream_ = streamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.offset_ = offset_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.stream_ = streamBuilder_ == null ? stream_ : streamBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offset_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1505,13 +1528,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { offset_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -1531,6 +1554,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.Stream stream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.Stream, @@ -1549,7 +1574,7 @@ public Builder mergeFrom( * @return Whether the stream field is set. */ public boolean hasStream() { - return streamBuilder_ != null || stream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1586,11 +1611,11 @@ public Builder setStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Strea throw new NullPointerException(); } stream_ = value; - onChanged(); } else { streamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1606,11 +1631,11 @@ public Builder setStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder builderForValue) { if (streamBuilder_ == null) { stream_ = builderForValue.build(); - onChanged(); } else { streamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1624,19 +1649,20 @@ public Builder setStream( */ public Builder mergeStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Stream value) { if (streamBuilder_ == null) { - if (stream_ != null) { - stream_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.newBuilder(stream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && stream_ != null + && stream_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Stream + .getDefaultInstance()) { + getStreamBuilder().mergeFrom(value); } else { stream_ = value; } - onChanged(); } else { streamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1649,14 +1675,13 @@ public Builder mergeStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Str * .google.cloud.bigquery.storage.v1beta1.Stream stream = 1; */ public Builder clearStream() { - if (streamBuilder_ == null) { - stream_ = null; - onChanged(); - } else { - stream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + stream_ = null; + if (streamBuilder_ != null) { + streamBuilder_.dispose(); streamBuilder_ = null; } - + onChanged(); return this; } /** @@ -1669,7 +1694,7 @@ public Builder clearStream() { * .google.cloud.bigquery.storage.v1beta1.Stream stream = 1; */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder getStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getStreamFieldBuilder().getBuilder(); } @@ -1749,6 +1774,7 @@ public long getOffset() { public Builder setOffset(long value) { offset_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1764,7 +1790,7 @@ public Builder setOffset(long value) { * @return This builder for chaining. */ public Builder clearOffset() { - + bitField0_ = (bitField0_ & ~0x00000002); offset_ = 0L; onChanged(); return this; @@ -2232,7 +2258,9 @@ public SchemaCase getSchemaCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -2328,7 +2356,7 @@ public com.google.protobuf.Timestamp getExpireTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() { - return getExpireTime(); + return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_; } public static final int AVRO_SCHEMA_FIELD_NUMBER = 5; @@ -2436,6 +2464,8 @@ public com.google.cloud.bigquery.storage.v1beta1.ArrowProto.ArrowSchema getArrow } public static final int STREAMS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List streams_; /** * @@ -2556,7 +2586,10 @@ public boolean hasTableReference() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReferenceOrBuilder getTableReferenceOrBuilder() { - return getTableReference(); + return tableReference_ == null + ? com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference + .getDefaultInstance() + : tableReference_; } public static final int TABLE_MODIFIERS_FIELD_NUMBER = 8; @@ -2608,11 +2641,14 @@ public boolean hasTableModifiers() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiersOrBuilder getTableModifiersOrBuilder() { - return getTableModifiers(); + return tableModifiers_ == null + ? com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers + .getDefaultInstance() + : tableModifiers_; } public static final int SHARDING_STRATEGY_FIELD_NUMBER = 9; - private int shardingStrategy_; + private int shardingStrategy_ = 0; /** * * @@ -2642,9 +2678,8 @@ public int getShardingStrategyValue() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy getShardingStrategy() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy result = - com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.valueOf( + com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.forNumber( shardingStrategy_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.UNRECOGNIZED @@ -2960,12 +2995,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (expireTimeBuilder_ == null) { - expireTime_ = null; - } else { - expireTime_ = null; + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } if (avroSchemaBuilder_ != null) { @@ -2980,21 +3014,18 @@ public Builder clear() { streams_ = null; streamsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); - if (tableReferenceBuilder_ == null) { - tableReference_ = null; - } else { - tableReference_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + tableReference_ = null; + if (tableReferenceBuilder_ != null) { + tableReferenceBuilder_.dispose(); tableReferenceBuilder_ = null; } - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - } else { - tableModifiers_ = null; + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } shardingStrategy_ = 0; - schemaCase_ = 0; schema_ = null; return this; @@ -3025,50 +3056,61 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession build() { public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession result = new com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - if (expireTimeBuilder_ == null) { - result.expireTime_ = expireTime_; - } else { - result.expireTime_ = expireTimeBuilder_.build(); - } - if (schemaCase_ == 5) { - if (avroSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = avroSchemaBuilder_.build(); - } - } - if (schemaCase_ == 6) { - if (arrowSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = arrowSchemaBuilder_.build(); - } + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession result) { if (streamsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000010) != 0)) { streams_ = java.util.Collections.unmodifiableList(streams_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } result.streams_ = streams_; } else { result.streams_ = streamsBuilder_.build(); } - if (tableReferenceBuilder_ == null) { - result.tableReference_ = tableReference_; - } else { - result.tableReference_ = tableReferenceBuilder_.build(); + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; } - if (tableModifiersBuilder_ == null) { - result.tableModifiers_ = tableModifiers_; - } else { - result.tableModifiers_ = tableModifiersBuilder_.build(); + if (((from_bitField0_ & 0x00000002) != 0)) { + result.expireTime_ = + expireTimeBuilder_ == null ? expireTime_ : expireTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.tableReference_ = + tableReferenceBuilder_ == null ? tableReference_ : tableReferenceBuilder_.build(); + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.tableModifiers_ = + tableModifiersBuilder_ == null ? tableModifiers_ : tableModifiersBuilder_.build(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.shardingStrategy_ = shardingStrategy_; } - result.shardingStrategy_ = shardingStrategy_; + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession result) { result.schemaCase_ = schemaCase_; - onBuilt(); - return result; + result.schema_ = this.schema_; + if (schemaCase_ == 5 && avroSchemaBuilder_ != null) { + result.schema_ = avroSchemaBuilder_.build(); + } + if (schemaCase_ == 6 && arrowSchemaBuilder_ != null) { + result.schema_ = arrowSchemaBuilder_.build(); + } } @java.lang.Override @@ -3123,6 +3165,7 @@ public Builder mergeFrom( return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasExpireTime()) { @@ -3132,7 +3175,7 @@ public Builder mergeFrom( if (!other.streams_.isEmpty()) { if (streams_.isEmpty()) { streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); } else { ensureStreamsIsMutable(); streams_.addAll(other.streams_); @@ -3145,7 +3188,7 @@ public Builder mergeFrom( streamsBuilder_.dispose(); streamsBuilder_ = null; streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); streamsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getStreamsFieldBuilder() @@ -3209,13 +3252,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 34: @@ -3248,20 +3291,20 @@ public Builder mergeFrom( { input.readMessage( getTableReferenceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000020; break; } // case 58 case 66: { input.readMessage( getTableModifiersFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 66 case 72: { shardingStrategy_ = input.readEnum(); - + bitField0_ |= 0x00000080; break; } // case 72 default: @@ -3361,8 +3404,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3379,8 +3422,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -3402,8 +3445,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3427,7 +3470,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the expireTime field is set. */ public boolean hasExpireTime() { - return expireTimeBuilder_ != null || expireTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -3466,11 +3509,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } expireTime_ = value; - onChanged(); } else { expireTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3486,11 +3529,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (expireTimeBuilder_ == null) { expireTime_ = builderForValue.build(); - onChanged(); } else { expireTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3505,19 +3548,18 @@ public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { if (expireTimeBuilder_ == null) { - if (expireTime_ != null) { - expireTime_ = - com.google.protobuf.Timestamp.newBuilder(expireTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && expireTime_ != null + && expireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getExpireTimeBuilder().mergeFrom(value); } else { expireTime_ = value; } - onChanged(); } else { expireTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3531,14 +3573,13 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp expire_time = 2; */ public Builder clearExpireTime() { - if (expireTimeBuilder_ == null) { - expireTime_ = null; - onChanged(); - } else { - expireTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3552,7 +3593,7 @@ public Builder clearExpireTime() { * .google.protobuf.Timestamp expire_time = 2; */ public com.google.protobuf.Timestamp.Builder getExpireTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getExpireTimeFieldBuilder().getBuilder(); } @@ -3818,7 +3859,6 @@ public Builder clearAvroSchema() { } schemaCase_ = 5; onChanged(); - ; return avroSchemaBuilder_; } @@ -4040,7 +4080,6 @@ public Builder clearArrowSchema() { } schemaCase_ = 6; onChanged(); - ; return arrowSchemaBuilder_; } @@ -4048,11 +4087,11 @@ public Builder clearArrowSchema() { java.util.Collections.emptyList(); private void ensureStreamsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000010) != 0)) { streams_ = new java.util.ArrayList( streams_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000010; } } @@ -4274,7 +4313,7 @@ public Builder addAllStreams( public Builder clearStreams() { if (streamsBuilder_ == null) { streams_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); } else { streamsBuilder_.clear(); @@ -4403,7 +4442,7 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder addStrea com.google.cloud.bigquery.storage.v1beta1.Storage.Stream, com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder, com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder>( - streams_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + streams_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); streams_ = null; } return streamsBuilder_; @@ -4428,7 +4467,7 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder addStrea * @return Whether the tableReference field is set. */ public boolean hasTableReference() { - return tableReferenceBuilder_ != null || tableReference_ != null; + return ((bitField0_ & 0x00000020) != 0); } /** * @@ -4468,11 +4507,11 @@ public Builder setTableReference( throw new NullPointerException(); } tableReference_ = value; - onChanged(); } else { tableReferenceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -4489,11 +4528,11 @@ public Builder setTableReference( builderForValue) { if (tableReferenceBuilder_ == null) { tableReference_ = builderForValue.build(); - onChanged(); } else { tableReferenceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -4508,20 +4547,20 @@ public Builder setTableReference( public Builder mergeTableReference( com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference value) { if (tableReferenceBuilder_ == null) { - if (tableReference_ != null) { - tableReference_ = - com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference - .newBuilder(tableReference_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000020) != 0) + && tableReference_ != null + && tableReference_ + != com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference + .getDefaultInstance()) { + getTableReferenceBuilder().mergeFrom(value); } else { tableReference_ = value; } - onChanged(); } else { tableReferenceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000020; + onChanged(); return this; } /** @@ -4534,14 +4573,13 @@ public Builder mergeTableReference( * .google.cloud.bigquery.storage.v1beta1.TableReference table_reference = 7; */ public Builder clearTableReference() { - if (tableReferenceBuilder_ == null) { - tableReference_ = null; - onChanged(); - } else { - tableReference_ = null; + bitField0_ = (bitField0_ & ~0x00000020); + tableReference_ = null; + if (tableReferenceBuilder_ != null) { + tableReferenceBuilder_.dispose(); tableReferenceBuilder_ = null; } - + onChanged(); return this; } /** @@ -4555,7 +4593,7 @@ public Builder clearTableReference() { */ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference.Builder getTableReferenceBuilder() { - + bitField0_ |= 0x00000020; onChanged(); return getTableReferenceFieldBuilder().getBuilder(); } @@ -4626,7 +4664,7 @@ public Builder clearTableReference() { * @return Whether the tableModifiers field is set. */ public boolean hasTableModifiers() { - return tableModifiersBuilder_ != null || tableModifiers_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -4666,11 +4704,11 @@ public Builder setTableModifiers( throw new NullPointerException(); } tableModifiers_ = value; - onChanged(); } else { tableModifiersBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4687,11 +4725,11 @@ public Builder setTableModifiers( builderForValue) { if (tableModifiersBuilder_ == null) { tableModifiers_ = builderForValue.build(); - onChanged(); } else { tableModifiersBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4706,20 +4744,20 @@ public Builder setTableModifiers( public Builder mergeTableModifiers( com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers value) { if (tableModifiersBuilder_ == null) { - if (tableModifiers_ != null) { - tableModifiers_ = - com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers - .newBuilder(tableModifiers_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && tableModifiers_ != null + && tableModifiers_ + != com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers + .getDefaultInstance()) { + getTableModifiersBuilder().mergeFrom(value); } else { tableModifiers_ = value; } - onChanged(); } else { tableModifiersBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4732,14 +4770,13 @@ public Builder mergeTableModifiers( * .google.cloud.bigquery.storage.v1beta1.TableModifiers table_modifiers = 8; */ public Builder clearTableModifiers() { - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - onChanged(); - } else { - tableModifiers_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - + onChanged(); return this; } /** @@ -4753,7 +4790,7 @@ public Builder clearTableModifiers() { */ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers.Builder getTableModifiersBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getTableModifiersFieldBuilder().getBuilder(); } @@ -4834,8 +4871,8 @@ public int getShardingStrategyValue() { * @return This builder for chaining. */ public Builder setShardingStrategyValue(int value) { - shardingStrategy_ = value; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -4853,9 +4890,8 @@ public Builder setShardingStrategyValue(int value) { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy getShardingStrategy() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy result = - com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.valueOf( + com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.forNumber( shardingStrategy_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.UNRECOGNIZED @@ -4878,7 +4914,7 @@ public Builder setShardingStrategy( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000080; shardingStrategy_ = value.getNumber(); onChanged(); return this; @@ -4895,7 +4931,7 @@ public Builder setShardingStrategy( * @return This builder for chaining. */ public Builder clearShardingStrategy() { - + bitField0_ = (bitField0_ & ~0x00000080); shardingStrategy_ = 0; onChanged(); return this; @@ -5300,11 +5336,16 @@ public boolean hasTableReference() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReferenceOrBuilder getTableReferenceOrBuilder() { - return getTableReference(); + return tableReference_ == null + ? com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference + .getDefaultInstance() + : tableReference_; } public static final int PARENT_FIELD_NUMBER = 6; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -5409,11 +5450,14 @@ public boolean hasTableModifiers() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiersOrBuilder getTableModifiersOrBuilder() { - return getTableModifiers(); + return tableModifiers_ == null + ? com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers + .getDefaultInstance() + : tableModifiers_; } public static final int REQUESTED_STREAMS_FIELD_NUMBER = 3; - private int requestedStreams_; + private int requestedStreams_ = 0; /** * * @@ -5482,11 +5526,14 @@ public com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions ge @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptionsOrBuilder getReadOptionsOrBuilder() { - return getReadOptions(); + return readOptions_ == null + ? com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions + .getDefaultInstance() + : readOptions_; } public static final int FORMAT_FIELD_NUMBER = 5; - private int format_; + private int format_ = 0; /** * * @@ -5515,16 +5562,15 @@ public int getFormatValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat getFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat result = - com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.valueOf(format_); + com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.forNumber(format_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.UNRECOGNIZED : result; } public static final int SHARDING_STRATEGY_FIELD_NUMBER = 7; - private int shardingStrategy_; + private int shardingStrategy_ = 0; /** * * @@ -5556,9 +5602,8 @@ public int getShardingStrategyValue() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy getShardingStrategy() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy result = - com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.valueOf( + com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.forNumber( shardingStrategy_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.UNRECOGNIZED @@ -5854,32 +5899,26 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (tableReferenceBuilder_ == null) { - tableReference_ = null; - } else { - tableReference_ = null; + bitField0_ = 0; + tableReference_ = null; + if (tableReferenceBuilder_ != null) { + tableReferenceBuilder_.dispose(); tableReferenceBuilder_ = null; } parent_ = ""; - - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - } else { - tableModifiers_ = null; + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } requestedStreams_ = 0; - - if (readOptionsBuilder_ == null) { - readOptions_ = null; - } else { - readOptions_ = null; + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } format_ = 0; - shardingStrategy_ = 0; - return this; } @@ -5911,29 +5950,42 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.CreateReadSessionReques buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.CreateReadSessionRequest result = new com.google.cloud.bigquery.storage.v1beta1.Storage.CreateReadSessionRequest(this); - if (tableReferenceBuilder_ == null) { - result.tableReference_ = tableReference_; - } else { - result.tableReference_ = tableReferenceBuilder_.build(); - } - result.parent_ = parent_; - if (tableModifiersBuilder_ == null) { - result.tableModifiers_ = tableModifiers_; - } else { - result.tableModifiers_ = tableModifiersBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.requestedStreams_ = requestedStreams_; - if (readOptionsBuilder_ == null) { - result.readOptions_ = readOptions_; - } else { - result.readOptions_ = readOptionsBuilder_.build(); - } - result.format_ = format_; - result.shardingStrategy_ = shardingStrategy_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.CreateReadSessionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.tableReference_ = + tableReferenceBuilder_ == null ? tableReference_ : tableReferenceBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.tableModifiers_ = + tableModifiersBuilder_ == null ? tableModifiers_ : tableModifiersBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.requestedStreams_ = requestedStreams_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.readOptions_ = + readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.format_ = format_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.shardingStrategy_ = shardingStrategy_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -5991,6 +6043,7 @@ public Builder mergeFrom( } if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasTableModifiers()) { @@ -6038,44 +6091,44 @@ public Builder mergeFrom( { input.readMessage( getTableReferenceFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( getTableModifiersFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 18 case 24: { requestedStreams_ = input.readInt32(); - + bitField0_ |= 0x00000008; break; } // case 24 case 34: { input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 34 case 40: { format_ = input.readEnum(); - + bitField0_ |= 0x00000020; break; } // case 40 case 50: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 50 case 56: { shardingStrategy_ = input.readEnum(); - + bitField0_ |= 0x00000040; break; } // case 56 default: @@ -6095,6 +6148,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference tableReference_; private com.google.protobuf.SingleFieldBuilderV3< @@ -6116,7 +6171,7 @@ public Builder mergeFrom( * @return Whether the tableReference field is set. */ public boolean hasTableReference() { - return tableReferenceBuilder_ != null || tableReference_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -6160,11 +6215,11 @@ public Builder setTableReference( throw new NullPointerException(); } tableReference_ = value; - onChanged(); } else { tableReferenceBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -6183,11 +6238,11 @@ public Builder setTableReference( builderForValue) { if (tableReferenceBuilder_ == null) { tableReference_ = builderForValue.build(); - onChanged(); } else { tableReferenceBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -6204,20 +6259,20 @@ public Builder setTableReference( public Builder mergeTableReference( com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference value) { if (tableReferenceBuilder_ == null) { - if (tableReference_ != null) { - tableReference_ = - com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference - .newBuilder(tableReference_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && tableReference_ != null + && tableReference_ + != com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference + .getDefaultInstance()) { + getTableReferenceBuilder().mergeFrom(value); } else { tableReference_ = value; } - onChanged(); } else { tableReferenceBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -6232,14 +6287,13 @@ public Builder mergeTableReference( * */ public Builder clearTableReference() { - if (tableReferenceBuilder_ == null) { - tableReference_ = null; - onChanged(); - } else { - tableReference_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + tableReference_ = null; + if (tableReferenceBuilder_ != null) { + tableReferenceBuilder_.dispose(); tableReferenceBuilder_ = null; } - + onChanged(); return this; } /** @@ -6255,7 +6309,7 @@ public Builder clearTableReference() { */ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference.Builder getTableReferenceBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getTableReferenceFieldBuilder().getBuilder(); } @@ -6384,8 +6438,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6405,8 +6459,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -6431,8 +6485,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -6456,7 +6510,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the tableModifiers field is set. */ public boolean hasTableModifiers() { - return tableModifiersBuilder_ != null || tableModifiers_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -6496,11 +6550,11 @@ public Builder setTableModifiers( throw new NullPointerException(); } tableModifiers_ = value; - onChanged(); } else { tableModifiersBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -6517,11 +6571,11 @@ public Builder setTableModifiers( builderForValue) { if (tableModifiersBuilder_ == null) { tableModifiers_ = builderForValue.build(); - onChanged(); } else { tableModifiersBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -6536,20 +6590,20 @@ public Builder setTableModifiers( public Builder mergeTableModifiers( com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers value) { if (tableModifiersBuilder_ == null) { - if (tableModifiers_ != null) { - tableModifiers_ = - com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers - .newBuilder(tableModifiers_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && tableModifiers_ != null + && tableModifiers_ + != com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers + .getDefaultInstance()) { + getTableModifiersBuilder().mergeFrom(value); } else { tableModifiers_ = value; } - onChanged(); } else { tableModifiersBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -6562,14 +6616,13 @@ public Builder mergeTableModifiers( * .google.cloud.bigquery.storage.v1beta1.TableModifiers table_modifiers = 2; */ public Builder clearTableModifiers() { - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - onChanged(); - } else { - tableModifiers_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - + onChanged(); return this; } /** @@ -6583,7 +6636,7 @@ public Builder clearTableModifiers() { */ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers.Builder getTableModifiersBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getTableModifiersFieldBuilder().getBuilder(); } @@ -6676,6 +6729,7 @@ public int getRequestedStreams() { public Builder setRequestedStreams(int value) { requestedStreams_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -6696,7 +6750,7 @@ public Builder setRequestedStreams(int value) { * @return This builder for chaining. */ public Builder clearRequestedStreams() { - + bitField0_ = (bitField0_ & ~0x00000008); requestedStreams_ = 0; onChanged(); return this; @@ -6720,7 +6774,7 @@ public Builder clearRequestedStreams() { * @return Whether the readOptions field is set. */ public boolean hasReadOptions() { - return readOptionsBuilder_ != null || readOptions_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -6760,11 +6814,11 @@ public Builder setReadOptions( throw new NullPointerException(); } readOptions_ = value; - onChanged(); } else { readOptionsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -6781,11 +6835,11 @@ public Builder setReadOptions( builderForValue) { if (readOptionsBuilder_ == null) { readOptions_ = builderForValue.build(); - onChanged(); } else { readOptionsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -6800,20 +6854,20 @@ public Builder setReadOptions( public Builder mergeReadOptions( com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions value) { if (readOptionsBuilder_ == null) { - if (readOptions_ != null) { - readOptions_ = - com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions.newBuilder( - readOptions_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && readOptions_ != null + && readOptions_ + != com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions + .getDefaultInstance()) { + getReadOptionsBuilder().mergeFrom(value); } else { readOptions_ = value; } - onChanged(); } else { readOptionsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -6826,14 +6880,13 @@ public Builder mergeReadOptions( * .google.cloud.bigquery.storage.v1beta1.TableReadOptions read_options = 4; */ public Builder clearReadOptions() { - if (readOptionsBuilder_ == null) { - readOptions_ = null; - onChanged(); - } else { - readOptions_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -6847,7 +6900,7 @@ public Builder clearReadOptions() { */ public com.google.cloud.bigquery.storage.v1beta1.ReadOptions.TableReadOptions.Builder getReadOptionsBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } @@ -6926,8 +6979,8 @@ public int getFormatValue() { * @return This builder for chaining. */ public Builder setFormatValue(int value) { - format_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -6944,9 +6997,8 @@ public Builder setFormatValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat getFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat result = - com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.valueOf(format_); + com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.forNumber(format_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.DataFormat.UNRECOGNIZED : result; @@ -6967,7 +7019,7 @@ public Builder setFormat(com.google.cloud.bigquery.storage.v1beta1.Storage.DataF if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000020; format_ = value.getNumber(); onChanged(); return this; @@ -6984,7 +7036,7 @@ public Builder setFormat(com.google.cloud.bigquery.storage.v1beta1.Storage.DataF * @return This builder for chaining. */ public Builder clearFormat() { - + bitField0_ = (bitField0_ & ~0x00000020); format_ = 0; onChanged(); return this; @@ -7021,8 +7073,8 @@ public int getShardingStrategyValue() { * @return This builder for chaining. */ public Builder setShardingStrategyValue(int value) { - shardingStrategy_ = value; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -7041,9 +7093,8 @@ public Builder setShardingStrategyValue(int value) { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy getShardingStrategy() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy result = - com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.valueOf( + com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.forNumber( shardingStrategy_); return result == null ? com.google.cloud.bigquery.storage.v1beta1.Storage.ShardingStrategy.UNRECOGNIZED @@ -7067,7 +7118,7 @@ public Builder setShardingStrategy( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000040; shardingStrategy_ = value.getNumber(); onChanged(); return this; @@ -7085,7 +7136,7 @@ public Builder setShardingStrategy( * @return This builder for chaining. */ public Builder clearShardingStrategy() { - + bitField0_ = (bitField0_ & ~0x00000040); shardingStrategy_ = 0; onChanged(); return this; @@ -7317,7 +7368,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition getReadP @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPositionOrBuilder getReadPositionOrBuilder() { - return getReadPosition(); + return readPosition_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition.getDefaultInstance() + : readPosition_; } private byte memoizedIsInitialized = -1; @@ -7527,10 +7580,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (readPositionBuilder_ == null) { - readPosition_ = null; - } else { - readPosition_ = null; + bitField0_ = 0; + readPosition_ = null; + if (readPositionBuilder_ != null) { + readPositionBuilder_.dispose(); readPositionBuilder_ = null; } return this; @@ -7562,15 +7615,22 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsRequest build() public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsRequest result = new com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsRequest(this); - if (readPositionBuilder_ == null) { - result.readPosition_ = readPosition_; - } else { - result.readPosition_ = readPositionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.readPosition_ = + readPositionBuilder_ == null ? readPosition_ : readPositionBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -7654,7 +7714,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getReadPositionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -7674,6 +7734,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition readPosition_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition, @@ -7696,7 +7758,7 @@ public Builder mergeFrom( * @return Whether the readPosition field is set. */ public boolean hasReadPosition() { - return readPositionBuilder_ != null || readPosition_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -7743,11 +7805,11 @@ public Builder setReadPosition( throw new NullPointerException(); } readPosition_ = value; - onChanged(); } else { readPositionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -7768,11 +7830,11 @@ public Builder setReadPosition( builderForValue) { if (readPositionBuilder_ == null) { readPosition_ = builderForValue.build(); - onChanged(); } else { readPositionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -7791,20 +7853,20 @@ public Builder setReadPosition( public Builder mergeReadPosition( com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition value) { if (readPositionBuilder_ == null) { - if (readPosition_ != null) { - readPosition_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition.newBuilder( - readPosition_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && readPosition_ != null + && readPosition_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition + .getDefaultInstance()) { + getReadPositionBuilder().mergeFrom(value); } else { readPosition_ = value; } - onChanged(); } else { readPositionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -7821,14 +7883,13 @@ public Builder mergeReadPosition( * */ public Builder clearReadPosition() { - if (readPositionBuilder_ == null) { - readPosition_ = null; - onChanged(); - } else { - readPosition_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + readPosition_ = null; + if (readPositionBuilder_ != null) { + readPositionBuilder_.dispose(); readPositionBuilder_ = null; } - + onChanged(); return this; } /** @@ -7846,7 +7907,7 @@ public Builder clearReadPosition() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamPosition.Builder getReadPositionBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getReadPositionFieldBuilder().getBuilder(); } @@ -8109,7 +8170,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ESTIMATED_ROW_COUNT_FIELD_NUMBER = 1; - private long estimatedRowCount_; + private long estimatedRowCount_ = 0L; /** * * @@ -8129,7 +8190,7 @@ public long getEstimatedRowCount() { } public static final int FRACTION_CONSUMED_FIELD_NUMBER = 2; - private float fractionConsumed_; + private float fractionConsumed_ = 0F; /** * * @@ -8197,11 +8258,13 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Progress getProgress() @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ProgressOrBuilder getProgressOrBuilder() { - return getProgress(); + return progress_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Progress.getDefaultInstance() + : progress_; } public static final int IS_SPLITTABLE_FIELD_NUMBER = 3; - private boolean isSplittable_; + private boolean isSplittable_ = false; /** * * @@ -8455,18 +8518,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; estimatedRowCount_ = 0L; - fractionConsumed_ = 0F; - - if (progressBuilder_ == null) { - progress_ = null; - } else { - progress_ = null; + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } isSplittable_ = false; - return this; } @@ -8495,18 +8555,30 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus build() { public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus result = new com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus(this); - result.estimatedRowCount_ = estimatedRowCount_; - result.fractionConsumed_ = fractionConsumed_; - if (progressBuilder_ == null) { - result.progress_ = progress_; - } else { - result.progress_ = progressBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.isSplittable_ = isSplittable_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.estimatedRowCount_ = estimatedRowCount_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.fractionConsumed_ = fractionConsumed_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.progress_ = progressBuilder_ == null ? progress_ : progressBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.isSplittable_ = isSplittable_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -8598,25 +8670,25 @@ public Builder mergeFrom( case 8: { estimatedRowCount_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 case 21: { fractionConsumed_ = input.readFloat(); - + bitField0_ |= 0x00000002; break; } // case 21 case 24: { isSplittable_ = input.readBool(); - + bitField0_ |= 0x00000008; break; } // case 24 case 34: { input.readMessage(getProgressFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 34 default: @@ -8636,6 +8708,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long estimatedRowCount_; /** * @@ -8671,6 +8745,7 @@ public long getEstimatedRowCount() { public Builder setEstimatedRowCount(long value) { estimatedRowCount_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -8688,7 +8763,7 @@ public Builder setEstimatedRowCount(long value) { * @return This builder for chaining. */ public Builder clearEstimatedRowCount() { - + bitField0_ = (bitField0_ & ~0x00000001); estimatedRowCount_ = 0L; onChanged(); return this; @@ -8735,6 +8810,7 @@ public float getFractionConsumed() { public Builder setFractionConsumed(float value) { fractionConsumed_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -8755,7 +8831,7 @@ public Builder setFractionConsumed(float value) { * @return This builder for chaining. */ public Builder clearFractionConsumed() { - + bitField0_ = (bitField0_ & ~0x00000002); fractionConsumed_ = 0F; onChanged(); return this; @@ -8779,7 +8855,7 @@ public Builder clearFractionConsumed() { * @return Whether the progress field is set. */ public boolean hasProgress() { - return progressBuilder_ != null || progress_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -8816,11 +8892,11 @@ public Builder setProgress(com.google.cloud.bigquery.storage.v1beta1.Storage.Pro throw new NullPointerException(); } progress_ = value; - onChanged(); } else { progressBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -8836,11 +8912,11 @@ public Builder setProgress( com.google.cloud.bigquery.storage.v1beta1.Storage.Progress.Builder builderForValue) { if (progressBuilder_ == null) { progress_ = builderForValue.build(); - onChanged(); } else { progressBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -8855,19 +8931,20 @@ public Builder setProgress( public Builder mergeProgress( com.google.cloud.bigquery.storage.v1beta1.Storage.Progress value) { if (progressBuilder_ == null) { - if (progress_ != null) { - progress_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Progress.newBuilder(progress_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && progress_ != null + && progress_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Progress + .getDefaultInstance()) { + getProgressBuilder().mergeFrom(value); } else { progress_ = value; } - onChanged(); } else { progressBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -8880,14 +8957,13 @@ public Builder mergeProgress( * .google.cloud.bigquery.storage.v1beta1.Progress progress = 4; */ public Builder clearProgress() { - if (progressBuilder_ == null) { - progress_ = null; - onChanged(); - } else { - progress_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } - + onChanged(); return this; } /** @@ -8901,7 +8977,7 @@ public Builder clearProgress() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Progress.Builder getProgressBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getProgressFieldBuilder().getBuilder(); } @@ -8989,6 +9065,7 @@ public boolean getIsSplittable() { public Builder setIsSplittable(boolean value) { isSplittable_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -9008,7 +9085,7 @@ public Builder setIsSplittable(boolean value) { * @return This builder for chaining. */ public Builder clearIsSplittable() { - + bitField0_ = (bitField0_ & ~0x00000008); isSplittable_ = false; onChanged(); return this; @@ -9161,7 +9238,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int AT_RESPONSE_START_FIELD_NUMBER = 1; - private float atResponseStart_; + private float atResponseStart_ = 0F; /** * * @@ -9187,7 +9264,7 @@ public float getAtResponseStart() { } public static final int AT_RESPONSE_END_FIELD_NUMBER = 2; - private float atResponseEnd_; + private float atResponseEnd_ = 0F; /** * * @@ -9408,10 +9485,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; atResponseStart_ = 0F; - atResponseEnd_ = 0F; - return this; } @@ -9440,12 +9516,24 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Progress build() { public com.google.cloud.bigquery.storage.v1beta1.Storage.Progress buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.Progress result = new com.google.cloud.bigquery.storage.v1beta1.Storage.Progress(this); - result.atResponseStart_ = atResponseStart_; - result.atResponseEnd_ = atResponseEnd_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.Progress result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.atResponseStart_ = atResponseStart_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.atResponseEnd_ = atResponseEnd_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -9530,13 +9618,13 @@ public Builder mergeFrom( case 13: { atResponseStart_ = input.readFloat(); - + bitField0_ |= 0x00000001; break; } // case 13 case 21: { atResponseEnd_ = input.readFloat(); - + bitField0_ |= 0x00000002; break; } // case 21 default: @@ -9556,6 +9644,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private float atResponseStart_; /** * @@ -9603,6 +9693,7 @@ public float getAtResponseStart() { public Builder setAtResponseStart(float value) { atResponseStart_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -9626,7 +9717,7 @@ public Builder setAtResponseStart(float value) { * @return This builder for chaining. */ public Builder clearAtResponseStart() { - + bitField0_ = (bitField0_ & ~0x00000001); atResponseStart_ = 0F; onChanged(); return this; @@ -9665,6 +9756,7 @@ public float getAtResponseEnd() { public Builder setAtResponseEnd(float value) { atResponseEnd_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -9681,7 +9773,7 @@ public Builder setAtResponseEnd(float value) { * @return This builder for chaining. */ public Builder clearAtResponseEnd() { - + bitField0_ = (bitField0_ & ~0x00000002); atResponseEnd_ = 0F; onChanged(); return this; @@ -9819,7 +9911,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int THROTTLE_PERCENT_FIELD_NUMBER = 1; - private int throttlePercent_; + private int throttlePercent_ = 0; /** * * @@ -10039,8 +10131,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; throttlePercent_ = 0; - return this; } @@ -10070,11 +10162,21 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus build() public com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus result = new com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus(this); - result.throttlePercent_ = throttlePercent_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.throttlePercent_ = throttlePercent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -10158,7 +10260,7 @@ public Builder mergeFrom( case 8: { throttlePercent_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -10178,6 +10280,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int throttlePercent_; /** * @@ -10211,6 +10315,7 @@ public int getThrottlePercent() { public Builder setThrottlePercent(int value) { throttlePercent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -10227,7 +10332,7 @@ public Builder setThrottlePercent(int value) { * @return This builder for chaining. */ public Builder clearThrottlePercent() { - + bitField0_ = (bitField0_ & ~0x00000001); throttlePercent_ = 0; onChanged(); return this; @@ -10672,7 +10777,7 @@ public boolean hasArrowRecordBatch() { } public static final int ROW_COUNT_FIELD_NUMBER = 6; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -10738,7 +10843,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus getStatus( @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatusOrBuilder getStatusOrBuilder() { - return getStatus(); + return status_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus.getDefaultInstance() + : status_; } public static final int THROTTLE_STATUS_FIELD_NUMBER = 5; @@ -10790,7 +10897,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus getThrot @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatusOrBuilder getThrottleStatusOrBuilder() { - return getThrottleStatus(); + return throttleStatus_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus.getDefaultInstance() + : throttleStatus_; } private byte memoizedIsInitialized = -1; @@ -11065,6 +11174,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (avroRowsBuilder_ != null) { avroRowsBuilder_.clear(); } @@ -11072,17 +11182,14 @@ public Builder clear() { arrowRecordBatchBuilder_.clear(); } rowCount_ = 0L; - - if (statusBuilder_ == null) { - status_ = null; - } else { - status_ = null; + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); statusBuilder_ = null; } - if (throttleStatusBuilder_ == null) { - throttleStatus_ = null; - } else { - throttleStatus_ = null; + throttleStatus_ = null; + if (throttleStatusBuilder_ != null) { + throttleStatusBuilder_.dispose(); throttleStatusBuilder_ = null; } rowsCase_ = 0; @@ -11116,34 +11223,39 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse build( public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse result = new com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse(this); - if (rowsCase_ == 3) { - if (avroRowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = avroRowsBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (rowsCase_ == 4) { - if (arrowRecordBatchBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = arrowRecordBatchBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowCount_ = rowCount_; } - result.rowCount_ = rowCount_; - if (statusBuilder_ == null) { - result.status_ = status_; - } else { - result.status_ = statusBuilder_.build(); + if (((from_bitField0_ & 0x00000008) != 0)) { + result.status_ = statusBuilder_ == null ? status_ : statusBuilder_.build(); } - if (throttleStatusBuilder_ == null) { - result.throttleStatus_ = throttleStatus_; - } else { - result.throttleStatus_ = throttleStatusBuilder_.build(); + if (((from_bitField0_ & 0x00000010) != 0)) { + result.throttleStatus_ = + throttleStatusBuilder_ == null ? throttleStatus_ : throttleStatusBuilder_.build(); } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1beta1.Storage.ReadRowsResponse result) { result.rowsCase_ = rowsCase_; - onBuilt(); - return result; + result.rows_ = this.rows_; + if (rowsCase_ == 3 && avroRowsBuilder_ != null) { + result.rows_ = avroRowsBuilder_.build(); + } + if (rowsCase_ == 4 && arrowRecordBatchBuilder_ != null) { + result.rows_ = arrowRecordBatchBuilder_.build(); + } } @java.lang.Override @@ -11251,7 +11363,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getStatusFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 18 case 26: @@ -11271,13 +11383,13 @@ public Builder mergeFrom( { input.readMessage( getThrottleStatusFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 48 default: @@ -11311,6 +11423,8 @@ public Builder clearRows() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows, com.google.cloud.bigquery.storage.v1beta1.AvroProto.AvroRows.Builder, @@ -11524,7 +11638,6 @@ public Builder clearAvroRows() { } rowsCase_ = 3; onChanged(); - ; return avroRowsBuilder_; } @@ -11757,7 +11870,6 @@ public Builder clearArrowRecordBatch() { } rowsCase_ = 4; onChanged(); - ; return arrowRecordBatchBuilder_; } @@ -11798,6 +11910,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -11816,7 +11929,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000004); rowCount_ = 0L; onChanged(); return this; @@ -11840,7 +11953,7 @@ public Builder clearRowCount() { * @return Whether the status field is set. */ public boolean hasStatus() { - return statusBuilder_ != null || status_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -11878,11 +11991,11 @@ public Builder setStatus( throw new NullPointerException(); } status_ = value; - onChanged(); } else { statusBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -11898,11 +12011,11 @@ public Builder setStatus( com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus.Builder builderForValue) { if (statusBuilder_ == null) { status_ = builderForValue.build(); - onChanged(); } else { statusBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -11917,19 +12030,20 @@ public Builder setStatus( public Builder mergeStatus( com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus value) { if (statusBuilder_ == null) { - if (status_ != null) { - status_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus.newBuilder(status_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && status_ != null + && status_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus + .getDefaultInstance()) { + getStatusBuilder().mergeFrom(value); } else { status_ = value; } - onChanged(); } else { statusBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -11942,14 +12056,13 @@ public Builder mergeStatus( * .google.cloud.bigquery.storage.v1beta1.StreamStatus status = 2; */ public Builder clearStatus() { - if (statusBuilder_ == null) { - status_ = null; - onChanged(); - } else { - status_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); statusBuilder_ = null; } - + onChanged(); return this; } /** @@ -11963,7 +12076,7 @@ public Builder clearStatus() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamStatus.Builder getStatusBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getStatusFieldBuilder().getBuilder(); } @@ -12031,7 +12144,7 @@ public Builder clearStatus() { * @return Whether the throttleStatus field is set. */ public boolean hasThrottleStatus() { - return throttleStatusBuilder_ != null || throttleStatus_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -12072,11 +12185,11 @@ public Builder setThrottleStatus( throw new NullPointerException(); } throttleStatus_ = value; - onChanged(); } else { throttleStatusBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -12094,11 +12207,11 @@ public Builder setThrottleStatus( builderForValue) { if (throttleStatusBuilder_ == null) { throttleStatus_ = builderForValue.build(); - onChanged(); } else { throttleStatusBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -12114,20 +12227,20 @@ public Builder setThrottleStatus( public Builder mergeThrottleStatus( com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus value) { if (throttleStatusBuilder_ == null) { - if (throttleStatus_ != null) { - throttleStatus_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus.newBuilder( - throttleStatus_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && throttleStatus_ != null + && throttleStatus_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus + .getDefaultInstance()) { + getThrottleStatusBuilder().mergeFrom(value); } else { throttleStatus_ = value; } - onChanged(); } else { throttleStatusBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -12141,14 +12254,13 @@ public Builder mergeThrottleStatus( * .google.cloud.bigquery.storage.v1beta1.ThrottleStatus throttle_status = 5; */ public Builder clearThrottleStatus() { - if (throttleStatusBuilder_ == null) { - throttleStatus_ = null; - onChanged(); - } else { - throttleStatus_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + throttleStatus_ = null; + if (throttleStatusBuilder_ != null) { + throttleStatusBuilder_.dispose(); throttleStatusBuilder_ = null; } - + onChanged(); return this; } /** @@ -12163,7 +12275,7 @@ public Builder clearThrottleStatus() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.ThrottleStatus.Builder getThrottleStatusBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getThrottleStatusFieldBuilder().getBuilder(); } @@ -12454,11 +12566,13 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession getSession( @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSessionOrBuilder getSessionOrBuilder() { - return getSession(); + return session_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession.getDefaultInstance() + : session_; } public static final int REQUESTED_STREAMS_FIELD_NUMBER = 2; - private int requestedStreams_; + private int requestedStreams_ = 0; /** * * @@ -12719,14 +12833,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (sessionBuilder_ == null) { - session_ = null; - } else { - session_ = null; + bitField0_ = 0; + session_ = null; + if (sessionBuilder_ != null) { + sessionBuilder_.dispose(); sessionBuilder_ = null; } requestedStreams_ = 0; - return this; } @@ -12761,16 +12874,25 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result = new com.google.cloud.bigquery.storage.v1beta1.Storage .BatchCreateReadSessionStreamsRequest(this); - if (sessionBuilder_ == null) { - result.session_ = session_; - } else { - result.session_ = sessionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.requestedStreams_ = requestedStreams_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.BatchCreateReadSessionStreamsRequest + result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.session_ = sessionBuilder_ == null ? session_ : sessionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.requestedStreams_ = requestedStreams_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -12863,13 +12985,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getSessionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { requestedStreams_ = input.readInt32(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -12889,6 +13011,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession session_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession, @@ -12910,7 +13034,7 @@ public Builder mergeFrom( * @return Whether the session field is set. */ public boolean hasSession() { - return sessionBuilder_ != null || session_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -12954,11 +13078,11 @@ public Builder setSession( throw new NullPointerException(); } session_ = value; - onChanged(); } else { sessionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -12977,11 +13101,11 @@ public Builder setSession( com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession.Builder builderForValue) { if (sessionBuilder_ == null) { session_ = builderForValue.build(); - onChanged(); } else { sessionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -12999,19 +13123,20 @@ public Builder setSession( public Builder mergeSession( com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession value) { if (sessionBuilder_ == null) { - if (session_ != null) { - session_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession.newBuilder(session_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && session_ != null + && session_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession + .getDefaultInstance()) { + getSessionBuilder().mergeFrom(value); } else { session_ = value; } - onChanged(); } else { sessionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -13027,14 +13152,13 @@ public Builder mergeSession( * */ public Builder clearSession() { - if (sessionBuilder_ == null) { - session_ = null; - onChanged(); - } else { - session_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + session_ = null; + if (sessionBuilder_ != null) { + sessionBuilder_.dispose(); sessionBuilder_ = null; } - + onChanged(); return this; } /** @@ -13051,7 +13175,7 @@ public Builder clearSession() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.ReadSession.Builder getSessionBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getSessionFieldBuilder().getBuilder(); } @@ -13141,6 +13265,7 @@ public int getRequestedStreams() { public Builder setRequestedStreams(int value) { requestedStreams_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -13158,7 +13283,7 @@ public Builder setRequestedStreams(int value) { * @return This builder for chaining. */ public Builder clearRequestedStreams() { - + bitField0_ = (bitField0_ & ~0x00000002); requestedStreams_ = 0; onChanged(); return this; @@ -13349,6 +13474,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int STREAMS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List streams_; /** * @@ -13653,6 +13780,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (streamsBuilder_ == null) { streams_ = java.util.Collections.emptyList(); } else { @@ -13694,7 +13822,17 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result = new com.google.cloud.bigquery.storage.v1beta1.Storage .BatchCreateReadSessionStreamsResponse(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta1.Storage.BatchCreateReadSessionStreamsResponse + result) { if (streamsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { streams_ = java.util.Collections.unmodifiableList(streams_); @@ -13704,8 +13842,12 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { } else { result.streams_ = streamsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.BatchCreateReadSessionStreamsResponse + result) { + int from_bitField0_ = bitField0_; } @java.lang.Override @@ -14432,7 +14574,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream getStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder getStreamOrBuilder() { - return getStream(); + return stream_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.getDefaultInstance() + : stream_; } private byte memoizedIsInitialized = -1; @@ -14644,10 +14788,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (streamBuilder_ == null) { - stream_ = null; - } else { - stream_ = null; + bitField0_ = 0; + stream_ = null; + if (streamBuilder_ != null) { + streamBuilder_.dispose(); streamBuilder_ = null; } return this; @@ -14681,15 +14825,21 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.FinalizeStreamRequest b buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.FinalizeStreamRequest result = new com.google.cloud.bigquery.storage.v1beta1.Storage.FinalizeStreamRequest(this); - if (streamBuilder_ == null) { - result.stream_ = stream_; - } else { - result.stream_ = streamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.FinalizeStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.stream_ = streamBuilder_ == null ? stream_ : streamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -14774,7 +14924,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 18 default: @@ -14794,6 +14944,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.Stream stream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.Stream, @@ -14814,7 +14966,7 @@ public Builder mergeFrom( * @return Whether the stream field is set. */ public boolean hasStream() { - return streamBuilder_ != null || stream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -14855,11 +15007,11 @@ public Builder setStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Strea throw new NullPointerException(); } stream_ = value; - onChanged(); } else { streamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -14877,11 +15029,11 @@ public Builder setStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder builderForValue) { if (streamBuilder_ == null) { stream_ = builderForValue.build(); - onChanged(); } else { streamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -14897,19 +15049,20 @@ public Builder setStream( */ public Builder mergeStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Stream value) { if (streamBuilder_ == null) { - if (stream_ != null) { - stream_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.newBuilder(stream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && stream_ != null + && stream_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Stream + .getDefaultInstance()) { + getStreamBuilder().mergeFrom(value); } else { stream_ = value; } - onChanged(); } else { streamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -14924,14 +15077,13 @@ public Builder mergeStream(com.google.cloud.bigquery.storage.v1beta1.Storage.Str * */ public Builder clearStream() { - if (streamBuilder_ == null) { - stream_ = null; - onChanged(); - } else { - stream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + stream_ = null; + if (streamBuilder_ != null) { + streamBuilder_.dispose(); streamBuilder_ = null; } - + onChanged(); return this; } /** @@ -14946,7 +15098,7 @@ public Builder clearStream() { * */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder getStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getStreamFieldBuilder().getBuilder(); } @@ -15232,11 +15384,13 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream getOriginalStrea @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder getOriginalStreamOrBuilder() { - return getOriginalStream(); + return originalStream_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.getDefaultInstance() + : originalStream_; } public static final int FRACTION_FIELD_NUMBER = 2; - private float fraction_; + private float fraction_ = 0F; /** * * @@ -15483,14 +15637,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (originalStreamBuilder_ == null) { - originalStream_ = null; - } else { - originalStream_ = null; + bitField0_ = 0; + originalStream_ = null; + if (originalStreamBuilder_ != null) { + originalStreamBuilder_.dispose(); originalStreamBuilder_ = null; } fraction_ = 0F; - return this; } @@ -15522,16 +15675,25 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamRequest result = new com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamRequest(this); - if (originalStreamBuilder_ == null) { - result.originalStream_ = originalStream_; - } else { - result.originalStream_ = originalStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.fraction_ = fraction_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.originalStream_ = + originalStreamBuilder_ == null ? originalStream_ : originalStreamBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.fraction_ = fraction_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -15620,13 +15782,13 @@ public Builder mergeFrom( { input.readMessage( getOriginalStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 21: { fraction_ = input.readFloat(); - + bitField0_ |= 0x00000002; break; } // case 21 default: @@ -15646,6 +15808,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.Stream originalStream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.Stream, @@ -15666,7 +15830,7 @@ public Builder mergeFrom( * @return Whether the originalStream field is set. */ public boolean hasOriginalStream() { - return originalStreamBuilder_ != null || originalStream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -15708,11 +15872,11 @@ public Builder setOriginalStream( throw new NullPointerException(); } originalStream_ = value; - onChanged(); } else { originalStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -15730,11 +15894,11 @@ public Builder setOriginalStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder builderForValue) { if (originalStreamBuilder_ == null) { originalStream_ = builderForValue.build(); - onChanged(); } else { originalStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -15751,19 +15915,20 @@ public Builder setOriginalStream( public Builder mergeOriginalStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream value) { if (originalStreamBuilder_ == null) { - if (originalStream_ != null) { - originalStream_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.newBuilder(originalStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && originalStream_ != null + && originalStream_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Stream + .getDefaultInstance()) { + getOriginalStreamBuilder().mergeFrom(value); } else { originalStream_ = value; } - onChanged(); } else { originalStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -15778,14 +15943,13 @@ public Builder mergeOriginalStream( * */ public Builder clearOriginalStream() { - if (originalStreamBuilder_ == null) { - originalStream_ = null; - onChanged(); - } else { - originalStream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + originalStream_ = null; + if (originalStreamBuilder_ != null) { + originalStreamBuilder_.dispose(); originalStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -15801,7 +15965,7 @@ public Builder clearOriginalStream() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder getOriginalStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOriginalStreamFieldBuilder().getBuilder(); } @@ -15897,6 +16061,7 @@ public float getFraction() { public Builder setFraction(float value) { fraction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -15918,7 +16083,7 @@ public Builder setFraction(float value) { * @return This builder for chaining. */ public Builder clearFraction() { - + bitField0_ = (bitField0_ & ~0x00000002); fraction_ = 0F; onChanged(); return this; @@ -16176,7 +16341,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream getPrimaryStream @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder getPrimaryStreamOrBuilder() { - return getPrimaryStream(); + return primaryStream_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.getDefaultInstance() + : primaryStream_; } public static final int REMAINDER_STREAM_FIELD_NUMBER = 2; @@ -16228,7 +16395,9 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream getRemainderStre @java.lang.Override public com.google.cloud.bigquery.storage.v1beta1.Storage.StreamOrBuilder getRemainderStreamOrBuilder() { - return getRemainderStream(); + return remainderStream_ == null + ? com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.getDefaultInstance() + : remainderStream_; } private byte memoizedIsInitialized = -1; @@ -16459,16 +16628,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - } else { - primaryStream_ = null; + bitField0_ = 0; + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - } else { - remainderStream_ = null; + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } return this; @@ -16502,20 +16670,26 @@ public com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamResponse result = new com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamResponse(this); - if (primaryStreamBuilder_ == null) { - result.primaryStream_ = primaryStream_; - } else { - result.primaryStream_ = primaryStreamBuilder_.build(); - } - if (remainderStreamBuilder_ == null) { - result.remainderStream_ = remainderStream_; - } else { - result.remainderStream_ = remainderStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.Storage.SplitReadStreamResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.primaryStream_ = + primaryStreamBuilder_ == null ? primaryStream_ : primaryStreamBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.remainderStream_ = + remainderStreamBuilder_ == null ? remainderStream_ : remainderStreamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -16603,14 +16777,14 @@ public Builder mergeFrom( case 10: { input.readMessage(getPrimaryStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( getRemainderStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -16630,6 +16804,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta1.Storage.Stream primaryStream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta1.Storage.Stream, @@ -16650,7 +16826,7 @@ public Builder mergeFrom( * @return Whether the primaryStream field is set. */ public boolean hasPrimaryStream() { - return primaryStreamBuilder_ != null || primaryStream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -16692,11 +16868,11 @@ public Builder setPrimaryStream( throw new NullPointerException(); } primaryStream_ = value; - onChanged(); } else { primaryStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -16714,11 +16890,11 @@ public Builder setPrimaryStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder builderForValue) { if (primaryStreamBuilder_ == null) { primaryStream_ = builderForValue.build(); - onChanged(); } else { primaryStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -16735,19 +16911,20 @@ public Builder setPrimaryStream( public Builder mergePrimaryStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream value) { if (primaryStreamBuilder_ == null) { - if (primaryStream_ != null) { - primaryStream_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.newBuilder(primaryStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && primaryStream_ != null + && primaryStream_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Stream + .getDefaultInstance()) { + getPrimaryStreamBuilder().mergeFrom(value); } else { primaryStream_ = value; } - onChanged(); } else { primaryStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -16762,14 +16939,13 @@ public Builder mergePrimaryStream( * .google.cloud.bigquery.storage.v1beta1.Stream primary_stream = 1; */ public Builder clearPrimaryStream() { - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - onChanged(); - } else { - primaryStream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -16785,7 +16961,7 @@ public Builder clearPrimaryStream() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder getPrimaryStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPrimaryStreamFieldBuilder().getBuilder(); } @@ -16857,7 +17033,7 @@ public Builder clearPrimaryStream() { * @return Whether the remainderStream field is set. */ public boolean hasRemainderStream() { - return remainderStreamBuilder_ != null || remainderStream_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -16897,11 +17073,11 @@ public Builder setRemainderStream( throw new NullPointerException(); } remainderStream_ = value; - onChanged(); } else { remainderStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -16918,11 +17094,11 @@ public Builder setRemainderStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder builderForValue) { if (remainderStreamBuilder_ == null) { remainderStream_ = builderForValue.build(); - onChanged(); } else { remainderStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -16938,20 +17114,20 @@ public Builder setRemainderStream( public Builder mergeRemainderStream( com.google.cloud.bigquery.storage.v1beta1.Storage.Stream value) { if (remainderStreamBuilder_ == null) { - if (remainderStream_ != null) { - remainderStream_ = - com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.newBuilder( - remainderStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && remainderStream_ != null + && remainderStream_ + != com.google.cloud.bigquery.storage.v1beta1.Storage.Stream + .getDefaultInstance()) { + getRemainderStreamBuilder().mergeFrom(value); } else { remainderStream_ = value; } - onChanged(); } else { remainderStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -16965,14 +17141,13 @@ public Builder mergeRemainderStream( * .google.cloud.bigquery.storage.v1beta1.Stream remainder_stream = 2; */ public Builder clearRemainderStream() { - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - onChanged(); - } else { - remainderStream_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -16987,7 +17162,7 @@ public Builder clearRemainderStream() { */ public com.google.cloud.bigquery.storage.v1beta1.Storage.Stream.Builder getRemainderStreamBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRemainderStreamFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java index 4527edbedb..b77e7d77c8 100644 --- a/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java +++ b/proto-google-cloud-bigquerystorage-v1beta1/src/main/java/com/google/cloud/bigquery/storage/v1beta1/TableReferenceProto.java @@ -160,7 +160,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PROJECT_ID_FIELD_NUMBER = 1; - private volatile java.lang.Object projectId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object projectId_ = ""; /** * * @@ -209,7 +211,9 @@ public com.google.protobuf.ByteString getProjectIdBytes() { } public static final int DATASET_ID_FIELD_NUMBER = 2; - private volatile java.lang.Object datasetId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object datasetId_ = ""; /** * * @@ -258,7 +262,9 @@ public com.google.protobuf.ByteString getDatasetIdBytes() { } public static final int TABLE_ID_FIELD_NUMBER = 3; - private volatile java.lang.Object tableId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object tableId_ = ""; /** * * @@ -534,12 +540,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; projectId_ = ""; - datasetId_ = ""; - tableId_ = ""; - return this; } @@ -571,13 +575,27 @@ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableRefere buildPartial() { com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference result = new com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference(this); - result.projectId_ = projectId_; - result.datasetId_ = datasetId_; - result.tableId_ = tableId_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableReference result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.projectId_ = projectId_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.datasetId_ = datasetId_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.tableId_ = tableId_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -633,14 +651,17 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getProjectId().isEmpty()) { projectId_ = other.projectId_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getDatasetId().isEmpty()) { datasetId_ = other.datasetId_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getTableId().isEmpty()) { tableId_ = other.tableId_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -672,19 +693,19 @@ public Builder mergeFrom( case 10: { projectId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { datasetId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { tableId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -704,6 +725,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object projectId_ = ""; /** * @@ -765,8 +788,8 @@ public Builder setProjectId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - projectId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -782,8 +805,8 @@ public Builder setProjectId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearProjectId() { - projectId_ = getDefaultInstance().getProjectId(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -804,8 +827,8 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - projectId_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -871,8 +894,8 @@ public Builder setDatasetId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - datasetId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -888,8 +911,8 @@ public Builder setDatasetId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDatasetId() { - datasetId_ = getDefaultInstance().getDatasetId(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -910,8 +933,8 @@ public Builder setDatasetIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - datasetId_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -977,8 +1000,8 @@ public Builder setTableId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - tableId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -994,8 +1017,8 @@ public Builder setTableId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTableId() { - tableId_ = getDefaultInstance().getTableId(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1016,8 +1039,8 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - tableId_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1224,7 +1247,9 @@ public com.google.protobuf.Timestamp getSnapshotTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getSnapshotTimeOrBuilder() { - return getSnapshotTime(); + return snapshotTime_ == null + ? com.google.protobuf.Timestamp.getDefaultInstance() + : snapshotTime_; } private byte memoizedIsInitialized = -1; @@ -1442,10 +1467,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - } else { - snapshotTime_ = null; + bitField0_ = 0; + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } return this; @@ -1479,15 +1504,22 @@ public com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifi buildPartial() { com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers result = new com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers(this); - if (snapshotTimeBuilder_ == null) { - result.snapshotTime_ = snapshotTime_; - } else { - result.snapshotTime_ = snapshotTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta1.TableReferenceProto.TableModifiers result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.snapshotTime_ = + snapshotTimeBuilder_ == null ? snapshotTime_ : snapshotTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1573,7 +1605,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getSnapshotTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -1593,6 +1625,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp snapshotTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -1611,7 +1645,7 @@ public Builder mergeFrom( * @return Whether the snapshotTime field is set. */ public boolean hasSnapshotTime() { - return snapshotTimeBuilder_ != null || snapshotTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1648,11 +1682,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } snapshotTime_ = value; - onChanged(); } else { snapshotTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1667,11 +1701,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (snapshotTimeBuilder_ == null) { snapshotTime_ = builderForValue.build(); - onChanged(); } else { snapshotTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1685,19 +1719,18 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForV */ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { if (snapshotTimeBuilder_ == null) { - if (snapshotTime_ != null) { - snapshotTime_ = - com.google.protobuf.Timestamp.newBuilder(snapshotTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && snapshotTime_ != null + && snapshotTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getSnapshotTimeBuilder().mergeFrom(value); } else { snapshotTime_ = value; } - onChanged(); } else { snapshotTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1710,14 +1743,13 @@ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp snapshot_time = 1; */ public Builder clearSnapshotTime() { - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - onChanged(); - } else { - snapshotTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1730,7 +1762,7 @@ public Builder clearSnapshotTime() { * .google.protobuf.Timestamp snapshot_time = 1; */ public com.google.protobuf.Timestamp.Builder getSnapshotTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getSnapshotTimeFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml index 347f3c7f09..40314d66f0 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/pom.xml +++ b/proto-google-cloud-bigquerystorage-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigquerystorage-v1beta2 - 0.152.2 + 0.152.3 proto-google-cloud-bigquerystorage-v1beta2 PROTO library for proto-google-cloud-bigquerystorage-v1beta2 com.google.cloud google-cloud-bigquerystorage-parent - 2.28.2 + 2.28.3 diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsRequest.java index 7d9f0ed1bd..a7410205bd 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsRequest.java @@ -236,7 +236,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ProtoSchema getWriterSchema() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ProtoSchemaOrBuilder getWriterSchemaOrBuilder() { - return getWriterSchema(); + return writerSchema_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ProtoSchema.getDefaultInstance() + : writerSchema_; } public static final int ROWS_FIELD_NUMBER = 2; @@ -284,7 +286,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ProtoRows getRows() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ProtoRowsOrBuilder getRowsOrBuilder() { - return getRows(); + return rows_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ProtoRows.getDefaultInstance() + : rows_; } private byte memoizedIsInitialized = -1; @@ -515,16 +519,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (writerSchemaBuilder_ == null) { - writerSchema_ = null; - } else { - writerSchema_ = null; + bitField0_ = 0; + writerSchema_ = null; + if (writerSchemaBuilder_ != null) { + writerSchemaBuilder_.dispose(); writerSchemaBuilder_ = null; } - if (rowsBuilder_ == null) { - rows_ = null; - } else { - rows_ = null; + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } return this; @@ -557,20 +560,25 @@ public com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData bui public com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData result = new com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData(this); - if (writerSchemaBuilder_ == null) { - result.writerSchema_ = writerSchema_; - } else { - result.writerSchema_ = writerSchemaBuilder_.build(); - } - if (rowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = rowsBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writerSchema_ = + writerSchemaBuilder_ == null ? writerSchema_ : writerSchemaBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rows_ = rowsBuilder_ == null ? rows_ : rowsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -663,13 +671,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getWriterSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRowsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -689,6 +697,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta2.ProtoSchema writerSchema_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta2.ProtoSchema, @@ -707,7 +717,7 @@ public Builder mergeFrom( * @return Whether the writerSchema field is set. */ public boolean hasWriterSchema() { - return writerSchemaBuilder_ != null || writerSchema_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -744,11 +754,11 @@ public Builder setWriterSchema(com.google.cloud.bigquery.storage.v1beta2.ProtoSc throw new NullPointerException(); } writerSchema_ = value; - onChanged(); } else { writerSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -764,11 +774,11 @@ public Builder setWriterSchema( com.google.cloud.bigquery.storage.v1beta2.ProtoSchema.Builder builderForValue) { if (writerSchemaBuilder_ == null) { writerSchema_ = builderForValue.build(); - onChanged(); } else { writerSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -783,19 +793,19 @@ public Builder setWriterSchema( public Builder mergeWriterSchema( com.google.cloud.bigquery.storage.v1beta2.ProtoSchema value) { if (writerSchemaBuilder_ == null) { - if (writerSchema_ != null) { - writerSchema_ = - com.google.cloud.bigquery.storage.v1beta2.ProtoSchema.newBuilder(writerSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && writerSchema_ != null + && writerSchema_ + != com.google.cloud.bigquery.storage.v1beta2.ProtoSchema.getDefaultInstance()) { + getWriterSchemaBuilder().mergeFrom(value); } else { writerSchema_ = value; } - onChanged(); } else { writerSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -808,14 +818,13 @@ public Builder mergeWriterSchema( * .google.cloud.bigquery.storage.v1beta2.ProtoSchema writer_schema = 1; */ public Builder clearWriterSchema() { - if (writerSchemaBuilder_ == null) { - writerSchema_ = null; - onChanged(); - } else { - writerSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + writerSchema_ = null; + if (writerSchemaBuilder_ != null) { + writerSchemaBuilder_.dispose(); writerSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -829,7 +838,7 @@ public Builder clearWriterSchema() { */ public com.google.cloud.bigquery.storage.v1beta2.ProtoSchema.Builder getWriterSchemaBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getWriterSchemaFieldBuilder().getBuilder(); } @@ -896,7 +905,7 @@ public Builder clearWriterSchema() { * @return Whether the rows field is set. */ public boolean hasRows() { - return rowsBuilder_ != null || rows_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -933,11 +942,11 @@ public Builder setRows(com.google.cloud.bigquery.storage.v1beta2.ProtoRows value throw new NullPointerException(); } rows_ = value; - onChanged(); } else { rowsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -953,11 +962,11 @@ public Builder setRows( com.google.cloud.bigquery.storage.v1beta2.ProtoRows.Builder builderForValue) { if (rowsBuilder_ == null) { rows_ = builderForValue.build(); - onChanged(); } else { rowsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -971,19 +980,19 @@ public Builder setRows( */ public Builder mergeRows(com.google.cloud.bigquery.storage.v1beta2.ProtoRows value) { if (rowsBuilder_ == null) { - if (rows_ != null) { - rows_ = - com.google.cloud.bigquery.storage.v1beta2.ProtoRows.newBuilder(rows_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && rows_ != null + && rows_ + != com.google.cloud.bigquery.storage.v1beta2.ProtoRows.getDefaultInstance()) { + getRowsBuilder().mergeFrom(value); } else { rows_ = value; } - onChanged(); } else { rowsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -996,14 +1005,13 @@ public Builder mergeRows(com.google.cloud.bigquery.storage.v1beta2.ProtoRows val * .google.cloud.bigquery.storage.v1beta2.ProtoRows rows = 2; */ public Builder clearRows() { - if (rowsBuilder_ == null) { - rows_ = null; - onChanged(); - } else { - rows_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + rows_ = null; + if (rowsBuilder_ != null) { + rowsBuilder_.dispose(); rowsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1016,7 +1024,7 @@ public Builder clearRows() { * .google.cloud.bigquery.storage.v1beta2.ProtoRows rows = 2; */ public com.google.cloud.bigquery.storage.v1beta2.ProtoRows.Builder getRowsBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRowsFieldBuilder().getBuilder(); } @@ -1177,7 +1185,9 @@ public RowsCase getRowsCase() { } public static final int WRITE_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object writeStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writeStream_ = ""; /** * * @@ -1289,7 +1299,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } public static final int PROTO_ROWS_FIELD_NUMBER = 4; @@ -1347,7 +1357,9 @@ public com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest.ProtoData get } public static final int TRACE_ID_FIELD_NUMBER = 6; - private volatile java.lang.Object traceId_; + + @SuppressWarnings("serial") + private volatile java.lang.Object traceId_ = ""; /** * * @@ -1649,19 +1661,17 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; writeStream_ = ""; - - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } if (protoRowsBuilder_ != null) { protoRowsBuilder_.clear(); } traceId_ = ""; - rowsCase_ = 0; rows_ = null; return this; @@ -1691,25 +1701,36 @@ public com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest build() { public com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest result = new com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest(this); - result.writeStream_ = writeStream_; - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); - } - if (rowsCase_ == 4) { - if (protoRowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = protoRowsBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - result.traceId_ = traceId_; - result.rowsCase_ = rowsCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writeStream_ = writeStream_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.traceId_ = traceId_; + } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1beta2.AppendRowsRequest result) { + result.rowsCase_ = rowsCase_; + result.rows_ = this.rows_; + if (rowsCase_ == 4 && protoRowsBuilder_ != null) { + result.rows_ = protoRowsBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1758,6 +1779,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.AppendRowsReq return this; if (!other.getWriteStream().isEmpty()) { writeStream_ = other.writeStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOffset()) { @@ -1765,6 +1787,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.AppendRowsReq } if (!other.getTraceId().isEmpty()) { traceId_ = other.traceId_; + bitField0_ |= 0x00000008; onChanged(); } switch (other.getRowsCase()) { @@ -1812,13 +1835,13 @@ public Builder mergeFrom( case 10: { writeStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 34: @@ -1830,7 +1853,7 @@ public Builder mergeFrom( case 50: { traceId_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000008; break; } // case 50 default: @@ -1864,6 +1887,8 @@ public Builder clearRows() { return this; } + private int bitField0_; + private java.lang.Object writeStream_ = ""; /** * @@ -1943,8 +1968,8 @@ public Builder setWriteStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1966,8 +1991,8 @@ public Builder setWriteStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriteStream() { - writeStream_ = getDefaultInstance().getWriteStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1994,8 +2019,8 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -2021,7 +2046,7 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -2062,11 +2087,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2084,11 +2109,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2105,17 +2130,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -2131,14 +2157,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 2; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -2154,7 +2179,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 2; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getOffsetFieldBuilder().getBuilder(); } @@ -2433,7 +2458,6 @@ public Builder clearProtoRows() { } rowsCase_ = 4; onChanged(); - ; return protoRowsBuilder_; } @@ -2501,8 +2525,8 @@ public Builder setTraceId(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - traceId_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2519,8 +2543,8 @@ public Builder setTraceId(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTraceId() { - traceId_ = getDefaultInstance().getTraceId(); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -2542,8 +2566,8 @@ public Builder setTraceIdBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - traceId_ = value; + bitField0_ |= 0x00000008; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsResponse.java index a46b8f3d68..76d315ceac 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AppendRowsResponse.java @@ -202,7 +202,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } private byte memoizedIsInitialized = -1; @@ -419,10 +419,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + bitField0_ = 0; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } return this; @@ -456,15 +456,21 @@ public com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult result = new com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult(this); - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -549,7 +555,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -569,6 +575,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Int64Value offset_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int64Value, @@ -588,7 +596,7 @@ public Builder mergeFrom( * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -625,11 +633,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -645,11 +653,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -664,17 +672,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -688,14 +697,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 1; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -709,7 +717,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 1; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getOffsetFieldBuilder().getBuilder(); } @@ -1072,7 +1080,9 @@ public com.google.cloud.bigquery.storage.v1beta2.TableSchema getUpdatedSchema() @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableSchemaOrBuilder getUpdatedSchemaOrBuilder() { - return getUpdatedSchema(); + return updatedSchema_ == null + ? com.google.cloud.bigquery.storage.v1beta2.TableSchema.getDefaultInstance() + : updatedSchema_; } private byte memoizedIsInitialized = -1; @@ -1320,16 +1330,16 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (appendResultBuilder_ != null) { appendResultBuilder_.clear(); } if (errorBuilder_ != null) { errorBuilder_.clear(); } - if (updatedSchemaBuilder_ == null) { - updatedSchema_ = null; - } else { - updatedSchema_ = null; + updatedSchema_ = null; + if (updatedSchemaBuilder_ != null) { + updatedSchemaBuilder_.dispose(); updatedSchemaBuilder_ = null; } responseCase_ = 0; @@ -1362,30 +1372,35 @@ public com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse build() { public com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse result = new com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse(this); - if (responseCase_ == 1) { - if (appendResultBuilder_ == null) { - result.response_ = response_; - } else { - result.response_ = appendResultBuilder_.build(); - } - } - if (responseCase_ == 2) { - if (errorBuilder_ == null) { - result.response_ = response_; - } else { - result.response_ = errorBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (updatedSchemaBuilder_ == null) { - result.updatedSchema_ = updatedSchema_; - } else { - result.updatedSchema_ = updatedSchemaBuilder_.build(); - } - result.responseCase_ = responseCase_; + buildPartialOneofs(result); onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.updatedSchema_ = + updatedSchemaBuilder_ == null ? updatedSchema_ : updatedSchemaBuilder_.build(); + } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse result) { + result.responseCase_ = responseCase_; + result.response_ = this.response_; + if (responseCase_ == 1 && appendResultBuilder_ != null) { + result.response_ = appendResultBuilder_.build(); + } + if (responseCase_ == 2 && errorBuilder_ != null) { + result.response_ = errorBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1493,7 +1508,7 @@ public Builder mergeFrom( case 26: { input.readMessage(getUpdatedSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1527,6 +1542,8 @@ public Builder clearResponse() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult, com.google.cloud.bigquery.storage.v1beta2.AppendRowsResponse.AppendResult.Builder, @@ -1768,7 +1785,6 @@ public Builder clearAppendResult() { } responseCase_ = 1; onChanged(); - ; return appendResultBuilder_; } @@ -2086,7 +2102,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { } responseCase_ = 2; onChanged(); - ; return errorBuilder_; } @@ -2110,7 +2125,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() { * @return Whether the updatedSchema field is set. */ public boolean hasUpdatedSchema() { - return updatedSchemaBuilder_ != null || updatedSchema_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -2151,11 +2166,11 @@ public Builder setUpdatedSchema(com.google.cloud.bigquery.storage.v1beta2.TableS throw new NullPointerException(); } updatedSchema_ = value; - onChanged(); } else { updatedSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2173,11 +2188,11 @@ public Builder setUpdatedSchema( com.google.cloud.bigquery.storage.v1beta2.TableSchema.Builder builderForValue) { if (updatedSchemaBuilder_ == null) { updatedSchema_ = builderForValue.build(); - onChanged(); } else { updatedSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2193,19 +2208,19 @@ public Builder setUpdatedSchema( */ public Builder mergeUpdatedSchema(com.google.cloud.bigquery.storage.v1beta2.TableSchema value) { if (updatedSchemaBuilder_ == null) { - if (updatedSchema_ != null) { - updatedSchema_ = - com.google.cloud.bigquery.storage.v1beta2.TableSchema.newBuilder(updatedSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && updatedSchema_ != null + && updatedSchema_ + != com.google.cloud.bigquery.storage.v1beta2.TableSchema.getDefaultInstance()) { + getUpdatedSchemaBuilder().mergeFrom(value); } else { updatedSchema_ = value; } - onChanged(); } else { updatedSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2220,14 +2235,13 @@ public Builder mergeUpdatedSchema(com.google.cloud.bigquery.storage.v1beta2.Tabl * .google.cloud.bigquery.storage.v1beta2.TableSchema updated_schema = 3; */ public Builder clearUpdatedSchema() { - if (updatedSchemaBuilder_ == null) { - updatedSchema_ = null; - onChanged(); - } else { - updatedSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + updatedSchema_ = null; + if (updatedSchemaBuilder_ != null) { + updatedSchemaBuilder_.dispose(); updatedSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -2242,7 +2256,7 @@ public Builder clearUpdatedSchema() { * .google.cloud.bigquery.storage.v1beta2.TableSchema updated_schema = 3; */ public com.google.cloud.bigquery.storage.v1beta2.TableSchema.Builder getUpdatedSchemaBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getUpdatedSchemaFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowRecordBatch.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowRecordBatch.java index 9f9729d86d..f0f649a876 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowRecordBatch.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowRecordBatch.java @@ -68,7 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_RECORD_BATCH_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedRecordBatch_; + private com.google.protobuf.ByteString serializedRecordBatch_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -283,8 +284,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -312,11 +313,20 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch build() { public com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch result = new com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch(this); - result.serializedRecordBatch_ = serializedRecordBatch_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedRecordBatch_ = serializedRecordBatch_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -395,7 +405,7 @@ public Builder mergeFrom( case 10: { serializedRecordBatch_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -415,6 +425,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedRecordBatch_ = com.google.protobuf.ByteString.EMPTY; /** @@ -448,8 +460,8 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedRecordBatch_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -465,7 +477,7 @@ public Builder setSerializedRecordBatch(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedRecordBatch() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedRecordBatch_ = getDefaultInstance().getSerializedRecordBatch(); onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSchema.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSchema.java index 3def07938e..0852638cea 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSchema.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSchema.java @@ -72,7 +72,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_SCHEMA_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedSchema_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** * * @@ -291,8 +291,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedSchema_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -320,11 +320,20 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowSchema build() { public com.google.cloud.bigquery.storage.v1beta2.ArrowSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ArrowSchema result = new com.google.cloud.bigquery.storage.v1beta2.ArrowSchema(this); - result.serializedSchema_ = serializedSchema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ArrowSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedSchema_ = serializedSchema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -403,7 +412,7 @@ public Builder mergeFrom( case 10: { serializedSchema_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -423,6 +432,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedSchema_ = com.google.protobuf.ByteString.EMPTY; /** * @@ -455,8 +466,8 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedSchema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -472,7 +483,7 @@ public Builder setSerializedSchema(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedSchema() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedSchema_ = getDefaultInstance().getSerializedSchema(); onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSerializationOptions.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSerializationOptions.java index 03fba26518..fa9f13c85e 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSerializationOptions.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ArrowSerializationOptions.java @@ -227,7 +227,7 @@ private Format(int value) { } public static final int FORMAT_FIELD_NUMBER = 1; - private int format_; + private int format_ = 0; /** * * @@ -258,9 +258,9 @@ public int getFormatValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format getFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format result = - com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.valueOf(format_); + com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.forNumber( + format_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.UNRECOGNIZED : result; @@ -472,8 +472,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; format_ = 0; - return this; } @@ -503,11 +503,21 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions build public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions result = new com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions(this); - result.format_ = format_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.format_ = format_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -589,7 +599,7 @@ public Builder mergeFrom( case 8: { format_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -609,6 +619,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int format_ = 0; /** * @@ -640,8 +652,8 @@ public int getFormatValue() { * @return This builder for chaining. */ public Builder setFormatValue(int value) { - format_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -659,9 +671,8 @@ public Builder setFormatValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format getFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format result = - com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.valueOf( + com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.forNumber( format_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Format.UNRECOGNIZED @@ -685,7 +696,7 @@ public Builder setFormat( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; format_ = value.getNumber(); onChanged(); return this; @@ -703,7 +714,7 @@ public Builder setFormat( * @return This builder for chaining. */ public Builder clearFormat() { - + bitField0_ = (bitField0_ & ~0x00000001); format_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroRows.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroRows.java index b002f600bb..1bb668dc90 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroRows.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroRows.java @@ -68,7 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_BINARY_ROWS_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString serializedBinaryRows_; + private com.google.protobuf.ByteString serializedBinaryRows_ = + com.google.protobuf.ByteString.EMPTY; /** * * @@ -282,8 +283,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; - return this; } @@ -311,11 +312,20 @@ public com.google.cloud.bigquery.storage.v1beta2.AvroRows build() { public com.google.cloud.bigquery.storage.v1beta2.AvroRows buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AvroRows result = new com.google.cloud.bigquery.storage.v1beta2.AvroRows(this); - result.serializedBinaryRows_ = serializedBinaryRows_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.AvroRows result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.serializedBinaryRows_ = serializedBinaryRows_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -394,7 +404,7 @@ public Builder mergeFrom( case 10: { serializedBinaryRows_ = input.readBytes(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -414,6 +424,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.ByteString serializedBinaryRows_ = com.google.protobuf.ByteString.EMPTY; /** @@ -447,8 +459,8 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - serializedBinaryRows_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -464,7 +476,7 @@ public Builder setSerializedBinaryRows(com.google.protobuf.ByteString value) { * @return This builder for chaining. */ public Builder clearSerializedBinaryRows() { - + bitField0_ = (bitField0_ & ~0x00000001); serializedBinaryRows_ = getDefaultInstance().getSerializedBinaryRows(); onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroSchema.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroSchema.java index fbafd18b4b..25fae92701 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroSchema.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/AvroSchema.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SCHEMA_FIELD_NUMBER = 1; - private volatile java.lang.Object schema_; + + @SuppressWarnings("serial") + private volatile java.lang.Object schema_ = ""; /** * * @@ -315,8 +317,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; schema_ = ""; - return this; } @@ -344,11 +346,20 @@ public com.google.cloud.bigquery.storage.v1beta2.AvroSchema build() { public com.google.cloud.bigquery.storage.v1beta2.AvroSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta2.AvroSchema result = new com.google.cloud.bigquery.storage.v1beta2.AvroSchema(this); - result.schema_ = schema_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.AvroSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.schema_ = schema_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -397,6 +408,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.AvroSchema ot return this; if (!other.getSchema().isEmpty()) { schema_ = other.schema_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -428,7 +440,7 @@ public Builder mergeFrom( case 10: { schema_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -448,6 +460,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object schema_ = ""; /** * @@ -512,8 +526,8 @@ public Builder setSchema(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -530,8 +544,8 @@ public Builder setSchema(java.lang.String value) { * @return This builder for chaining. */ public Builder clearSchema() { - schema_ = getDefaultInstance().getSchema(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -553,8 +567,8 @@ public Builder setSchemaBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - schema_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsRequest.java index 0c22f60563..e62b521218 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsRequest.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -121,6 +123,8 @@ public com.google.protobuf.ByteString getParentBytes() { } public static final int WRITE_STREAMS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList writeStreams_; /** * @@ -399,10 +403,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - writeStreams_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -433,17 +437,31 @@ public com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest public com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest result = new com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest(this); - int from_bitField0_ = bitField0_; - result.parent_ = parent_; - if (((bitField0_ & 0x00000001) != 0)) { - writeStreams_ = writeStreams_.getUnmodifiableView(); - bitField0_ = (bitField0_ & ~0x00000001); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } - result.writeStreams_ = writeStreams_; onBuilt(); return result; } + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest result) { + if (((bitField0_ & 0x00000002) != 0)) { + writeStreams_ = writeStreams_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.writeStreams_ = writeStreams_; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -496,12 +514,13 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.writeStreams_.isEmpty()) { if (writeStreams_.isEmpty()) { writeStreams_ = other.writeStreams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureWriteStreamsIsMutable(); writeStreams_.addAll(other.writeStreams_); @@ -537,7 +556,7 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -630,8 +649,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -648,8 +667,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -671,8 +690,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -681,9 +700,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureWriteStreamsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { writeStreams_ = new com.google.protobuf.LazyStringArrayList(writeStreams_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } /** @@ -818,7 +837,7 @@ public Builder addAllWriteStreams(java.lang.Iterable values) { */ public Builder clearWriteStreams() { writeStreams_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsResponse.java index 896bbf3bfe..1a42ef4ec9 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/BatchCommitWriteStreamsResponse.java @@ -118,10 +118,12 @@ public com.google.protobuf.Timestamp getCommitTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { - return getCommitTime(); + return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_; } public static final int STREAM_ERRORS_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") private java.util.List streamErrors_; /** * @@ -430,10 +432,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (commitTimeBuilder_ == null) { - commitTime_ = null; - } else { - commitTime_ = null; + bitField0_ = 0; + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } if (streamErrorsBuilder_ == null) { @@ -442,7 +444,7 @@ public Builder clear() { streamErrors_ = null; streamErrorsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -474,23 +476,33 @@ public com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsResponse result = new com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsResponse(this); - int from_bitField0_ = bitField0_; - if (commitTimeBuilder_ == null) { - result.commitTime_ = commitTime_; - } else { - result.commitTime_ = commitTimeBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsResponse result) { if (streamErrorsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000002) != 0)) { streamErrors_ = java.util.Collections.unmodifiableList(streamErrors_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } result.streamErrors_ = streamErrors_; } else { result.streamErrors_ = streamErrorsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.BatchCommitWriteStreamsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build(); + } } @java.lang.Override @@ -550,7 +562,7 @@ public Builder mergeFrom( if (!other.streamErrors_.isEmpty()) { if (streamErrors_.isEmpty()) { streamErrors_ = other.streamErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); } else { ensureStreamErrorsIsMutable(); streamErrors_.addAll(other.streamErrors_); @@ -563,7 +575,7 @@ public Builder mergeFrom( streamErrorsBuilder_.dispose(); streamErrorsBuilder_ = null; streamErrors_ = other.streamErrors_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); streamErrorsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getStreamErrorsFieldBuilder() @@ -602,7 +614,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: @@ -658,7 +670,7 @@ public Builder mergeFrom( * @return Whether the commitTime field is set. */ public boolean hasCommitTime() { - return commitTimeBuilder_ != null || commitTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -699,11 +711,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } commitTime_ = value; - onChanged(); } else { commitTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -720,11 +732,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (commitTimeBuilder_ == null) { commitTime_ = builderForValue.build(); - onChanged(); } else { commitTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -740,17 +752,18 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { if (commitTimeBuilder_ == null) { - if (commitTime_ != null) { - commitTime_ = - com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && commitTime_ != null + && commitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCommitTimeBuilder().mergeFrom(value); } else { commitTime_ = value; } - onChanged(); } else { commitTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -765,14 +778,13 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp commit_time = 1; */ public Builder clearCommitTime() { - if (commitTimeBuilder_ == null) { - commitTime_ = null; - onChanged(); - } else { - commitTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -787,7 +799,7 @@ public Builder clearCommitTime() { * .google.protobuf.Timestamp commit_time = 1; */ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getCommitTimeFieldBuilder().getBuilder(); } @@ -843,11 +855,11 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { java.util.Collections.emptyList(); private void ensureStreamErrorsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000002) != 0)) { streamErrors_ = new java.util.ArrayList( streamErrors_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; } } @@ -1111,7 +1123,7 @@ public Builder addAllStreamErrors( public Builder clearStreamErrors() { if (streamErrorsBuilder_ == null) { streamErrors_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { streamErrorsBuilder_.clear(); @@ -1265,7 +1277,7 @@ public com.google.cloud.bigquery.storage.v1beta2.StorageError.Builder addStreamE com.google.cloud.bigquery.storage.v1beta2.StorageError, com.google.cloud.bigquery.storage.v1beta2.StorageError.Builder, com.google.cloud.bigquery.storage.v1beta2.StorageErrorOrBuilder>( - streamErrors_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + streamErrors_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); streamErrors_ = null; } return streamErrorsBuilder_; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateReadSessionRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateReadSessionRequest.java index 0c8831acdf..36b64bd143 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateReadSessionRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateReadSessionRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -173,11 +175,13 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession getReadSession() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ReadSessionOrBuilder getReadSessionOrBuilder() { - return getReadSession(); + return readSession_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ReadSession.getDefaultInstance() + : readSession_; } public static final int MAX_STREAM_COUNT_FIELD_NUMBER = 3; - private int maxStreamCount_; + private int maxStreamCount_ = 0; /** * * @@ -423,16 +427,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (readSessionBuilder_ == null) { - readSession_ = null; - } else { - readSession_ = null; + readSession_ = null; + if (readSessionBuilder_ != null) { + readSessionBuilder_.dispose(); readSessionBuilder_ = null; } maxStreamCount_ = 0; - return this; } @@ -462,17 +464,28 @@ public com.google.cloud.bigquery.storage.v1beta2.CreateReadSessionRequest build( public com.google.cloud.bigquery.storage.v1beta2.CreateReadSessionRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.CreateReadSessionRequest result = new com.google.cloud.bigquery.storage.v1beta2.CreateReadSessionRequest(this); - result.parent_ = parent_; - if (readSessionBuilder_ == null) { - result.readSession_ = readSession_; - } else { - result.readSession_ = readSessionBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } - result.maxStreamCount_ = maxStreamCount_; onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.CreateReadSessionRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.readSession_ = + readSessionBuilder_ == null ? readSession_ : readSessionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.maxStreamCount_ = maxStreamCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -524,6 +537,7 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasReadSession()) { @@ -561,19 +575,19 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getReadSessionFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { maxStreamCount_ = input.readInt32(); - + bitField0_ |= 0x00000004; break; } // case 24 default: @@ -593,6 +607,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -663,8 +679,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -683,8 +699,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -708,8 +724,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -734,7 +750,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the readSession field is set. */ public boolean hasReadSession() { - return readSessionBuilder_ != null || readSession_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -775,11 +791,11 @@ public Builder setReadSession(com.google.cloud.bigquery.storage.v1beta2.ReadSess throw new NullPointerException(); } readSession_ = value; - onChanged(); } else { readSessionBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -797,11 +813,11 @@ public Builder setReadSession( com.google.cloud.bigquery.storage.v1beta2.ReadSession.Builder builderForValue) { if (readSessionBuilder_ == null) { readSession_ = builderForValue.build(); - onChanged(); } else { readSessionBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -817,19 +833,19 @@ public Builder setReadSession( */ public Builder mergeReadSession(com.google.cloud.bigquery.storage.v1beta2.ReadSession value) { if (readSessionBuilder_ == null) { - if (readSession_ != null) { - readSession_ = - com.google.cloud.bigquery.storage.v1beta2.ReadSession.newBuilder(readSession_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && readSession_ != null + && readSession_ + != com.google.cloud.bigquery.storage.v1beta2.ReadSession.getDefaultInstance()) { + getReadSessionBuilder().mergeFrom(value); } else { readSession_ = value; } - onChanged(); } else { readSessionBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -844,14 +860,13 @@ public Builder mergeReadSession(com.google.cloud.bigquery.storage.v1beta2.ReadSe * */ public Builder clearReadSession() { - if (readSessionBuilder_ == null) { - readSession_ = null; - onChanged(); - } else { - readSession_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + readSession_ = null; + if (readSessionBuilder_ != null) { + readSessionBuilder_.dispose(); readSessionBuilder_ = null; } - + onChanged(); return this; } /** @@ -866,7 +881,7 @@ public Builder clearReadSession() { * */ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.Builder getReadSessionBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getReadSessionFieldBuilder().getBuilder(); } @@ -962,6 +977,7 @@ public int getMaxStreamCount() { public Builder setMaxStreamCount(int value) { maxStreamCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -983,7 +999,7 @@ public Builder setMaxStreamCount(int value) { * @return This builder for chaining. */ public Builder clearMaxStreamCount() { - + bitField0_ = (bitField0_ & ~0x00000004); maxStreamCount_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateWriteStreamRequest.java index 501941015b..d1c9cadbcc 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/CreateWriteStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int PARENT_FIELD_NUMBER = 1; - private volatile java.lang.Object parent_; + + @SuppressWarnings("serial") + private volatile java.lang.Object parent_ = ""; /** * * @@ -173,7 +175,9 @@ public com.google.cloud.bigquery.storage.v1beta2.WriteStream getWriteStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.WriteStreamOrBuilder getWriteStreamOrBuilder() { - return getWriteStream(); + return writeStream_ == null + ? com.google.cloud.bigquery.storage.v1beta2.WriteStream.getDefaultInstance() + : writeStream_; } private byte memoizedIsInitialized = -1; @@ -390,12 +394,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; parent_ = ""; - - if (writeStreamBuilder_ == null) { - writeStream_ = null; - } else { - writeStream_ = null; + writeStream_ = null; + if (writeStreamBuilder_ != null) { + writeStreamBuilder_.dispose(); writeStreamBuilder_ = null; } return this; @@ -427,16 +430,25 @@ public com.google.cloud.bigquery.storage.v1beta2.CreateWriteStreamRequest build( public com.google.cloud.bigquery.storage.v1beta2.CreateWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.CreateWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1beta2.CreateWriteStreamRequest(this); - result.parent_ = parent_; - if (writeStreamBuilder_ == null) { - result.writeStream_ = writeStream_; - } else { - result.writeStream_ = writeStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.CreateWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.parent_ = parent_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.writeStream_ = + writeStreamBuilder_ == null ? writeStream_ : writeStreamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -488,6 +500,7 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getParent().isEmpty()) { parent_ = other.parent_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasWriteStream()) { @@ -522,13 +535,13 @@ public Builder mergeFrom( case 10: { parent_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getWriteStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -548,6 +561,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object parent_ = ""; /** * @@ -618,8 +633,8 @@ public Builder setParent(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -638,8 +653,8 @@ public Builder setParent(java.lang.String value) { * @return This builder for chaining. */ public Builder clearParent() { - parent_ = getDefaultInstance().getParent(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -663,8 +678,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - parent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -689,7 +704,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { * @return Whether the writeStream field is set. */ public boolean hasWriteStream() { - return writeStreamBuilder_ != null || writeStream_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -730,11 +745,11 @@ public Builder setWriteStream(com.google.cloud.bigquery.storage.v1beta2.WriteStr throw new NullPointerException(); } writeStream_ = value; - onChanged(); } else { writeStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -752,11 +767,11 @@ public Builder setWriteStream( com.google.cloud.bigquery.storage.v1beta2.WriteStream.Builder builderForValue) { if (writeStreamBuilder_ == null) { writeStream_ = builderForValue.build(); - onChanged(); } else { writeStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -772,19 +787,19 @@ public Builder setWriteStream( */ public Builder mergeWriteStream(com.google.cloud.bigquery.storage.v1beta2.WriteStream value) { if (writeStreamBuilder_ == null) { - if (writeStream_ != null) { - writeStream_ = - com.google.cloud.bigquery.storage.v1beta2.WriteStream.newBuilder(writeStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && writeStream_ != null + && writeStream_ + != com.google.cloud.bigquery.storage.v1beta2.WriteStream.getDefaultInstance()) { + getWriteStreamBuilder().mergeFrom(value); } else { writeStream_ = value; } - onChanged(); } else { writeStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -799,14 +814,13 @@ public Builder mergeWriteStream(com.google.cloud.bigquery.storage.v1beta2.WriteS * */ public Builder clearWriteStream() { - if (writeStreamBuilder_ == null) { - writeStream_ = null; - onChanged(); - } else { - writeStream_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + writeStream_ = null; + if (writeStreamBuilder_ != null) { + writeStreamBuilder_.dispose(); writeStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -821,7 +835,7 @@ public Builder clearWriteStream() { * */ public com.google.cloud.bigquery.storage.v1beta2.WriteStream.Builder getWriteStreamBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getWriteStreamFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamRequest.java index b41ea0b782..75875b945f 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -322,8 +324,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -353,11 +355,21 @@ public com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamRequest buil public com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -409,6 +421,7 @@ public Builder mergeFrom( .getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -440,7 +453,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -460,6 +473,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -530,8 +545,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -550,8 +565,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -575,8 +590,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamResponse.java index dec7e9701f..c5dfa7acfc 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FinalizeWriteStreamResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int ROW_COUNT_FIELD_NUMBER = 1; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -283,8 +283,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; rowCount_ = 0L; - return this; } @@ -314,11 +314,21 @@ public com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamResponse bui public com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamResponse result = new com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamResponse(this); - result.rowCount_ = rowCount_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.FinalizeWriteStreamResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.rowCount_ = rowCount_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -400,7 +410,7 @@ public Builder mergeFrom( case 8: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -420,6 +430,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long rowCount_; /** * @@ -451,6 +463,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -466,7 +479,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000001); rowCount_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsRequest.java index c64f54ff64..c1664eecaf 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int WRITE_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object writeStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object writeStream_ = ""; /** * * @@ -166,7 +168,7 @@ public com.google.protobuf.Int64Value getOffset() { */ @java.lang.Override public com.google.protobuf.Int64ValueOrBuilder getOffsetOrBuilder() { - return getOffset(); + return offset_ == null ? com.google.protobuf.Int64Value.getDefaultInstance() : offset_; } private byte memoizedIsInitialized = -1; @@ -381,12 +383,11 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; writeStream_ = ""; - - if (offsetBuilder_ == null) { - offset_ = null; - } else { - offset_ = null; + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } return this; @@ -416,16 +417,23 @@ public com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequest build() { public com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequest result = new com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequest(this); - result.writeStream_ = writeStream_; - if (offsetBuilder_ == null) { - result.offset_ = offset_; - } else { - result.offset_ = offsetBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.writeStream_ = writeStream_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offsetBuilder_ == null ? offset_ : offsetBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -474,6 +482,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.FlushRowsRequ return this; if (!other.getWriteStream().isEmpty()) { writeStream_ = other.writeStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasOffset()) { @@ -508,13 +517,13 @@ public Builder mergeFrom( case 10: { writeStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getOffsetFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -534,6 +543,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object writeStream_ = ""; /** * @@ -601,8 +612,8 @@ public Builder setWriteStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -620,8 +631,8 @@ public Builder setWriteStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearWriteStream() { - writeStream_ = getDefaultInstance().getWriteStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -644,8 +655,8 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - writeStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -669,7 +680,7 @@ public Builder setWriteStreamBytes(com.google.protobuf.ByteString value) { * @return Whether the offset field is set. */ public boolean hasOffset() { - return offsetBuilder_ != null || offset_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -706,11 +717,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { throw new NullPointerException(); } offset_ = value; - onChanged(); } else { offsetBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -726,11 +737,11 @@ public Builder setOffset(com.google.protobuf.Int64Value value) { public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) { if (offsetBuilder_ == null) { offset_ = builderForValue.build(); - onChanged(); } else { offsetBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -745,17 +756,18 @@ public Builder setOffset(com.google.protobuf.Int64Value.Builder builderForValue) */ public Builder mergeOffset(com.google.protobuf.Int64Value value) { if (offsetBuilder_ == null) { - if (offset_ != null) { - offset_ = - com.google.protobuf.Int64Value.newBuilder(offset_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && offset_ != null + && offset_ != com.google.protobuf.Int64Value.getDefaultInstance()) { + getOffsetBuilder().mergeFrom(value); } else { offset_ = value; } - onChanged(); } else { offsetBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -769,14 +781,13 @@ public Builder mergeOffset(com.google.protobuf.Int64Value value) { * .google.protobuf.Int64Value offset = 2; */ public Builder clearOffset() { - if (offsetBuilder_ == null) { - offset_ = null; - onChanged(); - } else { - offset_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + offset_ = null; + if (offsetBuilder_ != null) { + offsetBuilder_.dispose(); offsetBuilder_ = null; } - + onChanged(); return this; } /** @@ -790,7 +801,7 @@ public Builder clearOffset() { * .google.protobuf.Int64Value offset = 2; */ public com.google.protobuf.Int64Value.Builder getOffsetBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getOffsetFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsResponse.java index c11a6a1f62..09d0e513e5 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/FlushRowsResponse.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int OFFSET_FIELD_NUMBER = 1; - private long offset_; + private long offset_ = 0L; /** * * @@ -281,8 +281,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; offset_ = 0L; - return this; } @@ -310,11 +310,20 @@ public com.google.cloud.bigquery.storage.v1beta2.FlushRowsResponse build() { public com.google.cloud.bigquery.storage.v1beta2.FlushRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.FlushRowsResponse result = new com.google.cloud.bigquery.storage.v1beta2.FlushRowsResponse(this); - result.offset_ = offset_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.FlushRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.offset_ = offset_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -393,7 +402,7 @@ public Builder mergeFrom( case 8: { offset_ = input.readInt64(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -413,6 +422,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private long offset_; /** * @@ -444,6 +455,7 @@ public long getOffset() { public Builder setOffset(long value) { offset_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -459,7 +471,7 @@ public Builder setOffset(long value) { * @return This builder for chaining. */ public Builder clearOffset() { - + bitField0_ = (bitField0_ & ~0x00000001); offset_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/GetWriteStreamRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/GetWriteStreamRequest.java index c274da4c11..412310c7a2 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/GetWriteStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/GetWriteStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -320,8 +322,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -350,11 +352,21 @@ public com.google.cloud.bigquery.storage.v1beta2.GetWriteStreamRequest build() { public com.google.cloud.bigquery.storage.v1beta2.GetWriteStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.GetWriteStreamRequest result = new com.google.cloud.bigquery.storage.v1beta2.GetWriteStreamRequest(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.GetWriteStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -405,6 +417,7 @@ public Builder mergeFrom( return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -436,7 +449,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -456,6 +469,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -526,8 +541,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -546,8 +561,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -571,8 +586,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoRows.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoRows.java index 40377d2686..4f92ff6d18 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoRows.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoRows.java @@ -60,6 +60,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SERIALIZED_ROWS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List serializedRows_; /** * @@ -309,8 +311,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; serializedRows_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -338,14 +340,25 @@ public com.google.cloud.bigquery.storage.v1beta2.ProtoRows build() { public com.google.cloud.bigquery.storage.v1beta2.ProtoRows buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ProtoRows result = new com.google.cloud.bigquery.storage.v1beta2.ProtoRows(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.ProtoRows result) { if (((bitField0_ & 0x00000001) != 0)) { serializedRows_ = java.util.Collections.unmodifiableList(serializedRows_); bitField0_ = (bitField0_ & ~0x00000001); } result.serializedRows_ = serializedRows_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ProtoRows result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoSchema.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoSchema.java index 9c13d89292..9d3ec977ab 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoSchema.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ProtoSchema.java @@ -117,7 +117,9 @@ public com.google.protobuf.DescriptorProtos.DescriptorProto getProtoDescriptor() @java.lang.Override public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getProtoDescriptorOrBuilder() { - return getProtoDescriptor(); + return protoDescriptor_ == null + ? com.google.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance() + : protoDescriptor_; } private byte memoizedIsInitialized = -1; @@ -329,10 +331,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (protoDescriptorBuilder_ == null) { - protoDescriptor_ = null; - } else { - protoDescriptor_ = null; + bitField0_ = 0; + protoDescriptor_ = null; + if (protoDescriptorBuilder_ != null) { + protoDescriptorBuilder_.dispose(); protoDescriptorBuilder_ = null; } return this; @@ -362,15 +364,21 @@ public com.google.cloud.bigquery.storage.v1beta2.ProtoSchema build() { public com.google.cloud.bigquery.storage.v1beta2.ProtoSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ProtoSchema result = new com.google.cloud.bigquery.storage.v1beta2.ProtoSchema(this); - if (protoDescriptorBuilder_ == null) { - result.protoDescriptor_ = protoDescriptor_; - } else { - result.protoDescriptor_ = protoDescriptorBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ProtoSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.protoDescriptor_ = + protoDescriptorBuilder_ == null ? protoDescriptor_ : protoDescriptorBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -454,7 +462,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getProtoDescriptorFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -474,6 +482,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.DescriptorProtos.DescriptorProto protoDescriptor_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.DescriptorProtos.DescriptorProto, @@ -494,7 +504,7 @@ public Builder mergeFrom( * @return Whether the protoDescriptor field is set. */ public boolean hasProtoDescriptor() { - return protoDescriptorBuilder_ != null || protoDescriptor_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -535,11 +545,11 @@ public Builder setProtoDescriptor(com.google.protobuf.DescriptorProtos.Descripto throw new NullPointerException(); } protoDescriptor_ = value; - onChanged(); } else { protoDescriptorBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -557,11 +567,11 @@ public Builder setProtoDescriptor( com.google.protobuf.DescriptorProtos.DescriptorProto.Builder builderForValue) { if (protoDescriptorBuilder_ == null) { protoDescriptor_ = builderForValue.build(); - onChanged(); } else { protoDescriptorBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -578,19 +588,19 @@ public Builder setProtoDescriptor( public Builder mergeProtoDescriptor( com.google.protobuf.DescriptorProtos.DescriptorProto value) { if (protoDescriptorBuilder_ == null) { - if (protoDescriptor_ != null) { - protoDescriptor_ = - com.google.protobuf.DescriptorProtos.DescriptorProto.newBuilder(protoDescriptor_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && protoDescriptor_ != null + && protoDescriptor_ + != com.google.protobuf.DescriptorProtos.DescriptorProto.getDefaultInstance()) { + getProtoDescriptorBuilder().mergeFrom(value); } else { protoDescriptor_ = value; } - onChanged(); } else { protoDescriptorBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -605,14 +615,13 @@ public Builder mergeProtoDescriptor( * .google.protobuf.DescriptorProto proto_descriptor = 1; */ public Builder clearProtoDescriptor() { - if (protoDescriptorBuilder_ == null) { - protoDescriptor_ = null; - onChanged(); - } else { - protoDescriptor_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + protoDescriptor_ = null; + if (protoDescriptorBuilder_ != null) { + protoDescriptorBuilder_.dispose(); protoDescriptorBuilder_ = null; } - + onChanged(); return this; } /** @@ -628,7 +637,7 @@ public Builder clearProtoDescriptor() { */ public com.google.protobuf.DescriptorProtos.DescriptorProto.Builder getProtoDescriptorBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getProtoDescriptorFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsRequest.java index eaa54506b7..bcd7f664c5 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int READ_STREAM_FIELD_NUMBER = 1; - private volatile java.lang.Object readStream_; + + @SuppressWarnings("serial") + private volatile java.lang.Object readStream_ = ""; /** * * @@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getReadStreamBytes() { } public static final int OFFSET_FIELD_NUMBER = 2; - private long offset_; + private long offset_ = 0L; /** * * @@ -347,10 +349,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; readStream_ = ""; - offset_ = 0L; - return this; } @@ -378,12 +379,23 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadRowsRequest build() { public com.google.cloud.bigquery.storage.v1beta2.ReadRowsRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadRowsRequest result = new com.google.cloud.bigquery.storage.v1beta2.ReadRowsRequest(this); - result.readStream_ = readStream_; - result.offset_ = offset_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ReadRowsRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.readStream_ = readStream_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.offset_ = offset_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -432,6 +444,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadRowsReque return this; if (!other.getReadStream().isEmpty()) { readStream_ = other.readStream_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getOffset() != 0L) { @@ -466,13 +479,13 @@ public Builder mergeFrom( case 10: { readStream_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { offset_ = input.readInt64(); - + bitField0_ |= 0x00000002; break; } // case 16 default: @@ -492,6 +505,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object readStream_ = ""; /** * @@ -559,8 +574,8 @@ public Builder setReadStream(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - readStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -578,8 +593,8 @@ public Builder setReadStream(java.lang.String value) { * @return This builder for chaining. */ public Builder clearReadStream() { - readStream_ = getDefaultInstance().getReadStream(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -602,8 +617,8 @@ public Builder setReadStreamBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - readStream_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -643,6 +658,7 @@ public long getOffset() { public Builder setOffset(long value) { offset_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -660,7 +676,7 @@ public Builder setOffset(long value) { * @return This builder for chaining. */ public Builder clearOffset() { - + bitField0_ = (bitField0_ & ~0x00000002); offset_ = 0L; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsResponse.java index fb1dbda7f9..69a977cecd 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadRowsResponse.java @@ -264,7 +264,7 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowRecordBatch getArrowRecord } public static final int ROW_COUNT_FIELD_NUMBER = 6; - private long rowCount_; + private long rowCount_ = 0L; /** * * @@ -326,7 +326,9 @@ public com.google.cloud.bigquery.storage.v1beta2.StreamStats getStats() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.StreamStatsOrBuilder getStatsOrBuilder() { - return getStats(); + return stats_ == null + ? com.google.cloud.bigquery.storage.v1beta2.StreamStats.getDefaultInstance() + : stats_; } public static final int THROTTLE_STATE_FIELD_NUMBER = 5; @@ -378,7 +380,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ThrottleState getThrottleState( @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ThrottleStateOrBuilder getThrottleStateOrBuilder() { - return getThrottleState(); + return throttleState_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ThrottleState.getDefaultInstance() + : throttleState_; } public static final int AVRO_SCHEMA_FIELD_NUMBER = 7; @@ -800,6 +804,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (avroRowsBuilder_ != null) { avroRowsBuilder_.clear(); } @@ -807,17 +812,14 @@ public Builder clear() { arrowRecordBatchBuilder_.clear(); } rowCount_ = 0L; - - if (statsBuilder_ == null) { - stats_ = null; - } else { - stats_ = null; + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); statsBuilder_ = null; } - if (throttleStateBuilder_ == null) { - throttleState_ = null; - } else { - throttleState_ = null; + throttleState_ = null; + if (throttleStateBuilder_ != null) { + throttleStateBuilder_.dispose(); throttleStateBuilder_ = null; } if (avroSchemaBuilder_ != null) { @@ -857,49 +859,46 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse build() { public com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse result = new com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse(this); - if (rowsCase_ == 3) { - if (avroRowsBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = avroRowsBuilder_.build(); - } + if (bitField0_ != 0) { + buildPartial0(result); } - if (rowsCase_ == 4) { - if (arrowRecordBatchBuilder_ == null) { - result.rows_ = rows_; - } else { - result.rows_ = arrowRecordBatchBuilder_.build(); - } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rowCount_ = rowCount_; } - result.rowCount_ = rowCount_; - if (statsBuilder_ == null) { - result.stats_ = stats_; - } else { - result.stats_ = statsBuilder_.build(); + if (((from_bitField0_ & 0x00000008) != 0)) { + result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build(); } - if (throttleStateBuilder_ == null) { - result.throttleState_ = throttleState_; - } else { - result.throttleState_ = throttleStateBuilder_.build(); + if (((from_bitField0_ & 0x00000010) != 0)) { + result.throttleState_ = + throttleStateBuilder_ == null ? throttleState_ : throttleStateBuilder_.build(); } - if (schemaCase_ == 7) { - if (avroSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = avroSchemaBuilder_.build(); - } + } + + private void buildPartialOneofs( + com.google.cloud.bigquery.storage.v1beta2.ReadRowsResponse result) { + result.rowsCase_ = rowsCase_; + result.rows_ = this.rows_; + if (rowsCase_ == 3 && avroRowsBuilder_ != null) { + result.rows_ = avroRowsBuilder_.build(); } - if (schemaCase_ == 8) { - if (arrowSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = arrowSchemaBuilder_.build(); - } + if (rowsCase_ == 4 && arrowRecordBatchBuilder_ != null) { + result.rows_ = arrowRecordBatchBuilder_.build(); } - result.rowsCase_ = rowsCase_; result.schemaCase_ = schemaCase_; - onBuilt(); - return result; + result.schema_ = this.schema_; + if (schemaCase_ == 7 && avroSchemaBuilder_ != null) { + result.schema_ = avroSchemaBuilder_.build(); + } + if (schemaCase_ == 8 && arrowSchemaBuilder_ != null) { + result.schema_ = arrowSchemaBuilder_.build(); + } } @java.lang.Override @@ -1018,7 +1017,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 18 case 26: @@ -1037,13 +1036,13 @@ public Builder mergeFrom( case 42: { input.readMessage(getThrottleStateFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 case 48: { rowCount_ = input.readInt64(); - + bitField0_ |= 0x00000004; break; } // case 48 case 58: @@ -1103,6 +1102,8 @@ public Builder clearSchema() { return this; } + private int bitField0_; + private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta2.AvroRows, com.google.cloud.bigquery.storage.v1beta2.AvroRows.Builder, @@ -1309,7 +1310,6 @@ public com.google.cloud.bigquery.storage.v1beta2.AvroRowsOrBuilder getAvroRowsOr } rowsCase_ = 3; onChanged(); - ; return avroRowsBuilder_; } @@ -1525,7 +1525,6 @@ public Builder clearArrowRecordBatch() { } rowsCase_ = 4; onChanged(); - ; return arrowRecordBatchBuilder_; } @@ -1560,6 +1559,7 @@ public long getRowCount() { public Builder setRowCount(long value) { rowCount_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1575,7 +1575,7 @@ public Builder setRowCount(long value) { * @return This builder for chaining. */ public Builder clearRowCount() { - + bitField0_ = (bitField0_ & ~0x00000004); rowCount_ = 0L; onChanged(); return this; @@ -1599,7 +1599,7 @@ public Builder clearRowCount() { * @return Whether the stats field is set. */ public boolean hasStats() { - return statsBuilder_ != null || stats_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1636,11 +1636,11 @@ public Builder setStats(com.google.cloud.bigquery.storage.v1beta2.StreamStats va throw new NullPointerException(); } stats_ = value; - onChanged(); } else { statsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1656,11 +1656,11 @@ public Builder setStats( com.google.cloud.bigquery.storage.v1beta2.StreamStats.Builder builderForValue) { if (statsBuilder_ == null) { stats_ = builderForValue.build(); - onChanged(); } else { statsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1674,19 +1674,19 @@ public Builder setStats( */ public Builder mergeStats(com.google.cloud.bigquery.storage.v1beta2.StreamStats value) { if (statsBuilder_ == null) { - if (stats_ != null) { - stats_ = - com.google.cloud.bigquery.storage.v1beta2.StreamStats.newBuilder(stats_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && stats_ != null + && stats_ + != com.google.cloud.bigquery.storage.v1beta2.StreamStats.getDefaultInstance()) { + getStatsBuilder().mergeFrom(value); } else { stats_ = value; } - onChanged(); } else { statsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1699,14 +1699,13 @@ public Builder mergeStats(com.google.cloud.bigquery.storage.v1beta2.StreamStats * .google.cloud.bigquery.storage.v1beta2.StreamStats stats = 2; */ public Builder clearStats() { - if (statsBuilder_ == null) { - stats_ = null; - onChanged(); - } else { - stats_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + stats_ = null; + if (statsBuilder_ != null) { + statsBuilder_.dispose(); statsBuilder_ = null; } - + onChanged(); return this; } /** @@ -1719,7 +1718,7 @@ public Builder clearStats() { * .google.cloud.bigquery.storage.v1beta2.StreamStats stats = 2; */ public com.google.cloud.bigquery.storage.v1beta2.StreamStats.Builder getStatsBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getStatsFieldBuilder().getBuilder(); } @@ -1786,7 +1785,7 @@ public com.google.cloud.bigquery.storage.v1beta2.StreamStatsOrBuilder getStatsOr * @return Whether the throttleState field is set. */ public boolean hasThrottleState() { - return throttleStateBuilder_ != null || throttleState_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1825,11 +1824,11 @@ public Builder setThrottleState(com.google.cloud.bigquery.storage.v1beta2.Thrott throw new NullPointerException(); } throttleState_ = value; - onChanged(); } else { throttleStateBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1846,11 +1845,11 @@ public Builder setThrottleState( com.google.cloud.bigquery.storage.v1beta2.ThrottleState.Builder builderForValue) { if (throttleStateBuilder_ == null) { throttleState_ = builderForValue.build(); - onChanged(); } else { throttleStateBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1866,19 +1865,19 @@ public Builder setThrottleState( public Builder mergeThrottleState( com.google.cloud.bigquery.storage.v1beta2.ThrottleState value) { if (throttleStateBuilder_ == null) { - if (throttleState_ != null) { - throttleState_ = - com.google.cloud.bigquery.storage.v1beta2.ThrottleState.newBuilder(throttleState_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && throttleState_ != null + && throttleState_ + != com.google.cloud.bigquery.storage.v1beta2.ThrottleState.getDefaultInstance()) { + getThrottleStateBuilder().mergeFrom(value); } else { throttleState_ = value; } - onChanged(); } else { throttleStateBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1892,14 +1891,13 @@ public Builder mergeThrottleState( * .google.cloud.bigquery.storage.v1beta2.ThrottleState throttle_state = 5; */ public Builder clearThrottleState() { - if (throttleStateBuilder_ == null) { - throttleState_ = null; - onChanged(); - } else { - throttleState_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + throttleState_ = null; + if (throttleStateBuilder_ != null) { + throttleStateBuilder_.dispose(); throttleStateBuilder_ = null; } - + onChanged(); return this; } /** @@ -1914,7 +1912,7 @@ public Builder clearThrottleState() { */ public com.google.cloud.bigquery.storage.v1beta2.ThrottleState.Builder getThrottleStateBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getThrottleStateFieldBuilder().getBuilder(); } @@ -2190,7 +2188,6 @@ public com.google.cloud.bigquery.storage.v1beta2.AvroSchemaOrBuilder getAvroSche } schemaCase_ = 7; onChanged(); - ; return avroSchemaBuilder_; } @@ -2420,7 +2417,6 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowSchema.Builder getArrowSch } schemaCase_ = 8; onChanged(); - ; return arrowSchemaBuilder_; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadSession.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadSession.java index d96574e355..a7d9cb4359 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadSession.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadSession.java @@ -202,7 +202,9 @@ public com.google.protobuf.Timestamp getSnapshotTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getSnapshotTimeOrBuilder() { - return getSnapshotTime(); + return snapshotTime_ == null + ? com.google.protobuf.Timestamp.getDefaultInstance() + : snapshotTime_; } private byte memoizedIsInitialized = -1; @@ -412,10 +414,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - } else { - snapshotTime_ = null; + bitField0_ = 0; + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } return this; @@ -448,15 +450,22 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers buil public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers result = new com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers(this); - if (snapshotTimeBuilder_ == null) { - result.snapshotTime_ = snapshotTime_; - } else { - result.snapshotTime_ = snapshotTimeBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.snapshotTime_ = + snapshotTimeBuilder_ == null ? snapshotTime_ : snapshotTimeBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -540,7 +549,7 @@ public Builder mergeFrom( case 10: { input.readMessage(getSnapshotTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -560,6 +569,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.protobuf.Timestamp snapshotTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, @@ -578,7 +589,7 @@ public Builder mergeFrom( * @return Whether the snapshotTime field is set. */ public boolean hasSnapshotTime() { - return snapshotTimeBuilder_ != null || snapshotTime_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -615,11 +626,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } snapshotTime_ = value; - onChanged(); } else { snapshotTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -634,11 +645,11 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp value) { public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (snapshotTimeBuilder_ == null) { snapshotTime_ = builderForValue.build(); - onChanged(); } else { snapshotTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -652,19 +663,18 @@ public Builder setSnapshotTime(com.google.protobuf.Timestamp.Builder builderForV */ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { if (snapshotTimeBuilder_ == null) { - if (snapshotTime_ != null) { - snapshotTime_ = - com.google.protobuf.Timestamp.newBuilder(snapshotTime_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && snapshotTime_ != null + && snapshotTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getSnapshotTimeBuilder().mergeFrom(value); } else { snapshotTime_ = value; } - onChanged(); } else { snapshotTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -677,14 +687,13 @@ public Builder mergeSnapshotTime(com.google.protobuf.Timestamp value) { * .google.protobuf.Timestamp snapshot_time = 1; */ public Builder clearSnapshotTime() { - if (snapshotTimeBuilder_ == null) { - snapshotTime_ = null; - onChanged(); - } else { - snapshotTime_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + snapshotTime_ = null; + if (snapshotTimeBuilder_ != null) { + snapshotTimeBuilder_.dispose(); snapshotTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -697,7 +706,7 @@ public Builder clearSnapshotTime() { * .google.protobuf.Timestamp snapshot_time = 1; */ public com.google.protobuf.Timestamp.Builder getSnapshotTimeBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getSnapshotTimeFieldBuilder().getBuilder(); } @@ -1013,6 +1022,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int SELECTED_FIELDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private com.google.protobuf.LazyStringList selectedFields_; /** * @@ -1086,7 +1097,9 @@ public com.google.protobuf.ByteString getSelectedFieldsBytes(int index) { } public static final int ROW_RESTRICTION_FIELD_NUMBER = 2; - private volatile java.lang.Object rowRestriction_; + + @SuppressWarnings("serial") + private volatile java.lang.Object rowRestriction_ = ""; /** * * @@ -1202,7 +1215,9 @@ public boolean hasArrowSerializationOptions() { @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptionsOrBuilder getArrowSerializationOptionsOrBuilder() { - return getArrowSerializationOptions(); + return arrowSerializationOptions_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.getDefaultInstance() + : arrowSerializationOptions_; } private byte memoizedIsInitialized = -1; @@ -1442,14 +1457,13 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; selectedFields_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); rowRestriction_ = ""; - - if (arrowSerializationOptionsBuilder_ == null) { - arrowSerializationOptions_ = null; - } else { - arrowSerializationOptions_ = null; + arrowSerializationOptions_ = null; + if (arrowSerializationOptionsBuilder_ != null) { + arrowSerializationOptionsBuilder_.dispose(); arrowSerializationOptionsBuilder_ = null; } return this; @@ -1482,20 +1496,35 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions bu public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions result = new com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions result) { if (((bitField0_ & 0x00000001) != 0)) { selectedFields_ = selectedFields_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } result.selectedFields_ = selectedFields_; - result.rowRestriction_ = rowRestriction_; - if (arrowSerializationOptionsBuilder_ == null) { - result.arrowSerializationOptions_ = arrowSerializationOptions_; - } else { - result.arrowSerializationOptions_ = arrowSerializationOptionsBuilder_.build(); + } + + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000002) != 0)) { + result.rowRestriction_ = rowRestriction_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.arrowSerializationOptions_ = + arrowSerializationOptionsBuilder_ == null + ? arrowSerializationOptions_ + : arrowSerializationOptionsBuilder_.build(); } - onBuilt(); - return result; } @java.lang.Override @@ -1562,6 +1591,7 @@ public Builder mergeFrom( } if (!other.getRowRestriction().isEmpty()) { rowRestriction_ = other.rowRestriction_; + bitField0_ |= 0x00000002; onChanged(); } if (other.hasArrowSerializationOptions()) { @@ -1603,14 +1633,14 @@ public Builder mergeFrom( case 18: { rowRestriction_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage( getArrowSerializationOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -1909,8 +1939,8 @@ public Builder setRowRestriction(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1933,8 +1963,8 @@ public Builder setRowRestriction(java.lang.String value) { * @return This builder for chaining. */ public Builder clearRowRestriction() { - rowRestriction_ = getDefaultInstance().getRowRestriction(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1962,8 +1992,8 @@ public Builder setRowRestrictionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - rowRestriction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1989,7 +2019,7 @@ public Builder setRowRestrictionBytes(com.google.protobuf.ByteString value) { * @return Whether the arrowSerializationOptions field is set. */ public boolean hasArrowSerializationOptions() { - return arrowSerializationOptionsBuilder_ != null || arrowSerializationOptions_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -2033,11 +2063,11 @@ public Builder setArrowSerializationOptions( throw new NullPointerException(); } arrowSerializationOptions_ = value; - onChanged(); } else { arrowSerializationOptionsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2056,11 +2086,11 @@ public Builder setArrowSerializationOptions( builderForValue) { if (arrowSerializationOptionsBuilder_ == null) { arrowSerializationOptions_ = builderForValue.build(); - onChanged(); } else { arrowSerializationOptionsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2077,20 +2107,20 @@ public Builder setArrowSerializationOptions( public Builder mergeArrowSerializationOptions( com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions value) { if (arrowSerializationOptionsBuilder_ == null) { - if (arrowSerializationOptions_ != null) { - arrowSerializationOptions_ = - com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.newBuilder( - arrowSerializationOptions_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && arrowSerializationOptions_ != null + && arrowSerializationOptions_ + != com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions + .getDefaultInstance()) { + getArrowSerializationOptionsBuilder().mergeFrom(value); } else { arrowSerializationOptions_ = value; } - onChanged(); } else { arrowSerializationOptionsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -2105,14 +2135,13 @@ public Builder mergeArrowSerializationOptions( * */ public Builder clearArrowSerializationOptions() { - if (arrowSerializationOptionsBuilder_ == null) { - arrowSerializationOptions_ = null; - onChanged(); - } else { - arrowSerializationOptions_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + arrowSerializationOptions_ = null; + if (arrowSerializationOptionsBuilder_ != null) { + arrowSerializationOptionsBuilder_.dispose(); arrowSerializationOptionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -2128,7 +2157,7 @@ public Builder clearArrowSerializationOptions() { */ public com.google.cloud.bigquery.storage.v1beta2.ArrowSerializationOptions.Builder getArrowSerializationOptionsBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getArrowSerializationOptionsFieldBuilder().getBuilder(); } @@ -2298,7 +2327,9 @@ public SchemaCase getSchemaCase() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -2400,11 +2431,11 @@ public com.google.protobuf.Timestamp getExpireTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() { - return getExpireTime(); + return expireTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : expireTime_; } public static final int DATA_FORMAT_FIELD_NUMBER = 3; - private int dataFormat_; + private int dataFormat_ = 0; /** * * @@ -2437,9 +2468,8 @@ public int getDataFormatValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.DataFormat getDataFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.DataFormat result = - com.google.cloud.bigquery.storage.v1beta2.DataFormat.valueOf(dataFormat_); + com.google.cloud.bigquery.storage.v1beta2.DataFormat.forNumber(dataFormat_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.DataFormat.UNRECOGNIZED : result; @@ -2560,7 +2590,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowSchemaOrBuilder getArrowSc } public static final int TABLE_FIELD_NUMBER = 6; - private volatile java.lang.Object table_; + + @SuppressWarnings("serial") + private volatile java.lang.Object table_ = ""; /** * * @@ -2666,7 +2698,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers getT @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiersOrBuilder getTableModifiersOrBuilder() { - return getTableModifiers(); + return tableModifiers_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers.getDefaultInstance() + : tableModifiers_; } public static final int READ_OPTIONS_FIELD_NUMBER = 8; @@ -2722,10 +2756,15 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions ge @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptionsOrBuilder getReadOptionsOrBuilder() { - return getReadOptions(); + return readOptions_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions + .getDefaultInstance() + : readOptions_; } public static final int STREAMS_FIELD_NUMBER = 10; + + @SuppressWarnings("serial") private java.util.List streams_; /** * @@ -3137,16 +3176,14 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - - if (expireTimeBuilder_ == null) { - expireTime_ = null; - } else { - expireTime_ = null; + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } dataFormat_ = 0; - if (avroSchemaBuilder_ != null) { avroSchemaBuilder_.clear(); } @@ -3154,17 +3191,14 @@ public Builder clear() { arrowSchemaBuilder_.clear(); } table_ = ""; - - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - } else { - tableModifiers_ = null; + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - if (readOptionsBuilder_ == null) { - readOptions_ = null; - } else { - readOptions_ = null; + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } if (streamsBuilder_ == null) { @@ -3173,7 +3207,7 @@ public Builder clear() { streams_ = null; streamsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); schemaCase_ = 0; schema_ = null; return this; @@ -3203,51 +3237,61 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadSession build() { public com.google.cloud.bigquery.storage.v1beta2.ReadSession buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadSession result = new com.google.cloud.bigquery.storage.v1beta2.ReadSession(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - if (expireTimeBuilder_ == null) { - result.expireTime_ = expireTime_; - } else { - result.expireTime_ = expireTimeBuilder_.build(); - } - result.dataFormat_ = dataFormat_; - if (schemaCase_ == 4) { - if (avroSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = avroSchemaBuilder_.build(); - } - } - if (schemaCase_ == 5) { - if (arrowSchemaBuilder_ == null) { - result.schema_ = schema_; - } else { - result.schema_ = arrowSchemaBuilder_.build(); - } - } - result.table_ = table_; - if (tableModifiersBuilder_ == null) { - result.tableModifiers_ = tableModifiers_; - } else { - result.tableModifiers_ = tableModifiersBuilder_.build(); - } - if (readOptionsBuilder_ == null) { - result.readOptions_ = readOptions_; - } else { - result.readOptions_ = readOptionsBuilder_.build(); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); } + buildPartialOneofs(result); + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.ReadSession result) { if (streamsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000100) != 0)) { streams_ = java.util.Collections.unmodifiableList(streams_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); } result.streams_ = streams_; } else { result.streams_ = streamsBuilder_.build(); } + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ReadSession result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.expireTime_ = expireTimeBuilder_ == null ? expireTime_ : expireTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.dataFormat_ = dataFormat_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.table_ = table_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.tableModifiers_ = + tableModifiersBuilder_ == null ? tableModifiers_ : tableModifiersBuilder_.build(); + } + if (((from_bitField0_ & 0x00000080) != 0)) { + result.readOptions_ = + readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build(); + } + } + + private void buildPartialOneofs(com.google.cloud.bigquery.storage.v1beta2.ReadSession result) { result.schemaCase_ = schemaCase_; - onBuilt(); - return result; + result.schema_ = this.schema_; + if (schemaCase_ == 4 && avroSchemaBuilder_ != null) { + result.schema_ = avroSchemaBuilder_.build(); + } + if (schemaCase_ == 5 && arrowSchemaBuilder_ != null) { + result.schema_ = arrowSchemaBuilder_.build(); + } } @java.lang.Override @@ -3298,6 +3342,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadSession o return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.hasExpireTime()) { @@ -3308,6 +3353,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadSession o } if (!other.getTable().isEmpty()) { table_ = other.table_; + bitField0_ |= 0x00000020; onChanged(); } if (other.hasTableModifiers()) { @@ -3320,7 +3366,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadSession o if (!other.streams_.isEmpty()) { if (streams_.isEmpty()) { streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureStreamsIsMutable(); streams_.addAll(other.streams_); @@ -3333,7 +3379,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadSession o streamsBuilder_.dispose(); streamsBuilder_ = null; streams_ = other.streams_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); streamsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getStreamsFieldBuilder() @@ -3388,19 +3434,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getExpireTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 case 24: { dataFormat_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: @@ -3418,19 +3464,19 @@ public Builder mergeFrom( case 50: { table_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000020; break; } // case 50 case 58: { input.readMessage(getTableModifiersFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000040; break; } // case 58 case 66: { input.readMessage(getReadOptionsFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000080; break; } // case 66 case 82: @@ -3544,8 +3590,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3562,8 +3608,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -3585,8 +3631,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -3613,7 +3659,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * @return Whether the expireTime field is set. */ public boolean hasExpireTime() { - return expireTimeBuilder_ != null || expireTime_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -3658,11 +3704,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } expireTime_ = value; - onChanged(); } else { expireTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3681,11 +3727,11 @@ public Builder setExpireTime(com.google.protobuf.Timestamp value) { public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (expireTimeBuilder_ == null) { expireTime_ = builderForValue.build(); - onChanged(); } else { expireTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3703,17 +3749,18 @@ public Builder setExpireTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { if (expireTimeBuilder_ == null) { - if (expireTime_ != null) { - expireTime_ = - com.google.protobuf.Timestamp.newBuilder(expireTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && expireTime_ != null + && expireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getExpireTimeBuilder().mergeFrom(value); } else { expireTime_ = value; } - onChanged(); } else { expireTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -3730,14 +3777,13 @@ public Builder mergeExpireTime(com.google.protobuf.Timestamp value) { * */ public Builder clearExpireTime() { - if (expireTimeBuilder_ == null) { - expireTime_ = null; - onChanged(); - } else { - expireTime_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + expireTime_ = null; + if (expireTimeBuilder_ != null) { + expireTimeBuilder_.dispose(); expireTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -3754,7 +3800,7 @@ public Builder clearExpireTime() { * */ public com.google.protobuf.Timestamp.Builder getExpireTimeBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getExpireTimeFieldBuilder().getBuilder(); } @@ -3843,8 +3889,8 @@ public int getDataFormatValue() { * @return This builder for chaining. */ public Builder setDataFormatValue(int value) { - dataFormat_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -3863,9 +3909,8 @@ public Builder setDataFormatValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.DataFormat getDataFormat() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.DataFormat result = - com.google.cloud.bigquery.storage.v1beta2.DataFormat.valueOf(dataFormat_); + com.google.cloud.bigquery.storage.v1beta2.DataFormat.forNumber(dataFormat_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.DataFormat.UNRECOGNIZED : result; @@ -3888,7 +3933,7 @@ public Builder setDataFormat(com.google.cloud.bigquery.storage.v1beta2.DataForma if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; dataFormat_ = value.getNumber(); onChanged(); return this; @@ -3907,7 +3952,7 @@ public Builder setDataFormat(com.google.cloud.bigquery.storage.v1beta2.DataForma * @return This builder for chaining. */ public Builder clearDataFormat() { - + bitField0_ = (bitField0_ & ~0x00000004); dataFormat_ = 0; onChanged(); return this; @@ -4138,7 +4183,6 @@ public com.google.cloud.bigquery.storage.v1beta2.AvroSchemaOrBuilder getAvroSche } schemaCase_ = 4; onChanged(); - ; return avroSchemaBuilder_; } @@ -4368,7 +4412,6 @@ public com.google.cloud.bigquery.storage.v1beta2.ArrowSchema.Builder getArrowSch } schemaCase_ = 5; onChanged(); - ; return arrowSchemaBuilder_; } @@ -4442,8 +4485,8 @@ public Builder setTable(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - table_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -4462,8 +4505,8 @@ public Builder setTable(java.lang.String value) { * @return This builder for chaining. */ public Builder clearTable() { - table_ = getDefaultInstance().getTable(); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } @@ -4487,8 +4530,8 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - table_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -4513,7 +4556,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { * @return Whether the tableModifiers field is set. */ public boolean hasTableModifiers() { - return tableModifiersBuilder_ != null || tableModifiers_ != null; + return ((bitField0_ & 0x00000040) != 0); } /** * @@ -4557,11 +4600,11 @@ public Builder setTableModifiers( throw new NullPointerException(); } tableModifiers_ = value; - onChanged(); } else { tableModifiersBuilder_.setMessage(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4580,11 +4623,11 @@ public Builder setTableModifiers( builderForValue) { if (tableModifiersBuilder_ == null) { tableModifiers_ = builderForValue.build(); - onChanged(); } else { tableModifiersBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4601,20 +4644,20 @@ public Builder setTableModifiers( public Builder mergeTableModifiers( com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers value) { if (tableModifiersBuilder_ == null) { - if (tableModifiers_ != null) { - tableModifiers_ = - com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers.newBuilder( - tableModifiers_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000040) != 0) + && tableModifiers_ != null + && tableModifiers_ + != com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers + .getDefaultInstance()) { + getTableModifiersBuilder().mergeFrom(value); } else { tableModifiers_ = value; } - onChanged(); } else { tableModifiersBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000040; + onChanged(); return this; } /** @@ -4629,14 +4672,13 @@ public Builder mergeTableModifiers( * */ public Builder clearTableModifiers() { - if (tableModifiersBuilder_ == null) { - tableModifiers_ = null; - onChanged(); - } else { - tableModifiers_ = null; + bitField0_ = (bitField0_ & ~0x00000040); + tableModifiers_ = null; + if (tableModifiersBuilder_ != null) { + tableModifiersBuilder_.dispose(); tableModifiersBuilder_ = null; } - + onChanged(); return this; } /** @@ -4652,7 +4694,7 @@ public Builder clearTableModifiers() { */ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableModifiers.Builder getTableModifiersBuilder() { - + bitField0_ |= 0x00000040; onChanged(); return getTableModifiersFieldBuilder().getBuilder(); } @@ -4726,7 +4768,7 @@ public Builder clearTableModifiers() { * @return Whether the readOptions field is set. */ public boolean hasReadOptions() { - return readOptionsBuilder_ != null || readOptions_ != null; + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -4769,11 +4811,11 @@ public Builder setReadOptions( throw new NullPointerException(); } readOptions_ = value; - onChanged(); } else { readOptionsBuilder_.setMessage(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -4792,11 +4834,11 @@ public Builder setReadOptions( builderForValue) { if (readOptionsBuilder_ == null) { readOptions_ = builderForValue.build(); - onChanged(); } else { readOptionsBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -4813,20 +4855,20 @@ public Builder setReadOptions( public Builder mergeReadOptions( com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions value) { if (readOptionsBuilder_ == null) { - if (readOptions_ != null) { - readOptions_ = - com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions.newBuilder( - readOptions_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000080) != 0) + && readOptions_ != null + && readOptions_ + != com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions + .getDefaultInstance()) { + getReadOptionsBuilder().mergeFrom(value); } else { readOptions_ = value; } - onChanged(); } else { readOptionsBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000080; + onChanged(); return this; } /** @@ -4841,14 +4883,13 @@ public Builder mergeReadOptions( * */ public Builder clearReadOptions() { - if (readOptionsBuilder_ == null) { - readOptions_ = null; - onChanged(); - } else { - readOptions_ = null; + bitField0_ = (bitField0_ & ~0x00000080); + readOptions_ = null; + if (readOptionsBuilder_ != null) { + readOptionsBuilder_.dispose(); readOptionsBuilder_ = null; } - + onChanged(); return this; } /** @@ -4864,7 +4905,7 @@ public Builder clearReadOptions() { */ public com.google.cloud.bigquery.storage.v1beta2.ReadSession.TableReadOptions.Builder getReadOptionsBuilder() { - + bitField0_ |= 0x00000080; onChanged(); return getReadOptionsFieldBuilder().getBuilder(); } @@ -4922,10 +4963,10 @@ public Builder clearReadOptions() { java.util.Collections.emptyList(); private void ensureStreamsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000100) != 0)) { streams_ = new java.util.ArrayList(streams_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000100; } } @@ -5209,7 +5250,7 @@ public Builder addAllStreams( public Builder clearStreams() { if (streamsBuilder_ == null) { streams_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000100); onChanged(); } else { streamsBuilder_.clear(); @@ -5377,7 +5418,7 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder addStreamsBu com.google.cloud.bigquery.storage.v1beta2.ReadStream, com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder, com.google.cloud.bigquery.storage.v1beta2.ReadStreamOrBuilder>( - streams_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + streams_, ((bitField0_ & 0x00000100) != 0), getParentForChildren(), isClean()); streams_ = null; } return streamsBuilder_; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadStream.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadStream.java index 08e54059ed..15356edcbf 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadStream.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ReadStream.java @@ -70,7 +70,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -319,8 +321,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - return this; } @@ -348,11 +350,20 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadStream build() { public com.google.cloud.bigquery.storage.v1beta2.ReadStream buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ReadStream result = new com.google.cloud.bigquery.storage.v1beta2.ReadStream(this); - result.name_ = name_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ReadStream result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -401,6 +412,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.ReadStream ot return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -432,7 +444,7 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 default: @@ -452,6 +464,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -516,8 +530,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -534,8 +548,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -557,8 +571,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamRequest.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamRequest.java index c2ae199dfc..f342e844e4 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamRequest.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamRequest.java @@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -121,7 +123,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int FRACTION_FIELD_NUMBER = 2; - private double fraction_; + private double fraction_ = 0D; /** * * @@ -355,10 +357,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - fraction_ = 0D; - return this; } @@ -387,12 +388,24 @@ public com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamRequest build() public com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamRequest buildPartial() { com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamRequest result = new com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamRequest(this); - result.name_ = name_; - result.fraction_ = fraction_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamRequest result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.fraction_ = fraction_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -443,6 +456,7 @@ public Builder mergeFrom( return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.getFraction() != 0D) { @@ -477,13 +491,13 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 17: { fraction_ = input.readDouble(); - + bitField0_ |= 0x00000002; break; } // case 17 default: @@ -503,6 +517,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -570,8 +586,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -589,8 +605,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -613,8 +629,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -662,6 +678,7 @@ public double getFraction() { public Builder setFraction(double value) { fraction_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -683,7 +700,7 @@ public Builder setFraction(double value) { * @return This builder for chaining. */ public Builder clearFraction() { - + bitField0_ = (bitField0_ & ~0x00000002); fraction_ = 0D; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamResponse.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamResponse.java index 8e14ef79c3..f87c67f295 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamResponse.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/SplitReadStreamResponse.java @@ -108,7 +108,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadStream getPrimaryStream() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ReadStreamOrBuilder getPrimaryStreamOrBuilder() { - return getPrimaryStream(); + return primaryStream_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ReadStream.getDefaultInstance() + : primaryStream_; } public static final int REMAINDER_STREAM_FIELD_NUMBER = 2; @@ -160,7 +162,9 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadStream getRemainderStream() @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.ReadStreamOrBuilder getRemainderStreamOrBuilder() { - return getRemainderStream(); + return remainderStream_ == null + ? com.google.cloud.bigquery.storage.v1beta2.ReadStream.getDefaultInstance() + : remainderStream_; } private byte memoizedIsInitialized = -1; @@ -374,16 +378,15 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - } else { - primaryStream_ = null; + bitField0_ = 0; + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - } else { - remainderStream_ = null; + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } return this; @@ -414,20 +417,26 @@ public com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamResponse build() public com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamResponse buildPartial() { com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamResponse result = new com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamResponse(this); - if (primaryStreamBuilder_ == null) { - result.primaryStream_ = primaryStream_; - } else { - result.primaryStream_ = primaryStreamBuilder_.build(); - } - if (remainderStreamBuilder_ == null) { - result.remainderStream_ = remainderStream_; - } else { - result.remainderStream_ = remainderStreamBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.SplitReadStreamResponse result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.primaryStream_ = + primaryStreamBuilder_ == null ? primaryStream_ : primaryStreamBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.remainderStream_ = + remainderStreamBuilder_ == null ? remainderStream_ : remainderStreamBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -511,13 +520,13 @@ public Builder mergeFrom( case 10: { input.readMessage(getPrimaryStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage(getRemainderStreamFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000002; break; } // case 18 default: @@ -537,6 +546,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta2.ReadStream primaryStream_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta2.ReadStream, @@ -557,7 +568,7 @@ public Builder mergeFrom( * @return Whether the primaryStream field is set. */ public boolean hasPrimaryStream() { - return primaryStreamBuilder_ != null || primaryStream_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -598,11 +609,11 @@ public Builder setPrimaryStream(com.google.cloud.bigquery.storage.v1beta2.ReadSt throw new NullPointerException(); } primaryStream_ = value; - onChanged(); } else { primaryStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -620,11 +631,11 @@ public Builder setPrimaryStream( com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder builderForValue) { if (primaryStreamBuilder_ == null) { primaryStream_ = builderForValue.build(); - onChanged(); } else { primaryStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -640,19 +651,19 @@ public Builder setPrimaryStream( */ public Builder mergePrimaryStream(com.google.cloud.bigquery.storage.v1beta2.ReadStream value) { if (primaryStreamBuilder_ == null) { - if (primaryStream_ != null) { - primaryStream_ = - com.google.cloud.bigquery.storage.v1beta2.ReadStream.newBuilder(primaryStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && primaryStream_ != null + && primaryStream_ + != com.google.cloud.bigquery.storage.v1beta2.ReadStream.getDefaultInstance()) { + getPrimaryStreamBuilder().mergeFrom(value); } else { primaryStream_ = value; } - onChanged(); } else { primaryStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -667,14 +678,13 @@ public Builder mergePrimaryStream(com.google.cloud.bigquery.storage.v1beta2.Read * .google.cloud.bigquery.storage.v1beta2.ReadStream primary_stream = 1; */ public Builder clearPrimaryStream() { - if (primaryStreamBuilder_ == null) { - primaryStream_ = null; - onChanged(); - } else { - primaryStream_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + primaryStream_ = null; + if (primaryStreamBuilder_ != null) { + primaryStreamBuilder_.dispose(); primaryStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -689,7 +699,7 @@ public Builder clearPrimaryStream() { * .google.cloud.bigquery.storage.v1beta2.ReadStream primary_stream = 1; */ public com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder getPrimaryStreamBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getPrimaryStreamFieldBuilder().getBuilder(); } @@ -761,7 +771,7 @@ public com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder getPrimarySt * @return Whether the remainderStream field is set. */ public boolean hasRemainderStream() { - return remainderStreamBuilder_ != null || remainderStream_ != null; + return ((bitField0_ & 0x00000002) != 0); } /** * @@ -800,11 +810,11 @@ public Builder setRemainderStream(com.google.cloud.bigquery.storage.v1beta2.Read throw new NullPointerException(); } remainderStream_ = value; - onChanged(); } else { remainderStreamBuilder_.setMessage(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -821,11 +831,11 @@ public Builder setRemainderStream( com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder builderForValue) { if (remainderStreamBuilder_ == null) { remainderStream_ = builderForValue.build(); - onChanged(); } else { remainderStreamBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -841,19 +851,19 @@ public Builder setRemainderStream( public Builder mergeRemainderStream( com.google.cloud.bigquery.storage.v1beta2.ReadStream value) { if (remainderStreamBuilder_ == null) { - if (remainderStream_ != null) { - remainderStream_ = - com.google.cloud.bigquery.storage.v1beta2.ReadStream.newBuilder(remainderStream_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000002) != 0) + && remainderStream_ != null + && remainderStream_ + != com.google.cloud.bigquery.storage.v1beta2.ReadStream.getDefaultInstance()) { + getRemainderStreamBuilder().mergeFrom(value); } else { remainderStream_ = value; } - onChanged(); } else { remainderStreamBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000002; + onChanged(); return this; } /** @@ -867,14 +877,13 @@ public Builder mergeRemainderStream( * .google.cloud.bigquery.storage.v1beta2.ReadStream remainder_stream = 2; */ public Builder clearRemainderStream() { - if (remainderStreamBuilder_ == null) { - remainderStream_ = null; - onChanged(); - } else { - remainderStream_ = null; + bitField0_ = (bitField0_ & ~0x00000002); + remainderStream_ = null; + if (remainderStreamBuilder_ != null) { + remainderStreamBuilder_.dispose(); remainderStreamBuilder_ = null; } - + onChanged(); return this; } /** @@ -889,7 +898,7 @@ public Builder clearRemainderStream() { */ public com.google.cloud.bigquery.storage.v1beta2.ReadStream.Builder getRemainderStreamBuilder() { - + bitField0_ |= 0x00000002; onChanged(); return getRemainderStreamFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageError.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageError.java index dd68ece9ff..b4160bc776 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageError.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StorageError.java @@ -328,7 +328,7 @@ private StorageErrorCode(int value) { } public static final int CODE_FIELD_NUMBER = 1; - private int code_; + private int code_ = 0; /** * * @@ -357,16 +357,17 @@ public int getCodeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode result = - com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.UNRECOGNIZED : result; } public static final int ENTITY_FIELD_NUMBER = 2; - private volatile java.lang.Object entity_; + + @SuppressWarnings("serial") + private volatile java.lang.Object entity_ = ""; /** * * @@ -415,7 +416,9 @@ public com.google.protobuf.ByteString getEntityBytes() { } public static final int ERROR_MESSAGE_FIELD_NUMBER = 3; - private volatile java.lang.Object errorMessage_; + + @SuppressWarnings("serial") + private volatile java.lang.Object errorMessage_ = ""; /** * * @@ -688,12 +691,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; code_ = 0; - entity_ = ""; - errorMessage_ = ""; - return this; } @@ -721,13 +722,26 @@ public com.google.cloud.bigquery.storage.v1beta2.StorageError build() { public com.google.cloud.bigquery.storage.v1beta2.StorageError buildPartial() { com.google.cloud.bigquery.storage.v1beta2.StorageError result = new com.google.cloud.bigquery.storage.v1beta2.StorageError(this); - result.code_ = code_; - result.entity_ = entity_; - result.errorMessage_ = errorMessage_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.StorageError result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.code_ = code_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.entity_ = entity_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.errorMessage_ = errorMessage_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -779,10 +793,12 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.StorageError } if (!other.getEntity().isEmpty()) { entity_ = other.entity_; + bitField0_ |= 0x00000002; onChanged(); } if (!other.getErrorMessage().isEmpty()) { errorMessage_ = other.errorMessage_; + bitField0_ |= 0x00000004; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -814,19 +830,19 @@ public Builder mergeFrom( case 8: { code_ = input.readEnum(); - + bitField0_ |= 0x00000001; break; } // case 8 case 18: { entity_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000002; break; } // case 18 case 26: { errorMessage_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000004; break; } // case 26 default: @@ -846,6 +862,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int code_ = 0; /** * @@ -875,8 +893,8 @@ public int getCodeValue() { * @return This builder for chaining. */ public Builder setCodeValue(int value) { - code_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -893,9 +911,8 @@ public Builder setCodeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode getCode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode result = - com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.valueOf(code_); + com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.forNumber(code_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.StorageError.StorageErrorCode.UNRECOGNIZED : result; @@ -917,7 +934,7 @@ public Builder setCode( if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000001; code_ = value.getNumber(); onChanged(); return this; @@ -934,7 +951,7 @@ public Builder setCode( * @return This builder for chaining. */ public Builder clearCode() { - + bitField0_ = (bitField0_ & ~0x00000001); code_ = 0; onChanged(); return this; @@ -1001,8 +1018,8 @@ public Builder setEntity(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - entity_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1018,8 +1035,8 @@ public Builder setEntity(java.lang.String value) { * @return This builder for chaining. */ public Builder clearEntity() { - entity_ = getDefaultInstance().getEntity(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -1040,8 +1057,8 @@ public Builder setEntityBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - entity_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1107,8 +1124,8 @@ public Builder setErrorMessage(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - errorMessage_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1124,8 +1141,8 @@ public Builder setErrorMessage(java.lang.String value) { * @return This builder for chaining. */ public Builder clearErrorMessage() { - errorMessage_ = getDefaultInstance().getErrorMessage(); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -1146,8 +1163,8 @@ public Builder setErrorMessageBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - errorMessage_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamStats.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamStats.java index de9657f9a6..b6cf2d63e6 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamStats.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamStats.java @@ -146,7 +146,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int AT_RESPONSE_START_FIELD_NUMBER = 1; - private double atResponseStart_; + private double atResponseStart_ = 0D; /** * * @@ -173,7 +173,7 @@ public double getAtResponseStart() { } public static final int AT_RESPONSE_END_FIELD_NUMBER = 2; - private double atResponseEnd_; + private double atResponseEnd_ = 0D; /** * * @@ -400,10 +400,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; atResponseStart_ = 0D; - atResponseEnd_ = 0D; - return this; } @@ -432,12 +431,24 @@ public com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress build() { public com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress buildPartial() { com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress result = new com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress(this); - result.atResponseStart_ = atResponseStart_; - result.atResponseEnd_ = atResponseEnd_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0( + com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.atResponseStart_ = atResponseStart_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.atResponseEnd_ = atResponseEnd_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -523,13 +534,13 @@ public Builder mergeFrom( case 9: { atResponseStart_ = input.readDouble(); - + bitField0_ |= 0x00000001; break; } // case 9 case 17: { atResponseEnd_ = input.readDouble(); - + bitField0_ |= 0x00000002; break; } // case 17 default: @@ -549,6 +560,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private double atResponseStart_; /** * @@ -598,6 +611,7 @@ public double getAtResponseStart() { public Builder setAtResponseStart(double value) { atResponseStart_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -622,7 +636,7 @@ public Builder setAtResponseStart(double value) { * @return This builder for chaining. */ public Builder clearAtResponseStart() { - + bitField0_ = (bitField0_ & ~0x00000001); atResponseStart_ = 0D; onChanged(); return this; @@ -661,6 +675,7 @@ public double getAtResponseEnd() { public Builder setAtResponseEnd(double value) { atResponseEnd_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -677,7 +692,7 @@ public Builder setAtResponseEnd(double value) { * @return This builder for chaining. */ public Builder clearAtResponseEnd() { - + bitField0_ = (bitField0_ & ~0x00000002); atResponseEnd_ = 0D; onChanged(); return this; @@ -796,7 +811,9 @@ public com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress getProgres @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.StreamStats.ProgressOrBuilder getProgressOrBuilder() { - return getProgress(); + return progress_ == null + ? com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress.getDefaultInstance() + : progress_; } private byte memoizedIsInitialized = -1; @@ -1002,10 +1019,10 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); - if (progressBuilder_ == null) { - progress_ = null; - } else { - progress_ = null; + bitField0_ = 0; + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } return this; @@ -1035,15 +1052,20 @@ public com.google.cloud.bigquery.storage.v1beta2.StreamStats build() { public com.google.cloud.bigquery.storage.v1beta2.StreamStats buildPartial() { com.google.cloud.bigquery.storage.v1beta2.StreamStats result = new com.google.cloud.bigquery.storage.v1beta2.StreamStats(this); - if (progressBuilder_ == null) { - result.progress_ = progress_; - } else { - result.progress_ = progressBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.StreamStats result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.progress_ = progressBuilder_ == null ? progress_ : progressBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -1122,7 +1144,7 @@ public Builder mergeFrom( case 18: { input.readMessage(getProgressFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000001; break; } // case 18 default: @@ -1142,6 +1164,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress progress_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress, @@ -1160,7 +1184,7 @@ public Builder mergeFrom( * @return Whether the progress field is set. */ public boolean hasProgress() { - return progressBuilder_ != null || progress_ != null; + return ((bitField0_ & 0x00000001) != 0); } /** * @@ -1198,11 +1222,11 @@ public Builder setProgress( throw new NullPointerException(); } progress_ = value; - onChanged(); } else { progressBuilder_.setMessage(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1218,11 +1242,11 @@ public Builder setProgress( com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress.Builder builderForValue) { if (progressBuilder_ == null) { progress_ = builderForValue.build(); - onChanged(); } else { progressBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1237,19 +1261,20 @@ public Builder setProgress( public Builder mergeProgress( com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress value) { if (progressBuilder_ == null) { - if (progress_ != null) { - progress_ = - com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress.newBuilder(progress_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000001) != 0) + && progress_ != null + && progress_ + != com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress + .getDefaultInstance()) { + getProgressBuilder().mergeFrom(value); } else { progress_ = value; } - onChanged(); } else { progressBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000001; + onChanged(); return this; } /** @@ -1262,14 +1287,13 @@ public Builder mergeProgress( * .google.cloud.bigquery.storage.v1beta2.StreamStats.Progress progress = 2; */ public Builder clearProgress() { - if (progressBuilder_ == null) { - progress_ = null; - onChanged(); - } else { - progress_ = null; + bitField0_ = (bitField0_ & ~0x00000001); + progress_ = null; + if (progressBuilder_ != null) { + progressBuilder_.dispose(); progressBuilder_ = null; } - + onChanged(); return this; } /** @@ -1283,7 +1307,7 @@ public Builder clearProgress() { */ public com.google.cloud.bigquery.storage.v1beta2.StreamStats.Progress.Builder getProgressBuilder() { - + bitField0_ |= 0x00000001; onChanged(); return getProgressFieldBuilder().getBuilder(); } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableFieldSchema.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableFieldSchema.java index c36b93dbfa..5b9689b1d1 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableFieldSchema.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableFieldSchema.java @@ -634,7 +634,9 @@ private Mode(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -687,7 +689,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int TYPE_FIELD_NUMBER = 2; - private int type_; + private int type_ = 0; /** * * @@ -720,16 +722,15 @@ public int getTypeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type result = - com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.UNRECOGNIZED : result; } public static final int MODE_FIELD_NUMBER = 3; - private int mode_; + private int mode_ = 0; /** * * @@ -762,15 +763,16 @@ public int getModeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode getMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode result = - com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.valueOf(mode_); + com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.forNumber(mode_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.UNRECOGNIZED : result; } public static final int FIELDS_FIELD_NUMBER = 4; + + @SuppressWarnings("serial") private java.util.List fields_; /** * @@ -853,7 +855,9 @@ public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchemaOrBuilder getFi } public static final int DESCRIPTION_FIELD_NUMBER = 6; - private volatile java.lang.Object description_; + + @SuppressWarnings("serial") + private volatile java.lang.Object description_ = ""; /** * * @@ -1145,21 +1149,18 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - type_ = 0; - mode_ = 0; - if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); } else { fields_ = null; fieldsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); description_ = ""; - return this; } @@ -1187,22 +1188,41 @@ public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema build() { public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema result = new com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema(this); - int from_bitField0_ = bitField0_; - result.name_ = name_; - result.type_ = type_; - result.mode_ = mode_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema result) { if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { + if (((bitField0_ & 0x00000008) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } result.fields_ = fields_; } else { result.fields_ = fieldsBuilder_.build(); } - result.description_ = description_; - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.mode_ = mode_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.description_ = description_; + } } @java.lang.Override @@ -1253,6 +1273,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.TableFieldSch return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.type_ != 0) { @@ -1265,7 +1286,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.TableFieldSch if (!other.fields_.isEmpty()) { if (fields_.isEmpty()) { fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); } else { ensureFieldsIsMutable(); fields_.addAll(other.fields_); @@ -1278,7 +1299,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.TableFieldSch fieldsBuilder_.dispose(); fieldsBuilder_ = null; fields_ = other.fields_; - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); fieldsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getFieldsFieldBuilder() @@ -1290,6 +1311,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.TableFieldSch } if (!other.getDescription().isEmpty()) { description_ = other.description_; + bitField0_ |= 0x00000010; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -1321,19 +1343,19 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { type_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 24: { mode_ = input.readEnum(); - + bitField0_ |= 0x00000004; break; } // case 24 case 34: @@ -1353,7 +1375,7 @@ public Builder mergeFrom( case 50: { description_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000010; break; } // case 50 default: @@ -1442,8 +1464,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1461,8 +1483,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1485,8 +1507,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1524,8 +1546,8 @@ public int getTypeValue() { * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1544,9 +1566,8 @@ public Builder setTypeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type result = - com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Type.UNRECOGNIZED : result; @@ -1569,7 +1590,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1beta2.TableFieldSchem if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; type_ = value.getNumber(); onChanged(); return this; @@ -1588,7 +1609,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1beta2.TableFieldSchem * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000002); type_ = 0; onChanged(); return this; @@ -1627,8 +1648,8 @@ public int getModeValue() { * @return This builder for chaining. */ public Builder setModeValue(int value) { - mode_ = value; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -1647,9 +1668,8 @@ public Builder setModeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode getMode() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode result = - com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.valueOf(mode_); + com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.forNumber(mode_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Mode.UNRECOGNIZED : result; @@ -1672,7 +1692,7 @@ public Builder setMode(com.google.cloud.bigquery.storage.v1beta2.TableFieldSchem if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000004; mode_ = value.getNumber(); onChanged(); return this; @@ -1691,7 +1711,7 @@ public Builder setMode(com.google.cloud.bigquery.storage.v1beta2.TableFieldSchem * @return This builder for chaining. */ public Builder clearMode() { - + bitField0_ = (bitField0_ & ~0x00000004); mode_ = 0; onChanged(); return this; @@ -1701,11 +1721,11 @@ public Builder clearMode() { java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { + if (!((bitField0_ & 0x00000008) != 0)) { fields_ = new java.util.ArrayList( fields_); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000008; } } @@ -1949,7 +1969,7 @@ public Builder addAllFields( public Builder clearFields() { if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); } else { fieldsBuilder_.clear(); @@ -2092,7 +2112,7 @@ public com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Builder addFie com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema, com.google.cloud.bigquery.storage.v1beta2.TableFieldSchema.Builder, com.google.cloud.bigquery.storage.v1beta2.TableFieldSchemaOrBuilder>( - fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); + fields_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -2159,8 +2179,8 @@ public Builder setDescription(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2176,8 +2196,8 @@ public Builder setDescription(java.lang.String value) { * @return This builder for chaining. */ public Builder clearDescription() { - description_ = getDefaultInstance().getDescription(); + bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } @@ -2198,8 +2218,8 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - description_ = value; + bitField0_ |= 0x00000010; onChanged(); return this; } diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableSchema.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableSchema.java index 8126497b74..ba6c3636c4 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableSchema.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/TableSchema.java @@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int FIELDS_FIELD_NUMBER = 1; + + @SuppressWarnings("serial") private java.util.List fields_; /** * @@ -339,6 +341,7 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; if (fieldsBuilder_ == null) { fields_ = java.util.Collections.emptyList(); } else { @@ -373,7 +376,16 @@ public com.google.cloud.bigquery.storage.v1beta2.TableSchema build() { public com.google.cloud.bigquery.storage.v1beta2.TableSchema buildPartial() { com.google.cloud.bigquery.storage.v1beta2.TableSchema result = new com.google.cloud.bigquery.storage.v1beta2.TableSchema(this); - int from_bitField0_ = bitField0_; + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { + buildPartial0(result); + } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields( + com.google.cloud.bigquery.storage.v1beta2.TableSchema result) { if (fieldsBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); @@ -383,8 +395,10 @@ public com.google.cloud.bigquery.storage.v1beta2.TableSchema buildPartial() { } else { result.fields_ = fieldsBuilder_.build(); } - onBuilt(); - return result; + } + + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.TableSchema result) { + int from_bitField0_ = bitField0_; } @java.lang.Override diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ThrottleState.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ThrottleState.java index bc228736a2..5281d244f1 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ThrottleState.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/ThrottleState.java @@ -66,7 +66,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int THROTTLE_PERCENT_FIELD_NUMBER = 1; - private int throttlePercent_; + private int throttlePercent_ = 0; /** * * @@ -282,8 +282,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; throttlePercent_ = 0; - return this; } @@ -311,11 +311,20 @@ public com.google.cloud.bigquery.storage.v1beta2.ThrottleState build() { public com.google.cloud.bigquery.storage.v1beta2.ThrottleState buildPartial() { com.google.cloud.bigquery.storage.v1beta2.ThrottleState result = new com.google.cloud.bigquery.storage.v1beta2.ThrottleState(this); - result.throttlePercent_ = throttlePercent_; + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.ThrottleState result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.throttlePercent_ = throttlePercent_; + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -394,7 +403,7 @@ public Builder mergeFrom( case 8: { throttlePercent_ = input.readInt32(); - + bitField0_ |= 0x00000001; break; } // case 8 default: @@ -414,6 +423,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private int throttlePercent_; /** * @@ -447,6 +458,7 @@ public int getThrottlePercent() { public Builder setThrottlePercent(int value) { throttlePercent_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -463,7 +475,7 @@ public Builder setThrottlePercent(int value) { * @return This builder for chaining. */ public Builder clearThrottlePercent() { - + bitField0_ = (bitField0_ & ~0x00000001); throttlePercent_ = 0; onChanged(); return this; diff --git a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/WriteStream.java b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/WriteStream.java index 953abfd436..625658a008 100644 --- a/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/WriteStream.java +++ b/proto-google-cloud-bigquerystorage-v1beta2/src/main/java/com/google/cloud/bigquery/storage/v1beta2/WriteStream.java @@ -252,7 +252,9 @@ private Type(int value) { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * * @@ -303,7 +305,7 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int TYPE_FIELD_NUMBER = 2; - private int type_; + private int type_ = 0; /** * * @@ -336,9 +338,8 @@ public int getTypeValue() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type result = - com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.UNRECOGNIZED : result; @@ -393,7 +394,7 @@ public com.google.protobuf.Timestamp getCreateTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { - return getCreateTime(); + return createTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : createTime_; } public static final int COMMIT_TIME_FIELD_NUMBER = 4; @@ -451,7 +452,7 @@ public com.google.protobuf.Timestamp getCommitTime() { */ @java.lang.Override public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { - return getCommitTime(); + return commitTime_ == null ? com.google.protobuf.Timestamp.getDefaultInstance() : commitTime_; } public static final int TABLE_SCHEMA_FIELD_NUMBER = 5; @@ -514,7 +515,9 @@ public com.google.cloud.bigquery.storage.v1beta2.TableSchema getTableSchema() { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.TableSchemaOrBuilder getTableSchemaOrBuilder() { - return getTableSchema(); + return tableSchema_ == null + ? com.google.cloud.bigquery.storage.v1beta2.TableSchema.getDefaultInstance() + : tableSchema_; } private byte memoizedIsInitialized = -1; @@ -770,26 +773,22 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - type_ = 0; - - if (createTimeBuilder_ == null) { - createTime_ = null; - } else { - createTime_ = null; + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - if (commitTimeBuilder_ == null) { - commitTime_ = null; - } else { - commitTime_ = null; + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - if (tableSchemaBuilder_ == null) { - tableSchema_ = null; - } else { - tableSchema_ = null; + tableSchema_ = null; + if (tableSchemaBuilder_ != null) { + tableSchemaBuilder_.dispose(); tableSchemaBuilder_ = null; } return this; @@ -819,27 +818,33 @@ public com.google.cloud.bigquery.storage.v1beta2.WriteStream build() { public com.google.cloud.bigquery.storage.v1beta2.WriteStream buildPartial() { com.google.cloud.bigquery.storage.v1beta2.WriteStream result = new com.google.cloud.bigquery.storage.v1beta2.WriteStream(this); - result.name_ = name_; - result.type_ = type_; - if (createTimeBuilder_ == null) { - result.createTime_ = createTime_; - } else { - result.createTime_ = createTimeBuilder_.build(); - } - if (commitTimeBuilder_ == null) { - result.commitTime_ = commitTime_; - } else { - result.commitTime_ = commitTimeBuilder_.build(); - } - if (tableSchemaBuilder_ == null) { - result.tableSchema_ = tableSchema_; - } else { - result.tableSchema_ = tableSchemaBuilder_.build(); + if (bitField0_ != 0) { + buildPartial0(result); } onBuilt(); return result; } + private void buildPartial0(com.google.cloud.bigquery.storage.v1beta2.WriteStream result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.type_ = type_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.createTime_ = createTimeBuilder_ == null ? createTime_ : createTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.commitTime_ = commitTimeBuilder_ == null ? commitTime_ : commitTimeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.tableSchema_ = + tableSchemaBuilder_ == null ? tableSchema_ : tableSchemaBuilder_.build(); + } + } + @java.lang.Override public Builder clone() { return super.clone(); @@ -888,6 +893,7 @@ public Builder mergeFrom(com.google.cloud.bigquery.storage.v1beta2.WriteStream o return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (other.type_ != 0) { @@ -931,31 +937,31 @@ public Builder mergeFrom( case 10: { name_ = input.readStringRequireUtf8(); - + bitField0_ |= 0x00000001; break; } // case 10 case 16: { type_ = input.readEnum(); - + bitField0_ |= 0x00000002; break; } // case 16 case 26: { input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage(getCommitTimeFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage(getTableSchemaFieldBuilder().getBuilder(), extensionRegistry); - + bitField0_ |= 0x00000010; break; } // case 42 default: @@ -975,6 +981,8 @@ public Builder mergeFrom( return this; } + private int bitField0_; + private java.lang.Object name_ = ""; /** * @@ -1039,8 +1047,8 @@ public Builder setName(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1057,8 +1065,8 @@ public Builder setName(java.lang.String value) { * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } @@ -1080,8 +1088,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -1119,8 +1127,8 @@ public int getTypeValue() { * @return This builder for chaining. */ public Builder setTypeValue(int value) { - type_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -1139,9 +1147,8 @@ public Builder setTypeValue(int value) { */ @java.lang.Override public com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type getType() { - @SuppressWarnings("deprecation") com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type result = - com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.valueOf(type_); + com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.forNumber(type_); return result == null ? com.google.cloud.bigquery.storage.v1beta2.WriteStream.Type.UNRECOGNIZED : result; @@ -1164,7 +1171,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1beta2.WriteStream.Typ if (value == null) { throw new NullPointerException(); } - + bitField0_ |= 0x00000002; type_ = value.getNumber(); onChanged(); return this; @@ -1183,7 +1190,7 @@ public Builder setType(com.google.cloud.bigquery.storage.v1beta2.WriteStream.Typ * @return This builder for chaining. */ public Builder clearType() { - + bitField0_ = (bitField0_ & ~0x00000002); type_ = 0; onChanged(); return this; @@ -1210,7 +1217,7 @@ public Builder clearType() { * @return Whether the createTime field is set. */ public boolean hasCreateTime() { - return createTimeBuilder_ != null || createTime_ != null; + return ((bitField0_ & 0x00000004) != 0); } /** * @@ -1253,11 +1260,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } createTime_ = value; - onChanged(); } else { createTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1275,11 +1282,11 @@ public Builder setCreateTime(com.google.protobuf.Timestamp value) { public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (createTimeBuilder_ == null) { createTime_ = builderForValue.build(); - onChanged(); } else { createTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1296,17 +1303,18 @@ public Builder setCreateTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { if (createTimeBuilder_ == null) { - if (createTime_ != null) { - createTime_ = - com.google.protobuf.Timestamp.newBuilder(createTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000004) != 0) + && createTime_ != null + && createTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCreateTimeBuilder().mergeFrom(value); } else { createTime_ = value; } - onChanged(); } else { createTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000004; + onChanged(); return this; } /** @@ -1322,14 +1330,13 @@ public Builder mergeCreateTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCreateTime() { - if (createTimeBuilder_ == null) { - createTime_ = null; - onChanged(); - } else { - createTime_ = null; + bitField0_ = (bitField0_ & ~0x00000004); + createTime_ = null; + if (createTimeBuilder_ != null) { + createTimeBuilder_.dispose(); createTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1345,7 +1352,7 @@ public Builder clearCreateTime() { * */ public com.google.protobuf.Timestamp.Builder getCreateTimeBuilder() { - + bitField0_ |= 0x00000004; onChanged(); return getCreateTimeFieldBuilder().getBuilder(); } @@ -1422,7 +1429,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { * @return Whether the commitTime field is set. */ public boolean hasCommitTime() { - return commitTimeBuilder_ != null || commitTime_ != null; + return ((bitField0_ & 0x00000008) != 0); } /** * @@ -1469,11 +1476,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { throw new NullPointerException(); } commitTime_ = value; - onChanged(); } else { commitTimeBuilder_.setMessage(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1493,11 +1500,11 @@ public Builder setCommitTime(com.google.protobuf.Timestamp value) { public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForValue) { if (commitTimeBuilder_ == null) { commitTime_ = builderForValue.build(); - onChanged(); } else { commitTimeBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1516,17 +1523,18 @@ public Builder setCommitTime(com.google.protobuf.Timestamp.Builder builderForVal */ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { if (commitTimeBuilder_ == null) { - if (commitTime_ != null) { - commitTime_ = - com.google.protobuf.Timestamp.newBuilder(commitTime_).mergeFrom(value).buildPartial(); + if (((bitField0_ & 0x00000008) != 0) + && commitTime_ != null + && commitTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) { + getCommitTimeBuilder().mergeFrom(value); } else { commitTime_ = value; } - onChanged(); } else { commitTimeBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000008; + onChanged(); return this; } /** @@ -1544,14 +1552,13 @@ public Builder mergeCommitTime(com.google.protobuf.Timestamp value) { * */ public Builder clearCommitTime() { - if (commitTimeBuilder_ == null) { - commitTime_ = null; - onChanged(); - } else { - commitTime_ = null; + bitField0_ = (bitField0_ & ~0x00000008); + commitTime_ = null; + if (commitTimeBuilder_ != null) { + commitTimeBuilder_.dispose(); commitTimeBuilder_ = null; } - + onChanged(); return this; } /** @@ -1569,7 +1576,7 @@ public Builder clearCommitTime() { * */ public com.google.protobuf.Timestamp.Builder getCommitTimeBuilder() { - + bitField0_ |= 0x00000008; onChanged(); return getCommitTimeFieldBuilder().getBuilder(); } @@ -1650,7 +1657,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { * @return Whether the tableSchema field is set. */ public boolean hasTableSchema() { - return tableSchemaBuilder_ != null || tableSchema_ != null; + return ((bitField0_ & 0x00000010) != 0); } /** * @@ -1697,11 +1704,11 @@ public Builder setTableSchema(com.google.cloud.bigquery.storage.v1beta2.TableSch throw new NullPointerException(); } tableSchema_ = value; - onChanged(); } else { tableSchemaBuilder_.setMessage(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1722,11 +1729,11 @@ public Builder setTableSchema( com.google.cloud.bigquery.storage.v1beta2.TableSchema.Builder builderForValue) { if (tableSchemaBuilder_ == null) { tableSchema_ = builderForValue.build(); - onChanged(); } else { tableSchemaBuilder_.setMessage(builderForValue.build()); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1745,19 +1752,19 @@ public Builder setTableSchema( */ public Builder mergeTableSchema(com.google.cloud.bigquery.storage.v1beta2.TableSchema value) { if (tableSchemaBuilder_ == null) { - if (tableSchema_ != null) { - tableSchema_ = - com.google.cloud.bigquery.storage.v1beta2.TableSchema.newBuilder(tableSchema_) - .mergeFrom(value) - .buildPartial(); + if (((bitField0_ & 0x00000010) != 0) + && tableSchema_ != null + && tableSchema_ + != com.google.cloud.bigquery.storage.v1beta2.TableSchema.getDefaultInstance()) { + getTableSchemaBuilder().mergeFrom(value); } else { tableSchema_ = value; } - onChanged(); } else { tableSchemaBuilder_.mergeFrom(value); } - + bitField0_ |= 0x00000010; + onChanged(); return this; } /** @@ -1775,14 +1782,13 @@ public Builder mergeTableSchema(com.google.cloud.bigquery.storage.v1beta2.TableS * */ public Builder clearTableSchema() { - if (tableSchemaBuilder_ == null) { - tableSchema_ = null; - onChanged(); - } else { - tableSchema_ = null; + bitField0_ = (bitField0_ & ~0x00000010); + tableSchema_ = null; + if (tableSchemaBuilder_ != null) { + tableSchemaBuilder_.dispose(); tableSchemaBuilder_ = null; } - + onChanged(); return this; } /** @@ -1800,7 +1806,7 @@ public Builder clearTableSchema() { * */ public com.google.cloud.bigquery.storage.v1beta2.TableSchema.Builder getTableSchemaBuilder() { - + bitField0_ |= 0x00000010; onChanged(); return getTableSchemaFieldBuilder().getBuilder(); } diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 94ecf42095..b303e2d237 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigquerystorage - 2.28.2 + 2.28.3 diff --git a/versions.txt b/versions.txt index dbd515dc0c..31a590d35e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -google-cloud-bigquerystorage:2.28.2:2.28.2 -grpc-google-cloud-bigquerystorage-v1beta1:0.152.2:0.152.2 -grpc-google-cloud-bigquerystorage-v1beta2:0.152.2:0.152.2 -grpc-google-cloud-bigquerystorage-v1:2.28.2:2.28.2 -proto-google-cloud-bigquerystorage-v1beta1:0.152.2:0.152.2 -proto-google-cloud-bigquerystorage-v1beta2:0.152.2:0.152.2 -proto-google-cloud-bigquerystorage-v1:2.28.2:2.28.2 +google-cloud-bigquerystorage:2.28.3:2.28.3 +grpc-google-cloud-bigquerystorage-v1beta1:0.152.3:0.152.3 +grpc-google-cloud-bigquerystorage-v1beta2:0.152.3:0.152.3 +grpc-google-cloud-bigquerystorage-v1:2.28.3:2.28.3 +proto-google-cloud-bigquerystorage-v1beta1:0.152.3:0.152.3 +proto-google-cloud-bigquerystorage-v1beta2:0.152.3:0.152.3 +proto-google-cloud-bigquerystorage-v1:2.28.3:2.28.3