Skip to content

Commit f840d86

Browse files
Neenu1995Neenu1995
committed
refactor finestTrace method
1 parent 97a5cdf commit f840d86

12 files changed

Lines changed: 81 additions & 68 deletions

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryArrowArray.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public BigQueryArrowArray(Field schema, JsonStringArrayList<?> values) {
4141

4242
@Override
4343
public Object getArray() {
44-
LOG.finestTrace("getArray", "++enter++");
44+
LOG.finestTrace("getArray");
4545
ensureValid();
4646
if (values == null) {
4747
return null;
@@ -51,7 +51,7 @@ public Object getArray() {
5151

5252
@Override
5353
public Object getArray(long index, int count) {
54-
LOG.finestTrace("getArray", "++enter++");
54+
LOG.finestTrace("getArray");
5555
ensureValid();
5656
if (values == null) {
5757
return null;
@@ -62,7 +62,7 @@ public Object getArray(long index, int count) {
6262

6363
@Override
6464
public ResultSet getResultSet() throws SQLException {
65-
LOG.finestTrace("getResultSet", "++enter++");
65+
LOG.finestTrace("getResultSet");
6666
ensureValid();
6767
if (values == null) {
6868
return new BigQueryArrowResultSet();
@@ -75,7 +75,7 @@ public ResultSet getResultSet() throws SQLException {
7575

7676
@Override
7777
public ResultSet getResultSet(long index, int count) throws SQLException {
78-
LOG.finestTrace("getResultSet", "++enter++");
78+
LOG.finestTrace("getResultSet");
7979
ensureValid();
8080
if (values == null) {
8181
return new BigQueryArrowResultSet();
@@ -89,14 +89,14 @@ public ResultSet getResultSet(long index, int count) throws SQLException {
8989

9090
@Override
9191
public void free() {
92-
LOG.finestTrace("free", "++enter++");
92+
LOG.finestTrace("free");
9393
this.values = null;
9494
markInvalid();
9595
}
9696

9797
@Override
9898
Object getCoercedValue(int index) {
99-
LOG.finestTrace("getCoercedValue", "++enter++");
99+
LOG.finestTrace("getCoercedValue");
100100
Object value = this.values.get(index);
101101
return this.arrayOfStruct
102102
? new BigQueryArrowStruct(schema.getSubFields(), (JsonStringHashMap<?, ?>) value)

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryArrowResultSet.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private BigQueryArrowResultSet(
9696
BigQuery bigQuery)
9797
throws SQLException {
9898
super(bigQuery, statement, schema, isNested);
99-
LOG.finestTrace("<init>", "++enter++");
99+
LOG.finestTrace("<init>");
100100
this.totalRows = totalRows;
101101
this.buffer = buffer;
102102
this.currentNestedBatch = currentNestedBatch;
@@ -181,7 +181,7 @@ private ArrowDeserializer(ArrowSchema arrowSchema) throws IOException {
181181
}
182182

183183
private void deserializeArrowBatch(ArrowRecordBatch batch) throws SQLException {
184-
LOG.finestTrace("deserializeArrowBatch", "++enter++");
184+
LOG.finestTrace("deserializeArrowBatch");
185185
try {
186186
if (vectorSchemaRoot != null) {
187187
// Clear vectorSchemaRoot before populating a new batch
@@ -276,7 +276,7 @@ else if (this.currentBatchRowIndex < this.vectorSchemaRoot.getRowCount()) {
276276
}
277277

278278
private Object getObjectInternal(int columnIndex) throws SQLException {
279-
LOG.finestTrace("getObjectInternal", "++enter++");
279+
LOG.finestTrace("getObjectInternal");
280280
checkClosed();
281281
Object value;
282282
if (this.isNested) {
@@ -318,7 +318,7 @@ private Object getObjectInternal(int columnIndex) throws SQLException {
318318
public Object getObject(int columnIndex) throws SQLException {
319319

320320
// columnIndex is SQL index starting at 1
321-
LOG.finestTrace("getObject", "++enter++");
321+
LOG.finestTrace("getObject");
322322
checkClosed();
323323
Object value = getObjectInternal(columnIndex);
324324
if (value == null) {
@@ -460,7 +460,7 @@ public void close() {
460460

461461
@Override
462462
public boolean isBeforeFirst() throws SQLException {
463-
LOG.finestTrace("isBeforeFirst", "++enter++");
463+
LOG.finestTrace("isBeforeFirst");
464464
checkClosed();
465465
if (this.isNested) {
466466
return this.nestedRowIndex < this.fromIndex;
@@ -471,14 +471,14 @@ public boolean isBeforeFirst() throws SQLException {
471471

472472
@Override
473473
public boolean isAfterLast() throws SQLException {
474-
LOG.finestTrace("isAfterLast", "++enter++");
474+
LOG.finestTrace("isAfterLast");
475475
checkClosed();
476476
return this.afterLast;
477477
}
478478

479479
@Override
480480
public boolean isFirst() throws SQLException {
481-
LOG.finestTrace("isFirst", "++enter++");
481+
LOG.finestTrace("isFirst");
482482
checkClosed();
483483
if (this.isNested) {
484484
return this.nestedRowIndex == this.fromIndex;
@@ -489,7 +489,7 @@ public boolean isFirst() throws SQLException {
489489

490490
@Override
491491
public boolean isLast() throws SQLException {
492-
LOG.finestTrace("isLast", "++enter++");
492+
LOG.finestTrace("isLast");
493493
checkClosed();
494494
if (this.isNested) {
495495
return this.nestedRowIndex == this.toIndexExclusive - 1;

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryArrowStruct.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ FieldList getSchema() {
5252

5353
@Override
5454
public Object[] getAttributes() {
55-
LOG.finestTrace("getAttributes", "++enter++");
55+
LOG.finestTrace("getAttributes");
5656
int size = this.schema.size();
5757
Object[] attributes = (Object[]) Array.newInstance(Object.class, size);
5858

@@ -71,7 +71,7 @@ public Object[] getAttributes() {
7171
}
7272

7373
private Object getValue(Field currentSchema, Object currentValue) {
74-
LOG.finestTrace("getValue", "++enter++");
74+
LOG.finestTrace("getValue");
7575
if (isArray(currentSchema)) {
7676
return new BigQueryArrowArray(currentSchema, (JsonStringArrayList<?>) currentValue);
7777
} else if (isStruct(currentSchema)) {

‎java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryBaseArray.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ abstract class BigQueryBaseArray implements java.sql.Array {
5656

5757
@Override
5858
public final String getBaseTypeName() {
59-
LOG.finestTrace("getBaseTypeName", "++enter++");
59+
LOG.finestTrace("getBaseTypeName");
6060
ensureValid();
6161
return this.schema.getType().getStandardType().name();
6262
}
6363

6464
@Override
6565
public final int getBaseType() {
66-
LOG.finestTrace("getBaseType", "++enter++");
66+
LOG.finestTrace("getBaseType");
6767
ensureValid();
6868
return BigQueryJdbcTypeMappings.standardSQLToJavaSqlTypesMapping.get(
6969
schema.getType().getStandardType());
@@ -92,7 +92,7 @@ public final ResultSet getResultSet(long index, int count, Map<String, Class<?>>
9292
}
9393

9494
protected Object getArrayInternal(int fromIndex, int toIndexExclusive) {
95-
LOG.finestTrace("getArrayInternal", "++enter++");
95+
LOG.finestTrace("getArrayInternal");
9696
Class<?> targetClass = getTargetClass();
9797
int size = toIndexExclusive - fromIndex;
9898
Object javaArray = Array.newInstance(targetClass, size);
@@ -104,7 +104,7 @@ protected Object getArrayInternal(int fromIndex, int toIndexExclusive) {
104104
}
105105

106106
protected void ensureValid() throws IllegalStateException {
107-
LOG.finestTrace("ensureValid", "++enter++");
107+
LOG.finestTrace("ensureValid");
108108
if (!this.valid) {
109109
IllegalStateException ex = new IllegalStateException(INVALID_ARRAY);
110110
LOG.severe(INVALID_ARRAY, ex);
@@ -113,19 +113,19 @@ protected void ensureValid() throws IllegalStateException {
113113
}
114114

115115
protected void markInvalid() {
116-
LOG.finestTrace("markInvalid", "++enter++");
116+
LOG.finestTrace("markInvalid");
117117
this.schema = null;
118118
this.valid = false;
119119
}
120120

121121
protected Field singleElementSchema() {
122-
LOG.finestTrace("singleElementSchema", "++enter++");
122+
LOG.finestTrace("singleElementSchema");
123123
return this.schema.toBuilder().setMode(Mode.REQUIRED).build();
124124
}
125125

126126
protected Tuple<Integer, Integer> createRange(long index, int count, int size)
127127
throws IllegalStateException {
128-
LOG.finestTrace("createRange", "++enter++");
128+
LOG.finestTrace("createRange");
129129
// jdbc array follows 1 based array indexing
130130
long normalisedFromIndex = index - 1;
131131
if (normalisedFromIndex + count > size) {
@@ -142,7 +142,7 @@ protected Tuple<Integer, Integer> createRange(long index, int count, int size)
142142
}
143143

144144
protected Class<?> getTargetClass() {
145-
LOG.finestTrace("getTargetClass", "++enter++");
145+
LOG.finestTrace("getTargetClass");
146146
return this.arrayOfStruct
147147
? Struct.class
148148
: BigQueryJdbcTypeMappings.standardSQLToJavaTypeMapping.get(
@@ -152,7 +152,7 @@ protected Class<?> getTargetClass() {
152152
abstract Object getCoercedValue(int index);
153153

154154
static boolean isArray(Field currentSchema) {
155-
LOG.finestTrace("isArray", "++enter++");
155+
LOG.finestTrace("isArray");
156156
return currentSchema.getMode() == REPEATED;
157157
}
158158

0 commit comments

Comments
 (0)