Skip to content

Commit fb4ca5b

Browse files
committed
fix multi cf polute query
1 parent 058e572 commit fb4ca5b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/main/java/com/alipay/oceanbase/rpc/direct_load/protocol/v0/ObDirectLoadProtocolV0.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public void checkIsSupported(ObDirectLoadStatement statement) throws ObDirectLoa
6969
logger.warn("partition names in ob version " + ObGlobal.getObVsnString(obVersion)
7070
+ "is not supported, minimum version required is "
7171
+ ObGlobal.getObVsnString(OB_VERSION_4_3_5_0));
72-
throw new ObDirectLoadNotSupportedException("partition names in ob version "
73-
+ ObGlobal.getObVsnString(obVersion)
74-
+ " is not supported, minimum version required is "
75-
+ ObGlobal.getObVsnString(OB_VERSION_4_3_5_0));
72+
throw new ObDirectLoadNotSupportedException(
73+
"partition names in ob version " + ObGlobal.getObVsnString(obVersion)
74+
+ " is not supported, minimum version required is "
75+
+ ObGlobal.getObVsnString(OB_VERSION_4_3_5_0));
7676
}
7777
}
7878

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/ObTableLSOpRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ public void addTabletOperation(ObTableTabletOp tabletOp) {
121121
public void setLsOperation(ObTableLSOperation lsOperation) {
122122
this.lsOperation = lsOperation;
123123
}
124-
124+
125125
/*
126126
* Get entity type.
127127
*/
128128
public ObTableEntityType getEntityType() {
129129
return entityType;
130130
}
131-
131+
132132
/*
133133
* Set entity type.
134134
*/

src/main/java/com/alipay/oceanbase/rpc/table/ObHBaseParams.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import static com.alipay.oceanbase.rpc.util.Serialization.encodeObUniVersionHeader;
2424

2525
public class ObHBaseParams extends ObKVParamsBase {
26-
int caching = -1; // limit the number of for each rpc call
27-
int callTimeout = -1; // scannerLeasePeriodTimeout in hbase, client rpc timeout
28-
boolean allowPartialResults = true; // whether allow partial row return or not
29-
boolean isCacheBlock = false; // whether enable server block cache and row cache or not
30-
boolean checkExistenceOnly = false; // check the existence only
26+
int caching = -1; // limit the number of for each rpc call
27+
int callTimeout = -1; // scannerLeasePeriodTimeout in hbase, client rpc timeout
28+
boolean allowPartialResults = true; // whether allow partial row return or not
29+
boolean isCacheBlock = false; // whether enable server block cache and row cache or not
30+
boolean checkExistenceOnly = false; // check the existence only
3131
String hbaseVersion = "1.3.6";
3232

3333
private static final int FLAG_ALLOW_PARTIAL_RESULTS = 1 << 0;
@@ -120,7 +120,7 @@ public byte[] encode() {
120120
System.arraycopy(booleansToByteArray(), 0, bytes, idx, 1);
121121
idx += 1;
122122
System.arraycopy(Serialization.encodeVString(hbaseVersion), 0, bytes, idx,
123-
Serialization.getNeedBytes(hbaseVersion));
123+
Serialization.getNeedBytes(hbaseVersion));
124124
idx += Serialization.getNeedBytes(hbaseVersion);
125125

126126
return bytes;
@@ -150,8 +150,8 @@ public String toString() {
150150
return "ObParams: {\n pType = " + pType + ", \n caching = " + caching
151151
+ ", \n callTimeout = " + callTimeout + ", \n allowPartialResult = "
152152
+ allowPartialResults + ", \n isCacheBlock = " + isCacheBlock
153-
+ ", \n checkExistenceOnly = " + checkExistenceOnly
154-
+ ", \n hbaseVersion = " + hbaseVersion + "\n}\n";
153+
+ ", \n checkExistenceOnly = " + checkExistenceOnly + ", \n hbaseVersion = "
154+
+ hbaseVersion + "\n}\n";
155155
}
156156

157157
}

0 commit comments

Comments
 (0)