diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 63ae42ebf841..b3638b57f2c4 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -76,6 +76,18 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image + echo "Install GraalVM 25" + echo "$JAVA_HOME" + pwd + mkdir -p ~/tools/jdk + cd ~/tools/jdk + wget https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz + tar -xf graalvm-jdk-25_linux-x64_bin.tar.gz + export JAVA_HOME=~/tools/jdk/graalvm-jdk-25+37.1 + export PATH=$JAVA_HOME/bin:$PATH + java -version + echo "Running native image tests..." + cd "${scriptDir}/.." mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true RETURN_CODE=$? ;; diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/ChannelPoolHealthChecker.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/ChannelPoolHealthChecker.java index cb0841e7a184..5c5c689810c9 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/ChannelPoolHealthChecker.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/grpc/ChannelPoolHealthChecker.java @@ -102,7 +102,8 @@ void start() { if (!(channelPrimer instanceof BigtableChannelPrimer)) { logger.log( Level.WARNING, - "Provided channelPrimer not an instance of BigtableChannelPrimer, not checking channel health."); + "Provided channelPrimer not an instance of BigtableChannelPrimer, not checking channel" + + " health."); return; } diff --git a/owlbot.py b/owlbot.py index c9aac4e206d2..f0fefd683675 100644 --- a/owlbot.py +++ b/owlbot.py @@ -113,5 +113,6 @@ def make_internal_only(sources): '.github/release-please.yml', 'renovate.json', '.kokoro/requirements.in', - '.kokoro/requirements.txt' + '.kokoro/requirements.txt', + '.kokoro/build.sh' ]) diff --git a/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/ResultSetSerializer.java b/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/ResultSetSerializer.java index 27b8217146c2..1868108efc70 100644 --- a/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/ResultSetSerializer.java +++ b/test-proxy/src/main/java/com/google/cloud/bigtable/testproxy/ResultSetSerializer.java @@ -29,11 +29,11 @@ import com.google.bigtable.v2.Type.Timestamp; import com.google.bigtable.v2.Value; import com.google.cloud.Date; +import com.google.cloud.bigtable.common.Type.SchemalessEnum; +import com.google.cloud.bigtable.common.Type.SchemalessProto; import com.google.cloud.bigtable.data.v2.models.sql.ColumnMetadata; import com.google.cloud.bigtable.data.v2.models.sql.ResultSet; import com.google.cloud.bigtable.data.v2.models.sql.SqlType; -import com.google.cloud.bigtable.common.Type.SchemalessProto; -import com.google.cloud.bigtable.common.Type.SchemalessEnum; import com.google.cloud.bigtable.data.v2.models.sql.StructReader; import com.google.protobuf.ByteString; import java.time.Instant; @@ -235,14 +235,21 @@ private static Type toProtoType(SqlType type) { case PROTO: SchemalessProto protoType = (SchemalessProto) type; return Type.newBuilder() - .setProtoType(Proto.newBuilder().setMessageName(protoType.getMessageName()) - .setSchemaBundleId(protoType.schemaBundleId()).build()).build(); + .setProtoType( + Proto.newBuilder() + .setMessageName(protoType.getMessageName()) + .setSchemaBundleId(protoType.schemaBundleId()) + .build()) + .build(); case ENUM: SchemalessEnum enumType = (SchemalessEnum) type; return Type.newBuilder() .setEnumType( - com.google.bigtable.v2.Type.Enum.newBuilder().setEnumName(enumType.getEnumName()) - .setSchemaBundleId(enumType.schemaBundleId()).build()).build(); + com.google.bigtable.v2.Type.Enum.newBuilder() + .setEnumName(enumType.getEnumName()) + .setSchemaBundleId(enumType.schemaBundleId()) + .build()) + .build(); default: throw new IllegalStateException("Unexpected Type: " + type); }