Skip to content

Commit bfd3f43

Browse files
ShenFeng312ShenFeng312
committed
localtest
1 parent cd61d5b commit bfd3f43

File tree

48 files changed

+225
-236
lines changed

Some content is hidden

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

48 files changed

+225
-236
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol;
1+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol;
22

3-
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
4-
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
3+
import org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
4+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
55
import org.postgresql.core.Oid;
66
import org.postgresql.jdbc.ShardingSpherePgArrayUtils;
77

@@ -40,7 +40,7 @@ private PostgreSQLArrayBinaryProtocolValue(){
4040
public static final PostgreSQLArrayBinaryProtocolValue instance = new PostgreSQLArrayBinaryProtocolValue();
4141

4242
@Override
43-
public int getColumnLength(PostgreSQLPacketPayload payload,Object value) {
43+
public int getColumnLength(PostgreSQLPacketPayload payload, Object value) {
4444
return -1;
4545
}
4646

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol;
1919

20+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
21+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.encoder.NumericArrayEncoder;
2022
import org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
21-
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
22-
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.encoder.NumericArrayEncoder;
23-
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
2423
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
2524
import org.postgresql.util.ByteConverter;
2625

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol;
1919

20+
import lombok.SneakyThrows;
21+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.ArrayDecoding;
2022
import org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
21-
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
23+
import org.postgresql.jdbc.ShardingSpherePgArrayUtils;
2224

2325
/**
2426
* Binary protocol value for string array for PostgreSQL.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol;
1919

2020
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.PostgreSQLBinaryTimestampUtils;
21+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
2122
import org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
2223

2324
import java.sql.Time;

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,11 @@
1717

1818
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol;
1919

20-
<<<<<<<< HEAD:database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLTimeStampBinaryProtocolValue.java
21-
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.PostgreSQLBinaryTimestampUtils;
22-
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
23-
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
24-
25-
import java.sql.Timestamp;
26-
========
20+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.PostgreSQLBinaryTimestampUtils;
21+
import org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder.PgBinaryObj;
2722
import org.apache.shardingsphere.database.protocol.postgresql.payload.PostgreSQLPacketPayload;
28-
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
29-
>>>>>>>> origin/master:database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLBoolArrayBinaryProtocolValue.java
3023

24+
import java.sql.Timestamp;
3125
/**
3226
* Binary protocol value for time for PostgreSQL.
3327
*/

‎database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/decoder/AbstractObjectArrayDecoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
1+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
22

33
import java.lang.reflect.Array;
44
import java.nio.ByteBuffer;

‎database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/decoder/ArrayDecoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
1+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
22

33
import java.nio.ByteBuffer;
44
import java.nio.charset.Charset;

‎database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/decoder/ArrayDecoding.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* See the LICENSE file in the project root for more information.
2020
*/
2121

22-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
22+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
2323

2424
import org.postgresql.core.Oid;
2525
import org.postgresql.util.GT;

‎database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/decoder/BooleanArrayDecoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
1+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
22

33
import java.nio.ByteBuffer;
44
import java.nio.charset.Charset;

‎database/protocol/type/postgresql/src/main/java/org/apache/shardingsphere/database/protocol/postgresql/packet/command/query/extended/bind/protocol/util/codec/decoder/ByteaArrayDecoder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
1+
package org.apache.shardingsphere.database.protocol.postgresql.packet.command.query.extended.bind.protocol.util.codec.decoder;
22

33
import java.nio.ByteBuffer;
44
import java.nio.charset.Charset;

0 commit comments

Comments
 (0)