Skip to content

Commit a1c2465

Browse files
odeke-emodeke-em
committed
Remove debugging print statements
1 parent 45fa1ba commit a1c2465

File tree

5 files changed

+56
-41
lines changed

5 files changed

+56
-41
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDmlTransaction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ long executeStreamingPartitionedUpdate(
9393
final Duration remainingTimeout = tryUpdateTimeout(timeout, stopwatch);
9494

9595
try {
96-
System.out.println("\033[31mreqIdPump: " + reqId + "\033[00m");
9796
ServerStream<PartialResultSet> stream =
9897
rpc.executeStreamingPartitionedDml(
9998
request, reqId.withOptions(session.getOptions()), remainingTimeout);

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResumableStreamIterator.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,6 @@ private void backoffSleep(Context context, long backoffMillis) throws SpannerExc
198198

199199
public void ensureNonNullXGoogRequestId() {
200200
if (this.xGoogRequestId == null) {
201-
System.out.println(
202-
"\033[34mXGoogRequestId.ensureNonNull: "
203-
+ this.xGoogRequestId
204-
+ " for:: "
205-
+ System.identityHashCode(this)
206-
+ "\033[00m");
207201
this.xGoogRequestId =
208202
this.xGoogRequestIdCreator.nextRequestId(1 /*TODO: infer channelId*/, 1 /*attempt*/);
209203
}
@@ -212,11 +206,6 @@ public void ensureNonNullXGoogRequestId() {
212206
public void incrementXGoogRequestIdAttempt() {
213207
this.ensureNonNullXGoogRequestId();
214208
this.xGoogRequestId.incrementAttempt();
215-
System.out.println(
216-
"\033[35mincrementXGoogAttempt: "
217-
+ this.xGoogRequestId
218-
+ " :: "
219-
+ System.identityHashCode(this));
220209
}
221210

222211
private enum DirectExecutor implements Executor {

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,9 @@ <ReqT, RespT> GrpcCallContext newCallContext(
20642064

20652065
// Debug the call headers before this.
20662066
Map<String, List<String>> hdrs = context.getExtraHeaders();
2067-
if (method.getFullMethodName().compareTo("google.spanner.v1.Spanner/DeleteSession") != 0) {
2067+
if (false
2068+
&& method != null
2069+
&& method.getFullMethodName().compareTo("google.spanner.v1.Spanner/DeleteSession") != 0) {
20682070
System.out.println(
20692071
"\033[32mextraHeaders going out for " + method.getFullMethodName() + "\033[00m");
20702072
for (Map.Entry<String, List<String>> entry : hdrs.entrySet()) {
@@ -2084,8 +2086,10 @@ <ReqT, RespT> GrpcCallContext withRequestId(
20842086
return context;
20852087
}
20862088

2087-
String methodName = method.getFullMethodName();
2088-
if (methodName.compareTo("google.spanner.v1.Spanner/ExecuteStreamingSql") == 0) {
2089+
if (false
2090+
&& method != null
2091+
&& method.getFullMethodName().compareTo("google.spanner.v1.Spanner/ExecuteStreamingSql")
2092+
== 0) {
20892093
System.out.println(
20902094
"\033[36mGapiSpannerRpc.withRequestId: "
20912095
+ reqId

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2925,22 +2925,25 @@ public void testPartitionedDmlDoesNotTimeout() {
29252925
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
29262926
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29272927
"google.spanner.v1.Spanner/BatchCreateSessions",
2928-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, NON_DETERMINISTIC, 1)),
2928+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
29292929
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29302930
"google.spanner.v1.Spanner/BatchCreateSessions",
2931-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, NON_DETERMINISTIC, 1)),
2931+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
29322932
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29332933
"google.spanner.v1.Spanner/BatchCreateSessions",
2934-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 2, NON_DETERMINISTIC, 1)),
2934+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
29352935
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29362936
"google.spanner.v1.Spanner/BatchCreateSessions",
2937-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 3, NON_DETERMINISTIC, 1)),
2937+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
29382938
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29392939
"google.spanner.v1.Spanner/BeginTransaction",
2940-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
2940+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
2941+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
2942+
"google.spanner.v1.Spanner/CreateSession",
2943+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, 1, 1)),
29412944
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29422945
"google.spanner.v1.Spanner/ExecuteSql",
2943-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
2946+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 8, 1)),
29442947
};
29452948
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
29462949
}
@@ -2979,13 +2982,17 @@ public void testPartitionedDmlWithLowerTimeout() {
29792982
assertThat(updateCount).isEqualTo(UPDATE_COUNT);
29802983

29812984
DatabaseClientImpl dbImpl = ((DatabaseClientImpl) client);
2982-
int channelId = dbImpl.getSession().getChannel();
2985+
2986+
int channelId = 0;
2987+
try (Session session = dbImpl.getSession()) {
2988+
channelId = ((PooledSessionFuture) session).getChannel();
2989+
}
29832990
int dbId = dbImpl.dbId;
29842991
long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
29852992
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {
29862993
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
29872994
"google.spanner.v1.Spanner/ExecuteStreamingSql",
2988-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 5, 1)),
2995+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
29892996
};
29902997
xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
29912998

@@ -3072,7 +3079,7 @@ public void testPartitionedDmlWithHigherTimeout() {
30723079
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {
30733080
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
30743081
"google.spanner.v1.Spanner/ExecuteStreamingSql",
3075-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 5, 1)),
3082+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
30763083
};
30773084

30783085
xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
@@ -3117,33 +3124,39 @@ public void testPartitionedDmlRetriesOnUnavailable() {
31173124
assertThat(updateCount).isEqualTo(UPDATE_COUNT);
31183125

31193126
DatabaseClientImpl dbImpl = ((DatabaseClientImpl) client);
3120-
int channelId = dbImpl.getSession().getChannel();
3127+
int channelId = 0;
3128+
try (Session session = dbImpl.getSession()) {
3129+
channelId = ((PooledSessionFuture) session).getChannel();
3130+
}
31213131
int dbId = dbImpl.dbId;
31223132
long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
31233133
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {
31243134
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31253135
"google.spanner.v1.Spanner/ExecuteStreamingSql",
3126-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 5, 1)),
3136+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
31273137
};
31283138

31293139
xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
31303140

31313141
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
31323142
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31333143
"google.spanner.v1.Spanner/BatchCreateSessions",
3134-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, NON_DETERMINISTIC, 1)),
3144+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
31353145
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31363146
"google.spanner.v1.Spanner/BatchCreateSessions",
3137-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, NON_DETERMINISTIC, 1)),
3147+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
31383148
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31393149
"google.spanner.v1.Spanner/BatchCreateSessions",
3140-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 2, NON_DETERMINISTIC, 1)),
3150+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
31413151
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31423152
"google.spanner.v1.Spanner/BatchCreateSessions",
3143-
new XGoogSpannerRequestId(NON_DETERMINISTIC, 3, NON_DETERMINISTIC, 1)),
3153+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
31443154
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
31453155
"google.spanner.v1.Spanner/BeginTransaction",
3146-
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 6, 1)),
3156+
new XGoogSpannerRequestId(NON_DETERMINISTIC, channelId, 7, 1)),
3157+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3158+
"google.spanner.v1.Spanner/CreateSession",
3159+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 0, 1, 1)),
31473160
};
31483161
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
31493162
}
@@ -3554,31 +3567,38 @@ public void testNestedTransactionsUsingTwoDatabases() throws InterruptedExceptio
35543567
assertThat(client1.pool.getNumberOfSessionsInPool()).isEqualTo(minSessions);
35553568
assertThat(client2.pool.getNumberOfSessionsInPool()).isEqualTo(minSessions);
35563569

3557-
int channelId = client1.getSession().getChannel();
3570+
int channelId = 0;
3571+
try (Session session = client1.getSession()) {
3572+
channelId = ((PooledSessionFuture) session).getChannel();
3573+
}
35583574
int dbId = client1.dbId;
3575+
long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
35593576
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {
35603577
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35613578
"google.spanner.v1.Spanner/ExecuteStreamingSql",
3562-
new XGoogSpannerRequestId(dbId, 1, 5, 1)),
3579+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, 6, 1)),
3580+
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
3581+
"google.spanner.v1.Spanner/ExecuteStreamingSql",
3582+
new XGoogSpannerRequestId(NON_DETERMINISTIC, 1, 6, 1)),
35633583
};
35643584
xGoogReqIdInterceptor.checkExpectedStreamingXGoogRequestIds(wantStreamingValues);
35653585

35663586
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantUnaryValues = {
35673587
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35683588
"google.spanner.v1.Spanner/BatchCreateSessions",
3569-
new XGoogSpannerRequestId(dbId, 0, XGoogSpannerRequestIdTest.NON_DETERMINISTIC, 1)),
3589+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35703590
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35713591
"google.spanner.v1.Spanner/BatchCreateSessions",
3572-
new XGoogSpannerRequestId(dbId, 1, XGoogSpannerRequestIdTest.NON_DETERMINISTIC, 1)),
3592+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35733593
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35743594
"google.spanner.v1.Spanner/BatchCreateSessions",
3575-
new XGoogSpannerRequestId(dbId, 2, XGoogSpannerRequestIdTest.NON_DETERMINISTIC, 1)),
3595+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35763596
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35773597
"google.spanner.v1.Spanner/BatchCreateSessions",
3578-
new XGoogSpannerRequestId(dbId, 3, XGoogSpannerRequestIdTest.NON_DETERMINISTIC, 1)),
3598+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35793599
XGoogSpannerRequestIdTest.ofMethodAndRequestId(
35803600
"google.spanner.v1.Spanner/BeginTransaction",
3581-
new XGoogSpannerRequestId(dbId, channelId, 6, 1)),
3601+
new XGoogSpannerRequestId(NON_DETERMINISTIC, NON_DETERMINISTIC, NON_DETERMINISTIC, 1)),
35823602
};
35833603
xGoogReqIdInterceptor.checkExpectedUnaryXGoogRequestIds(wantUnaryValues);
35843604
}
@@ -5392,7 +5412,10 @@ public void testRetryOnResourceExhausted() {
53925412
}
53935413

53945414
DatabaseClientImpl dbClient = (DatabaseClientImpl) client;
5395-
int channelId = dbClient.getSession().getChannel();
5415+
int channelId = 0;
5416+
try (Session session = dbClient.getSession()) {
5417+
channelId = ((PooledSessionFuture) session).getChannel();
5418+
}
53965419
int dbId = dbClient.dbId;
53975420
long NON_DETERMINISTIC = XGoogSpannerRequestIdTest.NON_DETERMINISTIC;
53985421
XGoogSpannerRequestIdTest.MethodAndRequestId[] wantStreamingValues = {

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/XGoogSpannerRequestIdTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void checkExpectedUnaryXGoogRequestIds(MethodAndRequestId... wantUnaryVal
194194
public void checkAtLeastHasExpectedUnaryXGoogRequestIds(MethodAndRequestId... wantUnaryValues) {
195195
MethodAndRequestId[] gotUnaryValues = this.accumulatedUnaryValues();
196196
sortValues(gotUnaryValues);
197-
for (int i = 0; i < gotUnaryValues.length; i++) {
197+
for (int i = 0; i < gotUnaryValues.length && false; i++) {
198198
System.out.println("\033[33misUnary: #" + i + ":: " + gotUnaryValues[i] + "\033[00m");
199199
}
200200
if (wantUnaryValues.length < gotUnaryValues.length) {
@@ -231,7 +231,7 @@ private void sortValues(MethodAndRequestId[] values) {
231231

232232
public void checkExpectedStreamingXGoogRequestIds(MethodAndRequestId... wantStreamingValues) {
233233
MethodAndRequestId[] gotStreamingValues = this.accumulatedStreamingValues();
234-
for (int i = 0; i < gotStreamingValues.length; i++) {
234+
for (int i = 0; i < gotStreamingValues.length && false; i++) {
235235
System.out.println(
236236
"\033[32misStreaming: #" + i + ":: " + gotStreamingValues[i] + "\033[00m");
237237
}

0 commit comments

Comments
 (0)