Skip to content

Commit 62ffb68

Browse files
ShenFeng312ShenFeng312
committed
fix cr
1 parent bbbcae6 commit 62ffb68

File tree

13 files changed

+123
-118
lines changed

13 files changed

+123
-118
lines changed

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLArrayParameterDecoder.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ public final class PostgreSQLArrayParameterDecoder {
3737
* @param parameterValue arrayString
3838
* @return array
3939
*/
40+
@SuppressWarnings("rawtypes")
4041
public Object decodeNumberArray(final String parameterValue) {
41-
PgDimensionsArrayList list = decodeFromString(parameterValue, ',');
42+
char delim = ',';
43+
PgDimensionsArrayList list = decodeFromString(parameterValue, delim);
4244
int dims = list.dimensionsCount;
43-
final int[] dimensionLengths = new int[dims];
45+
int[] dimensionLengths = new int[dims];
4446
dimensionLengths[0] = list.size();
4547
List tmpList = (List) list.get(0);
4648
for (int i = 1; i < dims; i++) {
@@ -66,6 +68,7 @@ public Object decodeNumberArray(final String parameterValue) {
6668
* @param dimensionLengths dimensionLengths
6769
* @param dim dim
6870
*/
71+
@SuppressWarnings("rawtypes")
6972
private static void storeStringValues(final Object[] array, final List list, final int[] dimensionLengths,
7073
final int dim) {
7174
for (int i = 0; i < dimensionLengths[dim]; i++) {
@@ -84,6 +87,7 @@ private static void storeStringValues(final Object[] array, final List list, fin
8487
* @param target Number[]
8588
* @param source String list
8689
*/
90+
@SuppressWarnings("rawtypes")
8791
private static void parserNumber(final Number[] target, final List source) {
8892
for (int i = 0; i < target.length; i++) {
8993
Object o = source.get(i);
@@ -97,13 +101,13 @@ private static void parserNumber(final Number[] target, final List source) {
97101
/**
98102
* parse String to Number.
99103
*
100-
* @param each String
104+
* @param stringValue String
101105
* @return BigDecimal or Double
102106
*/
103-
private static Number parseNumber(final String each) {
104-
String value = each;
107+
private static Number parseNumber(final String stringValue) {
108+
String value = stringValue;
105109
if (value.startsWith("\"") && value.endsWith("\"") && value.length() > 2) {
106-
value = each.substring(1, value.length() - 1);
110+
value = stringValue.substring(1, value.length() - 1);
107111
}
108112
if (Double.toString(Double.NaN).equals(value)) {
109113
return Double.NaN;
@@ -124,18 +128,18 @@ private static Number parseNumber(final String each) {
124128
* @param delim delim
125129
* @return PgDimensionsArrayList
126130
*/
127-
public PgDimensionsArrayList decodeFromString(final String fieldString, final char delim) {
128-
final PgDimensionsArrayList result = new PgDimensionsArrayList();
131+
private PgDimensionsArrayList decodeFromString(final String fieldString, final char delim) {
132+
PgDimensionsArrayList result = new PgDimensionsArrayList();
129133
if (fieldString == null) {
130134
return result;
131135
}
132-
final char[] chars = fieldString.toCharArray();
136+
char[] chars = fieldString.toCharArray();
133137
StringBuilder buffer = null;
134138
boolean insideString = false;
135139
// needed for checking if NULL value occurred
136140
boolean wasInsideString = false;
137141
// array dimension arrays
138-
final List<PgDimensionsArrayList> dims = new ArrayList<>();
142+
List<PgDimensionsArrayList> dims = new ArrayList<>(10);
139143
// currently processed array
140144
PgDimensionsArrayList curArray = result;
141145
// Starting with 8.0 non-standard (beginning index
@@ -229,7 +233,7 @@ public PgDimensionsArrayList decodeFromString(final String fieldString, final ch
229233
return result;
230234
}
231235

232-
static final class PgDimensionsArrayList extends ArrayList<@Nullable Object> {
236+
private static final class PgDimensionsArrayList extends ArrayList<@Nullable Object> {
233237

234238
private static final long serialVersionUID = 1L;
235239

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/AbstractArrayEncoder.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,24 @@ public void toSingleDimensionBinaryRepresentation(final D[] array, final ByteArr
6868

6969
@SneakyThrows(IOException.class)
7070
@Override
71-
public void toBinaryRepresentation(final D[] array, final int oid, final ByteArrayOutputStream baos, final Charset charset) {
71+
public void toBinaryRepresentation(final D[] array, final int oid, final ByteArrayOutputStream bout, final Charset charset) {
7272
final byte[] buffer = new byte[4];
7373
// 1 dimension
7474
ByteConverter.int4(buffer, 0, 1);
75-
baos.write(buffer);
75+
bout.write(buffer);
7676
// null
7777
ByteConverter.int4(buffer, 0, countNulls(array) > 0 ? 1 : 0);
78-
baos.write(buffer);
78+
bout.write(buffer);
7979
// oid
8080
ByteConverter.int4(buffer, 0, getTypeOID(oid));
81-
baos.write(buffer);
81+
bout.write(buffer);
8282
// length
8383
ByteConverter.int4(buffer, 0, array.length);
84-
baos.write(buffer);
84+
bout.write(buffer);
8585
// postgresql uses 1 base by default
8686
ByteConverter.int4(buffer, 0, 1);
87-
baos.write(buffer);
88-
writeBytes(array, baos, charset);
87+
bout.write(buffer);
88+
writeBytes(array, bout, charset);
8989
}
9090

9191
/**
@@ -106,8 +106,8 @@ int getTypeOID(@SuppressWarnings("unused") final int arrayOid) {
106106
*/
107107
int countNulls(final D[] array) {
108108
int result = 0;
109-
for (int i = 0; i < array.length; i++) {
110-
if (array[i] == null) {
109+
for (D each : array) {
110+
if (each == null) {
111111
++result;
112112
}
113113
}
@@ -118,21 +118,22 @@ int countNulls(final D[] array) {
118118
* decode array.
119119
*
120120
* @param array array to decode
121-
* @param baos output stream
121+
* @param bout output stream
122122
* @param charset charset
123123
*/
124+
@SuppressWarnings("unchecked")
124125
@SneakyThrows(IOException.class)
125-
private void writeBytes(final D[] array, final ByteArrayOutputStream baos, final Charset charset) {
126+
private void writeBytes(final D[] array, final ByteArrayOutputStream bout, final Charset charset) {
126127

127128
byte[] buffer = new byte[4];
128129
int length = Array.getLength(array);
129130
for (int i = 0; i < length; i++) {
130-
D d = (D) Array.get(array, i);
131-
if (d == null) {
131+
D each = (D) Array.get(array, i);
132+
if (each == null) {
132133
ByteConverter.int4(buffer, 0, -1);
133-
baos.write(buffer);
134+
bout.write(buffer);
134135
} else {
135-
write(d, baos, charset);
136+
write(each, bout, charset);
136137
}
137138
}
138139
}

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/ArrayEncoder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public interface ArrayEncoder<A> {
3232
*
3333
* @param array array
3434
* @param oid array oid
35-
* @param baos OutputStream to write
35+
* @param bout OutputStream to write
3636
* @param charset charset
3737
*/
38-
void toBinaryRepresentation(A array, int oid, ByteArrayOutputStream baos, Charset charset);
38+
void toBinaryRepresentation(A array, int oid, ByteArrayOutputStream bout, Charset charset);
3939
}

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/BooleanArrayEncoder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public BooleanArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Boolean item, final ByteArrayOutputStream baos, final Charset charset) {
38-
baos.write(0);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(1);
42-
baos.write(item ? (byte) 1 : (byte) 0);
37+
public void write(final Boolean item, final ByteArrayOutputStream bout, final Charset charset) {
38+
bout.write(0);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(1);
42+
bout.write(item ? (byte) 1 : (byte) 0);
4343
}
4444

4545
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/ByteaArrayEncoder.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ private ByteaArrayEncoder() {
3838

3939
@SneakyThrows(IOException.class)
4040
@Override
41-
public void write(final byte[] item, final ByteArrayOutputStream baos, final Charset charset) {
41+
public void write(final byte[] item, final ByteArrayOutputStream bout, final Charset charset) {
4242
int length = item.length;
43-
baos.write((byte) (length >>> 24));
44-
baos.write((byte) (length >>> 16));
45-
baos.write((byte) (length >>> 8));
46-
baos.write(length);
47-
baos.write(item);
43+
bout.write((byte) (length >>> 24));
44+
bout.write((byte) (length >>> 16));
45+
bout.write((byte) (length >>> 8));
46+
bout.write(length);
47+
bout.write(item);
4848
}
4949

5050
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/Float4ArrayEncoder.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ public Float4ArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Float item, final ByteArrayOutputStream baos, final Charset charset) {
37+
public void write(final Float item, final ByteArrayOutputStream bout, final Charset charset) {
3838
int i = Float.floatToRawIntBits(item);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(0);
42-
baos.write(4);
43-
baos.write((byte) (i >>> 24));
44-
baos.write((byte) (i >>> 16));
45-
baos.write((byte) (i >>> 8));
46-
baos.write(i);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(0);
42+
bout.write(4);
43+
bout.write((byte) (i >>> 24));
44+
bout.write((byte) (i >>> 16));
45+
bout.write((byte) (i >>> 8));
46+
bout.write(i);
4747
}
4848

4949
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/Float8ArrayEncoder.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ public Float8ArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Double item, final ByteArrayOutputStream baos, final Charset charset) {
37+
public void write(final Double item, final ByteArrayOutputStream bout, final Charset charset) {
3838
long l = Double.doubleToRawLongBits(item);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(0);
42-
baos.write(8);
43-
baos.write((byte) (l >>> 56));
44-
baos.write((byte) (l >>> 48));
45-
baos.write((byte) (l >>> 40));
46-
baos.write((byte) (l >>> 32));
47-
baos.write((byte) (l >>> 24));
48-
baos.write((byte) (l >>> 16));
49-
baos.write((byte) (l >>> 8));
50-
baos.write((byte) l);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(0);
42+
bout.write(8);
43+
bout.write((byte) (l >>> 56));
44+
bout.write((byte) (l >>> 48));
45+
bout.write((byte) (l >>> 40));
46+
bout.write((byte) (l >>> 32));
47+
bout.write((byte) (l >>> 24));
48+
bout.write((byte) (l >>> 16));
49+
bout.write((byte) (l >>> 8));
50+
bout.write((byte) l);
5151
}
5252

5353
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/Int2ArrayEncoder.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ private Int2ArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Short item, final ByteArrayOutputStream baos, final Charset charset) {
38-
baos.write(0);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(2);
42-
baos.write((byte) (item >>> 8));
43-
baos.write(item.byteValue());
37+
public void write(final Short item, final ByteArrayOutputStream bout, final Charset charset) {
38+
bout.write(0);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(2);
42+
bout.write((byte) (item >>> 8));
43+
bout.write(item.byteValue());
4444
}
4545

4646
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/Int4ArrayEncoder.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ private Int4ArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Integer item, final ByteArrayOutputStream baos, final Charset charset) {
38-
baos.write(0);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(4);
42-
baos.write((byte) (item >>> 24));
43-
baos.write((byte) (item >>> 16));
44-
baos.write((byte) (item >>> 8));
45-
baos.write(item.byteValue());
37+
public void write(final Integer item, final ByteArrayOutputStream bout, final Charset charset) {
38+
bout.write(0);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(4);
42+
bout.write((byte) (item >>> 24));
43+
bout.write((byte) (item >>> 16));
44+
bout.write((byte) (item >>> 8));
45+
bout.write(item.byteValue());
4646
}
4747

4848
@Override

‎database/protocol/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/encoder/Int8ArrayEncoder.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ private Int8ArrayEncoder() {
3434
}
3535

3636
@Override
37-
public void write(final Long item, final ByteArrayOutputStream baos, final Charset charset) {
38-
baos.write(0);
39-
baos.write(0);
40-
baos.write(0);
41-
baos.write(8);
42-
baos.write((byte) (item >>> 56));
43-
baos.write((byte) (item >>> 48));
44-
baos.write((byte) (item >>> 40));
45-
baos.write((byte) (item >>> 32));
46-
baos.write((byte) (item >>> 24));
47-
baos.write((byte) (item >>> 16));
48-
baos.write((byte) (item >>> 8));
49-
baos.write(item.byteValue());
37+
public void write(final Long item, final ByteArrayOutputStream bout, final Charset charset) {
38+
bout.write(0);
39+
bout.write(0);
40+
bout.write(0);
41+
bout.write(8);
42+
bout.write((byte) (item >>> 56));
43+
bout.write((byte) (item >>> 48));
44+
bout.write((byte) (item >>> 40));
45+
bout.write((byte) (item >>> 32));
46+
bout.write((byte) (item >>> 24));
47+
bout.write((byte) (item >>> 16));
48+
bout.write((byte) (item >>> 8));
49+
bout.write(item.byteValue());
5050
}
5151

5252
@Override

0 commit comments

Comments
 (0)