Skip to content

Commit

Permalink
5.4.13-16615127 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Oldbread3 committed Aug 26, 2022
1 parent 2a399ae commit c9d9d85
Show file tree
Hide file tree
Showing 764 changed files with 207,357 additions and 65 deletions.
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,14 @@ The CDC Node provides change data capture capability that is fully compatible wi

PolarDB-X provides tool to manage the above components through K8S Operator, and the RPC between the CN and DN can be done through private protocol component. The corresponding repositories of these components are as follows.

| **Component Name** | **Repository** |
| --- | --- |
| CN (Compute Node) | [galaxysql](https://github.com/ApsaraDB/galaxysql) |
| GMS (Global Meta Service) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) |
| DN (Data Node) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) |
| CDC (Change Data Capture) | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) |
| RPC | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) |
| K8S Operator | [galaxykube](https://github.com/ApsaraDB/galaxykube) |

| **Component Name** | **Repository** | **Version** |
|---------------------------| --- |---|
| CN (Compute Node) | [galaxysql](https://github.com/ApsaraDB/galaxysql) | v5.4.13-16615127 |
| GMS (Global Meta Service) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
| DN (Data Node) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
| CDC (Change Data Capture) | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) | v5.4.13 |
| RPC | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) | v5.4.13-16615127 |
| K8S Operator | [galaxykube](https://github.com/ApsaraDB/galaxykube) | v1.2.2 |


## What is ApsaraDB GalaxySQL ?
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ RUN \
USER admin

# Set command to entrypoint.sh
ENTRYPOINT /home/admin/entrypoint.sh
ENTRYPOINT /home/admin/entrypoint.sh
16 changes: 8 additions & 8 deletions docs/zh_CN/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ PolarDB-X 采用 Shared-nothing 与存储分离计算架构进行设计,系统

PolarDB-X 提供通过 K8S Operator 方式管理以上4个组件,同时计算节点与存储节点之间可通过私有协议进行 RPC 通信,这些组件对应的仓库如下。

| 组件名称 | 仓库地址 |
| --- | --- |
| 计算节点(CN, Compute Node) | [galaxysql](https://github.com/ApsaraDB/galaxysql) |
| 元数据服务(GMS, Global Meta Service) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) |
| 存储节点(DN, Data Node) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) |
| 日志节点(CDC, Change Data Capture) | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) |
| 私有协议 | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) |
| K8S Operator | [galaxykube](https://github.com/ApsaraDB/galaxykube) |
| 组件名称 | 仓库地址 | 版本号 |
| --- | --- |-----------------|
| 计算节点(CN, Compute Node) | [galaxysql](https://github.com/ApsaraDB/galaxysql) | v5.4.13-16615127 |
| 元数据服务(GMS, Global Meta Service) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
| 存储节点(DN, Data Node) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
| 日志节点(CDC, Change Data Capture) | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) | v5.4.13 |
| 私有协议 | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) | v5.4.13-16615127 |
| K8S Operator | [galaxykube](https://github.com/ApsaraDB/galaxykube) | v1.2.2 |



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ protected void parseParams(String k, String v) {
case RplConstants.SOURCE_HOST_TYPE:
params.put(RplConstants.SOURCE_HOST_TYPE, v);
break;
case RplConstants.DEST_APPLIER_TYPE:
params.put(RplConstants.DEST_APPLIER_TYPE, v);
break;
default:
throw new TddlRuntimeException(ErrorCode.ERR_REPLICATION_RESULT, String.format("Unrecognized arguments: %s", k));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ public SqlChangeReplicationFilter(SqlParserPos pos, List<Pair<SqlNode, SqlNode>>
super(pos, options);
}

public SqlChangeReplicationFilter(SqlParserPos pos, List<Pair<SqlNode, SqlNode>> options, SqlNode channel){
super(pos, options, channel);
}


@Override
protected void parseParams(String k, String v) {
k = StringUtils.upperCase(k);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class RplConstants {

public final static String SOURCE_HOST_TYPE = "SOURCE_HOST_TYPE";

public final static String DEST_APPLIER_TYPE = "DEST_APPLIER_TYPE";

public final static String CHANNEL = "CHANNEL";

public final static String REPLICATE_DO_DB = "REPLICATE_DO_DB";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@

import com.alibaba.polardbx.common.collation.CollationHandler;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

public class CharsetFactoryTest {
@Test
@Ignore
public void test() {
for (CollationName collation : CollationName.POLAR_DB_X_IMPLEMENTED_COLLATION_NAMES) {
CollationHandler collationHandler = CharsetFactory.INSTANCE.createCollationHandler(collation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.alibaba.polardbx.executor.ddl.job.factory;

import com.alibaba.polardbx.common.utils.GeneralUtil;
import com.alibaba.polardbx.common.utils.Pair;
import com.alibaba.polardbx.executor.ddl.job.builder.tablegroup.RefreshTopologyBuilder;
import com.alibaba.polardbx.executor.ddl.job.task.basic.InitNewStorageInstTask;
Expand All @@ -34,7 +33,6 @@
import com.alibaba.polardbx.optimizer.core.rel.ddl.data.AlterTableGroupItemPreparedData;
import com.alibaba.polardbx.optimizer.core.rel.ddl.data.RefreshDbTopologyPreparedData;
import com.google.common.collect.Lists;
import com.sun.tools.javac.jvm.Gen;
import org.apache.calcite.rel.core.DDL;

import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
/**
* 事务管理器对象
*
* @author <a href="mailto:changyuan.lh@taobao.com">Changyuan.lh</a>
* @since 5.1.28
*/
public interface ITransactionManager extends Lifecycle, ITransactionManagerUtil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.alibaba.polardbx.optimizer.parse.HintParser;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
import org.junit.Ignore;
import org.junit.Test;

@Ignore
public class BindingTest extends BindingTestBase {

@Test
@Ignore
public void testCaseWhen() {
initTable("test_case_when",
"CREATE TABLE `test_case_when` (\n"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
/**
* 每一个索引(或者叫KV更直白点)的描述
*
* @author jianxing <jianxing.qx@taobao.com>
*/
public class IndexMeta implements Serializable, Cloneable {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.alibaba.polardbx.optimizer.config.table;

/**
* @author jianxing <jianxing.qx@taobao.com>
*/
public enum IndexType {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* Defines the relationship between instances of the entity class and the
* secondary keys.
*
* @author jianxing <jianxing.qx@taobao.com>
*/
public enum Relationship {
NONE, ONE_TO_ONE, MANY_TO_ONE, ONE_TO_MANY, MANY_TO_MANY;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@
* 用来描述一个逻辑表由哪些key-val组成的 <br/>
* 屏蔽掉不同的schema存储,存储可能会是本地,diamond或zk schema
*
* @author jianxing <jianxing.qx@taobao.com>
* @author whisper
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
*/
public interface SchemaManager extends Lifecycle {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
/**
* 一个table的描述,包含主键信息/字段信息/索引信息等,暂时不考虑外键/约束键,目前没意义
*
* @author jianxing <jianxing.qx@taobao.com>
* @author whisper
*/
public class TableMeta implements Serializable, Cloneable, Table, Wrapper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
/**
* 代表一个列信息,非函数列
*
* @author jianxing <jianxing.qx@taobao.com>
* @author whisper
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
* @since 5.0.0
*/
public interface IColumn extends ISelectable<IColumn> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
/**
* 带前缀的字符串, 例如:x'20', b'1100', _utf8'x', _latin1'x', _binary'u'.
*
* @author <a href="mailto:changyuan.lh@taobao.com">Changyuan.lh</a>
* @since 5.0.0
*/
public class LobVal implements Comparable<String> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8320,7 +8320,6 @@ public boolean visit(DrdsSlowSqlCclStatement x) {

@Override
public boolean visit(MySqlChangeMasterStatement x) {
//2do
List<Pair<SqlNode, SqlNode>> options = new LinkedList<>();
for (SQLAssignItem option : x.getOptions()) {
SqlNode key = convertToSqlNode(option.getTarget());
Expand All @@ -8345,7 +8344,13 @@ public boolean visit(MySqlChangeReplicationFilterStatement x) {
SqlNode value = convertToSqlNode(option.getValue());
options.add(Pair.of(key, value));
}
sqlNode = new SqlChangeReplicationFilter(SqlParserPos.ZERO, options);
final SQLCharExpr channel = x.getChannel();
if (channel == null) {
sqlNode = new SqlChangeReplicationFilter(SqlParserPos.ZERO, options);
} else {
SqlNode ch = convertToSqlNode(channel);
sqlNode = new SqlChangeReplicationFilter(SqlParserPos.ZERO, options, ch);
}
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
* </pre>
*
* @author Dreamond
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
* @since 5.0.0
*/
public class DataNodeChooser {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
/**
* 一些相同的 IFunction 处理函数合并到公共类。
*
* @author <a href="mailto:changyuan.lh@taobao.com">Changyuan.lh</a>
*/
public class FunctionUtils {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: begin-end within begin-end
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: procedure begin-end, loop, while use label
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: procedure begin-end, loop, while use label
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: procedure begin-end, loop, while use label
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
/**
*
* @Description: procedure begin-end, loop, while use label
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: create procedure parameter type support
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/**
*
* @Description: create procedure parameter type support
* @author zz email:455910092@qq.com
* @date 2015-9-14
* @version V1.0
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/**
* 做一下老的rule兼容处理,tddl5版本类名做了下统一调整,所以以前配置中使用的一下类名已经不存在,需要做转换
*
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
* @since 5.0.0
*/
public class RuleCompatibleHelper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
* 一组{@linkplain TableRule}的集合
*
* @author junyu
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
*/
public class VirtualTableRoot extends AbstractLifecycle implements Lifecycle {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.util.Map;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.alibaba.polardbx.rule.VirtualTableSupport;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.alibaba.polardbx.rule.VirtualTableSupport;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
* 有些乱七八糟的oriDb/oriTable比较,我也没想明白具体的应用场景<br/>
* 猜测应该和动态迁移有关,比如指定某个库/表完成了迁移,就单独开放这个表写入权限
*
* @author <a href="junyu@taobao.com">junyu</a>
* @author <a href="jianghang.loujh@taobao.com">jianghang</a>
* @version 1.0
* @since 1.6
* @date 2011-4-22 12:49:53
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
/**
* 构造group的一致性hash的slot
*
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
* @date 2011-6-2 03:12:39
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
/**
* 构造table的一致性hash的slot
*
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
* @date 2011-6-2 03:13:08
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/**
* 虚拟节点
*
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
* @date 2011-8-8下午07:08:45
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.alibaba.polardbx.rule.enumerator.handler.IntegerPartDiscontinousRangeEnumerator;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
* @date 2011-8-20 02:58:34
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.alibaba.polardbx.common.model.sqljep.Comparative;

/**
* @author <a href="junyu@taobao.com">junyu</a>
* @version 1.0
* @since 1.6
* @date 2011-9-16 11:00:47
Expand Down
2 changes: 1 addition & 1 deletion polardbx-server/src/main/bin/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ fi

#2.6.32-220.23.2.al.ali1.1.alios6.x86_64 not support Wisp2
if [ "$wisp" == "wisp" ] && [ "$KERNEL_VERSION" != "2.6.32-220.23.2.al.ali1.1.alios6.x86_64" ]; then
JAVA_OPTS="$JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2"
JAVA_OPTS="$JAVA_OPTS -XX:+UnlockExperimentalVMOptions -XX:+UseWisp2 -Dio.grpc.netty.shaded.io.netty.transport.noNative=true"
fi

#disable netty-native in order to support Wisp2
Expand Down
Loading

0 comments on commit c9d9d85

Please sign in to comment.