diff --git a/ceresdb-example/src/test/java/io/ceresdb/CeresDBTest.java b/ceresdb-example/src/test/java/io/ceresdb/CeresDBTest.java index 885a8ca..5b81aed 100644 --- a/ceresdb-example/src/test/java/io/ceresdb/CeresDBTest.java +++ b/ceresdb-example/src/test/java/io/ceresdb/CeresDBTest.java @@ -159,7 +159,7 @@ public void comprehensiveTest() throws ExecutionException, InterruptedException ok.stream().forEach(row -> { LOG.info( - "Data: ts={}, tString={}, tInt64={}, fString={}, fBool={}, fDouble={}, fFloat={}, fInt64={}, fInt32={}, fInt16={}," + "======> Data: ts={}, tString={}, tInt64={}, fString={}, fBool={}, fDouble={}, fFloat={}, fInt64={}, fInt32={}, fInt16={}," + // "fInt8={}, fUint64={}, fUint32={}, fUint16={}, fUint8={}, fTimestamp={}, fVarbinary={}", // row.getColumn("ts").getValue().getTimestamp(), // diff --git a/ceresdb-protocol/src/main/java/io/ceresdb/Route.java b/ceresdb-protocol/src/main/java/io/ceresdb/Route.java index 2793367..ed5d641 100644 --- a/ceresdb-protocol/src/main/java/io/ceresdb/Route.java +++ b/ceresdb-protocol/src/main/java/io/ceresdb/Route.java @@ -15,7 +15,6 @@ public class Route { private String table; private Endpoint endpoint; - private Object ext; private final AtomicLong lastHit = new AtomicLong(Clock.defaultClock().getTick()); public static Route invalid(final String table) { @@ -23,18 +22,13 @@ public static Route invalid(final String table) { } public static Route of(final Endpoint endpoint) { - return of(null, endpoint, null); + return of(null, endpoint); } public static Route of(final String table, final Endpoint endpoint) { - return of(table, endpoint, null); - } - - public static Route of(final String table, final Endpoint endpoint, final Object ext) { final Route r = new Route(); r.table = table; r.endpoint = endpoint; - r.ext = ext; return r; } @@ -54,14 +48,6 @@ public void setEndpoint(Endpoint endpoint) { this.endpoint = endpoint; } - public Object getExt() { - return ext; - } - - public void setExt(Object ext) { - this.ext = ext; - } - public long getLastHit() { return lastHit.get(); } @@ -78,7 +64,6 @@ public String toString() { return "Route{" + // "table='" + table + '\'' + // ", endpoint=" + endpoint + // - ", ext=" + ext + // ", lastHit=" + lastHit.get() + // '}'; } diff --git a/ceresdb-protocol/src/main/java/io/ceresdb/RouterClient.java b/ceresdb-protocol/src/main/java/io/ceresdb/RouterClient.java index 267f0a9..67b833d 100644 --- a/ceresdb-protocol/src/main/java/io/ceresdb/RouterClient.java +++ b/ceresdb-protocol/src/main/java/io/ceresdb/RouterClient.java @@ -410,7 +410,7 @@ private CompletableFuture invokeRpc(final Storage.RouteRe private Route toRouteObj(final Storage.Route r) { final Storage.Endpoint ep = Requires.requireNonNull(r.getEndpoint(), "CeresDB.Endpoint"); - return Route.of(r.getTable(), Endpoint.of(ep.getIp(), ep.getPort()), r.getExt()); + return Route.of(r.getTable(), Endpoint.of(ep.getIp(), ep.getPort())); } } } diff --git a/pom.xml b/pom.xml index ff4d913..2e61fc5 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ 4.9.1 2.8.0 UTF-8 - 0.3.0 + 1.0.0 3.21.7 1.0.0-alpha