Skip to content

Commit 6fb27a7

Browse files
authored
refactor: remove the protos and generated codes, use ceresdbproto instead (#36)
1 parent 6505fec commit 6fb27a7

File tree

16 files changed

+24
-14574
lines changed

16 files changed

+24
-14574
lines changed

ceresdb-protocol/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<artifactId>ceresdb-rpc</artifactId>
1616
</dependency>
1717

18+
<!-- an independent protocal lib for all ceresdb components -->
19+
<dependency>
20+
<groupId>${project.groupId}</groupId>
21+
<artifactId>ceresdb-proto-internal</artifactId>
22+
</dependency>
23+
1824
<dependency>
1925
<groupId>org.slf4j</groupId>
2026
<artifactId>slf4j-api</artifactId>

ceresdb-protocol/src/main/java/io/ceresdb/QueryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.concurrent.Executor;
2222
import java.util.stream.Collectors;
2323

24+
import io.ceresdb.proto.internal.Storage;
2425
import org.slf4j.Logger;
2526
import org.slf4j.LoggerFactory;
2627

@@ -38,7 +39,6 @@
3839
import io.ceresdb.models.QueryRequest;
3940
import io.ceresdb.models.Result;
4041
import io.ceresdb.options.QueryOptions;
41-
import io.ceresdb.proto.Storage;
4242
import io.ceresdb.rpc.Context;
4343
import io.ceresdb.rpc.Observer;
4444
import com.codahale.metrics.Histogram;

ceresdb-protocol/src/main/java/io/ceresdb/RouterClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.concurrent.TimeoutException;
3333
import java.util.stream.Collectors;
3434

35+
import io.ceresdb.proto.internal.Storage;
3536
import org.slf4j.Logger;
3637
import org.slf4j.LoggerFactory;
3738

@@ -47,7 +48,6 @@
4748
import io.ceresdb.common.util.TopKSelector;
4849
import io.ceresdb.errors.RouteTableException;
4950
import io.ceresdb.options.RouterOptions;
50-
import io.ceresdb.proto.Storage;
5151
import io.ceresdb.rpc.Context;
5252
import io.ceresdb.rpc.Observer;
5353
import io.ceresdb.rpc.RpcClient;

ceresdb-protocol/src/main/java/io/ceresdb/RpcServiceRegister.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import io.ceresdb.common.OptKeys;
2020
import io.ceresdb.common.util.SystemPropertyUtil;
21-
import io.ceresdb.proto.Storage;
21+
import io.ceresdb.proto.internal.Storage;
2222
import io.ceresdb.rpc.MethodDescriptor;
2323
import io.ceresdb.rpc.RpcFactoryProvider;
2424

ceresdb-protocol/src/main/java/io/ceresdb/Utils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
import io.ceresdb.models.TagValue;
5454
import io.ceresdb.models.Value;
5555
import io.ceresdb.models.WriteOk;
56-
import io.ceresdb.proto.Common;
57-
import io.ceresdb.proto.Storage;
56+
import io.ceresdb.proto.internal.Common;
57+
import io.ceresdb.proto.internal.Storage;
5858
import io.ceresdb.rpc.Observer;
5959
import com.google.protobuf.ByteStringHelper;
6060

ceresdb-protocol/src/main/java/io/ceresdb/WriteClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import io.ceresdb.models.Value;
5050
import io.ceresdb.models.WriteOk;
5151
import io.ceresdb.options.WriteOptions;
52-
import io.ceresdb.proto.Storage;
52+
import io.ceresdb.proto.internal.Storage;
5353
import io.ceresdb.rpc.Context;
5454
import io.ceresdb.rpc.Observer;
5555
import com.codahale.metrics.Histogram;

0 commit comments

Comments
 (0)