diff --git a/README.md b/README.md index 488c2bf..cc993f7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [中文](./README_CN.md) ## Introduction -CeresDBxClient is a high-performance Java client for CeresDB. +CeresDBClient is a high-performance Java client for CeresDB. CeresDB is a high-performance, distributed, schema-less, cloud native time-series database that can handle both time-series and analytics workloads. ## Features @@ -19,7 +19,7 @@ CeresDB is a high-performance, distributed, schema-less, cloud native time-serie ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -51,14 +51,14 @@ CeresDB is a high-performance, distributed, schema-less, cloud native time-serie │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` ## Data query process ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -90,7 +90,7 @@ CeresDB is a high-performance, distributed, schema-less, cloud native time-serie │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` @@ -100,9 +100,9 @@ CeresDB is a high-performance, distributed, schema-less, cloud native time-serie ## Init CeresDB client ```java -// CeresDBx options -final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // - .tenant("test", "sub_test", "test_token") // tenant info +// CeresDB options +final CeresDBOptions opts = CeresDBOptions.newBuilder("127.0.0.1", 8831) //// CeresDB default grpc port 8831 + .tenant("public", "sub_test", "test_token") // tenant info // maximum retry times when write fails // (only some error codes will be retried, such as the routing table failure) .writeMaxRetries(1) @@ -111,9 +111,9 @@ final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // .readMaxRetries(1) .build(); -final CeresDBxClient client = new CeresDBxClient(); +final CeresDBClient client = new CeresDBClient(); if (!client.init(this.opts)) { - throw new IllegalStateException("Fail to start CeresDBxClient"); + throw new IllegalStateException("Fail to start CeresDBClient"); } ``` For more configuration options, see [configuration](docs/configuration.md) diff --git a/README_CN.md b/README_CN.md index e1ebf49..8ca707a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -4,7 +4,7 @@ ![License](https://img.shields.io/badge/license-Apache--2.0-green.svg) ## 介绍 -CeresDBxClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为高性能的、分布式的、Schema-less 的云原生时序数据库。它可以同时支持时间序列和数据分析型的工作负载。 +CeresDBClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为高性能的、分布式的、Schema-less 的云原生时序数据库。它可以同时支持时间序列和数据分析型的工作负载。 ## 功能特性 - 通信层基于 SPI 可扩展，默认提供 gRPC 的实现 @@ -16,7 +16,7 @@ CeresDBxClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为 ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -48,14 +48,14 @@ CeresDBxClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为 │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` ## 查询流程 ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -87,7 +87,7 @@ CeresDBxClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为 │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` @@ -96,8 +96,8 @@ CeresDBxClient 是 CeresDB 的高性能 Java 版客户端。CeresDB 是定位为 ## 初始化 CeresDB Client ```java -// CeresDBx options -final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // +// CeresDB options +final CeresDBOptions opts = CeresDBOptions.newBuilder("127.0.0.1", 8831) // .tenant("test", "sub_test", "test_token") // tenant info // maximum retry times when write fails // (only some error codes will be retried, such as the routing table failure) @@ -107,9 +107,9 @@ final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // .readMaxRetries(1) .build(); -final CeresDBxClient client = new CeresDBxClient(); +final CeresDBClient client = new CeresDBClient(); if (!client.init(this.opts)) { - throw new IllegalStateException("Fail to start CeresDBxClient"); + throw new IllegalStateException("Fail to start CeresDBClient"); } ``` 配置详情见 [configuration](docs/configuration.md) @@ -122,9 +122,9 @@ CeresDB 是一个 Schema-less 的时序数据引擎，你可以不必创建 sche 下面的建表语句（使用 SDK 的 SQL API）包含了 CeresDB 支持的所有字段类型： ```java -final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // 默认 gprc 端口号 +final CeresDBOptions opts = CeresDBOptions.newBuilder("127.0.0.1", 8831) // 默认 gprc 端口号 .managementAddress("127.0.0.1", 5440) // 注意，直接使用 sql 需要连接 CeresDB 的 http 端口 - .tenant("test", "sub_test", "test_token") // 租户信息 + .tenant("public", "sub_test", "test_token") // 租户信息 .writeMaxRetries(1) // 写入失败重试次数上限（只有部分错误 code 才会重试，比如路由表失效） .readMaxRetries(1) // 查询失败重试次数上限（只有部分错误 code 才会重试，比如路由表失效） .build(); diff --git a/ceresdb-common/src/main/java/com/ceresdb/common/OptKeys.java b/ceresdb-common/src/main/java/com/ceresdb/common/OptKeys.java index 6af8d5a..937ce02 100644 --- a/ceresdb-common/src/main/java/com/ceresdb/common/OptKeys.java +++ b/ceresdb-common/src/main/java/com/ceresdb/common/OptKeys.java @@ -24,17 +24,17 @@ public final class OptKeys { public static final String OS_NAME = "os.name"; - public static final String RW_LOGGING = "CeresDBx.client.read.write.rw_logging"; - public static final String COLLECT_WROTE_DETAIL = "CeresDBx.client.write.collect_wrote_detail"; - public static final String USE_OS_SIGNAL = "CeresDBx.client.use_os_signal"; - public static final String REPORT_PERIOD = "CeresDBx.reporter.period_minutes"; - public static final String SIG_OUT_DIR = "CeresDBx.signal.out_dir"; - public static final String HTTP_READ_TIMEOUT_MS = "CeresDBx.http.read_timeout_ms"; - public static final String HTTP_WRITE_TIMEOUT_MS = "CeresDBx.http.write_timeout_ms"; - public static final String GRPC_CONN_RESET_THRESHOLD = "CeresDBx.grpc.conn.failures.reset_threshold"; - public static final String AVAILABLE_CPUS = "CeresDBx.available_cpus"; - public static final String NAME_VALIDATE = "CeresDBx.avro.name_validate"; - public static final String WRITE_LIMIT_PERCENT = "CeresDBx.rpc.write.limit_percent"; + public static final String RW_LOGGING = "CeresDB.client.read.write.rw_logging"; + public static final String COLLECT_WROTE_DETAIL = "CeresDB.client.write.collect_wrote_detail"; + public static final String USE_OS_SIGNAL = "CeresDB.client.use_os_signal"; + public static final String REPORT_PERIOD = "CeresDB.reporter.period_minutes"; + public static final String SIG_OUT_DIR = "CeresDB.signal.out_dir"; + public static final String HTTP_READ_TIMEOUT_MS = "CeresDB.http.read_timeout_ms"; + public static final String HTTP_WRITE_TIMEOUT_MS = "CeresDB.http.write_timeout_ms"; + public static final String GRPC_CONN_RESET_THRESHOLD = "CeresDB.grpc.conn.failures.reset_threshold"; + public static final String AVAILABLE_CPUS = "CeresDB.available_cpus"; + public static final String NAME_VALIDATE = "CeresDB.avro.name_validate"; + public static final String WRITE_LIMIT_PERCENT = "CeresDB.rpc.write.limit_percent"; private OptKeys() { } diff --git a/ceresdb-common/src/main/java/com/ceresdb/common/util/AuthUtil.java b/ceresdb-common/src/main/java/com/ceresdb/common/util/AuthUtil.java index bd1504b..4f7c6b9 100644 --- a/ceresdb-common/src/main/java/com/ceresdb/common/util/AuthUtil.java +++ b/ceresdb-common/src/main/java/com/ceresdb/common/util/AuthUtil.java @@ -31,10 +31,10 @@ */ public class AuthUtil { - public static final String HEAD_TIMESTAMP = "x-ceresdbx-timestamp"; - public static final String HEAD_ACCESS_TENANT = "x-ceresdbx-access-tenant"; - public static final String HEAD_ACCESS_TOKEN = "x-ceresdbx-access-token"; - public static final String HEAD_ACCESS_CHILD_TENANT = "x-ceresdbx-access-child-tenant"; + public static final String HEAD_TIMESTAMP = "x-ceresdb-timestamp"; + public static final String HEAD_ACCESS_TENANT = "x-ceresdb-access-tenant"; + public static final String HEAD_ACCESS_TOKEN = "x-ceresdb-access-token"; + public static final String HEAD_ACCESS_CHILD_TENANT = "x-ceresdb-access-child-tenant"; public static Map authHeaders(final Tenant tenant) { if (tenant == null) { diff --git a/ceresdb-common/src/main/java/com/ceresdb/common/util/Cpus.java b/ceresdb-common/src/main/java/com/ceresdb/common/util/Cpus.java index c8db108..ad53eb6 100644 --- a/ceresdb-common/src/main/java/com/ceresdb/common/util/Cpus.java +++ b/ceresdb-common/src/main/java/com/ceresdb/common/util/Cpus.java @@ -31,7 +31,7 @@ public class Cpus { /** * The configured number of available processors. The default is * {@link Runtime#availableProcessors()}. This can be overridden - * by setting the system property "CeresDBx.available_cpus". + * by setting the system property "CeresDB.available_cpus". * * @return available cpus num */ diff --git a/ceresdb-example/src/test/java/com/ceresdb/CeresDBTest.java b/ceresdb-example/src/test/java/com/ceresdb/CeresDBTest.java index a154286..912eb9b 100644 --- a/ceresdb-example/src/test/java/com/ceresdb/CeresDBTest.java +++ b/ceresdb-example/src/test/java/com/ceresdb/CeresDBTest.java @@ -51,7 +51,7 @@ import com.ceresdb.models.SqlResult; import com.ceresdb.models.TagValue; import com.ceresdb.models.WriteOk; -import com.ceresdb.options.CeresDBxOptions; +import com.ceresdb.options.CeresDBOptions; import com.ceresdb.rpc.RpcOptions; /** @@ -64,8 +64,8 @@ public class CeresDBTest { private String TEST_TABLE_NAME = "all_type_test_table_%d"; - private CeresDBxOptions opts; - private CeresDBxClient client; + private CeresDBOptions opts; + private CeresDBClient client; @Before public void before() { @@ -74,13 +74,13 @@ public void before() { rpcOpts.setInitialLimit(32); rpcOpts.setLimitKind(RpcOptions.LimitKind.Gradient); rpcOpts.setLogOnLimitChange(true); - this.opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831, 5000) // + this.opts = CeresDBOptions.newBuilder("127.0.0.1", 8831, 5000) // .tenant("public", "sub_test", "test_token") // .rpcOptions(rpcOpts) // .writeMaxRetries(0) // .readMaxRetries(1) // .build(); - this.client = new CeresDBxClient(); + this.client = new CeresDBClient(); final boolean ret = this.client.init(this.opts); TEST_TABLE_NAME = String.format(TEST_TABLE_NAME, System.currentTimeMillis()); @@ -111,7 +111,7 @@ public void before() { "TIMESTAMP KEY(ts)) ENGINE=Analytic WITH (ttl='7d')", TEST_TABLE_NAME)); - LOG.info("Start CeresDBx client {}, with options: {}, create table {}: {}.", result(ret), this.opts, + LOG.info("Start CeresDB client {}, with options: {}, create table {}: {}.", result(ret), this.opts, TEST_TABLE_NAME, result); final SqlResult existsResult2 = management.executeSql("EXISTS TABLE %s", TEST_TABLE_NAME); @@ -130,7 +130,7 @@ public void after() { this.client.shutdownGracefully(); } - public CeresDBxOptions getOpts() { + public CeresDBOptions getOpts() { return opts; } diff --git a/ceresdb-example/src/test/java/com/ceresdb/ReadmeTest.java b/ceresdb-example/src/test/java/com/ceresdb/ReadmeTest.java index 29946cb..db76813 100644 --- a/ceresdb-example/src/test/java/com/ceresdb/ReadmeTest.java +++ b/ceresdb-example/src/test/java/com/ceresdb/ReadmeTest.java @@ -17,7 +17,7 @@ package com.ceresdb; import com.ceresdb.models.*; -import com.ceresdb.options.CeresDBxOptions; +import com.ceresdb.options.CeresDBOptions; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -35,9 +35,9 @@ public class ReadmeTest { @Ignore @Test public void readmeTest() throws ExecutionException, InterruptedException { - final CeresDBxOptions opts = CeresDBxOptions.newBuilder("127.0.0.1", 8831) // CeresDB default grpc port 8831 - .managementAddress("127.0.0.1", 5440) // CeresDB default http port 3307 - .tenant("test", "sub_test", "test_token") // tenant info + final CeresDBOptions opts = CeresDBOptions.newBuilder("127.0.0.1", 8831) // CeresDB default grpc port 8831 + .managementAddress("127.0.0.1", 5000) // CeresDB default http port 3307 + .tenant("public", "sub_test", "test_token") // tenant info // maximum retry times when write fails // (only some error codes will be retried, such as the routing table failure) .writeMaxRetries(1) @@ -45,9 +45,9 @@ public void readmeTest() throws ExecutionException, InterruptedException { // (only some error codes will be retried, such as the routing table failure) .readMaxRetries(1).build(); - final CeresDBxClient client = new CeresDBxClient(); + final CeresDBClient client = new CeresDBClient(); if (!client.init(opts)) { - throw new IllegalStateException("Fail to start CeresDBxClient"); + throw new IllegalStateException("Fail to start CeresDBClient"); } // Create table manually, creating table schema ahead of data ingestion is not required diff --git a/ceresdb-example/src/test/resources/log4j2.xml b/ceresdb-example/src/test/resources/log4j2.xml index fa9fa8e..44359c7 100644 --- a/ceresdb-example/src/test/resources/log4j2.xml +++ b/ceresdb-example/src/test/resources/log4j2.xml @@ -6,8 +6,8 @@ - - + + diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxClient.java b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBClient.java similarity index 86% rename from ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxClient.java rename to ceresdb-protocol/src/main/java/com/ceresdb/CeresDBClient.java index fa8591e..f9e8511 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxClient.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBClient.java @@ -42,7 +42,7 @@ import com.ceresdb.models.Result; import com.ceresdb.models.Rows; import com.ceresdb.models.WriteOk; -import com.ceresdb.options.CeresDBxOptions; +import com.ceresdb.options.CeresDBOptions; import com.ceresdb.options.ManagementOptions; import com.ceresdb.options.QueryOptions; import com.ceresdb.options.RouterOptions; @@ -60,24 +60,24 @@ * * @author jiachun.fjc */ -public class CeresDBxClient implements Write, Query, Lifecycle, Display { +public class CeresDBClient implements Write, Query, Lifecycle, Display { - private static final Logger LOG = LoggerFactory.getLogger(CeresDBxClient.class); + private static final Logger LOG = LoggerFactory.getLogger(CeresDBClient.class); - private static final Map INSTANCES = new ConcurrentHashMap<>(); - private static final AtomicInteger ID = new AtomicInteger(0); - private static final String ID_KEY = "client.id"; - private static final String VERSION_KEY = "client.version"; - private static final String VERSION = loadVersion(); + private static final Map INSTANCES = new ConcurrentHashMap<>(); + private static final AtomicInteger ID = new AtomicInteger(0); + private static final String ID_KEY = "client.id"; + private static final String VERSION_KEY = "client.version"; + private static final String VERSION = loadVersion(); private final int id; private final AtomicBoolean started = new AtomicBoolean(false); - private CeresDBxOptions opts; - private RouterClient routerClient; - private WriteClient writeClient; - private QueryClient queryClient; - // CeresDBxClient is only intended to manage the instance and does not + private CeresDBOptions opts; + private RouterClient routerClient; + private WriteClient writeClient; + private QueryClient queryClient; + // CeresDBClient is only intended to manage the instance and does not // intend to broker any of its behavior private Management management; // Note: We do not close it to free resources, as we view it as shared @@ -94,17 +94,17 @@ public class CeresDBxClient implements Write, Query, Lifecycle, Runtime.getRuntime().addShutdownHook(new Thread(MetricsUtil::stopScheduledReporterAndDestroy)); } - public CeresDBxClient() { + public CeresDBClient() { this.id = ID.incrementAndGet(); } @Override - public boolean init(final CeresDBxOptions opts) { + public boolean init(final CeresDBOptions opts) { if (!this.started.compareAndSet(false, true)) { - throw new IllegalStateException("CeresDBx client has started"); + throw new IllegalStateException("CeresDB client has started"); } - this.opts = CeresDBxOptions.check(opts).copy(); + this.opts = CeresDBOptions.check(opts).copy(); final RpcClient rpcClient = initRpcClient(this.opts); this.routerClient = initRouteClient(this.opts, rpcClient); @@ -151,7 +151,7 @@ public void ensureInitialized() { if (this.started.get() && INSTANCES.containsKey(this.id)) { return; } - throw new IllegalStateException(String.format("CeresDBxClient(%d) is not started", this.id)); + throw new IllegalStateException(String.format("CeresDBClient(%d) is not started", this.id)); } @Override @@ -225,7 +225,7 @@ public QueryClient queryClient() { @Override public void display(final Printer out) { - out.println("--- CeresDBxClient ---") // + out.println("--- CeresDBClient ---") // .print("id=") // .println(this.id) // .print("version=") // @@ -264,7 +264,7 @@ public void display(final Printer out) { @Override public String toString() { - return "CeresDBxClient{" + // + return "CeresDBClient{" + // "id=" + id + // "version=" + version() + // ", started=" + started + // @@ -275,11 +275,11 @@ public String toString() { '}'; } - public static List instances() { + public static List instances() { return new ArrayList<>(INSTANCES.values()); } - private static RpcClient initRpcClient(final CeresDBxOptions opts) { + private static RpcClient initRpcClient(final CeresDBOptions opts) { final RpcOptions rpcOpts = opts.getRpcOptions(); rpcOpts.setTenant(opts.getTenant()); final RpcClient rpcClient = RpcFactoryProvider.getRpcFactory().createRpcClient(); @@ -290,7 +290,7 @@ private static RpcClient initRpcClient(final CeresDBxOptions opts) { return rpcClient; } - private static RouterClient initRouteClient(final CeresDBxOptions opts, final RpcClient rpcClient) { + private static RouterClient initRouteClient(final CeresDBOptions opts, final RpcClient rpcClient) { final RouterOptions routerOpts = opts.getRouterOptions(); routerOpts.setRpcClient(rpcClient); final RouterClient routerClient = new RouterClient(); @@ -300,7 +300,7 @@ private static RouterClient initRouteClient(final CeresDBxOptions opts, final Rp return routerClient; } - private static WriteClient initWriteClient(final CeresDBxOptions opts, // + private static WriteClient initWriteClient(final CeresDBOptions opts, // final RouterClient routerClient, // final Executor asyncPool) { final WriteOptions writeOpts = opts.getWriteOptions(); @@ -313,7 +313,7 @@ private static WriteClient initWriteClient(final CeresDBxOptions opts, // return writeClient; } - private static QueryClient initQueryClient(final CeresDBxOptions opts, // + private static QueryClient initQueryClient(final CeresDBOptions opts, // final RouterClient routerClient, // final Executor asyncPool) { final QueryOptions queryOpts = opts.getQueryOptions(); @@ -326,15 +326,15 @@ private static QueryClient initQueryClient(final CeresDBxOptions opts, // return queryClient; } - private static Management initManagementClient(final CeresDBxOptions opts, final RouterClient routerClient) { + private static Management initManagementClient(final CeresDBOptions opts, final RouterClient routerClient) { final ManagementOptions mOpts = opts.getManagementOptions(); if (mOpts == null) { return null; } - if (!CeresDBxManagementProvider.hasManagement()) { + if (!CeresDBManagementProvider.hasManagement()) { return null; } - final Management management = CeresDBxManagementProvider.createManagement(); + final Management management = CeresDBManagementProvider.createManagement(); mOpts.setRouterClient(routerClient); if (!management.init(mOpts)) { return null; @@ -345,7 +345,7 @@ private static Management initManagementClient(final CeresDBxOptions opts, final private static String loadVersion() { try { return Utils // - .loadProperties(CeresDBxClient.class.getClassLoader(), "client_version.properties") // + .loadProperties(CeresDBClient.class.getClassLoader(), "client_version.properties") // .getProperty(VERSION_KEY, "Unknown version"); } catch (final Exception ignored) { return "Unknown version(err)"; diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxLimiter.java b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBLimiter.java similarity index 96% rename from ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxLimiter.java rename to ceresdb-protocol/src/main/java/com/ceresdb/CeresDBLimiter.java index 0ebed9a..4ce8544 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxLimiter.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBLimiter.java @@ -35,13 +35,13 @@ * * @author jiachun.fjc */ -public abstract class CeresDBxLimiter { +public abstract class CeresDBLimiter { private final Limiter limiter; private final LimitedPolicy policy; private final Histogram acquireAvailablePermits; - public CeresDBxLimiter(int maxInFlight, LimitedPolicy policy, String metricPrefix) { + public CeresDBLimiter(int maxInFlight, LimitedPolicy policy, String metricPrefix) { this.limiter = maxInFlight > 0 ? new InFlightLimiter(maxInFlight, metricPrefix) : null; this.policy = policy; this.acquireAvailablePermits = MetricsUtil.histogram(metricPrefix, "available_permits"); diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxManagementProvider.java b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxManagementProvider.java index a335e13..8b5477c 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxManagementProvider.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/CeresDBxManagementProvider.java @@ -23,7 +23,7 @@ * * @author jiachun.fjc */ -final class CeresDBxManagementProvider { +final class CeresDBManagementProvider { private static final Class MANAGEMENT_CLS; diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/QueryLimiter.java b/ceresdb-protocol/src/main/java/com/ceresdb/QueryLimiter.java index 471629b..bbf54f6 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/QueryLimiter.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/QueryLimiter.java @@ -22,11 +22,11 @@ import com.ceresdb.models.Result; /** - * Like rust: pub type QueryLimiter = CeresDBxLimiter> + * Like rust: pub type QueryLimiter = CeresDBLimiter> * * @author jiachun.fjc */ -public abstract class QueryLimiter extends CeresDBxLimiter> { +public abstract class QueryLimiter extends CeresDBLimiter> { public QueryLimiter(int maxInFlight, LimitedPolicy policy, String metricPrefix) { super(maxInFlight, policy, metricPrefix); diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/RouterClient.java b/ceresdb-protocol/src/main/java/com/ceresdb/RouterClient.java index 0b55d7d..b6d5f29 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/RouterClient.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/RouterClient.java @@ -464,7 +464,7 @@ private CompletableFuture invokeRpc(final Storage.RouteRe } private Route toRouteObj(final Storage.Route r) { - final Storage.Endpoint ep = Requires.requireNonNull(r.getEndpoint(), "CeresDBx.Endpoint"); + final Storage.Endpoint ep = Requires.requireNonNull(r.getEndpoint(), "CeresDB.Endpoint"); return Route.of(r.getMetric(), Endpoint.of(ep.getIp(), ep.getPort()), r.getExt()); } } diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/Utils.java b/ceresdb-protocol/src/main/java/com/ceresdb/Utils.java index f17e732..167364a 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/Utils.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/Utils.java @@ -59,7 +59,7 @@ import com.google.protobuf.ByteStringHelper; /** - * Utils for CeresDBxClient. + * Utils for CeresDBClient. * * @author jiachun.fjc */ @@ -107,7 +107,7 @@ public static boolean resetRwLogging() { } /** - * Auto report self(CeresDBxClient) period. + * Auto report self(CeresDBClient) period. * * @return period with minutes */ diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/WriteLimiter.java b/ceresdb-protocol/src/main/java/com/ceresdb/WriteLimiter.java index ad187d7..8f43c70 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/WriteLimiter.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/WriteLimiter.java @@ -24,11 +24,11 @@ import com.ceresdb.models.WriteOk; /** - * Like rust: pub type WriteLimiter = CeresDBxLimiter, Result> + * Like rust: pub type WriteLimiter = CeresDBLimiter, Result> * * @author jiachun.fjc */ -public abstract class WriteLimiter extends CeresDBxLimiter, Result> { +public abstract class WriteLimiter extends CeresDBLimiter, Result> { public WriteLimiter(int maxInFlight, LimitedPolicy policy, String metric) { super(maxInFlight, policy, metric); diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBxOptions.java b/ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBOptions.java similarity index 94% rename from ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBxOptions.java rename to ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBOptions.java index ad162c4..9c76925 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBxOptions.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/options/CeresDBOptions.java @@ -26,11 +26,11 @@ import com.ceresdb.rpc.RpcOptions; /** - * CeresDBx client options. + * CeresDB client options. * * @author jiachun.fjc */ -public class CeresDBxOptions implements Copiable { +public class CeresDBOptions implements Copiable { private Endpoint clusterAddress; private Executor asyncWritePool; private Executor asyncReadPool; @@ -114,8 +114,8 @@ public void setManagementOptions(ManagementOptions managementOptions) { } @Override - public CeresDBxOptions copy() { - final CeresDBxOptions copy = new CeresDBxOptions(); + public CeresDBOptions copy() { + final CeresDBOptions copy = new CeresDBOptions(); copy.clusterAddress = this.clusterAddress; copy.asyncWritePool = this.asyncWritePool; copy.asyncReadPool = this.asyncReadPool; @@ -142,7 +142,7 @@ public CeresDBxOptions copy() { @Override public String toString() { - return "CeresDBxOptions{" + // + return "CeresDBOptions{" + // "clusterAddress=" + clusterAddress + // ", asyncWritePool=" + asyncWritePool + // ", asyncReadPool=" + asyncReadPool + // @@ -155,19 +155,19 @@ public String toString() { '}'; } - public static CeresDBxOptions check(final CeresDBxOptions opts) { - Requires.requireNonNull(opts, "CeresDBxOptions.opts"); - Requires.requireNonNull(opts.getClusterAddress(), "CeresDBxOptions.clusterAddress"); - Requires.requireNonNull(opts.getTenant(), "CeresDBxOptions.tenant"); - Requires.requireNonNull(opts.getRpcOptions(), "CeresDBxOptions.rpcOptions"); - Requires.requireNonNull(opts.getRouterOptions(), "CeresDBxOptions.RouterOptions"); - Requires.requireNonNull(opts.getWriteOptions(), "CeresDBxOptions.writeOptions"); - Requires.requireNonNull(opts.getQueryOptions(), "CeresDBxOptions.queryOptions"); + public static CeresDBOptions check(final CeresDBOptions opts) { + Requires.requireNonNull(opts, "CeresDBOptions.opts"); + Requires.requireNonNull(opts.getClusterAddress(), "CeresDBOptions.clusterAddress"); + Requires.requireNonNull(opts.getTenant(), "CeresDBOptions.tenant"); + Requires.requireNonNull(opts.getRpcOptions(), "CeresDBOptions.rpcOptions"); + Requires.requireNonNull(opts.getRouterOptions(), "CeresDBOptions.RouterOptions"); + Requires.requireNonNull(opts.getWriteOptions(), "CeresDBOptions.writeOptions"); + Requires.requireNonNull(opts.getQueryOptions(), "CeresDBOptions.queryOptions"); return opts; } /** - * Create a new builder for CeresDBxOptions. + * Create a new builder for CeresDBOptions. * * @param clusterAddress cluster address, for read/write data * @return builder @@ -177,7 +177,7 @@ public static Builder newBuilder(final Endpoint clusterAddress) { } /** - * Create a new builder for CeresDBxOptions. + * Create a new builder for CeresDBOptions. * * @param clusterHost cluster ip/host, for read/write data * @param clusterPort cluster port @@ -188,7 +188,7 @@ public static Builder newBuilder(final String clusterHost, final int clusterPort } /** - * Create a new builder for CeresDBxOptions. + * Create a new builder for CeresDBOptions. * * @param clusterHost cluster ip/host, for read/write data * @param clusterPort cluster port @@ -437,8 +437,8 @@ public Builder routeTableRefreshPeriodSeconds(final long routeTableRefreshPeriod * * @return nice things */ - public CeresDBxOptions build() { - final CeresDBxOptions opts = new CeresDBxOptions(); + public CeresDBOptions build() { + final CeresDBOptions opts = new CeresDBOptions(); opts.clusterAddress = this.clusterAddress; opts.asyncWritePool = asyncWritePool; opts.asyncReadPool = asyncReadPool; @@ -464,7 +464,7 @@ public CeresDBxOptions build() { mOpts.setTenant(this.tenant); opts.managementOptions = mOpts; } - return CeresDBxOptions.check(opts); + return CeresDBOptions.check(opts); } } } diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ClearRouteCacheSignalHandler.java b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ClearRouteCacheSignalHandler.java index 841bae0..ec891b6 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ClearRouteCacheSignalHandler.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ClearRouteCacheSignalHandler.java @@ -21,7 +21,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ceresdb.CeresDBxClient; +import com.ceresdb.CeresDBClient; import com.ceresdb.common.SPI; import com.ceresdb.common.signal.FileSignal; import com.ceresdb.common.signal.FileSignals; @@ -45,12 +45,12 @@ public void handle(final String signalName) { LOG.info("Clear all route cache triggered by signal: {}.", signalName); - final List instances = CeresDBxClient.instances(); + final List instances = CeresDBClient.instances(); if (instances.isEmpty()) { return; } - for (final CeresDBxClient ins : instances) { + for (final CeresDBClient ins : instances) { final int count = ins.routerClient().clearRouteCache(); LOG.info("Clearing the client route cache, count={}, client id={}.", count, ins.id()); } diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/signal/DisplaySignalHandler.java b/ceresdb-protocol/src/main/java/com/ceresdb/signal/DisplaySignalHandler.java index 667b948..c6f7458 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/signal/DisplaySignalHandler.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/signal/DisplaySignalHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ceresdb.CeresDBxClient; +import com.ceresdb.CeresDBClient; import com.ceresdb.common.Display; import com.ceresdb.common.SPI; import com.ceresdb.common.signal.FileOutputHelper; @@ -53,7 +53,7 @@ public void handle(final String signalName) { return; } - final List instances = CeresDBxClient.instances(); + final List instances = CeresDBClient.instances(); if (instances.isEmpty()) { return; } @@ -61,20 +61,20 @@ public void handle(final String signalName) { try { final File file = FileOutputHelper.getOutputFile(BASE_NAME); - LOG.info("Displaying CeresDBx clients triggered by signal: {} to file: {}.", signalName, + LOG.info("Displaying CeresDB clients triggered by signal: {} to file: {}.", signalName, file.getAbsoluteFile()); try (PrintWriter out = new PrintWriter( new OutputStreamWriter(new FileOutputStream(file, true), StandardCharsets.UTF_8))) { final Display.Printer printer = new Display.DefaultPrinter(out); - for (final CeresDBxClient ins : instances) { + for (final CeresDBClient ins : instances) { ins.display(printer); } out.flush(); } Files.fsync(file); } catch (final IOException e) { - LOG.error("Fail to display CeresDBx clients: {}.", instances, e); + LOG.error("Fail to display CeresDB clients: {}.", instances, e); } } } diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowHelpSignalHandler.java b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowHelpSignalHandler.java index 9d7c89e..ac6210c 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowHelpSignalHandler.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowHelpSignalHandler.java @@ -36,7 +36,7 @@ public class ShowHelpSignalHandler implements SignalHandler { @Override public void handle(final String signalName) { final String outDir = FileOutputHelper.getOutDir(); - LOG.info("-- CeresDBxClient Signal Help --"); + LOG.info("-- CeresDBClient Signal Help --"); LOG.info(" Signal output dir: {}", outDir); for (final FileSignal fileSignal : FileSignal.values()) { formatLog(outDir, fileSignal); diff --git a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowRouteCacheSignalHandler.java b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowRouteCacheSignalHandler.java index f5aac19..10d3cd7 100644 --- a/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowRouteCacheSignalHandler.java +++ b/ceresdb-protocol/src/main/java/com/ceresdb/signal/ShowRouteCacheSignalHandler.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ceresdb.CeresDBxClient; +import com.ceresdb.CeresDBClient; import com.ceresdb.common.Display; import com.ceresdb.common.SPI; import com.ceresdb.common.signal.FileOutputHelper; @@ -53,7 +53,7 @@ public void handle(final String signalName) { return; } - final List instances = CeresDBxClient.instances(); + final List instances = CeresDBClient.instances(); if (instances.isEmpty()) { return; } @@ -67,7 +67,7 @@ public void handle(final String signalName) { try (PrintWriter out = new PrintWriter( new OutputStreamWriter(new FileOutputStream(file, true), StandardCharsets.UTF_8))) { final Display.Printer printer = new Display.DefaultPrinter(out); - for (final CeresDBxClient ins : instances) { + for (final CeresDBClient ins : instances) { printer.print("clientId=").println(ins.id()); ins.routerClient().iterator().forEachRemaining(printer::println); } diff --git a/ceresdb-protocol/src/test/java/com/ceresdb/CeresDBxClientTest.java b/ceresdb-protocol/src/test/java/com/ceresdb/CeresDBClientTest.java similarity index 83% rename from ceresdb-protocol/src/test/java/com/ceresdb/CeresDBxClientTest.java rename to ceresdb-protocol/src/test/java/com/ceresdb/CeresDBClientTest.java index 8700251..7aaffce 100644 --- a/ceresdb-protocol/src/test/java/com/ceresdb/CeresDBxClientTest.java +++ b/ceresdb-protocol/src/test/java/com/ceresdb/CeresDBClientTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import com.ceresdb.CeresDBxClient; +import com.ceresdb.CeresDBClient; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -36,7 +36,7 @@ import com.ceresdb.models.Result; import com.ceresdb.models.Rows; import com.ceresdb.models.WriteOk; -import com.ceresdb.options.CeresDBxOptions; +import com.ceresdb.options.CeresDBOptions; import com.ceresdb.util.TestUtil; /** @@ -44,24 +44,24 @@ * @author jiachun.fjc */ @RunWith(value = MockitoJUnitRunner.class) -public class CeresDBxClientTest { +public class CeresDBClientTest { - private static final ReferenceFieldUpdater WC_UPDATER = Updaters // - .newReferenceFieldUpdater(CeresDBxClient.class, "writeClient"); + private static final ReferenceFieldUpdater WC_UPDATER = Updaters // + .newReferenceFieldUpdater(CeresDBClient.class, "writeClient"); - private CeresDBxClient client; - private CeresDBxOptions opts; + private CeresDBClient client; + private CeresDBOptions opts; @Mock - private WriteClient writeClient; + private WriteClient writeClient; @Before public void before() { - this.opts = CeresDBxOptions.newBuilder("127.0.0.1", 8081) // + this.opts = CeresDBOptions.newBuilder("127.0.0.1", 8081) // .tenant("test", "sub_test", "test_token") // .writeMaxRetries(1) // .readMaxRetries(1) // .build(); - this.client = new CeresDBxClient(); + this.client = new CeresDBClient(); } @After @@ -85,9 +85,9 @@ public void repeatedStartTest() { @Test public void instancesTest() { this.client.init(this.opts); - Assert.assertEquals(1, CeresDBxClient.instances().size()); + Assert.assertEquals(1, CeresDBClient.instances().size()); this.client.shutdownGracefully(); - Assert.assertTrue(CeresDBxClient.instances().isEmpty()); + Assert.assertTrue(CeresDBClient.instances().isEmpty()); } @SuppressWarnings("unchecked") diff --git a/ceresdb-protocol/src/test/resources/log4j2.xml b/ceresdb-protocol/src/test/resources/log4j2.xml index fa9fa8e..44359c7 100644 --- a/ceresdb-protocol/src/test/resources/log4j2.xml +++ b/ceresdb-protocol/src/test/resources/log4j2.xml @@ -6,8 +6,8 @@ - - + + diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParser.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParser.java similarity index 89% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParser.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParser.java index 1040d14..e571b93 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParser.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParser.java @@ -27,15 +27,15 @@ * * @author jiachun.fjc */ -public class CeresDBxMetricParser implements MetricParser { +public class CeresDBMetricParser implements MetricParser { private final String ql; - private boolean parsed; - private StatementType statementType = StatementType.Unknown; - private CeresDBxSqlStatement stmt; + private boolean parsed; + private StatementType statementType = StatementType.Unknown; + private CeresDBSqlStatement stmt; - public CeresDBxMetricParser(String ql) { + public CeresDBMetricParser(String ql) { this.ql = ql; } @@ -68,7 +68,7 @@ private void parse() { this.parsed = true; try { - final CeresDBxSqlStatement stmt = CeresDBxSqlParser.parse(this.ql)[0]; + final CeresDBSqlStatement stmt = CeresDBSqlParser.parse(this.ql)[0]; switch (stmt.getStatementType()) { case SELECT: diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParserFactory.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParserFactory.java similarity index 89% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParserFactory.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParserFactory.java index ec28b88..ea189ba 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxMetricParserFactory.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBMetricParserFactory.java @@ -25,10 +25,10 @@ * @author jiachun.fjc */ @SPI(priority = 1) -public class CeresDBxMetricParserFactory implements MetricParserFactory { +public class CeresDBMetricParserFactory implements MetricParserFactory { @Override public MetricParser getParser(final String ql) { - return new CeresDBxMetricParser(ql); + return new CeresDBMetricParser(ql); } } diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParser.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParser.java similarity index 99% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParser.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParser.java index 6d67526..f8b8b1d 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParser.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParser.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* CeresDBxSqlParser.java */ -/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBxSqlParser.java */ +/* CeresDBSqlParser.java */ +/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBSqlParser.java */ package com.ceresdb.sql; import org.slf4j.Logger; @@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.List; -public class CeresDBxSqlParser implements CeresDBxSqlParserConstants { +public class CeresDBSqlParser implements CeresDBSqlParserConstants { private static final boolean DEBUG = false; - private static final Logger log = LoggerFactory.getLogger(CeresDBxSqlParser.class); + private static final Logger log = LoggerFactory.getLogger(CeresDBSqlParser.class); - private final List statements = new ArrayList<>(); + private final List statements = new ArrayList<>(); private ParseHandler handler; @@ -56,18 +56,18 @@ private boolean noAndWithinBetween() { return !(getToken(1).kind == AND && token_source.parentToken == BETWEEN); } - public static CeresDBxSqlStatement[] parse(String sql) { + public static CeresDBSqlStatement[] parse(String sql) { return parse(sql, null); } - public static CeresDBxSqlStatement[] parse(String sql, ParseHandler handler) { - CeresDBxSqlStatement[] stmts = new CeresDBxSqlStatement[] { new CeresDBxSqlStatement(sql, StatementType.UNKNOWN) }; + public static CeresDBSqlStatement[] parse(String sql, ParseHandler handler) { + CeresDBSqlStatement[] stmts = new CeresDBSqlStatement[] { new CeresDBSqlStatement(sql, StatementType.UNKNOWN) }; if (sql == null || sql.isEmpty()) { return stmts; } - CeresDBxSqlParser p = new CeresDBxSqlParser(sql, handler); + CeresDBSqlParser p = new CeresDBSqlParser(sql, handler); try { stmts = p.sql(); } catch (Exception e) { @@ -83,7 +83,7 @@ public static CeresDBxSqlStatement[] parse(String sql, ParseHandler handler) { return stmts; } - public CeresDBxSqlParser(String sql, ParseHandler handler) { + public CeresDBSqlParser(String sql, ParseHandler handler) { this(new StringReader(sql)); this.handler = handler; @@ -91,7 +91,7 @@ public CeresDBxSqlParser(String sql, ParseHandler handler) { public void addStatement() { if (token_source.isValid()) { - CeresDBxSqlStatement sqlStmt = token_source.build(handler); + CeresDBSqlStatement sqlStmt = token_source.build(handler); // FIXME remove the restriction once we can handle insertion with format well if (statements.size() == 0 || sqlStmt.isRecognized()) { statements.add(sqlStmt); @@ -102,7 +102,7 @@ public void addStatement() { } // top-level statements - final public CeresDBxSqlStatement[] sql() throws ParseException { + final public CeresDBSqlStatement[] sql() throws ParseException { stmts(); addStatement(); label_1: while (true) { @@ -130,7 +130,7 @@ final public CeresDBxSqlStatement[] sql() throws ParseException { jj_consume_token(0); { if ("" != null) - return statements.toArray(new CeresDBxSqlStatement[statements.size()]); + return statements.toArray(new CeresDBSqlStatement[statements.size()]); } throw new IllegalStateException("Missing return statement in function"); } @@ -7555,7 +7555,7 @@ private boolean jj_3R_94() { } /** Generated Token Manager. */ - public CeresDBxSqlParserTokenManager token_source; + public CeresDBSqlParserTokenManager token_source; SimpleCharStream jj_input_stream; /** Current token. */ public Token token; @@ -7572,7 +7572,7 @@ private boolean jj_3R_94() { * Constructor with InputStream. * @param stream input stream */ - public CeresDBxSqlParser(final java.io.InputStream stream) { + public CeresDBSqlParser(final java.io.InputStream stream) { this(stream, null); } @@ -7581,9 +7581,9 @@ public CeresDBxSqlParser(final java.io.InputStream stream) { * @param stream input stream * @param encoding charset to be used */ - public CeresDBxSqlParser(final java.io.InputStream stream, final java.nio.charset.Charset encoding) { + public CeresDBSqlParser(final java.io.InputStream stream, final java.nio.charset.Charset encoding) { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); - token_source = new CeresDBxSqlParserTokenManager(jj_input_stream); + token_source = new CeresDBSqlParserTokenManager(jj_input_stream); token = new Token(); jj_ntk = -1; } @@ -7612,9 +7612,9 @@ public void ReInit(final java.io.InputStream stream, final java.nio.charset.Char * Constructor with InputStream. * @param stream char stream */ - public CeresDBxSqlParser(final java.io.Reader stream) { + public CeresDBSqlParser(final java.io.Reader stream) { jj_input_stream = new SimpleCharStream(stream, 1, 1); - token_source = new CeresDBxSqlParserTokenManager(jj_input_stream); + token_source = new CeresDBSqlParserTokenManager(jj_input_stream); token = new Token(); jj_ntk = -1; } @@ -7630,7 +7630,7 @@ public void ReInit(final java.io.Reader stream) { jj_input_stream.reInit(stream, 1, 1); } if (token_source == null) { - token_source = new CeresDBxSqlParserTokenManager(jj_input_stream); + token_source = new CeresDBSqlParserTokenManager(jj_input_stream); } token_source.ReInit(jj_input_stream); @@ -7642,7 +7642,7 @@ public void ReInit(final java.io.Reader stream) { * Constructor with generated Token Manager. * @param tm Token manager to use */ - public CeresDBxSqlParser(final CeresDBxSqlParserTokenManager tm) { + public CeresDBSqlParser(final CeresDBSqlParserTokenManager tm) { token_source = tm; token = new Token(); jj_ntk = -1; @@ -7652,7 +7652,7 @@ public CeresDBxSqlParser(final CeresDBxSqlParserTokenManager tm) { * Reinitialise * @param tm Token manager to use */ - public void ReInit(final CeresDBxSqlParserTokenManager tm) { + public void ReInit(final CeresDBSqlParserTokenManager tm) { token_source = tm; token = new Token(); jj_ntk = -1; diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserConstants.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserConstants.java similarity index 99% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserConstants.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserConstants.java index 0c7bd5e..97c90e0 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserConstants.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserConstants.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBxSqlParserConstants.java */ +/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBSqlParserConstants.java */ package com.ceresdb.sql; /** * Token literal values and constants. * Generated by com.helger.pgcc.output.java.OtherFilesGenJava#start() */ -public interface CeresDBxSqlParserConstants { +public interface CeresDBSqlParserConstants { /** End of File. */ int EOF = 0; diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserTokenManager.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserTokenManager.java similarity index 99% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserTokenManager.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserTokenManager.java index eedb32b..5d8a593 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlParserTokenManager.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlParserTokenManager.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* CeresDBxSqlParserTokenManager.java */ -/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBxSqlParserTokenManager.java */ +/* CeresDBSqlParserTokenManager.java */ +/* Generated by: ParserGeneratorCC: Do not edit this line. CeresDBSqlParserTokenManager.java */ package com.ceresdb.sql; import java.util.ArrayList; @@ -25,7 +25,7 @@ /** Token Manager. */ @SuppressWarnings("unused") -public class CeresDBxSqlParserTokenManager implements CeresDBxSqlParserConstants { +public class CeresDBSqlParserTokenManager implements CeresDBSqlParserConstants { // whitespaces and comments are invalid private int validTokens = 0; // see http://www.engr.mun.ca/~theo/JavaCC-FAQ/javacc-faq-moz.htm#tth_sEc3.17 @@ -44,10 +44,10 @@ public class CeresDBxSqlParserTokenManager implements CeresDBxSqlParserConstants final Map positions = new HashMap<>(); public void CommonTokenAction(Token t) { - if (t.kind != CeresDBxSqlParserConstants.SEMICOLON) { + if (t.kind != CeresDBSqlParserConstants.SEMICOLON) { builder.append(t.image); - if (t.kind != CeresDBxSqlParserConstants.EOF) { + if (t.kind != CeresDBSqlParserConstants.EOF) { validTokens++; } } @@ -115,15 +115,15 @@ void reset() { positions.clear(); } - CeresDBxSqlStatement build(ParseHandler handler) { + CeresDBSqlStatement build(ParseHandler handler) { String sqlStmt = builder.toString(); - CeresDBxSqlStatement s = null; + CeresDBSqlStatement s = null; if (handler != null) { s = handler.handleStatement(sqlStmt, stmtType, database, tables, parameters, positions); } if (s == null) { - s = new CeresDBxSqlStatement(sqlStmt, stmtType, database, tables, parameters, positions); + s = new CeresDBSqlStatement(sqlStmt, stmtType, database, tables, parameters, positions); } // reset variables @@ -3137,12 +3137,12 @@ private void jjCheckNAddStates(int start, int end) { } /** Constructor. */ - public CeresDBxSqlParserTokenManager(SimpleCharStream stream) { + public CeresDBSqlParserTokenManager(SimpleCharStream stream) { input_stream = stream; } /** Constructor. */ - public CeresDBxSqlParserTokenManager(SimpleCharStream stream, int lexState) { + public CeresDBSqlParserTokenManager(SimpleCharStream stream, int lexState) { ReInit(stream); SwitchTo(lexState); } diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlStatement.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlStatement.java similarity index 93% rename from ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlStatement.java rename to ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlStatement.java index 2f0bb61..bff0115 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBxSqlStatement.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/CeresDBSqlStatement.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Map.Entry; -public class CeresDBxSqlStatement { +public class CeresDBSqlStatement { public static final String DEFAULT_DATABASE = "system"; public static final String DEFAULT_TABLE = "unknown"; public static final List DEFAULT_TABLES = Collections.singletonList(DEFAULT_TABLE); @@ -43,20 +43,20 @@ public class CeresDBxSqlStatement { private final List parameters; private final Map positions; - public CeresDBxSqlStatement(String sql) { + public CeresDBSqlStatement(String sql) { this(sql, StatementType.UNKNOWN, null, null, null, null); } - public CeresDBxSqlStatement(String sql, StatementType stmtType) { + public CeresDBSqlStatement(String sql, StatementType stmtType) { this(sql, stmtType, null, null, null, null); } - public CeresDBxSqlStatement(String sql, // - StatementType stmtType, // - String database, // - List tables, // - List parameters, // - Map positions) { + public CeresDBSqlStatement(String sql, // + StatementType stmtType, // + String database, // + List tables, // + List parameters, // + Map positions) { this.sql = sql; this.stmtType = stmtType; @@ -197,7 +197,7 @@ public Map getPositions() { @Override public String toString() { - return "CeresDBxSqlStatement{" + // + return "CeresDBSqlStatement{" + // "sql='" + sql + '\'' + // ", stmtType=" + stmtType + // ", database='" + database + '\'' + // @@ -231,7 +231,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) { return false; } - final CeresDBxSqlStatement other = (CeresDBxSqlStatement) obj; + final CeresDBSqlStatement other = (CeresDBSqlStatement) obj; if (database == null) { if (other.database != null) { return false; diff --git a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/ParseHandler.java b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/ParseHandler.java index b6586d4..8efc01c 100644 --- a/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/ParseHandler.java +++ b/ceresdb-sql-javacc/src/main/java/com/ceresdb/sql/ParseHandler.java @@ -56,12 +56,12 @@ public String handleParameter(final String database, final List tables, * @param positions keyword positions * @return sql statement, or null means no change */ - public CeresDBxSqlStatement handleStatement(final String sql, // - final StatementType stmtType, // - final String database, // - final List tables, // - final List parameters, // - final Map positions) { + public CeresDBSqlStatement handleStatement(final String sql, // + final StatementType stmtType, // + final String database, // + final List tables, // + final List parameters, // + final Map positions) { return null; } } diff --git a/ceresdb-sql-javacc/src/main/javacc/CeresDBxSqlParser.jj b/ceresdb-sql-javacc/src/main/javacc/CeresDBxSqlParser.jj index a59af47..8ecfc8f 100644 --- a/ceresdb-sql-javacc/src/main/javacc/CeresDBxSqlParser.jj +++ b/ceresdb-sql-javacc/src/main/javacc/CeresDBxSqlParser.jj @@ -14,7 +14,7 @@ options { COMMON_TOKEN_ACTION = true; } -PARSER_BEGIN(CeresDBxSqlParser) +PARSER_BEGIN(CeresDBSqlParser) package com.ceresdb.sql; @@ -28,12 +28,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class CeresDBxSqlParser { +public class CeresDBSqlParser { private static final boolean DEBUG = false; - private static final Logger log = LoggerFactory.getLogger(CeresDBxSqlParser.class); + private static final Logger log = LoggerFactory.getLogger(CeresDBSqlParser.class); - private final List statements = new ArrayList<>(); + private final List statements = new ArrayList<>(); private ParseHandler handler; @@ -58,18 +58,18 @@ public class CeresDBxSqlParser { return !(getToken(1).kind == AND && token_source.parentToken == BETWEEN); } - public static CeresDBxSqlStatement[] parse(String sql) { + public static CeresDBSqlStatement[] parse(String sql) { return parse(sql, null); } - public static CeresDBxSqlStatement[] parse(String sql, ParseHandler handler) { - CeresDBxSqlStatement[] stmts = new CeresDBxSqlStatement[] { new CeresDBxSqlStatement(sql, StatementType.UNKNOWN) }; + public static CeresDBSqlStatement[] parse(String sql, ParseHandler handler) { + CeresDBSqlStatement[] stmts = new CeresDBSqlStatement[] { new CeresDBSqlStatement(sql, StatementType.UNKNOWN) }; if (sql == null || sql.isEmpty()) { return stmts; } - CeresDBxSqlParser p = new CeresDBxSqlParser(sql, handler); + CeresDBSqlParser p = new CeresDBSqlParser(sql, handler); try { stmts = p.sql(); } catch (Exception e) { @@ -83,7 +83,7 @@ public class CeresDBxSqlParser { return stmts; } - public CeresDBxSqlParser(String sql, ParseHandler handler) { + public CeresDBSqlParser(String sql, ParseHandler handler) { this(new StringReader(sql)); this.handler = handler; @@ -91,7 +91,7 @@ public class CeresDBxSqlParser { public void addStatement() { if (token_source.isValid()) { - CeresDBxSqlStatement sqlStmt = token_source.build(handler); + CeresDBSqlStatement sqlStmt = token_source.build(handler); // FIXME remove the restriction once we can handle insertion with format well if (statements.size() == 0 || sqlStmt.isRecognized()) { statements.add(sqlStmt); @@ -102,7 +102,7 @@ public class CeresDBxSqlParser { } } -PARSER_END(CeresDBxSqlParser) +PARSER_END(CeresDBSqlParser) TOKEN_MGR_DECLS: { // whitespaces and comments are invalid @@ -123,10 +123,10 @@ TOKEN_MGR_DECLS: { final Map positions = new HashMap<>(); public void CommonTokenAction(Token t) { - if (t.kind != CeresDBxSqlParserConstants.SEMICOLON) { + if (t.kind != CeresDBSqlParserConstants.SEMICOLON) { builder.append(t.image); - if (t.kind != CeresDBxSqlParserConstants.EOF) { + if (t.kind != CeresDBSqlParserConstants.EOF) { validTokens++; } } @@ -194,16 +194,16 @@ TOKEN_MGR_DECLS: { positions.clear(); } - CeresDBxSqlStatement build(ParseHandler handler) { + CeresDBSqlStatement build(ParseHandler handler) { String sqlStmt = builder.toString(); - CeresDBxSqlStatement s = null; + CeresDBSqlStatement s = null; if (handler != null) { s = handler.handleStatement( sqlStmt, stmtType, database, tables, parameters, positions); } if (s == null) { - s = new CeresDBxSqlStatement( + s = new CeresDBSqlStatement( sqlStmt, stmtType, database, tables, parameters, positions); } @@ -242,7 +242,7 @@ SKIP: { } // top-level statements -CeresDBxSqlStatement[] sql(): {} { +CeresDBSqlStatement[] sql(): {} { stmts() { addStatement(); } ( @@ -251,7 +251,7 @@ CeresDBxSqlStatement[] sql(): {} { { addStatement(); } )* - { return statements.toArray(new CeresDBxSqlStatement[statements.size()]); } + { return statements.toArray(new CeresDBSqlStatement[statements.size()]); } } void stmts(): { Token t; } { diff --git a/ceresdb-sql-javacc/src/main/resources/META-INF/services/com.ceresdb.MetricParserFactory b/ceresdb-sql-javacc/src/main/resources/META-INF/services/com.ceresdb.MetricParserFactory index d5ccc8a..ec09b62 100644 --- a/ceresdb-sql-javacc/src/main/resources/META-INF/services/com.ceresdb.MetricParserFactory +++ b/ceresdb-sql-javacc/src/main/resources/META-INF/services/com.ceresdb.MetricParserFactory @@ -1 +1 @@ -com.ceresdb.sql.CeresDBxMetricParserFactory \ No newline at end of file +com.ceresdb.sql.CeresDBMetricParserFactory \ No newline at end of file diff --git a/ceresdb-sql-javacc/src/test/java/com/ceresdb/sql/MetricParserTest.java b/ceresdb-sql-javacc/src/test/java/com/ceresdb/sql/MetricParserTest.java index db187a7..cc84f14 100644 --- a/ceresdb-sql-javacc/src/test/java/com/ceresdb/sql/MetricParserTest.java +++ b/ceresdb-sql-javacc/src/test/java/com/ceresdb/sql/MetricParserTest.java @@ -37,7 +37,7 @@ public class MetricParserTest { public void loadFromSPITest() { final MetricParserFactory factory = ServiceLoader.load(MetricParserFactory.class) // .firstOrDefault(() -> MetricParserFactory.DEFAULT); - Assert.assertTrue(factory instanceof CeresDBxMetricParserFactory); + Assert.assertTrue(factory instanceof CeresDBMetricParserFactory); } @Test diff --git a/docs/configuration.md b/docs/configuration.md index 80e9516..301b583 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1,19 +1,19 @@ ## Global Options (System properties / Java -Dxxx) | name | description | | --- | --- | -| "CeresDBx.available_cpus" | CeresDB 可用 cpu 数量指定，默认使用当前环境的全部 cpu 数量 | -| "CeresDBx.grpc.conn.failures.reset_threshold" | gRPC reset connection 的阈值，默认 3 | -| "CeresDBx.client.read.write.rw_logging" | 写查的简洁日志输出开关，默认 true | -| "CeresDBx.client.write.collect_wrote_detail" | 写入成功后是否保留写入的 metric 列表，默认为 false | -| "CeresDBx.client.use_os_signal" | 是否使用 OS Signal，默认会使用 SIGUSR2 | -| "CeresDBx.signal.out_dir" | Signal 接收器输出内容到指定磁盘目录，默认为进程启动目录 | -| "CeresDBx.avro.name_validate" | 是否开启 Avro name 校验，默认 false | -| "CeresDBx.rpc.write.limit_percent" | RPC 层自适应限流器 `写` 操作占比（默认 0.7），剩下的留给 `读` 操作 | -| "CeresDBx.reporter.period_minutes" | Metrics reporter 定时输出周期，默认 30 分钟 | -| "CeresDBx.http.read_timeout_ms" | 基于 http 协议的管理类 API 的 http 读超时时间，默认 10000ms | -| "CeresDBx.http.write_timeout_ms" | 基于 http 协议的管理类 API 的 http 写超时时间，默认 10000ms | +| "CeresDB.available_cpus" | CeresDB 可用 cpu 数量指定，默认使用当前环境的全部 cpu 数量 | +| "CeresDB.grpc.conn.failures.reset_threshold" | gRPC reset connection 的阈值，默认 3 | +| "CeresDB.client.read.write.rw_logging" | 写查的简洁日志输出开关，默认 true | +| "CeresDB.client.write.collect_wrote_detail" | 写入成功后是否保留写入的 metric 列表，默认为 false | +| "CeresDB.client.use_os_signal" | 是否使用 OS Signal，默认会使用 SIGUSR2 | +| "CeresDB.signal.out_dir" | Signal 接收器输出内容到指定磁盘目录，默认为进程启动目录 | +| "CeresDB.avro.name_validate" | 是否开启 Avro name 校验，默认 false | +| "CeresDB.rpc.write.limit_percent" | RPC 层自适应限流器 `写` 操作占比（默认 0.7），剩下的留给 `读` 操作 | +| "CeresDB.reporter.period_minutes" | Metrics reporter 定时输出周期，默认 30 分钟 | +| "CeresDB.http.read_timeout_ms" | 基于 http 协议的管理类 API 的 http 读超时时间，默认 10000ms | +| "CeresDB.http.write_timeout_ms" | 基于 http 协议的管理类 API 的 http 写超时时间，默认 10000ms | -## CeresDBxOptions +## CeresDBOptions | name | description | | --- | --- | | clusterAddress | 集群地址（稳定可用的地址），路由表将从这个地址获取 | diff --git a/docs/limit_policy.md b/docs/limit_policy.md index cc734d8..3606af4 100644 --- a/docs/limit_policy.md +++ b/docs/limit_policy.md @@ -1,5 +1,5 @@ ## 关于 LimitedPolicy -CeresDBxClient 默认会对写入/查询进行限流（默认写请求最大在途数据条目 16384，查询最大在途请求数目 8）， +CeresDBClient 默认会对写入/查询进行限流（默认写请求最大在途数据条目 16384，查询最大在途请求数目 8）， 限流方式为对在途请求的数据条数/查询请求数进行限制，可参见 WriteOptions/QueryOptions 中的配置， 其中 LimitedPolicy 为被限流后的处理策略，需要注意的是，如果用户一个写入请求中包含的数据条数就超过设置的最大许可数， 那么当在途请求为 0 的情况下会放行这次请求，下面为所有策略进行一个简单介绍 @@ -16,7 +16,7 @@ CeresDBxClient 默认会对写入/查询进行限流（默认写请求最大在 注意：AbortOnBlockingTimeoutPolicy(3s) 为写入限流的默认策略，AbortOnBlockingTimeoutPolicy(10s) 为查询限流的默认策略 ## 自适应限流 -除了上面介绍的上层限流器，CeresDBxClient 还在底层通信层提供了基于 TCP Vegas 和 Gradient Concurrency-limits 算法的自适应限流器。 +除了上面介绍的上层限流器，CeresDBClient 还在底层通信层提供了基于 TCP Vegas 和 Gradient Concurrency-limits 算法的自适应限流器。 ### Vegas Vegas 是一种主动调整 cwnd 的拥塞控制算法，主要思想是设置两个阈值，alpha 和 beta，然后通过计算目标速率 (Expected) @@ -51,4 +51,4 @@ newLimit = currentLimit * (1 - smoothing) + newLimit * smoothing - 默认自适应限流算法是 Gradient，可以通过设置 `com.ceresdb.rpc.RpcOptions.limitKind = Vegas` 改为 Vegas 或者是设置为 设置 `com.ceresdb.rpc.RpcOptions.limitKind = None` 进行关闭 - 默认达到限流值会快速失败，也可以通过设置 `com.ceresdb.rpc.RpcOptions.blockOnLimit = true` 将策略改为阻塞直至超时 -- 默认情况下写、读请求共享这个限流器，默认写、读分别可以获得 70% 和 30% 的通行许可，可以通过启动参数 -DCeresDBx.rpc.write.limit_percent=xxx 来设置写的比例，读的比例为 1 - writeLimitPercent +- 默认情况下写、读请求共享这个限流器，默认写、读分别可以获得 70% 和 30% 的通行许可，可以通过启动参数 -DCeresDB.rpc.write.limit_percent=xxx 来设置写的比例，读的比例为 1 - writeLimitPercent diff --git a/docs/metrics_and_display.md b/docs/metrics_and_display.md index 14a6c98..b9090ba 100644 --- a/docs/metrics_and_display.md +++ b/docs/metrics_and_display.md @@ -58,9 +58,9 @@ ### Metrics demo: ``` --- CeresDBx 21-7-16 17:24:12 =============================================================== +-- CeresDB 21-7-16 17:24:12 =============================================================== --- CeresDBx -- Counters -------------------------------------------------------------------- +-- CeresDB -- Counters -------------------------------------------------------------------- -- CeresDB 21-12-28 14:22:36 ============================================================== -- CeresDB -- Counters -------------------------------------------------------------------- @@ -585,7 +585,7 @@ write_limiter_acquire_wait_time ### Display demo: ``` ---- CeresDBxClient --- +--- CeresDBClient --- id=1 version=1.0.0.Final clusterAddress=127.0.0.1:8831 @@ -600,7 +600,7 @@ routeCache.size=1 --- GrpcClient --- started=true opts=RpcOptions{defaultRpcTimeout=10000, rpcThreadPoolSize=0, rpcThreadPoolQueueSize=16, maxInboundMessageSize=67108864, flowControlWindow=67108864, idleTimeoutSeconds=300, keepAliveTimeSeconds=3, keepAliveTimeoutSeconds=3, keepAliveWithoutCalls=true, openVegasLimiter=true, vegasInitialLimit=50, blockOnLimit=false, tenant=Tenant{tenant='public', childTenant='sub_test', token='test_token'}} -connectionObservers=[com.ceresdb.CeresDBxClient$RpcConnectionObserver@465f5824] +connectionObservers=[com.ceresdb.CeresDBClient$RpcConnectionObserver@465f5824] asyncPool=DirectExecutor{name='grpc_executor'} interceptors=[com.ceresdb.rpc.interceptors.MetricInterceptor@62b47ad1, com.ceresdb.rpc.interceptors.ClientRequestLimitInterceptor@77533e32, com.ceresdb.rpc.interceptors.ContextToHeadersInterceptor@1a52427d, com.ceresdb.rpc.interceptors.AuthHeadersInterceptor@2670a76b] managedChannelPool={127.0.0.1:8831=ManagedChannelOrphanWrapper{delegate=ManagedChannelImpl{logId=1, target=127.0.0.1:8831}}} diff --git a/docs/other.md b/docs/other.md index 117b8b1..9e21598 100644 --- a/docs/other.md +++ b/docs/other.md @@ -10,7 +10,7 @@ 按照帮助信息执行即可 ``` - - -- CeresDBxClient Signal Help -- + - -- CeresDBClient Signal Help -- - Signal output dir: /Users/xxx/xxx - - How to clear route cache: diff --git a/docs/read.md b/docs/read.md index 331eac8..2c70b0f 100644 --- a/docs/read.md +++ b/docs/read.md @@ -2,7 +2,7 @@ ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -34,13 +34,13 @@ │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` ## 名词解释 -- CeresDBxClient - - CeresDBx 的 java client 实现，面向使用用户，提供写入、查询等 API +- CeresDBClient + - CeresDB 的 java client 实现，面向使用用户，提供写入、查询等 API - QueryClient - 查询的默认实现，纯异步 - 包含异步获取路由表，路由表失效自动重试 @@ -66,7 +66,7 @@ CompletableFuture> query(QueryRequest req, Context ctx); ### 参数说明: | name | desc | | --- | --- | -| `QueryRequest req` | 查询条件，包含 metrics 和 ql 字段，metrics 为建议字段，填写话会有更高效的路由, 不填写的话会自动解析 ql 语句以便进行路由(需要引入 ceresdbx-sql 模块); ql 为查询语言的文本表示。 | +| `QueryRequest req` | 查询条件，包含 metrics 和 ql 字段，metrics 为建议字段，填写话会有更高效的路由, 不填写的话会自动解析 ql 语句以便进行路由(需要引入 ceresdb-sql 模块); ql 为查询语言的文本表示。 | | `Context ctx` | 调用上下文，实现一些特殊需求，ctx 中的内容会写入 gRPC 的 headers metadata | ### 返回值说明 diff --git a/docs/write.md b/docs/write.md index 295c9b1..565d792 100644 --- a/docs/write.md +++ b/docs/write.md @@ -3,7 +3,7 @@ ``` ┌─────────────────────┐ - │ CeresDBxClient │ + │ CeresDBClient │ └─────────────────────┘ │ ▼ @@ -35,13 +35,13 @@ │ │ ▼ ▼ ▼ ┌─────────────────────┐ ┌─────────────────────┐ ┌─────────────────────┐ -│ CeresDBx Node1 │ │ CeresDBx Node2 │ │ ... │ +│ CeresDB Node1 │ │ CeresDB Node2 │ │ ... │ └─────────────────────┘ └─────────────────────┘ └─────────────────────┘ ``` ## 名词解释 -- CeresDBxClient - - CeresDBx 的 java client 实现，面向使用用户，提供写入、查询等 API +- CeresDBClient + - CeresDB 的 java client 实现，面向使用用户，提供写入、查询等 API - WriteClient - 写数据的默认实现，纯异步写入 - 包含异步获取路由表，自动拆分请求 diff --git a/pom.xml b/pom.xml index c3435e3..81fe382 100644 --- a/pom.xml +++ b/pom.xml @@ -276,9 +276,9 @@ **/proto/* **/sql/AbstractCharStream.java - **/sql/CeresDBxSqlParser.java - **/sql/CeresDBxSqlParserConstants.java - **/sql/CeresDBxSqlParserTokenManager.java + **/sql/CeresDBSqlParser.java + **/sql/CeresDBSqlParserConstants.java + **/sql/CeresDBSqlParserTokenManager.java **/sql/ParseException.java **/sql/SimpleCharStream.java **/sql/Token.java @@ -344,9 +344,9 @@ **/UnsafeUtil.java **/proto/* **/sql/AbstractCharStream.java - **/sql/CeresDBxSqlParser.java - **/sql/CeresDBxSqlParserConstants.java - **/sql/CeresDBxSqlParserTokenManager.java + **/sql/CeresDBSqlParser.java + **/sql/CeresDBSqlParserConstants.java + **/sql/CeresDBSqlParserTokenManager.java **/sql/ParseException.java **/sql/SimpleCharStream.java **/sql/Token.java