Skip to content

Commit 6cc31d1

Browse files
yihanzhenyihanzhen
authored
Merge pull request #3231 from hzyi-google/spanner-gapic-migration
merge master into spanner gapic migration
2 parents 02f0bc7 + 4e1dfc0 commit 6cc31d1

3,206 files changed

Lines changed: 1677840 additions & 3006 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- image: maven:3.5.2-jdk-7
3333
environment:
3434
TERM: dumb
35-
MAVEN_OPTS: -Xmx256m
35+
MAVEN_OPTS: -Xmx1024m
3636
steps:
3737
- checkout
3838
- run:
@@ -221,6 +221,16 @@ jobs:
221221
- run:
222222
name: Run integration tests for google-cloud-translate
223223
command: ./utilities/verify_single_it.sh google-cloud-translate
224+
javadoc_test:
225+
working_directory: ~/googleapis
226+
<<: *anchor_docker
227+
steps:
228+
- checkout
229+
- run:
230+
<<: *anchor_build
231+
- run:
232+
name: Run mvn javadoc goal
233+
command: mvn javadoc:jar javadoc:test-jar
224234

225235
workflows:
226236
version: 2
@@ -229,6 +239,7 @@ workflows:
229239
- openjdk_7
230240
- openjdk_8
231241
- mac_openjdk_8
242+
- javadoc_test
232243
- bigquery_it:
233244
filters:
234245
branches:

‎CHANGES.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- `TableResult.getTotalRows()` can be called to obtain the total number of rows across pages.
1515
- Various `Job` statistics are no longer available at `QueryResponse`.
1616
- Use `BigQuery.getJob` then `Job.getStatistics` instead.
17+
1718
# v0.36.0
1819
## Pub/Sub
1920
- `TopicName` is renamed to `ProjectTopicName`, and now inherits from a new base class `TopicName`
@@ -34,3 +35,19 @@
3435
- `subscription.getTopicAsTopicNameOneof()`: use `TopicNames.parse(subscription.getTopic())`
3536
- `subscription.getNameAsSubscriptionName()`: use `ProjectSubscriptionName.parse(subscription.getName())`
3637
- `snapshot.getNameAsSnapshotName()`: use `ProjectSnapshotName.parse(snapshot.getName())`
38+
39+
# v0.44.0
40+
## Pub/Sub
41+
The default flow control settings for `Subscriber` is changed.
42+
43+
- Previously it keeps combined size of outstanding messages below 20% of available memory.
44+
Now it keeps the number of outstanding messages less than or equal to 1000.
45+
- Previously it opens one stream per available CPU.
46+
Now it opens one regardless of number of CPUs.
47+
48+
Slow message consumers will likely see better load-balancing across machines.
49+
Because each machine pulls messages less eagerly, messages not yet pulled can be pulled by another machine.
50+
51+
Fast message consumers might see reduced performance.
52+
If desired, these settings can be adjusted back by `Subscriber.Builder#setFlowControlSettings` and
53+
`Subscriber.Builder#setParallelPullCount`.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ If you are using Maven, add this to your pom.xml file
5959
<dependency>
6060
<groupId>com.google.cloud</groupId>
6161
<artifactId>google-cloud</artifactId>
62-
<version>0.43.0-alpha</version>
62+
<version>0.46.0-alpha</version>
6363
</dependency>
6464
```
6565
If you are using Gradle, add this to your dependencies
6666
```Groovy
67-
compile 'com.google.cloud:google-cloud:0.43.0-alpha'
67+
compile 'com.google.cloud:google-cloud:0.46.0-alpha'
6868
```
6969
If you are using SBT, add this to your dependencies
7070
```Scala
71-
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.43.0-alpha"
71+
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.46.0-alpha"
7272
```
7373
[//]: # ({x-version-update-end})
7474

@@ -292,7 +292,7 @@ The easiest way to solve version conflicts is to use google-cloud's BOM. In Mave
292292
<dependency>
293293
<groupId>com.google.cloud</groupId>
294294
<artifactId>google-cloud-bom</artifactId>
295-
<version>0.43.0-alpha</version>
295+
<version>0.46.0-alpha</version>
296296
<type>pom</type>
297297
<scope>import</scope>
298298
</dependency>

‎TROUBLESHOOTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ There may be multiple sources for classpath conflicts:
5252

5353
For example, if you have a direct or a transitive dependency on Guava version 10.0, and also `google-cloud-java` uses Guava version 20.0, then `google-cloud-java` could be using Guava methods that don't exist in Guava 10.0, and could cause `NoSuchMethodError`.
5454

55-
Similarily, if your classpath has an older version of `protobuf-java`, but `google-cloud-java` requires newer version, then you may see `NoClassDefFoundError` that fails to initialize `google-cloud-java` classes, e.g.:
55+
Similarily, if your classpath has an older version of `protobuf-java`, but `google-cloud-java` requires a newer version, then you may see `NoClassDefFoundError` that fails to initialize `google-cloud-java` classes, e.g.:
5656

5757
```
5858
java.lang.NoClassDefFoundError: Could not initialize class com.google.pubsub.v1.PubsubMessage$AttributesDefaultEntryHolder
@@ -72,7 +72,7 @@ If you experience the error only during runtime, then it means that your runtime
7272

7373
### Detecting the conflict early during build
7474

75-
To detect dependnecy version conflicts early, use the [Enforcer Plugin](https://maven.apache.org/enforcer/maven-enforcer-plugin/index.html) in your Maven configuration to enforce dependency convergence:
75+
To detect dependency version conflicts early, use the [Enforcer Plugin](https://maven.apache.org/enforcer/maven-enforcer-plugin/index.html) in your Maven configuration to enforce dependency convergence:
7676

7777
```
7878
<plugin>

‎google-api-grpc/grpc-google-cloud-bigquerydatatransfer-v1/pom.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<artifactId>grpc-google-cloud-bigquerydatatransfer-v1</artifactId>
6+
<version>0.11.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigquerydatatransfer-v1:current} -->
7+
<name>grpc-google-cloud-bigquerydatatransfer-v1</name>
8+
<description>GRPC library for grpc-google-cloud-bigquerydatatransfer-v1</description>
9+
<parent>
10+
<groupId>com.google.api.grpc</groupId>
11+
<artifactId>google-api-grpc-pom</artifactId>
12+
<version>0.11.1-SNAPSHOT</version><!-- {x-version-update:google-api-grpc-pom:current} -->
13+
</parent>
14+
<dependencies>
15+
<dependency>
16+
<groupId>io.grpc</groupId>
17+
<artifactId>grpc-stub</artifactId>
18+
<scope>compile</scope>
19+
</dependency>
20+
<dependency>
21+
<groupId>io.grpc</groupId>
22+
<artifactId>grpc-protobuf</artifactId>
23+
<scope>compile</scope>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.google.api.grpc</groupId>
27+
<artifactId>proto-google-cloud-bigquerydatatransfer-v1</artifactId>
28+
<scope>compile</scope>
29+
</dependency>
30+
</dependencies>
31+
</project>

0 commit comments

Comments
 (0)