Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

Follow

JetBrains Research 47

apache/shardingsphere/1944/1933

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1933

https://github.com/apache/shardingsphere/pull/1944

https://github.com/apache/shardingsphere/pull/1944

fixes

oracle getAllTableNames returns oracle build-in table

xml config: <?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:sharding="http://shardingsphere.io/schema/shardingsphere/sharding" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://shardingsphere.io/schema/shardingsphere/sharding http://shardingsphere.io/schema/shardingsphere/sharding/sharding.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> <bean name="dataSource_0" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close"> <property name="url" value="${jdbc.url_0}"/> <property name="username" value="${jdbc.username_0}"/> <property name="password" value="${jdbc.password_0}"/> <property name="driverClassName" value="${jdbc.driverClassName}" /> <!-- 配置初始化大小、最小、最大 --> <property name="initialSize" value="${jdbc.initialSize}"/> <property name="minIdle" value="${jdbc.minIdle}"/> <property name="maxActive" value="${jdbc.maxActive}"/> <!-- 配置获取连接等待超时的时间 --> <property name="maxWait" value="${jdbc.maxWait}"/> </bean> <bean name="dataSource_1" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close"> <property name="url" value="${jdbc.url_1}"/> <property name="username" value="${jdbc.username_1}"/> <property name="password" value="${jdbc.password_1}"/> <property name="driverClassName" value="${jdbc.driverClassName}" /> <!-- 配置初始化大小、最小、最大 --> <property name="initialSize" value="${jdbc.initialSize}"/> <property name="minIdle" value="${jdbc.minIdle}"/> <property name="maxActive" value="${jdbc.maxActive}"/> <!-- 配置获取连接等待超时的时间 --> <property name="maxWait" value="${jdbc.maxWait}"/> </bean> <bean name="globalDataSource" class="com.alibaba.druid.pool.DruidDataSource" init-method="init" destroy-method="close"> <property name="url" value="${jdbc.url}"/> <property name="username" value="${jdbc.username}"/> <property name="password" value="${jdbc.password}"/> <property name="driverClassName" value="${jdbc.driverClassName}" /> <!-- 配置初始化大小、最小、最大 --> <property name="initialSize" value="${jdbc.initialSize}"/> <property name="minIdle" value="${jdbc.minIdle}"/> <property name="maxActive" value="${jdbc.maxActive}"/> <!-- 配置获取连接等待超时的时间 --> <property name="maxWait" value="${jdbc.maxWait}"/> </bean> <bean id="preciseModuloDatabaseShardingAlgorithm" class="com.hundsun.ta.aop.DemoTableShardingAlgorithm" /> <bean id="preciseModuloTableShardingAlgorithm" class="com.hundsun.ta.aop.DemoDatabaseShardingAlgorithm" /> <!-- 分库策略 --> <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" precise-algorithm-ref="preciseModuloDatabaseShardingAlgorithm" /> <!-- 分表策略 --> <sharding:standard-strategy id="tableStrategy" sharding-column="user_id" precise-algorithm-ref="preciseModuloTableShardingAlgorithm" /> <sharding:data-source id="shardingDataSource"> <!-- configDataSource为不参数分库分表的全局表的默认数据源,比如系统参数 --> <sharding:sharding-rule data-source-names="dataSource_0,dataSource_1,globalDataSource" default-data-source-name="globalDataSource" default-database-strategy-ref="databaseStrategy" default-table-strategy-ref="tableStrategy"> <sharding:table-rules> <sharding:table-rule logic-table="t_order" actual-data-nodes="dataSource_$->{0..1}.t_order_$->{0..1}" /> <sharding:table-rule logic-table="t_order_item" actual-data-nodes="dataSource_$->{0..1}.t_order_item_$->{0..1}" /> <sharding:table-rule logic-table="t_user" actual-data-nodes="dataSource_$->{0..1}.t_user"/> </sharding:table-rules> <!-- 绑定表规则列表,表示分库分表的规则相同,这样万一涉及到多个分片的查询,sharding-jdbc就可以确定分库之间不需要不必要的二次关联,所有涉及表都应该如此维护 --> <sharding:binding-table-rules> <sharding:binding-table-rule logic-tables="t_order,t_order_item"/> </sharding:binding-table-rules> <sharding:broadcast-table-rules> <sharding:broadcast-table-rule table="t_dict" /> </sharding:broadcast-table-rules> </sharding:sharding-rule> </sharding:data-source> </beans> method io.shardingsphere.core.metadata.table.executor.TableMetaDataInitializer#getAllTableNames returns more table then current schema's table. ex. it returns table like SYS_IOT_OVER_84700。 version:sharding-sphere 3.1.0. the reason is getAllTableNames() method call getTables() pass null to schemaPattern in line 98. as follows: ResultSet resultSet = connection.getMetaData().getTables(catalog, null, null, new String[]{"TABLE"})) the result is app suspend after datasource init. the jstack is as follows: "main" #1 prio=5 os_prio=0 tid=0x00000000055ad800 nid=0x154c runnable [0x000000000559c000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(Native Method) at java.net.SocketInputStream.socketRead(SocketInputStream.java:116) at java.net.SocketInputStream.read(SocketInputStream.java:171) at java.net.SocketInputStream.read(SocketInputStream.java:141) at oracle.net.ns.Packet.receive(Packet.java:300) at oracle.net.ns.DataPacket.receive(DataPacket.java:106) at oracle.net.ns.NetInputStream.getNextPacket(NetInputStream.java:315) at oracle.net.ns.NetInputStream.read(NetInputStream.java:260) at oracle.net.ns.NetInputStream.read(NetInputStream.java:185) at oracle.net.ns.NetInputStream.read(NetInputStream.java:102) at oracle.jdbc.driver.T4CSocketInputStreamWrapper.readNextPacket(T4CSocketInputStreamWrapper.java:124) at oracle.jdbc.driver.T4CSocketInputStreamWrapper.read(T4CSocketInputStreamWrapper.java:80) at oracle.jdbc.driver.T4CMAREngine.unmarshalUB1(T4CMAREngine.java:1137) at oracle.jdbc.driver.T4CTTIfun.receive(T4CTTIfun.java:290) at oracle.jdbc.driver.T4CTTIfun.doRPC(T4CTTIfun.java:192) at oracle.jdbc.driver.T4C8Oall.doOALL(T4C8Oall.java:531) at oracle.jdbc.driver.T4CPreparedStatement.doOall8(T4CPreparedStatement.java:207) at oracle.jdbc.driver.T4CPreparedStatement.fetch(T4CPreparedStatement.java:1119) at oracle.jdbc.driver.OracleResultSetImpl.close_or_fetch_from_next(OracleResultSetImpl.java:373) - locked <0x0000000780aac2a0> (a oracle.jdbc.driver.T4CConnection) at oracle.jdbc.driver.OracleResultSetImpl.next(OracleResultSetImpl.java:277) - locked <0x0000000780aac2a0> (a oracle.jdbc.driver.T4CConnection) at io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader.getColumnMetaDataList(TableMetaDataLoader.java:137) at io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader.load(TableMetaDataLoader.java:96) at io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader.access$100(TableMetaDataLoader.java:52) at io.shardingsphere.core.metadata.table.executor.TableMetaDataLoader$1.execute(TableMetaDataLoader.java:86) at io.shardingsphere.core.executor.ShardingExecuteEngine.syncGroupExecute(ShardingExecuteEngine.java:175) at io.shardingsphere.core.executor.ShardingExecuteEngine.groupExecute(ShardingExecuteEngine.java:152) at io.shardingsphere.core.executor.ShardingExecuteEngine.groupExecute(ShardingExecuteEngine.java:130) ### Expected behavior return only tables in current schema. ### Actual behavior return tables in other schema. all table with access privilege. ### how to resolve pass schemaName to getTables method in line 98, as follows: ResultSet resultSet = connection.getMetaData().getTables(catalog, dataSourceMetaData.getSchemeName(), null, new String[]{"TABLE"})) {

5fd9c9df9f2c8c249d018368ca3d940084411397

1bbe50547876766f5d2181149726a315c58aa73c

https://github.com/apache/shardingsphere/compare/5fd9c9df9f2c8c249d018368ca3d940084411397...1bbe50547876766f5d2181149726a315c58aa73c

diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java index 2d594b99cfe..80f74f331f3 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java @@ -92,7 +92,7 @@ public final class TableMetaDataInitializer { DataSourceMetaData dataSourceMetaData = shardingDataSourceMetaData.getActualDataSourceMetaData(dataSourceName); String catalog = null == dataSourceMetaData ? null : dataSourceMetaData.getSchemaName(); try (Connection connection = connectionManager.getConnection(dataSourceName); - ResultSet resultSet = connection.getMetaData().getTables(catalog, null, null, new String[]{"TABLE"})) { + ResultSet resultSet = connection.getMetaData().getTables(catalog, connection.getSchema(), null, new String[]{"TABLE"})) { while (resultSet.next()) { String tableName = resultSet.getString("TABLE_NAME"); if (!tableName.contains("$") && !tableName.contains("/")) {

['sharding-core/src/main/java/org/apache/shardingsphere/core/metadata/table/executor/TableMetaDataInitializer.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/963/962

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/962

https://github.com/apache/shardingsphere/pull/963

https://github.com/apache/shardingsphere/pull/963

fixes

Column types disordered when use prepared statement in Proxy

Please answer these questions before submitting your issue. Thanks! 开源不易，我们希望将精力放在完成新功能和解决有价值的问题上，为了让大家的配合更具有效率，请填写以下列出的全部问题 ### Which version of Sharding-Sphere do you using?（您使用的Sharding-Sphere版本为？） dev ### Expected behavior （您预期的结果是） correct prepared statement result ### Actual behavior （实际运行的结果是） a chance to triger wrong result ### Steps to reproduce the behavior （可重现问题的操作步骤） use prepared statement in Proxy ### Please provide the reproduce example codes (such as github link)，otherwise we will label the issue as Invalid and close it.（为了节省复现问题的时间，请务必提供可重现的代码，否则我们会将issue直接标记为invalid并关闭） example Code should based on https://github.com/sharding-sphere/sharding-sphere-example （代码请基于 https://github.com/sharding-sphere/sharding-sphere-example）

e8e429ceda2f677e83b7a1f45a8389c0e67126fc

8b6f08696ec9fad30b47fbf3e780e4659173d5e3

https://github.com/apache/shardingsphere/compare/e8e429ceda2f677e83b7a1f45a8389c0e67126fc...8b6f08696ec9fad30b47fbf3e780e4659173d5e3

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java index e1468ce99a7..793a37e100a 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java @@ -84,7 +84,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { private int columnCount; - private final List<ColumnType> columnTypes; + private List<ColumnType> columnTypes; private boolean isMerged; @@ -101,7 +101,6 @@ public final class StatementExecuteBackendHandler implements BackendHandler { connections = new CopyOnWriteArrayList<>(); resultSets = new CopyOnWriteArrayList<>(); resultLists = new CopyOnWriteArrayList<>(); - columnTypes = new CopyOnWriteArrayList<>(); isMerged = false; hasMoreResultValueFlag = true; this.databaseType = databaseType; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java index ad949d28e2e..c2f2dc1b53f 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java @@ -190,13 +190,15 @@ public final class StatementExecuteWorker implements Callable<CommandResponsePac return result; } result.addPacket(new FieldCountPacket(++currentSequenceId, columnCount)); + List<ColumnType> columnTypes = new ArrayList<>(128); for (int i = 1; i <= columnCount; i++) { ColumnType columnType = ColumnType.valueOfJDBCType(resultSetMetaData.getColumnType(i)); ColumnDefinition41Packet columnDefinition41Packet = new ColumnDefinition41Packet(++currentSequenceId, resultSetMetaData.getSchemaName(i), resultSetMetaData.getTableName(i), resultSetMetaData.getTableName(i), resultSetMetaData.getColumnLabel(i), resultSetMetaData.getColumnName(i), resultSetMetaData.getColumnDisplaySize(i), columnType, 0); result.addPacket(columnDefinition41Packet); - statementExecuteBackendHandler.getColumnTypes().add(columnType); + columnTypes.add(columnType); } + statementExecuteBackendHandler.setColumnTypes(columnTypes); result.addPacket(new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue())); return result; } @@ -211,20 +213,22 @@ public final class StatementExecuteWorker implements Callable<CommandResponsePac return result; } result.addPacket(new FieldCountPacket(++currentSequenceId, columnCount)); + List<ColumnType> columnTypes = new ArrayList<>(128); for (int i = 1; i <= columnCount; i++) { ColumnType columnType = ColumnType.valueOfJDBCType(resultSetMetaData.getColumnType(i)); ColumnDefinition41Packet columnDefinition41Packet = new ColumnDefinition41Packet(++currentSequenceId, resultSetMetaData.getSchemaName(i), resultSetMetaData.getTableName(i), resultSetMetaData.getTableName(i), resultSetMetaData.getColumnLabel(i), resultSetMetaData.getColumnName(i), resultSetMetaData.getColumnDisplaySize(i), columnType, 0); result.addPacket(columnDefinition41Packet); - statementExecuteBackendHandler.getColumnTypes().add(columnType); + columnTypes.add(columnType); } + statementExecuteBackendHandler.setColumnTypes(columnTypes); result.addPacket(new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue())); while (resultSet.next()) { List<Object> data = new ArrayList<>(columnCount); for (int i = 1; i <= columnCount; i++) { data.add(resultSet.getObject(i)); } - result.addPacket(new BinaryResultSetRowPacket(++currentSequenceId, columnCount, data, statementExecuteBackendHandler.getColumnTypes())); + result.addPacket(new BinaryResultSetRowPacket(++currentSequenceId, columnCount, data, columnTypes)); } result.addPacket(new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue())); return result;

['sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1309/1307

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1307

https://github.com/apache/shardingsphere/pull/1309

https://github.com/apache/shardingsphere/pull/1309

fixes

Sql-Server exception : The URL of JDBC is not supported.

spring-boot 1.5.6.RELEASE sharding-3.0.0.M3 sqlServer 2012 sqljdbc4 4.0 when I use sharding-3.0.0.M1，everything works fine my configuration is like this sharding.jdbc.datasource.ds_0.url=jdbc:sqlserver://dev.database.chinacloudapi.cn;database=sharding;loginTimeout=30;sendStringParametersAsUnicode=false but when I upgrade to M3, the connection fails. report this error : The URL of JDBC is not supported.

a502022308d0bc9258c8dc0e27d28565ccc7574b

78721892d6c5431317bd6f8fb1794d8bc1477bb7

https://github.com/apache/shardingsphere/compare/a502022308d0bc9258c8dc0e27d28565ccc7574b...78721892d6c5431317bd6f8fb1794d8bc1477bb7

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/H2DataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/H2DataSourceMetaData.java index 38487251c2d..c3f0b37ad60 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/H2DataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/H2DataSourceMetaData.java @@ -40,7 +40,7 @@ public final class H2DataSourceMetaData implements DataSourceMetaData { private final String schemeName; - private final Pattern pattern = Pattern.compile("jdbc:h2:(mem|~)[:/]([\\\\w\\\\-]+);?\\\\w*"); + private final Pattern pattern = Pattern.compile("jdbc:h2:(mem|~)[:/]([\\\\w\\\\-]+);?\\\\w*", Pattern.CASE_INSENSITIVE); public H2DataSourceMetaData(final String url) { Matcher matcher = pattern.matcher(url); @@ -49,7 +49,7 @@ public final class H2DataSourceMetaData implements DataSourceMetaData { port = DEFAULT_PORT; schemeName = matcher.group(2); } else { - throw new ShardingException("The URL of JDBC is not supported."); + throw new ShardingException("The URL of JDBC is not supported. Please refer to this pattern: %s.", pattern.pattern()); } } diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java index 6f307335735..b8b0a121fb8 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java @@ -41,7 +41,7 @@ public final class MySQLDataSourceMetaData implements DataSourceMetaData { private final String schemeName; - private final Pattern pattern = Pattern.compile("jdbc:mysql://([\\\\w\\\\-\\\\.]+):?([0-9]*)/([\\\\w\\\\-]+);?\\\\w*"); + private final Pattern pattern = Pattern.compile("jdbc:mysql://([\\\\w\\\\-\\\\.]+):?([0-9]*)/([\\\\w\\\\-]+);?\\\\w*", Pattern.CASE_INSENSITIVE); public MySQLDataSourceMetaData(final String url) { Matcher matcher = pattern.matcher(url); @@ -50,7 +50,7 @@ public final class MySQLDataSourceMetaData implements DataSourceMetaData { port = Strings.isNullOrEmpty(matcher.group(2)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(2)); schemeName = matcher.group(3); } else { - throw new ShardingException("The URL of JDBC is not supported."); + throw new ShardingException("The URL of JDBC is not supported. Please refer to this pattern: %s.", pattern.pattern()); } } diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/OracleDataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/OracleDataSourceMetaData.java index 544c79c3601..9cbaf1518ad 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/OracleDataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/OracleDataSourceMetaData.java @@ -41,7 +41,7 @@ public final class OracleDataSourceMetaData implements DataSourceMetaData { private final String schemeName; - private final Pattern pattern = Pattern.compile("jdbc:oracle:thin:@/{0,2}([\\\\w\\\\-\\\\.]+):?([0-9]*)[:/]([\\\\w\\\\-]+)"); + private final Pattern pattern = Pattern.compile("jdbc:oracle:thin:@/{0,2}([\\\\w\\\\-\\\\.]+):?([0-9]*)[:/]([\\\\w\\\\-]+)", Pattern.CASE_INSENSITIVE); public OracleDataSourceMetaData(final String url) { Matcher matcher = pattern.matcher(url); @@ -50,7 +50,7 @@ public final class OracleDataSourceMetaData implements DataSourceMetaData { port = Strings.isNullOrEmpty(matcher.group(2)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(2)); schemeName = matcher.group(3); } else { - throw new ShardingException("The URL of JDBC is not supported."); + throw new ShardingException("The URL of JDBC is not supported. Please refer to this pattern: %s.", pattern.pattern()); } } diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java index 066897eeecc..8dd813f99fc 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java @@ -41,7 +41,7 @@ public final class PostgreSQLDataSourceMetaData implements DataSourceMetaData { private final String schemeName; - private final Pattern pattern = Pattern.compile("jdbc:postgresql://([\\\\w\\\\-\\\\.]+):?([0-9]*)/([\\\\w\\\\-]+)"); + private final Pattern pattern = Pattern.compile("jdbc:postgresql://([\\\\w\\\\-\\\\.]+):?([0-9]*)/([\\\\w\\\\-]+)", Pattern.CASE_INSENSITIVE); public PostgreSQLDataSourceMetaData(final String url) { Matcher matcher = pattern.matcher(url); @@ -50,7 +50,7 @@ public final class PostgreSQLDataSourceMetaData implements DataSourceMetaData { port = Strings.isNullOrEmpty(matcher.group(2)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(2)); schemeName = matcher.group(3); } else { - throw new ShardingException("The URL of JDBC is not supported."); + throw new ShardingException("The URL of JDBC is not supported. Please refer to this pattern: %s.", pattern.pattern()); } } diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java index 791faa9aeaa..8ec50d4048f 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java @@ -41,16 +41,16 @@ public final class SQLServerDataSourceMetaData implements DataSourceMetaData { private final String schemeName; - private final Pattern pattern = Pattern.compile("jdbc:(microsoft:)?sqlserver://([\\\\w\\\\-\\\\.]+):?([0-9]*);DatabaseName=([\\\\w\\\\-]+)"); - + private final Pattern pattern = Pattern.compile("jdbc:(microsoft:)?sqlserver://([\\\\w\\\\-\\\\.]+):?([0-9]*);(DatabaseName|database)=([\\\\w\\\\-]+)", Pattern.CASE_INSENSITIVE); + public SQLServerDataSourceMetaData(final String url) { Matcher matcher = pattern.matcher(url); if (matcher.find()) { hostName = matcher.group(2); port = Strings.isNullOrEmpty(matcher.group(3)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(3)); - schemeName = matcher.group(4); + schemeName = matcher.group(5); } else { - throw new ShardingException("The URL of JDBC is not supported."); + throw new ShardingException("The URL of JDBC is not supported. Please refer to this pattern: %s.", pattern.pattern()); } }

['sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/H2DataSourceMetaData.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/OracleDataSourceMetaData.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/SQLServerDataSourceMetaData.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java']

{'.java': 5}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/972/954

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/954

https://github.com/apache/shardingsphere/pull/972

https://github.com/apache/shardingsphere/pull/972

fixes

The tables with no configuration appear in the proxy.

The tables which are not configed in yaml can be used with show tables, select etc. It is not correct, i will fix it in next week.

1f507269d224ec774208e1d843c77dcbc84a2d05

ebad0412bdd4cf326733898cac72c69cbbae34db

https://github.com/apache/shardingsphere/compare/1f507269d224ec774208e1d843c77dcbc84a2d05...ebad0412bdd4cf326733898cac72c69cbbae34db

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java index 55e509112e9..9af8cce6b0a 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java @@ -46,6 +46,7 @@ import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket; import io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket; import io.shardingsphere.proxy.util.MySQLResultCache; import io.shardingsphere.proxy.util.SynchronizedFuture; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import java.sql.SQLException; @@ -64,6 +65,7 @@ import java.util.concurrent.TimeoutException; * @author panjuan */ @Slf4j +@Getter public final class SQLPacketsBackendHandler implements BackendHandler { private static final int CONNECT_TIMEOUT = 30; diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java index 88836c3a5a3..a0292a57dc5 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java @@ -24,11 +24,18 @@ import io.shardingsphere.proxy.backend.common.SQLPacketsBackendHandler; import io.shardingsphere.proxy.config.RuleRegistry; import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder; import io.shardingsphere.proxy.transport.common.packet.DatabaseProtocolPacket; +import io.shardingsphere.proxy.transport.mysql.constant.ColumnType; +import io.shardingsphere.proxy.transport.mysql.constant.StatusFlag; import io.shardingsphere.proxy.transport.mysql.packet.MySQLPacketPayload; import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacket; import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacketType; import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePackets; +import io.shardingsphere.proxy.transport.mysql.packet.command.statement.close.DummyPacket; +import io.shardingsphere.proxy.transport.mysql.packet.command.text.query.ColumnDefinition41Packet; import io.shardingsphere.proxy.transport.mysql.packet.command.text.query.ComQueryPacket; +import io.shardingsphere.proxy.transport.mysql.packet.command.text.query.TextResultSetRowPacket; +import io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket; +import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket; import lombok.extern.slf4j.Slf4j; import java.sql.SQLException; @@ -49,6 +56,8 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa private final String fieldWildcard; + private int currentSequenceId; + private SQLExecuteBackendHandler sqlExecuteBackendHandler; private SQLPacketsBackendHandler sqlPacketsBackendHandler; @@ -82,10 +91,12 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa // TODO use common database type if (RuleRegistry.getInstance().isWithoutJdbc()) { sqlPacketsBackendHandler = new SQLPacketsBackendHandler(this, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()); - return sqlPacketsBackendHandler.execute(); + sqlPacketsBackendHandler.execute(); + return new CommandResponsePackets(new DummyPacket()); } else { sqlExecuteBackendHandler = new SQLExecuteBackendHandler(sql, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()); - return sqlExecuteBackendHandler.execute(); + sqlExecuteBackendHandler.execute(); + return new CommandResponsePackets(new DummyPacket()); } } @@ -104,10 +115,25 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa @Override public DatabaseProtocolPacket getResultValue() { + DatabaseProtocolPacket result; if (RuleRegistry.getInstance().isWithoutJdbc()) { - return sqlPacketsBackendHandler.getResultValue(); + result = sqlPacketsBackendHandler.getResultValue(); + if (!sqlPacketsBackendHandler.isHasMoreResultValueFlag()) { + return new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue()); + } + } else { + result = sqlExecuteBackendHandler.getResultValue(); + if (!sqlExecuteBackendHandler.isHasMoreResultValueFlag()) { + return new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue()); + } + } + if (result instanceof TextResultSetRowPacket) { + TextResultSetRowPacket fieldListResponse = (TextResultSetRowPacket) result; + String columnName = (String) fieldListResponse.getData().get(0); + return new ColumnDefinition41Packet(++currentSequenceId, ShardingConstant.LOGIC_SCHEMA_NAME, table, table, + columnName, columnName, 100, ColumnType.MYSQL_TYPE_VARCHAR, 0); } else { - return sqlExecuteBackendHandler.getResultValue(); + return new ErrPacket(1, 0, "", "", ""); } }

['sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1018/962

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/962

https://github.com/apache/shardingsphere/pull/1018

https://github.com/apache/shardingsphere/pull/1018

fixes

Column types disordered when use prepared statement in Proxy

Please answer these questions before submitting your issue. Thanks! 开源不易，我们希望将精力放在完成新功能和解决有价值的问题上，为了让大家的配合更具有效率，请填写以下列出的全部问题 ### Which version of Sharding-Sphere do you using?（您使用的Sharding-Sphere版本为？） dev ### Expected behavior （您预期的结果是） correct prepared statement result ### Actual behavior （实际运行的结果是） a chance to triger wrong result ### Steps to reproduce the behavior （可重现问题的操作步骤） use prepared statement in Proxy ### Please provide the reproduce example codes (such as github link)，otherwise we will label the issue as Invalid and close it.（为了节省复现问题的时间，请务必提供可重现的代码，否则我们会将issue直接标记为invalid并关闭） example Code should based on https://github.com/sharding-sphere/sharding-sphere-example （代码请基于 https://github.com/sharding-sphere/sharding-sphere-example）

2980776da2bd492d2dcf1eb93c39deb64cd134a7

0481d943a5f13381d98546ba08317a9cab9291bb

https://github.com/apache/shardingsphere/compare/2980776da2bd492d2dcf1eb93c39deb64cd134a7...0481d943a5f13381d98546ba08317a9cab9291bb

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCExecuteWorker.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCExecuteWorker.java index 90358c3135f..b6bb34dd4e4 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCExecuteWorker.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCExecuteWorker.java @@ -35,6 +35,8 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.Callable; /** @@ -86,16 +88,18 @@ public abstract class JDBCExecuteWorker implements Callable<CommandResponsePacke return new CommandResponsePackets(new OKPacket(++currentSequenceId)); } CommandResponsePackets result = new CommandResponsePackets(new FieldCountPacket(++currentSequenceId, columnCount)); + List<ColumnType> columnTypes = new ArrayList<>(128); for (int columnIndex = 1; columnIndex <= columnCount; columnIndex++) { - setColumnType(ColumnType.valueOfJDBCType(resultSetMetaData.getColumnType(columnIndex))); + columnTypes.add(ColumnType.valueOfJDBCType(resultSetMetaData.getColumnType(columnIndex))); result.addPacket(new ColumnDefinition41Packet(++currentSequenceId, resultSetMetaData, columnIndex)); } + setColumnTypes(columnTypes); result.addPacket(new EofPacket(++currentSequenceId)); return result; } // TODO why only prepareStatement need this? - protected void setColumnType(final ColumnType columnType) { + protected void setColumnTypes(final List<ColumnType> columnTypes) { } private long getGeneratedKey() throws SQLException { diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementBackendHandler.java index 68508d04c6c..3bcba985556 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementBackendHandler.java @@ -28,7 +28,7 @@ import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePac import io.shardingsphere.proxy.transport.mysql.packet.command.statement.PreparedStatementRegistry; import io.shardingsphere.proxy.transport.mysql.packet.command.statement.execute.BinaryResultSetRowPacket; import io.shardingsphere.proxy.transport.mysql.packet.command.statement.execute.PreparedStatementParameter; -import lombok.Getter; +import lombok.Setter; import java.sql.Connection; import java.sql.PreparedStatement; @@ -37,7 +37,6 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.CopyOnWriteArrayList; /** * Statement protocol backend handler via JDBC to connect databases. @@ -51,8 +50,8 @@ public final class JDBCStatementBackendHandler extends JDBCBackendHandler { private final DatabaseType databaseType; - @Getter - private final List<ColumnType> columnTypes; + @Setter + private List<ColumnType> columnTypes; private final RuleRegistry ruleRegistry; @@ -60,7 +59,6 @@ public final class JDBCStatementBackendHandler extends JDBCBackendHandler { super(PreparedStatementRegistry.getInstance().getSQL(statementId)); this.preparedStatementParameters = preparedStatementParameters; this.databaseType = databaseType; - columnTypes = new CopyOnWriteArrayList<>(); ruleRegistry = RuleRegistry.getInstance(); } diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementExecuteWorker.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementExecuteWorker.java index 9f2e212ebc0..3f7758e5082 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementExecuteWorker.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementExecuteWorker.java @@ -22,6 +22,7 @@ import io.shardingsphere.proxy.transport.mysql.constant.ColumnType; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.List; /** * Statement execute worker. @@ -45,7 +46,7 @@ public final class JDBCStatementExecuteWorker extends JDBCExecuteWorker { } @Override - protected void setColumnType(final ColumnType columnType) { - ((JDBCStatementBackendHandler) getJdbcBackendHandler()).getColumnTypes().add(columnType); + protected void setColumnTypes(final List<ColumnType> columnTypes) { + ((JDBCStatementBackendHandler) getJdbcBackendHandler()).setColumnTypes(columnTypes); } }

['sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCExecuteWorker.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementExecuteWorker.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/statement/JDBCStatementBackendHandler.java']

{'.java': 3}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1050/372

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/372

https://github.com/apache/shardingsphere/pull/1050

https://github.com/apache/shardingsphere/pull/1050

fixes

Reuse PreparedStatement cause cache of route result do not clean

Please answer these questions before submitting your issue. Thanks! ### Which version of Sharding-Jdbc do you using? 1.5.3 ### Expected behavior 使用mybaits作为orm框架 开启spring事物支持时，在mybaits的settings中将defaultExecutorType设置为REUSE, 在同一个事物中查询时，即使路由不同的表查询正常 ### Actual behavior 开启事物 路由到同一张表是则查询正常，路由不同的表则异常 ### Steps to reproduce the behavior 1.启动项目 2Controller包下的的方法 3.点击控制台打印的路径 http://localhot:8081/select 若想不产生这个bug可以采取如下两种方法之一 1.关闭事物 2.开启事物则需将mybatisConfig.xml的defaultExecutorType设置为SIMPLE ### Please provide the reproduce example codes (such as github link) if possible. https://git.oschina.net/lxhs/com.study.demo.git

ae8966569b2c484d28fb55109a156124b6e5afb2

c811b6ffca57a0914a2f2d84acebaa2b4130d497

https://github.com/apache/shardingsphere/compare/ae8966569b2c484d28fb55109a156124b6e5afb2...c811b6ffca57a0914a2f2d84acebaa2b4130d497

diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java index ea4e92a00b1..83d11abbf82 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java @@ -129,6 +129,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta @Override public ResultSet executeQuery() throws SQLException { + routedStatements.clear(); ResultSet result; try { Collection<PreparedStatementUnit> preparedStatementUnits = route(); @@ -150,6 +151,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta @Override public int executeUpdate() throws SQLException { + routedStatements.clear(); try { Collection<PreparedStatementUnit> preparedStatementUnits = route(); return new PreparedStatementExecutor( @@ -164,6 +166,7 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta @Override public boolean execute() throws SQLException { + routedStatements.clear(); try { Collection<PreparedStatementUnit> preparedStatementUnits = route(); return new PreparedStatementExecutor(

['sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/961/954

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/954

https://github.com/apache/shardingsphere/pull/961

https://github.com/apache/shardingsphere/pull/961

fixes

The tables with no configuration appear in the proxy.

The tables which are not configed in yaml can be used with show tables, select etc. It is not correct, i will fix it in next week.

6b4a4632b91b6e816b69264b7c3512a2aaa151b3

83be16ee4ba19fa2aed74e737578b7af4a1cbad4

https://github.com/apache/shardingsphere/compare/6b4a4632b91b6e816b69264b7c3512a2aaa151b3...83be16ee4ba19fa2aed74e737578b7af4a1cbad4

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java index 373a17bcf07..88836c3a5a3 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java @@ -31,6 +31,8 @@ import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePac import io.shardingsphere.proxy.transport.mysql.packet.command.text.query.ComQueryPacket; import lombok.extern.slf4j.Slf4j; +import java.sql.SQLException; + /** * COM_FIELD_LIST command packet. * @@ -47,6 +49,10 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa private final String fieldWildcard; + private SQLExecuteBackendHandler sqlExecuteBackendHandler; + + private SQLPacketsBackendHandler sqlPacketsBackendHandler; + public ComFieldListPacket(final int sequenceId, final int connectionId, final MySQLPacketPayload mysqlPacketPayload) { super(sequenceId); this.connectionId = connectionId; @@ -75,20 +81,34 @@ public final class ComFieldListPacket extends CommandPacket implements CommandPa String sql = String.format("SHOW COLUMNS FROM %s FROM %s", table, ShardingConstant.LOGIC_SCHEMA_NAME); // TODO use common database type if (RuleRegistry.getInstance().isWithoutJdbc()) { - return new SQLPacketsBackendHandler(this, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()).execute(); + sqlPacketsBackendHandler = new SQLPacketsBackendHandler(this, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()); + return sqlPacketsBackendHandler.execute(); } else { - return new SQLExecuteBackendHandler(sql, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()).execute(); + sqlExecuteBackendHandler = new SQLExecuteBackendHandler(sql, DatabaseType.MySQL, RuleRegistry.getInstance().isShowSQL()); + return sqlExecuteBackendHandler.execute(); } } @Override public boolean hasMoreResultValue() { - return false; + try { + if (RuleRegistry.getInstance().isWithoutJdbc()) { + return sqlPacketsBackendHandler.hasMoreResultValue(); + } else { + return sqlExecuteBackendHandler.hasMoreResultValue(); + } + } catch (final SQLException ex) { + return false; + } } @Override public DatabaseProtocolPacket getResultValue() { - return null; + if (RuleRegistry.getInstance().isWithoutJdbc()) { + return sqlPacketsBackendHandler.getResultValue(); + } else { + return sqlExecuteBackendHandler.getResultValue(); + } } @Override

['sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/564/559

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/559

https://github.com/apache/shardingsphere/pull/564

https://github.com/apache/shardingsphere/pull/564

fixes

Support parsing numbers beginning with minus and decimal (e.g. `-.12`)

**BUG** 当前最新分支上，io.shardingjdbc.core.parsing.lexer.Lexer中代码： ```java private boolean isNumberBegin() { return CharType.isDigital(getCurrentChar(0)) || ('.' == getCurrentChar(0) && CharType.isDigital(getCurrentChar(1)) && !isIdentifierBegin(getCurrentChar(-1)) || ('-' == getCurrentChar(0) && ('.' == getCurrentChar(0) || CharType.isDigital(getCurrentChar(1))))); } ``` 最后一个判断负数的逻辑，应该是 `('-' == getCurrentChar(0) && ('.' == getCurrentChar(1) || CharType.isDigital(getCurrentChar(1))))`，才能解析出 `-.12` 这种情况

d113495faa6d389875ea7e49098c3a249e183250

d2a84d5786f51d83c8a721daa493f75b577c90c3

https://github.com/apache/shardingsphere/compare/d113495faa6d389875ea7e49098c3a249e183250...d2a84d5786f51d83c8a721daa493f75b577c90c3

diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/lexer/Lexer.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/lexer/Lexer.java index 93c8e3e68fb..aaaac141f63 100755 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/lexer/Lexer.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/lexer/Lexer.java @@ -119,7 +119,7 @@ public class Lexer { private boolean isNumberBegin() { return CharType.isDigital(getCurrentChar(0)) || ('.' == getCurrentChar(0) && CharType.isDigital(getCurrentChar(1)) && !isIdentifierBegin(getCurrentChar(-1)) - || ('-' == getCurrentChar(0) && ('.' == getCurrentChar(0) || CharType.isDigital(getCurrentChar(1))))); + || ('-' == getCurrentChar(0) && ('.' == getCurrentChar(1) || CharType.isDigital(getCurrentChar(1))))); } private boolean isSymbolBegin() { diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/lexer/LexerTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/lexer/LexerTest.java index 708faf2381a..9bb1968c843 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/lexer/LexerTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/lexer/LexerTest.java @@ -74,6 +74,7 @@ public final class LexerTest { assertNextTokenForNumber("0x-1e", Literals.HEX); assertNextTokenForNumber("123", Literals.INT); assertNextTokenForNumber("-123", Literals.INT); + assertNextTokenForNumber("-.123", Literals.FLOAT); assertNextTokenForNumber("123.0", Literals.FLOAT); assertNextTokenForNumber("123e4", Literals.FLOAT); assertNextTokenForNumber("123E4", Literals.FLOAT);

['sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/lexer/LexerTest.java', 'sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/lexer/Lexer.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/960/954

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/954

https://github.com/apache/shardingsphere/pull/960

https://github.com/apache/shardingsphere/pull/960

fixes

The tables with no configuration appear in the proxy.

The tables which are not configed in yaml can be used with show tables, select etc. It is not correct, i will fix it in next week.

6b4a4632b91b6e816b69264b7c3512a2aaa151b3

1a103b4e87b651829049d6141b00ae037fe2bfca

https://github.com/apache/shardingsphere/compare/6b4a4632b91b6e816b69264b7c3512a2aaa151b3...1a103b4e87b651829049d6141b00ae037fe2bfca

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/merger/MergeEngineFactory.java b/sharding-core/src/main/java/io/shardingsphere/core/merger/MergeEngineFactory.java index 368247b6be0..6a06589465c 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/merger/MergeEngineFactory.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/merger/MergeEngineFactory.java @@ -19,6 +19,7 @@ package io.shardingsphere.core.merger; import io.shardingsphere.core.merger.dal.DALMergeEngine; import io.shardingsphere.core.merger.dql.DQLMergeEngine; +import io.shardingsphere.core.metadata.ShardingMetaData; import io.shardingsphere.core.parsing.parser.sql.SQLStatement; import io.shardingsphere.core.parsing.parser.sql.dal.DALStatement; import io.shardingsphere.core.parsing.parser.sql.dql.select.SelectStatement; @@ -33,6 +34,7 @@ import java.util.List; * Result merge engine factory. * * @author zhangliang + * @author panjuan */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class MergeEngineFactory { @@ -43,15 +45,17 @@ public final class MergeEngineFactory { * @param shardingRule sharding rule * @param queryResults query results * @param sqlStatement SQL statement + * @param shardingMetaData sharding meta Data * @return merge engine instance * @throws SQLException SQL exception */ - public static MergeEngine newInstance(final ShardingRule shardingRule, final List<QueryResult> queryResults, final SQLStatement sqlStatement) throws SQLException { + public static MergeEngine newInstance(final ShardingRule shardingRule, final List<QueryResult> queryResults, + final SQLStatement sqlStatement, final ShardingMetaData shardingMetaData) throws SQLException { if (sqlStatement instanceof SelectStatement) { return new DQLMergeEngine(queryResults, (SelectStatement) sqlStatement); } if (sqlStatement instanceof DALStatement) { - return new DALMergeEngine(shardingRule, queryResults, (DALStatement) sqlStatement); + return new DALMergeEngine(shardingRule, queryResults, (DALStatement) sqlStatement, shardingMetaData); } throw new UnsupportedOperationException(String.format("Cannot support type '%s'", sqlStatement.getType())); } diff --git a/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/DALMergeEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/DALMergeEngine.java index b8884613dfe..4f8104f227c 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/DALMergeEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/DALMergeEngine.java @@ -24,6 +24,7 @@ import io.shardingsphere.core.merger.dal.show.ShowCreateTableMergedResult; import io.shardingsphere.core.merger.dal.show.ShowDatabasesMergedResult; import io.shardingsphere.core.merger.dal.show.ShowOtherMergedResult; import io.shardingsphere.core.merger.dal.show.ShowTablesMergedResult; +import io.shardingsphere.core.metadata.ShardingMetaData; import io.shardingsphere.core.parsing.parser.dialect.mysql.statement.ShowCreateTableStatement; import io.shardingsphere.core.parsing.parser.dialect.mysql.statement.ShowDatabasesStatement; import io.shardingsphere.core.parsing.parser.dialect.mysql.statement.ShowTablesStatement; @@ -38,6 +39,7 @@ import java.util.List; * DAL result set merge engine. * * @author zhangliang + * @author panjuan */ @RequiredArgsConstructor public final class DALMergeEngine implements MergeEngine { @@ -48,13 +50,15 @@ public final class DALMergeEngine implements MergeEngine { private final DALStatement dalStatement; + private final ShardingMetaData shardingMetaData; + @Override public MergedResult merge() throws SQLException { if (dalStatement instanceof ShowDatabasesStatement) { return new ShowDatabasesMergedResult(); } if (dalStatement instanceof ShowTablesStatement) { - return new ShowTablesMergedResult(shardingRule, queryResults); + return new ShowTablesMergedResult(shardingRule, queryResults, shardingMetaData); } if (dalStatement instanceof ShowCreateTableStatement) { return new ShowCreateTableMergedResult(shardingRule, queryResults); diff --git a/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResult.java b/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResult.java index f49d373e053..4fa86199ee4 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResult.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResult.java @@ -22,6 +22,7 @@ import io.shardingsphere.core.constant.ShardingConstant; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.merger.dql.common.MemoryMergedResult; import io.shardingsphere.core.merger.dql.common.MemoryQueryResultRow; +import io.shardingsphere.core.metadata.ShardingMetaData; import io.shardingsphere.core.rule.ShardingRule; import io.shardingsphere.core.rule.TableRule; @@ -38,6 +39,7 @@ import java.util.Set; * Merged result for show tables. * * @author zhangliang + * @author panjuan */ public final class ShowTablesMergedResult extends MemoryMergedResult { @@ -49,13 +51,16 @@ public final class ShowTablesMergedResult extends MemoryMergedResult { private final Set<String> tableNames = new HashSet<>(); + private final ShardingMetaData shardingMetaData; + static { LABEL_AND_INDEX_MAP.put("Tables_in_" + ShardingConstant.LOGIC_SCHEMA_NAME, 1); } - public ShowTablesMergedResult(final ShardingRule shardingRule, final List<QueryResult> queryResults) throws SQLException { + public ShowTablesMergedResult(final ShardingRule shardingRule, final List<QueryResult> queryResults, final ShardingMetaData shardingMetaData) throws SQLException { super(LABEL_AND_INDEX_MAP); this.shardingRule = shardingRule; + this.shardingMetaData = shardingMetaData; memoryResultSetRows = init(queryResults); } @@ -67,7 +72,11 @@ public final class ShowTablesMergedResult extends MemoryMergedResult { String actualTableName = memoryResultSetRow.getCell(1).toString(); Optional<TableRule> tableRule = shardingRule.tryFindTableRuleByActualTable(actualTableName); if (!tableRule.isPresent()) { - result.add(memoryResultSetRow); + if (shardingMetaData.getTableMetaDataMap().keySet().contains(actualTableName)) { + result.add(memoryResultSetRow); + } else if (!shardingMetaData.isSupportedDatabaseType()) { + result.add(memoryResultSetRow); + } } else if (tableNames.add(tableRule.get().getLogicTable())) { memoryResultSetRow.setCell(1, tableRule.get().getLogicTable()); result.add(memoryResultSetRow); diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java index 5fbef7e72c4..13f20104f69 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java @@ -168,4 +168,18 @@ public abstract class ShardingMetaData { return String.format("Cannot get uniformed table structure for %s. The different metadata of actual tables is as follows:\\n%s\\n%s.", logicTableName, oldTableMetaData.toString(), newTableMetaData.toString()); } + + /** + * Judge whether this databaseType is supported. + * + * @return supported or not + */ + public boolean isSupportedDatabaseType() { + for (TableMetaData each : tableMetaDataMap.values()) { + if (each.getColumnMetaData().isEmpty()) { + return false; + } + } + return true; + } } diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/MergeEngineFactoryTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/MergeEngineFactoryTest.java index 24af722058d..40128c9ec21 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/MergeEngineFactoryTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/MergeEngineFactoryTest.java @@ -58,18 +58,18 @@ public final class MergeEngineFactoryTest { @Test public void assertNewInstanceWithSelectStatement() throws SQLException { SQLStatement selectStatement = new SelectStatement(); - assertThat(MergeEngineFactory.newInstance(null, queryResults, selectStatement), instanceOf(DQLMergeEngine.class)); + assertThat(MergeEngineFactory.newInstance(null, queryResults, selectStatement, null), instanceOf(DQLMergeEngine.class)); } @Test public void assertNewInstanceWithDALStatement() throws SQLException { SQLStatement dalStatement = new DALStatement(); - assertThat(MergeEngineFactory.newInstance(null, queryResults, dalStatement), instanceOf(DALMergeEngine.class)); + assertThat(MergeEngineFactory.newInstance(null, queryResults, dalStatement, null), instanceOf(DALMergeEngine.class)); } @Test(expected = UnsupportedOperationException.class) public void assertNewInstanceWithOtherStatement() throws SQLException { SQLStatement insertStatement = new InsertStatement(); - MergeEngineFactory.newInstance(null, queryResults, insertStatement); + MergeEngineFactory.newInstance(null, queryResults, insertStatement, null); } } diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/DALMergeEngineTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/DALMergeEngineTest.java index 9d870960ad0..99f312519cb 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/DALMergeEngineTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/DALMergeEngineTest.java @@ -53,28 +53,28 @@ public final class DALMergeEngineTest { @Test public void assertMergeForShowDatabasesStatement() throws SQLException { DALStatement dalStatement = new ShowDatabasesStatement(); - DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement); + DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement, null); assertThat(dalMergeEngine.merge(), instanceOf(ShowDatabasesMergedResult.class)); } @Test public void assertMergeForShowShowTablesStatement() throws SQLException { DALStatement dalStatement = new ShowTablesStatement(); - DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement); + DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement, null); assertThat(dalMergeEngine.merge(), instanceOf(ShowTablesMergedResult.class)); } @Test public void assertMergeForShowCreateTableStatement() throws SQLException { DALStatement dalStatement = new ShowCreateTableStatement(); - DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement); + DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement, null); assertThat(dalMergeEngine.merge(), instanceOf(ShowCreateTableMergedResult.class)); } @Test public void assertMergeForShowOtherStatement() throws SQLException { DALStatement dalStatement = new ShowOtherStatement(); - DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement); + DALMergeEngine dalMergeEngine = new DALMergeEngine(null, queryResults, dalStatement, null); assertThat(dalMergeEngine.merge(), instanceOf(ShowOtherMergedResult.class)); } } diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java index 0222ce7cadc..d90a12b6394 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java @@ -24,6 +24,8 @@ import io.shardingsphere.core.api.config.TableRuleConfiguration; import io.shardingsphere.core.api.config.strategy.ComplexShardingStrategyConfiguration; import io.shardingsphere.core.merger.QueryResult; import io.shardingsphere.core.merger.fixture.TestQueryResult; +import io.shardingsphere.core.metadata.ShardingMetaData; +import io.shardingsphere.core.metadata.TableMetaData; import io.shardingsphere.core.rule.ShardingRule; import org.junit.Before; import org.junit.Test; @@ -32,10 +34,12 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -47,6 +51,8 @@ public final class ShowTablesMergedResultTest { private ResultSet resultSet; + private ShardingMetaData shardingMetaData; + @Before public void setUp() throws SQLException { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); @@ -56,6 +62,11 @@ public final class ShowTablesMergedResultTest { ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfig); shardingRule = new ShardingRule(shardingRuleConfig, Lists.newArrayList("ds")); + shardingMetaData = mock(ShardingMetaData.class); + Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(); + tableMetaDataMap.put("table", new TableMetaData()); + when(shardingMetaData.getTableMetaDataMap()).thenReturn(tableMetaDataMap); +// when(shardingMetaData.getTableMetaDataMap().keySet()).thenReturn(new HashSet<String>(){{add("table");}}); resultSet = mock(ResultSet.class); ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); @@ -73,21 +84,21 @@ public final class ShowTablesMergedResultTest { @Test public void assertNextForEmptyQueryResult() throws SQLException { - ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, new ArrayList<QueryResult>()); + ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, new ArrayList<QueryResult>(), shardingMetaData); assertFalse(showTablesMergedResult.next()); } @Test public void assertNextForActualTableNameInTableRule() throws SQLException { when(resultSet.getObject(1)).thenReturn("table_0"); - ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, queryResults); + ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, queryResults, shardingMetaData); assertTrue(showTablesMergedResult.next()); } @Test public void assertNextForActualTableNameNotInTableRule() throws SQLException { when(resultSet.getObject(1)).thenReturn("table_3"); - ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, queryResults); + ShowTablesMergedResult showTablesMergedResult = new ShowTablesMergedResult(shardingRule, queryResults, shardingMetaData); assertTrue(showTablesMergedResult.next()); } } diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java index 9c102091c54..a2368fdde14 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java @@ -137,7 +137,8 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta for (ResultSet each : resultSets) { queryResults.add(new JDBCQueryResult(each)); } - MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, routeResult.getSqlStatement()); + MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), + queryResults, routeResult.getSqlStatement(), connection.getShardingContext().getShardingMetaData()); result = new ShardingResultSet(resultSets, merge(mergeEngine), this); } finally { clearBatch(); @@ -305,7 +306,8 @@ public final class ShardingPreparedStatement extends AbstractShardingPreparedSta queryResults.add(new JDBCQueryResult(resultSet)); } if (routeResult.getSqlStatement() instanceof SelectStatement || routeResult.getSqlStatement() instanceof DALStatement) { - MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, routeResult.getSqlStatement()); + MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, + routeResult.getSqlStatement(), connection.getShardingContext().getShardingMetaData()); currentResultSet = new ShardingResultSet(resultSets, merge(mergeEngine), this); } return currentResultSet; diff --git a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java index d7f69f24fa3..f1ef5aa97e7 100644 --- a/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java +++ b/sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java @@ -110,7 +110,8 @@ public class ShardingStatement extends AbstractStatementAdapter { for (ResultSet each : resultSets) { queryResults.add(new JDBCQueryResult(each)); } - MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, routeResult.getSqlStatement()); + MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, + routeResult.getSqlStatement(), connection.getShardingContext().getShardingMetaData()); result = new ShardingResultSet(resultSets, merge(mergeEngine), this); } finally { currentResultSet = null; @@ -283,7 +284,8 @@ public class ShardingStatement extends AbstractStatementAdapter { queryResults.add(new JDBCQueryResult(resultSet)); } if (routeResult.getSqlStatement() instanceof SelectStatement || routeResult.getSqlStatement() instanceof DALStatement) { - MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, routeResult.getSqlStatement()); + MergeEngine mergeEngine = MergeEngineFactory.newInstance(connection.getShardingContext().getShardingRule(), queryResults, + routeResult.getSqlStatement(), connection.getShardingContext().getShardingMetaData()); currentResultSet = new ShardingResultSet(resultSets, merge(mergeEngine), this); } return currentResultSet; diff --git a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/MergeEventListenerTest.java b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/MergeEventListenerTest.java index 02feaa7d813..44fa16c821b 100644 --- a/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/MergeEventListenerTest.java +++ b/sharding-opentracing/src/test/java/io/shardingsphere/opentracing/MergeEventListenerTest.java @@ -82,7 +82,7 @@ public final class MergeEventListenerTest { dataSourceMap.put("ds_1", null); ShardingRule shardingRule = new ShardingRule(shardingRuleConfig, dataSourceMap.keySet()); shardingContext = new ShardingContext(dataSourceMap, shardingRule, DatabaseType.MySQL, null, null, true); - mergeEngine = new DALMergeEngine(null, null, new ShowDatabasesStatement()); + mergeEngine = new DALMergeEngine(null, null, new ShowDatabasesStatement(), null); } @Test @@ -107,7 +107,7 @@ public final class MergeEventListenerTest { @Test public void assertException() { try { - MergeEngine errorMergeEngine = new DALMergeEngine(null, null, new ShowColumnsStatement()); + MergeEngine errorMergeEngine = new DALMergeEngine(null, null, new ShowColumnsStatement(), null); ShardingStatement statement = new ShardingStatement(new ShardingConnection(shardingContext)); Method mergeMethod = ShardingStatement.class.getDeclaredMethod("merge", MergeEngine.class); mergeMethod.setAccessible(true); diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java index 234ed51c4d8..5dd2b8f99fe 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java @@ -17,17 +17,6 @@ package io.shardingsphere.proxy.backend.common; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.constant.SQLType; import io.shardingsphere.core.exception.ShardingException; @@ -55,6 +44,17 @@ import io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket; import lombok.Getter; import lombok.Setter; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; + /** * SQL execute backend handler. * @@ -198,7 +198,8 @@ public final class SQLExecuteBackendHandler implements BackendHandler { queryResults.add(mySQLPacketQueryResult); } try { - mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, sqlStatement).merge(); + mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, + sqlStatement, RuleRegistry.getInstance().getShardingMetaData()).merge(); isMerged = true; } catch (final SQLException ex) { return new CommandResponsePackets(new ErrPacket(1, ex.getErrorCode(), "", ex.getSQLState(), ex.getMessage())); diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java index 3b02783cde4..55e509112e9 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java @@ -17,16 +17,7 @@ package io.shardingsphere.proxy.backend.common; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import com.google.common.collect.Lists; - import io.netty.channel.Channel; import io.netty.channel.pool.SimpleChannelPool; import io.shardingsphere.core.constant.DatabaseType; @@ -57,11 +48,20 @@ import io.shardingsphere.proxy.util.MySQLResultCache; import io.shardingsphere.proxy.util.SynchronizedFuture; import lombok.extern.slf4j.Slf4j; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + /** * SQL packets backend handler. * * @author wangkai * @author linjiaqi + * @author panjuan */ @Slf4j public final class SQLPacketsBackendHandler implements BackendHandler { @@ -208,7 +208,8 @@ public final class SQLPacketsBackendHandler implements BackendHandler { private CommandResponsePackets mergeDQLorDAL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets, final List<QueryResult> queryResults) { try { - mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, sqlStatement).merge(); + mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, + sqlStatement, RuleRegistry.getInstance().getShardingMetaData()).merge(); isMerged = true; } catch (final SQLException ex) { return new CommandResponsePackets(new ErrPacket(1, ex.getErrorCode(), "", ex.getSQLState(), ex.getMessage())); diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java index 50a26c818e6..e1468ce99a7 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java @@ -62,6 +62,7 @@ import java.util.concurrent.Future; * Statement execute backend handler. * * @author zhangyonglun + * @author panjuan */ @Getter @Setter @@ -214,7 +215,8 @@ public final class StatementExecuteBackendHandler implements BackendHandler { queryResults.add(mySQLPacketStatementExecuteQueryResult); } try { - mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, sqlStatement).merge(); + mergedResult = MergeEngineFactory.newInstance(RuleRegistry.getInstance().getShardingRule(), queryResults, + sqlStatement, RuleRegistry.getInstance().getShardingMetaData()).merge(); isMerged = true; } catch (final SQLException ex) { return new CommandResponsePackets(new ErrPacket(1, ex.getErrorCode(), "", ex.getSQLState(), ex.getMessage()));

['sharding-core/src/main/java/io/shardingsphere/core/merger/dal/DALMergeEngine.java', 'sharding-core/src/test/java/io/shardingsphere/core/merger/dal/DALMergeEngineTest.java', 'sharding-opentracing/src/test/java/io/shardingsphere/opentracing/MergeEventListenerTest.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java', 'sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingStatement.java', 'sharding-core/src/main/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResult.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java', 'sharding-core/src/test/java/io/shardingsphere/core/merger/dal/show/ShowTablesMergedResultTest.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/ShardingMetaData.java', 'sharding-core/src/test/java/io/shardingsphere/core/merger/MergeEngineFactoryTest.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteBackendHandler.java', 'sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/core/statement/ShardingPreparedStatement.java', 'sharding-core/src/main/java/io/shardingsphere/core/merger/MergeEngineFactory.java']

{'.java': 13}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/863/858

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/858

https://github.com/apache/shardingsphere/pull/863

https://github.com/apache/shardingsphere/pull/863

fixes

sharding-proxy测试问题（中文乱码，应用死锁等）

Please answer these questions before submitting your issue. Thanks! 开源不易，我们希望将精力放在完成新功能和解决有价值的问题上，为了让大家的配合更具有效率，请填写以下列出的全部问题 ### Which version of Sharding-Sphere do you using?（您使用的Sharding-Sphere版本为？） windows 10 mysql5.5 sharding-proxy-3.0.0.M1 ### Expected behavior （您预期的结果是） 1、中文正常 2、能马上返回错误 3、shardingColumn大小写忽略 ### Actual behavior （实际运行的结果是） 1、中文乱码 2、应用死锁 3、shardingColumn需大小写一致 ### Steps to reproduce the behavior （可重现问题的操作步骤） 1、springboot配置了sharding-proxy的数据源，如下： spring.datasource.slave2.driver-class-name=com.mysql.jdbc.Driver spring.datasource.slave2.url=jdbc:mysql://127.0.0.1:3307/sharding_db?characterEncoding=utf8 spring.datasource.slave2.username=root spring.datasource.slave2.password=sa 在insert时，中文为乱码。（不用sharding-proxy正常） 不知道还需要在哪里配置？ 2、insert插入时shardingColumn在config.yaml中无法获取到dataSources，应用死锁。 3、shardingColumn需要严格大小写一致，实际上有些数据库是不区分大小写。 ### Please provide the reproduce example codes (such as github link)，otherwise we will label the issue as Invalid and close it.（为了节省复现问题的时间，请务必提供可重现的代码，否则我们会将issue直接标记为invalid并关闭） Code should based on https://github.com/sharding-sphere/sharding-sphere-example （代码请基于 https://github.com/sharding-sphere/sharding-sphere-example）

fced903fce40658b21237dad6e0ae82ed73e7430

d7464a4458805d782e1b80b917bf46008b91fb22

https://github.com/apache/shardingsphere/compare/fced903fce40658b21237dad6e0ae82ed73e7430...d7464a4458805d782e1b80b917bf46008b91fb22

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java index ade62d7cc16..8096c64f002 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java @@ -106,7 +106,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { return executeForSharding(); } } catch (final Exception ex) { - return new CommandResponsePackets(new ErrPacket(1, 0, "", "", ex.getMessage())); + return new CommandResponsePackets(new ErrPacket(1, 0, "", "", "" + ex.getMessage())); } }

['sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/756/750

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/750

https://github.com/apache/shardingsphere/pull/756

https://github.com/apache/shardingsphere/pull/756

fixes

Proxy raised an out of bound exception

Please answer these questions before submitting your issue. Thanks! 开源不易，我们希望将精力放在完成新功能和解决有价值的问题上，为了让大家的配合更具有效率，请填写以下列出的全部问题 ### Which version of Sharding-Jdbc do you using?（您使用的Sharding-Jdbc版本为？） dev ### Expected behavior （您预期的结果是） Read data correctly from the ByteBuf of sharding-proxy. ### Actual behavior （实际运行的结果是） [WARN ] 17:20:14.713 [nioEventLoopGroup-5-3] i.n.u.c.AbstractEventExecutor - A task raised an exception. Task: io.shardingjdbc.proxy.frontend.mysql.MySQLFrontendHandler$1@10d19d69 java.lang.IndexOutOfBoundsException: readerIndex(1040) + length(1) exceeds writerIndex(17): PooledUnsafeDirectByteBuf(ridx: 0, widx: 17, cap: 2048) at io.netty.buffer.AbstractByteBuf.checkReadableBytes0(AbstractByteBuf.java:1401) ~[netty-buffer-4.1.16.Final.jar:4.1.16.Final] at io.netty.buffer.AbstractByteBuf.readByte(AbstractByteBuf.java:707) ~[netty-buffer-4.1.16.Final.jar:4.1.16.Final] at io.shardingjdbc.proxy.transport.mysql.packet.MySQLPacketPayload.readInt1(MySQLPacketPayload.java:51) ~[classes/:na] at io.shardingjdbc.proxy.frontend.mysql.MySQLFrontendHandler$1.run(MySQLFrontendHandler.java:69) ~[classes/:na] at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:163) ~[netty-common-4.1.16.Final.jar:4.1.16.Final] at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:403) [netty-common-4.1.16.Final.jar:4.1.16.Final] at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:463) [netty-transport-4.1.16.Final.jar:4.1.16.Final] at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:858) [netty-common-4.1.16.Final.jar:4.1.16.Final] at io.netty.util.concurrent.DefaultThreadFactory$DefaultRunnableDecorator.run(DefaultThreadFactory.java:138) [netty-common-4.1.16.Final.jar:4.1.16.Final] at java.lang.Thread.run(Thread.java:748) [na:1.8.0_162] ### Steps to reproduce the behavior （可重现问题的操作步骤） This Exception bust randomly, but not difficult to be reproduced by continuously send message to sharding-proxy for not a very long time. ### Please provide the reproduce example codes (such as github link)，otherwise we will label the issue as Invalid and close it.（为了节省复现问题的时间，请务必提供可重现的代码，否则我们会将issue直接标记为invalid并关闭） https://github.com/shardingjdbc/sharding-proxy-example Code should based on https://github.com/shardingjdbc/sharding-jdbc-example （代码请基于 https://github.com/shardingjdbc/sharding-jdbc-example）

11f147fc98d1b47154de46127e26acf37f2566f0

f2434d32400826483f11f985fe072c1e583c93d2

https://github.com/apache/shardingsphere/compare/11f147fc98d1b47154de46127e26acf37f2566f0...f2434d32400826483f11f985fe072c1e583c93d2

diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java index f146fbeb129..1bbbc95a67b 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java @@ -58,6 +58,8 @@ import java.util.List; */ public final class SQLExecuteBackendHandler implements BackendHandler { + private static final Integer FETCH_ONE_ROW_A_TIME = Integer.MIN_VALUE; + private final String sql; private final StatementRoutingEngine routingEngine; @@ -116,7 +118,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { Connection connection = dataSource.getConnection(); connections.add(connection); Statement statement = connection.createStatement(); - statement.setFetchSize(Integer.MIN_VALUE); + statement.setFetchSize(FETCH_ONE_ROW_A_TIME); resultSets.add(statement.executeQuery(sql)); return getQueryDatabaseProtocolPackets(); } catch (final SQLException ex) { @@ -226,7 +228,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { return mergeDML(headPackets); } if (SQLType.DQL == sqlStatement.getType()) { - return mergeDQLorDAL(sqlStatement, packets); + return mergeDQL(sqlStatement, packets); } return packets.get(0); } @@ -242,7 +244,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { return new CommandResponsePackets(new OKPacket(1, affectedRows, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, "")); } - private CommandResponsePackets mergeDQLorDAL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) { + private CommandResponsePackets mergeDQL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) { List<QueryResult> queryResults = new ArrayList<>(packets.size()); for (int i = 0; i < packets.size(); i++) { // TODO replace to a common PacketQueryResult diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java index a98defd416d..80fb98fe5be 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java @@ -61,6 +61,8 @@ import java.util.List; */ public final class StatementExecuteBackendHandler implements BackendHandler { + private static final Integer FETCH_ONE_ROW_A_TIME = Integer.MIN_VALUE; + private final List<PreparedStatementParameter> preparedStatementParameters; private final PreparedStatementRoutingEngine routingEngine; @@ -137,7 +139,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { Connection connection = dataSource.getConnection(); connections.add(connection); PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setFetchSize(Integer.MIN_VALUE); + preparedStatement.setFetchSize(FETCH_ONE_ROW_A_TIME); setJDBCPreparedStatementParameters(preparedStatement); resultSets.add(preparedStatement.executeQuery()); return getQueryDatabaseProtocolPackets(); @@ -264,7 +266,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { return mergeDML(headPackets); } if (SQLType.DQL == sqlStatement.getType()) { - return mergeDQLorDAL(sqlStatement, packets); + return mergeDQL(sqlStatement, packets); } return packets.get(0); } @@ -280,7 +282,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { return new CommandResponsePackets(new OKPacket(1, affectedRows, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue(), 0, "")); } - private CommandResponsePackets mergeDQLorDAL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) { + private CommandResponsePackets mergeDQL(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets) { List<QueryResult> queryResults = new ArrayList<>(packets.size()); for (int i = 0; i < packets.size(); i++) { // TODO replace to a common PacketQueryResult diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java index 7ef4c7f95b2..27b73ecf622 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java @@ -45,11 +45,7 @@ public final class MySQLPacketCodec extends PacketCodec<MySQLPacket> { in.resetReaderIndex(); return; } - if (readableBytes > realPacketLength) { - out.add(in.readRetainedSlice(payloadLength + MySQLPacket.SEQUENCE_LENGTH)); - return; - } - out.add(in); + out.add(in.readRetainedSlice(payloadLength + MySQLPacket.SEQUENCE_LENGTH)); } @Override

['sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java', 'sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java', 'sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/codec/MySQLPacketCodec.java']

{'.java': 3}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/649/648

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/648

https://github.com/apache/shardingsphere/pull/649

https://github.com/apache/shardingsphere/pull/649

fixes

SelectItem should be annotated by EqualsAndHashCode

I found that there are several subclasses implement `SelectItem`. They are used as container elements in `Set` collection(io.shardingjdbc.core.parsing.parser.sql.dql.select.SelectStatement#items), but I only see the `AggregationSelectItem` has `EqualsAndHashCode` annotation. the others are forgotten?

cb17dc3e406c2d2a7b8d83f2b825a625031e5eb0

4ae5879be1359a452b77b2cacb70b43486e4b148

https://github.com/apache/shardingsphere/compare/cb17dc3e406c2d2a7b8d83f2b825a625031e5eb0...4ae5879be1359a452b77b2cacb70b43486e4b148

diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/CommonSelectItem.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/CommonSelectItem.java index 0014848d29c..aafe561f10c 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/CommonSelectItem.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/CommonSelectItem.java @@ -18,6 +18,7 @@ package io.shardingjdbc.core.parsing.parser.context.selectitem; import com.google.common.base.Optional; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; @@ -29,6 +30,7 @@ import lombok.ToString; */ @RequiredArgsConstructor @Getter +@EqualsAndHashCode @ToString public final class CommonSelectItem implements SelectItem { diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/StarSelectItem.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/StarSelectItem.java index 21ddd52e409..629b6df34a7 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/StarSelectItem.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/StarSelectItem.java @@ -19,6 +19,7 @@ package io.shardingjdbc.core.parsing.parser.context.selectitem; import io.shardingjdbc.core.parsing.lexer.token.Symbol; import com.google.common.base.Optional; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; @@ -30,6 +31,7 @@ import lombok.ToString; */ @RequiredArgsConstructor @Getter +@EqualsAndHashCode @ToString public final class StarSelectItem implements SelectItem {

['sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/StarSelectItem.java', 'sharding-jdbc-core/src/main/java/io/shardingjdbc/core/parsing/parser/context/selectitem/CommonSelectItem.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/583/577

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/577

https://github.com/apache/shardingsphere/pull/583

https://github.com/apache/shardingsphere/pull/583

fixes

Support new line for YAML configuration

Please answer these questions before submitting your issue. Thanks! 获取数据源换行 String dataSources = propertyResolver.getProperty("names"); 建议 OrchestrationSpringBootConfiguration文件 line77 String dataSources = propertyResolver.getProperty("names"); 加一个去空格处理 改为 String dataSources = propertyResolver.getProperty("names").trim(); ### Which version of Sharding-Jdbc do you using? ### Expected behavior ### Actual behavior ### Steps to reproduce the behavior ### Please provide the reproduce example codes (such as github link) Code should based on https://github.com/shardingjdbc/sharding-jdbc-example

35521a2da3cb5242891ef0d0d5ecbec154845330

4c0b501c46680be8727a007f0df960cced52bb2a

https://github.com/apache/shardingsphere/compare/35521a2da3cb5242891ef0d0d5ecbec154845330...4c0b501c46680be8727a007f0df960cced52bb2a

diff --git a/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java b/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java index c275da9b59b..1b598f8b581 100644 --- a/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java +++ b/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; +import org.springframework.util.StringUtils; import javax.sql.DataSource; import java.sql.SQLException; @@ -75,15 +76,17 @@ public class OrchestrationSpringBootConfiguration implements EnvironmentAware { private void setDataSourceMap(final Environment environment) { RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "sharding.jdbc.datasource."); String dataSources = propertyResolver.getProperty("names"); + Preconditions.checkState(!StringUtils.isEmpty(dataSources), "Wrong datasource properties, empty datasource !"); + dataSources = dataSources.trim(); for (String each : dataSources.split(",")) { - try { - Map<String, Object> dataSourceProps = propertyResolver.getSubProperties(each + "."); - Preconditions.checkState(!dataSourceProps.isEmpty(), "Wrong datasource properties!"); - DataSource dataSource = DataSourceUtil.getDataSource(dataSourceProps.get("type").toString(), dataSourceProps); - dataSourceMap.put(each, dataSource); - } catch (final ReflectiveOperationException ex) { - throw new ShardingJdbcException("Can't find datasource type!", ex); - } + try { + Map<String, Object> dataSourceProps = propertyResolver.getSubProperties(each + "."); + Preconditions.checkState(!dataSourceProps.isEmpty(), String.format("Wrong datasource [%s] properties!", each)); + DataSource dataSource = DataSourceUtil.getDataSource(dataSourceProps.get("type").toString(), dataSourceProps); + dataSourceMap.put(each, dataSource); + } catch (final ReflectiveOperationException ex) { + throw new ShardingJdbcException("Can't find datasource type!", ex); + } } } }

['sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1613/1603

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1603

https://github.com/apache/shardingsphere/pull/1613

https://github.com/apache/shardingsphere/pull/1613

fixes

After the integration of mybatis, mybatis Mapper is loop dead

## Bug Report **As a result, after integration with mybatis, some special operations lead to an endless cycle of mybatis** ### Which version of Sharding-Sphere did you use? ```xml <dependency> <groupId>io.shardingsphere</groupId> <artifactId>sharding-jdbc-spring-boot-starter</artifactId> <version>3.0.0</version> </dependency> ``` ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC ### Expected behavior **It doesn't create an infinite loop** ``` DEBUG org.mapper.UserRoleMapper.insertBySelect2 - ==> Preparing: INSERT INTO `user_role`(`username`, `role_name`) VALUES (?, ?) INFO Sharding-Sphere-SQL - Rule Type: master-slave INFO Sharding-Sphere-SQL - SQL: INSERT INTO `user_role`(`username`, `role_name`) VALUES (?, ?) ::: DataSources: write DEBUG org.mapper.UserRoleMapper.insertBySelect2 - ==> Parameters: write(String), write(String) DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 ...... The database operation completes printing other business logs ``` ### Actual behavior ``` DEBUG org.mapper.UserRoleMapper.insertBySelect2 - ==> Preparing: INSERT INTO `user_role`(`username`, `role_name`) VALUES (?, ?) INFO Sharding-Sphere-SQL - Rule Type: master-slave INFO Sharding-Sphere-SQL - SQL: INSERT INTO `user_role`(`username`, `role_name`) VALUES (?, ?) ::: DataSources: write DEBUG org.mapper.UserRoleMapper.insertBySelect2 - ==> Parameters: write(String), write(String) DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 DEBUG org.mapper.UserRoleMapper.insertBySelect2 - <== Updates: 1 ......Loop printing ``` ### Reason analyze (If you can) `java.sql.Statement#getMoreResults()`The interface returns false as specified below： ```java // io.shardingsphere.shardingjdbc.jdbc.adapter.AbstractStatementAdapter @Override public final boolean getMoreResults() { return false; } @Override public final boolean getMoreResults(final int current) { return false; } ``` **As a result, after integration with mybatis, some special operations cause mybatis to generate a dead loop. The position of the dead loop of mybatis code is as follows through debugging:** ```java // org.apache.ibatis.executor.resultset.DefaultResultSetHandler.java private ResultSetWrapper getFirstResultSet(Statement stmt) throws SQLException { ResultSet rs = stmt.getResultSet(); while (rs == null) { // move forward to get the first resultset in case the driver // doesn't return the resultset as the first result (HSQLDB 2.1) if (stmt.getMoreResults()) { rs = stmt.getResultSet(); } else { // Note: using sharding- JDBC, stmt.getupdatecount () is always greater than 1 (resulting in an infinite loop), // But using mysql's native driver returns -1 if (stmt.getUpdateCount() == -1) { // no more results. Must be no resultset break; } } } return rs != null ? new ResultSetWrapper(rs, configuration) : null; } ``` Use mybatis to reproduce the code： ```java @Repository @Mapper public interface UserRoleMapper extends BaseMapper<UserRole> { // Define update database statements in @select @Select("INSERT INTO `user_role`(`username`, `role_name`) VALUES (#{userRole.username}, #{userRole.roleName})") Integer insertBySelect(@Param("userRole") UserRole userRole); } ``` **My current solution** ``` java // Modify the io.shardingsphere.shardingjdbc.jdbc.core.statement.MasterSlavePreparedStatement @Override public final boolean getMoreResults() { return routedStatements.iterator().next().getMoreResults(); } ``` **After the test is modified in this way, online problems can be solved, but I do not know whether it will bring about other problems. I hope the official support (online is in use urgently).**

542720553f1bf604ba1133c8823373635b73000a

a24e6940bc8deb93667004987f55857f347692b4

https://github.com/apache/shardingsphere/compare/542720553f1bf604ba1133c8823373635b73000a...a24e6940bc8deb93667004987f55857f347692b4

diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java index 246ea05edf2..ba72069b3c6 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java @@ -32,6 +32,7 @@ import java.util.Collection; * * @author zhangliang * @author gaohongtao + * @author yangyi */ @RequiredArgsConstructor public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperationStatement { @@ -158,8 +159,12 @@ public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperat } @Override - public final boolean getMoreResults() { - return false; + public final boolean getMoreResults() throws SQLException { + boolean result = false; + for (Statement each : getRoutedStatements()) { + result = each.getMoreResults(); + } + return result; } @Override

['sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractStatementAdapter.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1666/1658

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1658

https://github.com/apache/shardingsphere/pull/1666

https://github.com/apache/shardingsphere/pull/1666

fixes

SS 3.1.0.M1 count sql throw an error,3.1.0 works well

## Bug Report **For English only**, other languages will not accept. With the Configration #1653 The sql throw an exception with 3.1.0.M1 and works well with 3.0.0 ```sql SELECT COUNT(1) FROM ( SELECT r.`channel` as `channel_code`, r.`channel_name` as `channel_name`, COUNT(r.id) `total_cnt`, COUNT(r.connect_flag = "Y") `connected_cnt` FROM record_callin r LEFT JOIN sys_org_tree_rel tree ON tree.teamid = r.teamid LEFT JOIN sys_user u ON u.brokerid = r.brokerid where r.create_time >= '2018-01-01 00:00:00' and r.create_time <= '2019-01-01 00:00:00' GROUP BY r.`channel` ) TOTAL ``` this throws an error: ``` Caused by: java.lang.IllegalStateException: DQL must have sharding column with subquery. at com.google.common.base.Preconditions.checkState(Preconditions.java:444) ~[guava-20.0.jar:na] at io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter.checkAndMergeShardingValue(ParsingSQLRouter.java:157) ~[sharding-core-3.1.0.M1.jar:na] at io.shardingsphere.core.routing.router.sharding.ParsingSQLRouter.route(ParsingSQLRouter.java:127) ~[sharding-core-3.1.0.M1.jar:na] at io.shardingsphere.core.routing.PreparedStatementRoutingEngine.route(PreparedStatementRoutingEngine.java:66) ~[sharding-core-3.1.0.M1.jar:na] at io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingPreparedStatement.sqlRoute(ShardingPreparedStatement.java:241) ~[sharding-jdbc-core-3.1.0.M1.jar:na] at io.shardingsphere.shardingjdbc.jdbc.core.statement.ShardingPreparedStatement.executeQuery(ShardingPreparedStatement.java:111) ~[sharding-jdbc-core-3.1.0.M1.jar:na] at com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor.queryTotal(PaginationInterceptor.java:207) ~[mybatis-plus-extension-3.0.6.jar:3.0.6] ... 116 common frames omitted ``` #1653 reason is I used single quote mark with column alias but this issue reason is different

c6acdfeee0bc069b032836931008a24b26460143

b8df689e73bf6c187bd8c90515184ff158fc815a

https://github.com/apache/shardingsphere/compare/c6acdfeee0bc069b032836931008a24b26460143...b8df689e73bf6c187bd8c90515184ff158fc815a

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java b/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java index 56034c9f339..c6fe888490b 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java @@ -149,6 +149,9 @@ public final class ParsingSQLRouter implements ShardingRouter { if (selectStatement.getSubQueryStatements().isEmpty()) { return; } + if (selectStatement.getTables().isEmpty()) { + return; + } for (AndCondition each : sqlStatement.getConditions().getOrCondition().getAndConditions()) { for (Condition eachCondition : each.getConditions()) { Preconditions.checkState(ShardingOperator.EQUAL == eachCondition.getOperator(), "DQL only support '=' with subquery."); diff --git a/sharding-core/src/test/java/io/shardingsphere/core/routing/type/standard/StandardRoutingEngineForSubQueryTest.java b/sharding-core/src/test/java/io/shardingsphere/core/routing/type/standard/StandardRoutingEngineForSubQueryTest.java index 1f15d291453..d7cb21b876a 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/routing/type/standard/StandardRoutingEngineForSubQueryTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/routing/type/standard/StandardRoutingEngineForSubQueryTest.java @@ -67,6 +67,15 @@ public final class StandardRoutingEngineForSubQueryTest { assertSubquery(sql, parameters); } + @Test + public void assertUnshardingTalbe() { + String sql = "select (select max(id) from t_user b where b.id = ?) from t_user a where id = ? "; + List<Object> parameters = new LinkedList<>(); + parameters.add(1); + parameters.add(1); + assertSubquery(sql, parameters); + } + public void assertSubquery(final String sql, final List<Object> parameters) { ShardingRule shardingRule = createShardingRule(); ShardingTableMetaData shardingTableMetaData = buildShardingTableMetaData();

['sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java', 'sharding-core/src/test/java/io/shardingsphere/core/routing/type/standard/StandardRoutingEngineForSubQueryTest.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/2210/2193

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/2193

https://github.com/apache/shardingsphere/pull/2210

https://github.com/apache/shardingsphere/pull/2210

fix

Table doesn't exist when sharding value in different datasource with in expression

## Table doesn't exist when sharding value in different data source with in expression ### Which version of ShardingSphere did you use? 4.0.0-RC1 ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC ### Expected behavior 21:31:45.941 [main] INFO ShardingSphere-SQL - Actual SQL: ds_0 ::: select * from ts_order_0001 where id = 1 or id = 3 21:31:45.941 [main] INFO ShardingSphere-SQL - Actual SQL: ds_1 ::: select * from ts_order_0003 where id = 1 or id = 3 ### Actual behavior 21:08:30.000 [main] INFO ShardingSphere-SQL - Actual SQL: ds_0 ::: select * from ts_order_0001 where id in (1, 3) 21:08:30.000 [main] INFO ShardingSphere-SQL - Actual SQL: ds_0 ::: select * from ts_order_0003 where id in (1, 3) 21:08:30.000 [main] INFO ShardingSphere-SQL - Actual SQL: ds_1 ::: select * from ts_order_0001 where id in (1, 3) 21:08:30.000 [main] INFO ShardingSphere-SQL - Actual SQL: ds_1 ::: select * from ts_order_0003 where id in (1, 3) Exception in thread "main" com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Table 'test_d_0.ts_order_0003' doesn't exist ### Reason analyze (If you can) ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. dependency ```xml <dependency> <groupId>com.alibaba</groupId> <artifactId>druid</artifactId> <version>1.0.9</version> </dependency> <dependency> <groupId>org.apache.shardingsphere</groupId> <artifactId>sharding-jdbc-core</artifactId> <version>4.0.0-RC1</version> </dependency> ``` sql ```sql create database test_d_0; create database test_d_1; CREATE TABLE test_d_0.`ts_order_0000` (`id` BIGINT NOT NULL AUTO_INCREMENT,PRIMARY KEY (`id`)); CREATE TABLE test_d_0.`ts_order_0001` (`id` BIGINT NOT NULL AUTO_INCREMENT,PRIMARY KEY (`id`)); CREATE TABLE test_d_1.`ts_order_0002` (`id` BIGINT NOT NULL AUTO_INCREMENT,PRIMARY KEY (`id`)); CREATE TABLE test_d_1.`ts_order_0003` (`id` BIGINT NOT NULL AUTO_INCREMENT,PRIMARY KEY (`id`)); ``` Java Code ```java BufferedReader reader = new BufferedReader(new InputStreamReader(ShardingDataSourceTest.class .getResourceAsStream("/sharding-config-example-1.yaml"), "utf-8")); StringBuffer sb = new StringBuffer(); CharBuffer charBuffer = CharBuffer.allocate(32); for (int count = reader.read(charBuffer); count > 0; count = reader.read(charBuffer)) { sb.append(charBuffer.flip()); } DataSource dataSource = YamlShardingDataSourceFactory.createDataSource(sb.toString().getBytes("utf-8")); Connection connection = dataSource.getConnection(); Statement st = connection.createStatement(); ResultSet rs = st.executeQuery("select * from ts_order where id in (1, 3)"); ``` sharding rule sharding-config-example-1.yaml ```yaml dataSources: ds_0: !!com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/test_d_0 username: root password: root135 ds_1: !!com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/test_d_1 username: root password: root135 shardingRule: tables: ts_order: actualDataNodes: ds_0.ts_order_0000,ds_0.ts_order_0001,ds_1.ts_order_0002,ds_1.ts_order_0003 databaseStrategy: inline: shardingColumn: id algorithmExpression: ds_${new BigDecimal(id).abs().divideAndRemainder(4)[1].longValue().intdiv(2)} tableStrategy: inline: shardingColumn: id algorithmExpression: ts_order_${String.format("%04d",new BigDecimal(id).abs().divideAndRemainder(4)[1].longValue())} props: sql.show: true ``` ### Example codes for reproduce this issue (such as a github link).

2069f0867b0c159d762616bb7f7b22ca75295b86

518987aeda09840157d996d71c72ee3daceb6726

https://github.com/apache/shardingsphere/compare/2069f0867b0c159d762616bb7f7b22ca75295b86...518987aeda09840157d996d71c72ee3daceb6726

diff --git a/sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngine.java b/sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngine.java index 22091dd7b5b..a182840ba4b 100644 --- a/sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngine.java +++ b/sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngine.java @@ -42,9 +42,11 @@ import org.apache.shardingsphere.core.strategy.route.value.RouteValue; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Set; /** * Standard routing engine. @@ -180,7 +182,7 @@ public final class StandardRoutingEngine implements RoutingEngine { for (String each : routedDataSources) { result.addAll(routeTables(tableRule, each, tableShardingValues)); } - return result; + return removeNonExistNodes(result, tableRule); } private Collection<String> routeDataSources(final TableRule tableRule, final List<RouteValue> databaseShardingValues) { @@ -205,6 +207,17 @@ public final class StandardRoutingEngine implements RoutingEngine { return result; } + private Collection<DataNode> removeNonExistNodes(final Collection<DataNode> routedDataNodes, final TableRule tableRule) { + Collection<DataNode> result = new LinkedList<>(); + Set<DataNode> actualDataNodeSet = new HashSet<>(tableRule.getActualDataNodes()); + for (DataNode each : routedDataNodes) { + if (actualDataNodeSet.contains(each)) { + result.add(each); + } + } + return result; + } + private void reviseInsertOptimizeResult(final ShardingCondition shardingCondition, final Collection<DataNode> dataNodes) { if (sqlStatement instanceof InsertStatement) { for (InsertOptimizeResultUnit each : optimizeResult.getInsertOptimizeResult().get().getUnits()) {

['sharding-core/sharding-core-route/src/main/java/org/apache/shardingsphere/core/route/type/standard/StandardRoutingEngine.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1279/1265

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1265

https://github.com/apache/shardingsphere/pull/1279

https://github.com/apache/shardingsphere/pull/1279

fixes

RoundRobinMasterSlaveLoadBalanceAlgorithm throw an ArrayIndexOutOfBoundsException

For English only, other languages we will close it directly. Please answer these questions before submitting your issue. Thanks! Before submit a new issue, please check existed issue first, to make sure your issue is not a duplicated one. ### Which version of Sharding-Sphere do you using? 3.0.0.M3 ### Which project do you using? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC ### Expected behavior RoundRobinMasterSlaveLoadBalance always be OK ### Actual behavior after roundrobin Integer.MAX_VALUE times, will throw an ArrayIndexOutOfBoundsException. ### Reason analyze the AtomicInteger's getAndIncrement() may produce an negative numbers. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc ### For bug report, please *MUST* provide the reproduce example codes (such as a github link).

23db595c3ad6aec93e66dbf7a8680270cb97c903

89d9049b2b8d0e04e35056fec2a89567dca202d0

https://github.com/apache/shardingsphere/compare/23db595c3ad6aec93e66dbf7a8680270cb97c903...89d9049b2b8d0e04e35056fec2a89567dca202d0

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/api/algorithm/masterslave/RoundRobinMasterSlaveLoadBalanceAlgorithm.java b/sharding-core/src/main/java/io/shardingsphere/core/api/algorithm/masterslave/RoundRobinMasterSlaveLoadBalanceAlgorithm.java index 955c8c71b03..fe7effb48b0 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/api/algorithm/masterslave/RoundRobinMasterSlaveLoadBalanceAlgorithm.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/api/algorithm/masterslave/RoundRobinMasterSlaveLoadBalanceAlgorithm.java @@ -35,6 +35,6 @@ public final class RoundRobinMasterSlaveLoadBalanceAlgorithm implements MasterSl AtomicInteger count = COUNT_MAP.containsKey(name) ? COUNT_MAP.get(name) : new AtomicInteger(0); COUNT_MAP.putIfAbsent(name, count); count.compareAndSet(slaveDataSourceNames.size(), 0); - return slaveDataSourceNames.get(count.getAndIncrement() % slaveDataSourceNames.size()); + return slaveDataSourceNames.get(Math.abs(count.getAndIncrement()) % slaveDataSourceNames.size()); } }

['sharding-core/src/main/java/io/shardingsphere/core/api/algorithm/masterslave/RoundRobinMasterSlaveLoadBalanceAlgorithm.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1200/1199

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1199

https://github.com/apache/shardingsphere/pull/1200

https://github.com/apache/shardingsphere/pull/1200

fixes

Lost the BinaryResultSetRowPacket when there's null value

For English only, other languages we will close it directly. Please answer these questions before submitting your issue. Thanks! ### Which version of Sharding-Sphere do you using? 3.0.0.M3 ### Which project do you using? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior Return the BinaryResultSetRowPacket when there's null value. ### Actual behavior Lost the BinaryResultSetRowPacket when there's null value. ### Reason analyze Sharding-Proxy burst Exception when write binary protocol null value, althouth have already filled the nullBitmap correctly. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc Use preparedStatement select a row which contains null value column. ### For bug report, please *MUST* provide the reproduce example codes (such as a github link). Official example.

2efe41281663926e9caef26e516714ae786a52fd

80b476acb749c64a9f0279f3fcf5f308277eee27

https://github.com/apache/shardingsphere/compare/2efe41281663926e9caef26e516714ae786a52fd...80b476acb749c64a9f0279f3fcf5f308277eee27

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryProtocolValue.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryProtocolValue.java index 6579c517db2..c29bad6ef09 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryProtocolValue.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryProtocolValue.java @@ -91,6 +91,9 @@ public final class BinaryProtocolValue { * @param binaryData binary data to be written */ public void write(final Object binaryData) { + if (null == binaryData) { + return; + } switch (columnType) { case MYSQL_TYPE_STRING: case MYSQL_TYPE_VARCHAR: @@ -108,11 +111,7 @@ public final class BinaryProtocolValue { payload.writeStringLenenc(binaryData.toString()); break; case MYSQL_TYPE_LONGLONG: - if (binaryData instanceof BigDecimal) { - payload.writeInt8(((BigDecimal) binaryData).longValue()); - } else { - payload.writeInt8((Long) binaryData); - } + writeInt8(binaryData); break; case MYSQL_TYPE_LONG: case MYSQL_TYPE_INT24: @@ -143,4 +142,12 @@ public final class BinaryProtocolValue { throw new IllegalArgumentException(String.format("Cannot find MySQL type '%s' in column type when write binary protocol value", columnType)); } } + + private void writeInt8(final Object binaryData) { + if (binaryData instanceof BigDecimal) { + payload.writeInt8(((BigDecimal) binaryData).longValue()); + } else { + payload.writeInt8((Long) binaryData); + } + } } diff --git a/sharding-proxy/src/test/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryResultSetRowPacketTest.java b/sharding-proxy/src/test/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryResultSetRowPacketTest.java index 3b38ad5a6eb..af4f039c9c8 100644 --- a/sharding-proxy/src/test/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryResultSetRowPacketTest.java +++ b/sharding-proxy/src/test/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryResultSetRowPacketTest.java @@ -39,13 +39,13 @@ public final class BinaryResultSetRowPacketTest { private MySQLPacketPayload payload; @Test - @Ignore public void assertWrite() { BinaryResultSetRowPacket actual = new BinaryResultSetRowPacket(1, 2, Arrays.<Object>asList("value", null), Arrays.asList(ColumnType.MYSQL_TYPE_STRING, ColumnType.MYSQL_TYPE_STRING)); assertThat(actual.getSequenceId(), is(1)); assertThat(actual.getData(), is(Arrays.<Object>asList("value", null))); actual.write(payload); - verify(payload, times(2)).writeInt1(0x00); + verify(payload).writeInt1(0x00); + verify(payload).writeInt1(0x08); verify(payload).writeStringLenenc("value"); } }

['sharding-proxy/src/test/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryResultSetRowPacketTest.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/query/binary/execute/BinaryProtocolValue.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1196/1191

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1191

https://github.com/apache/shardingsphere/pull/1196

https://github.com/apache/shardingsphere/pull/1196

fixes

Proxy blocked when client connect and close repeatly

For English only, other languages we will close it directly. Please answer these questions before submitting your issue. Thanks! ### Which version of Sharding-Sphere do you using? 3.0.0.M3 ### Which project do you using? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior High Availability. ### Actual behavior Proxy blocked when client connect and close repeatly. ### Reason analyze Only when a client close the connection meanwhile a query is not finish in this connection will triger this bug. When a frontend connection is closed the connection will become not writable, this cause MySQLFrontendHandler wait and never jump out the loop. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc Execute a slow SQL then close the connection until the connections is used up. ### For bug report, please *MUST* provide the reproduce example codes (such as a github link). Official example.

bddd0064727e6adb20033cb2d0e3f48a280f7bc3

aa6833d268eb76055dbc368d05033264fd09a5a7

https://github.com/apache/shardingsphere/compare/bddd0064727e6adb20033cb2d0e3f48a280f7bc3...aa6833d268eb76055dbc368d05033264fd09a5a7

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java index c55bbe06705..649a304923d 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java @@ -98,7 +98,7 @@ public final class ShardingProxy { } private void groupsEpoll(final ServerBootstrap bootstrap) { - workerGroup = new EpollEventLoopGroup(RULE_REGISTRY.getAcceptorSize()); + workerGroup = new EpollEventLoopGroup(); userGroup = new EpollEventLoopGroup(RULE_REGISTRY.getAcceptorSize()); bootstrap.group(bossGroup, workerGroup) .channel(EpollServerSocketChannel.class) @@ -111,7 +111,7 @@ public final class ShardingProxy { } private void groupsNio(final ServerBootstrap bootstrap) { - workerGroup = new NioEventLoopGroup(RULE_REGISTRY.getAcceptorSize()); + workerGroup = new NioEventLoopGroup(); userGroup = new NioEventLoopGroup(RULE_REGISTRY.getAcceptorSize()); bootstrap.group(bossGroup, workerGroup) .channel(NioServerSocketChannel.class) diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java index d645a1fc986..8643d862010 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java @@ -34,7 +34,7 @@ public abstract class FrontendHandler extends ChannelInboundHandlerAdapter { private boolean authorized; @Setter - private BackendConnection backendConnection; + private volatile BackendConnection backendConnection; @Override public final void channelActive(final ChannelHandlerContext context) {

['sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/ShardingProxy.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1192/1191

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1191

https://github.com/apache/shardingsphere/pull/1192

https://github.com/apache/shardingsphere/pull/1192

fixes

Proxy blocked when client connect and close repeatly

For English only, other languages we will close it directly. Please answer these questions before submitting your issue. Thanks! ### Which version of Sharding-Sphere do you using? 3.0.0.M3 ### Which project do you using? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior High Availability. ### Actual behavior Proxy blocked when client connect and close repeatly. ### Reason analyze Only when a client close the connection meanwhile a query is not finish in this connection will triger this bug. When a frontend connection is closed the connection will become not writable, this cause MySQLFrontendHandler wait and never jump out the loop. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc Execute a slow SQL then close the connection until the connections is used up. ### For bug report, please *MUST* provide the reproduce example codes (such as a github link). Official example.

4e9b2c038c62a427d1ed084fe87d1f57ccade933

97948b5d29b3e3dbc158244899b49a7025edb940

https://github.com/apache/shardingsphere/compare/4e9b2c038c62a427d1ed084fe87d1f57ccade933...97948b5d29b3e3dbc158244899b49a7025edb940

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java index e5a757f3b04..a3c671d8d01 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java @@ -75,6 +75,18 @@ public final class BackendConnection implements AutoCloseable { cachedResultSets.add(resultSet); } + /** + * Cancel statement. + */ + public void cancel() { + for (Statement each : cachedStatements) { + try { + each.cancel(); + } catch (final SQLException ignore) { + } + } + } + @Override public void close() throws SQLException { Collection<SQLException> exceptions = new LinkedList<>(); diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java index bcf08e10851..d645a1fc986 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java @@ -20,7 +20,9 @@ package io.shardingsphere.proxy.frontend.common; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import io.shardingsphere.proxy.backend.jdbc.connection.BackendConnection; import io.shardingsphere.proxy.frontend.common.executor.ChannelThreadExecutorGroup; +import lombok.Setter; /** * Frontend handler. @@ -31,6 +33,9 @@ public abstract class FrontendHandler extends ChannelInboundHandlerAdapter { private boolean authorized; + @Setter + private BackendConnection backendConnection; + @Override public final void channelActive(final ChannelHandlerContext context) { ChannelThreadExecutorGroup.getInstance().register(context.channel().id()); @@ -56,6 +61,7 @@ public abstract class FrontendHandler extends ChannelInboundHandlerAdapter { @Override public final void channelInactive(final ChannelHandlerContext context) { context.fireChannelInactive(); + backendConnection.cancel(); ChannelThreadExecutorGroup.getInstance().unregister(context.channel().id()); } } diff --git a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java index 4d6a2869087..e73dcada467 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java @@ -105,6 +105,7 @@ public final class MySQLFrontendHandler extends FrontendHandler { public void run() { try (MySQLPacketPayload payload = new MySQLPacketPayload(message); BackendConnection backendConnection = new BackendConnection()) { + setBackendConnection(backendConnection); CommandPacket commandPacket = getCommandPacket(payload, backendConnection); Optional<CommandResponsePackets> responsePackets = commandPacket.execute(); if (!responsePackets.isPresent()) { @@ -132,9 +133,12 @@ public final class MySQLFrontendHandler extends FrontendHandler { } private void writeMoreResults(final QueryCommandPacket queryCommandPacket, final int headPacketsCount) throws SQLException { + if (!context.channel().isActive()) { + return; + } currentSequenceId = headPacketsCount; while (queryCommandPacket.next()) { - while (!context.channel().isWritable()) { + while (!context.channel().isWritable() && context.channel().isActive()) { synchronized (MySQLFrontendHandler.this) { try { MySQLFrontendHandler.this.wait();

['sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/mysql/MySQLFrontendHandler.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java', 'sharding-proxy/src/main/java/io/shardingsphere/proxy/frontend/common/FrontendHandler.java']

{'.java': 3}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/2206/2205

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/2205

https://github.com/apache/shardingsphere/pull/2206

https://github.com/apache/shardingsphere/pull/2206

fixes

When use ShardingQueryAssistedEncryptor to find assistedQueryColumns, an outOfIndex exception will occur.

Here is the point: ``` ShardingEncryptorStrategy /** * Get assisted query column. * * @param logicTableName logic table name * @param columnName column name * @return assisted query column */ public Optional<String> getAssistedQueryColumn(final String logicTableName, final String columnName) { for (ColumnNode each : columns) { ColumnNode target = new ColumnNode(logicTableName, columnName); if (each.equals(target)) { return Optional.of(assistedQueryColumns.get(columns.indexOf(target)).getColumnName()); } } return Optional.absent(); } ```

2c82896d0db0f74c3cc346f6ca038df523ba417f

42f0cd16623e3aefb3b973c31f02894e3c95c35d

https://github.com/apache/shardingsphere/compare/2c82896d0db0f74c3cc346f6ca038df523ba417f...42f0cd16623e3aefb3b973c31f02894e3c95c35d

diff --git a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategy.java b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategy.java index f06942e5886..e7a97f0bb70 100644 --- a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategy.java +++ b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategy.java @@ -17,7 +17,6 @@ package org.apache.shardingsphere.core.strategy.encrypt; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -32,6 +31,7 @@ import org.apache.shardingsphere.spi.encrypt.ShardingQueryAssistedEncryptor; import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; @@ -105,6 +105,9 @@ public final class ShardingEncryptorStrategy { * @return assisted query column */ public Optional<String> getAssistedQueryColumn(final String logicTableName, final String columnName) { + if (assistedQueryColumns.isEmpty()) { + return Optional.absent(); + } for (ColumnNode each : columns) { ColumnNode target = new ColumnNode(logicTableName, columnName); if (each.equals(target)) { @@ -145,12 +148,10 @@ public final class ShardingEncryptorStrategy { * @return encrypt table names */ public Collection<String> getEncryptTableNames() { - return Collections2.transform(columns, new Function<ColumnNode, String>() { - - @Override - public String apply(final ColumnNode input) { - return input.getTableName(); - } - }); + Collection<String> result = new LinkedHashSet<>(); + for (ColumnNode each : columns) { + result.add(each.getTableName()); + } + return result; } } diff --git a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategyTest.java b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategyTest.java index 1e89575a0b2..42d8f8f0f36 100644 --- a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategyTest.java +++ b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategyTest.java @@ -27,6 +27,7 @@ import java.util.Properties; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public final class ShardingEncryptorStrategyTest { @@ -39,14 +40,51 @@ public final class ShardingEncryptorStrategyTest { @Test(expected = IllegalArgumentException.class) public void assertInvalidConstructor() { - EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("test", "test.pwd1, test.pwd2", "test.pwd1_index", new Properties()); + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("assistedTest", "test.pwd1, test.pwd2", "test.pwd1_index", new Properties()); new ShardingEncryptorStrategy(encryptorRuleConfiguration); } @Test public void assertGetAssistedQueryColumn() { - EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("test", "test.pwd1, test.pwd2", "test.pwd1_index,test.pwd2_index", new Properties()); + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("assistedTest", "test.pwd1, test.pwd2", "test.pwd1_index,test.pwd2_index", new Properties()); ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); assertThat(actual.getAssistedQueryColumn("test", "pwd1"), is(Optional.of("pwd1_index"))); + assertThat(actual.getAssistedQueryColumn("test", "pwd3"), is(Optional.<String>absent())); + } + + @Test + public void assertGetAssistedQueryColumnWithoutResult() { + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("test", "test.pwd1, test.pwd2", new Properties()); + ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); + assertThat(actual.getAssistedQueryColumn("test", "pwd1"), is(Optional.<String>absent())); + } + + @Test + public void assertGetAssistedQueryCount() { + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("assistedTest", "test.pwd1, test.pwd2", "test.pwd1_index,test.pwd2_index", new Properties()); + ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); + assertThat(actual.getAssistedQueryColumnCount("test"), is(2)); + } + + @Test + public void assertGetAssistedQueryColumnCountWithoutResult() { + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("test", "test.pwd1, test.pwd2", new Properties()); + ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); + assertThat(actual.getAssistedQueryColumnCount("test"), is(0)); + assertThat(actual.getAssistedQueryColumnCount("test1"), is(0)); + } + + @Test + public void assertGetEncryptTableNames() { + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("assistedTest", "test.pwd1, test.pwd2", "test.pwd1_index,test.pwd2_index", new Properties()); + ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); + assertThat(actual.getEncryptTableNames().size(), is(1)); + } + + @Test + public void assertIsHasShardingQueryAssistedEncryptor() { + EncryptorRuleConfiguration encryptorRuleConfiguration = new EncryptorRuleConfiguration("assistedTest", "test.pwd1, test.pwd2", "test.pwd1_index,test.pwd2_index", new Properties()); + ShardingEncryptorStrategy actual = new ShardingEncryptorStrategy(encryptorRuleConfiguration); + assertTrue(actual.isHasShardingQueryAssistedEncryptor("test")); } }

['sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategyTest.java', 'sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/strategy/encrypt/ShardingEncryptorStrategy.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/2182/2152

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/2152

https://github.com/apache/shardingsphere/pull/2182

https://github.com/apache/shardingsphere/pull/2182

fix

MemoryQueryResult getColumnIndex throw exception when using Oracle database

## Bug Report when execute Oracle's DQL, getting the result throws an exception ``` java.lang.IndexOutOfBoundsException: Index: 0, Size: 0 at java.util.ArrayList.rangeCheck(ArrayList.java:657) at java.util.ArrayList.get(ArrayList.java:433) at org.apache.shardingsphere.core.execute.sql.execute.result.QueryResultMetaData.getColumnIndex(QueryResultMetaData.java:140) at org.apache.shardingsphere.core.execute.sql.execute.result.MemoryQueryResult.getValue(MemoryQueryResult.java:95) at org.apache.shardingsphere.core.merge.dql.common.StreamMergedResult.getValue(StreamMergedResult.java:56) at org.apache.shardingsphere.core.merge.dql.common.DecoratorMergedResult.getValue(DecoratorMergedResult.java:46) at org.apache.shardingsphere.shardingjdbc.jdbc.core.resultset.ShardingResultSet.getString(ShardingResultSet.java:141) at org.hibernate.type.descriptor.sql.VarcharTypeDescriptor$2.doExtract(VarcharTypeDescriptor.java:62) at org.hibernate.type.descriptor.sql.BasicExtractor.extract(BasicExtractor.java:47) at org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:261) at org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:257) at org.hibernate.type.AbstractStandardBasicType.nullSafeGet(AbstractStandardBasicType.java:247) at org.hibernate.type.AbstractStandardBasicType.hydrate(AbstractStandardBasicType.java:333) at org.hibernate.loader.Loader.extractKeysFromResultSet(Loader.java:794) at org.hibernate.loader.Loader.getRowFromResultSet(Loader.java:719) at org.hibernate.loader.Loader.processResultSet(Loader.java:991) at org.hibernate.loader.Loader.doQuery(Loader.java:949) at org.hibernate.loader.Loader.doQueryAndInitializeNonLazyCollections(Loader.java:341) at org.hibernate.loader.Loader.doList(Loader.java:2692) at org.hibernate.loader.Loader.doList(Loader.java:2675) at org.hibernate.loader.Loader.listIgnoreQueryCache(Loader.java:2507) at org.hibernate.loader.Loader.list(Loader.java:2502) at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:502) at org.hibernate.hql.internal.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:392) at org.hibernate.engine.query.spi.HQLQueryPlan.performList(HQLQueryPlan.java:216) at org.hibernate.internal.SessionImpl.list(SessionImpl.java:1490) at org.hibernate.query.internal.AbstractProducedQuery.doList(AbstractProducedQuery.java:1445) at org.hibernate.query.internal.AbstractProducedQuery.list(AbstractProducedQuery.java:1414) at org.hibernate.query.Query.getResultList(Query.java:146) at org.hibernate.query.criteria.internal.compile.CriteriaQueryTypeQueryAdapter.getResultList(CriteriaQueryTypeQueryAdapter.java:72) at org.springframework.data.jpa.repository.support.SimpleJpaRepository.readPage(SimpleJpaRepository.java:570) at org.springframework.data.jpa.repository.support.SimpleJpaRepository.findAll(SimpleJpaRepository.java:389) at org.springframework.data.jpa.repository.support.SimpleJpaRepository.findAll(SimpleJpaRepository.java:357) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.springframework.data.repository.core.support.RepositoryComposition$RepositoryFragments.invoke(RepositoryComposition.java:377) at org.springframework.data.repository.core.support.RepositoryComposition.invoke(RepositoryComposition.java:200) at org.springframework.data.repository.core.support.RepositoryFactorySupport$ImplementationMethodExecutionInterceptor.invoke(RepositoryFactorySupport.java:641) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.doInvoke(RepositoryFactorySupport.java:605) at org.springframework.data.repository.core.support.RepositoryFactorySupport$QueryExecutorMethodInterceptor.invoke(RepositoryFactorySupport.java:590) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.data.projection.DefaultMethodInvokingMethodInterceptor.invoke(DefaultMethodInvokingMethodInterceptor.java:59) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:294) at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:98) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.data.jpa.repository.support.CrudMethodMetadataPostProcessor$CrudMethodMetadataPopulatingMethodInterceptor.invoke(CrudMethodMetadataPostProcessor.java:135) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:92) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.data.repository.core.support.SurroundingTransactionDetectorMethodInterceptor.invoke(SurroundingTransactionDetectorMethodInterceptor.java:61) at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:185) at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212) at com.sun.proxy.$Proxy88.findAll(Unknown Source) at com.fudabd.oracletest.controller.TerminalController.listTerminal(TerminalController.java:83) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:209) at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:136) at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:102) at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:891) at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:797) at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:991) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:925) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:981) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:873) at javax.servlet.http.HttpServlet.service(HttpServlet.java:635) at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:858) at javax.servlet.http.HttpServlet.service(HttpServlet.java:742) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:99) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.HttpPutFormContentFilter.doFilterInternal(HttpPutFormContentFilter.java:109) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.HiddenHttpMethodFilter.doFilterInternal(HiddenHttpMethodFilter.java:93) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:200) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:107) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:198) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:493) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:140) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:81) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:87) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:342) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:800) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:806) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1498) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:748) ``` ### Which version of ShardingSphere did you use? 3.1.0 and 4.0.0-RC1-SNAPSHOT ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC ### Expected behavior get results correctly ### Actual behavior throw exception `java.lang.IndexOutOfBoundsException: Index: 0, Size: 0` ### Reason analyze (If you can) MemoryQueryResult will get the table metadata when init, the columnLabel in oracle metadata is upper case. But the input of `getColumnIndex` method is lower case so that can't find the index. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. 1. clone example codes 2. change sharding-jdbc version to 3.1.0 or 4.0.0-RC1-SNAPSHOT 3. check configuration of jdbc at file `application-sharding-databases-oracle.properties` 4. run `OracleTestApplication` 5. visit http://localhost:8080/insertTest 6. visit http://localhost:8080/listTerminal ### Example codes for reproduce this issue (such as a github link). https://github.com/fdlzp/sharding-jdbc_jpa_oracle

f63e9cb1d1532aa95e5745f3b98842e669543eb6

5a5ccfefbc57dcb523a3e74360e69a0874e98d0e

https://github.com/apache/shardingsphere/compare/f63e9cb1d1532aa95e5745f3b98842e669543eb6...5a5ccfefbc57dcb523a3e74360e69a0874e98d0e

diff --git a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultMetaData.java b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultMetaData.java index e40fcceedbf..4a47497162b 100644 --- a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultMetaData.java +++ b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultMetaData.java @@ -18,8 +18,6 @@ package org.apache.shardingsphere.core.execute.sql.execute.result; import com.google.common.base.Optional; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import lombok.SneakyThrows; import org.apache.shardingsphere.core.rule.ShardingRule; import org.apache.shardingsphere.core.rule.TableRule; @@ -29,9 +27,9 @@ import org.apache.shardingsphere.spi.encrypt.ShardingEncryptor; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.ArrayList; import java.util.Collections; -import java.util.Map.Entry; +import java.util.Map; +import java.util.TreeMap; /** * Query result meta data. @@ -40,7 +38,7 @@ import java.util.Map.Entry; */ public final class QueryResultMetaData { - private final Multimap<String, Integer> columnLabelAndIndexes; + private final Map<String, Integer> columnLabelAndIndexes; private final ResultSetMetaData resultSetMetaData; @@ -62,9 +60,9 @@ public final class QueryResultMetaData { } @SneakyThrows - private Multimap<String, Integer> getColumnLabelAndIndexMap(final ResultSetMetaData resultSetMetaData) { - Multimap<String, Integer> result = HashMultimap.create(); - for (int columnIndex = 1; columnIndex <= resultSetMetaData.getColumnCount(); columnIndex++) { + private Map<String, Integer> getColumnLabelAndIndexMap(final ResultSetMetaData resultSetMetaData) { + Map<String, Integer> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + for (int columnIndex = resultSetMetaData.getColumnCount(); columnIndex > 0; columnIndex--) { result.put(resultSetMetaData.getColumnLabel(columnIndex), columnIndex); } return result; @@ -75,8 +73,9 @@ public final class QueryResultMetaData { * * @return column count */ + @SneakyThrows public int getColumnCount() { - return columnLabelAndIndexes.size(); + return resultSetMetaData.getColumnCount(); } /** @@ -87,12 +86,7 @@ public final class QueryResultMetaData { */ @SneakyThrows public String getColumnLabel(final int columnIndex) { - for (Entry<String, Integer> entry : columnLabelAndIndexes.entries()) { - if (columnIndex == entry.getValue()) { - return entry.getKey(); - } - } - throw new SQLException("Column index out of range", "9999"); + return resultSetMetaData.getColumnLabel(columnIndex); } /** @@ -113,7 +107,7 @@ public final class QueryResultMetaData { * @return column name */ public Integer getColumnIndex(final String columnLabel) { - return new ArrayList<>(columnLabelAndIndexes.get(columnLabel)).get(0); + return columnLabelAndIndexes.get(columnLabel); } /** diff --git a/sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/dql/DQLMergeEngine.java b/sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/dql/DQLMergeEngine.java index 486f4a5beea..376bf9cd335 100644 --- a/sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/dql/DQLMergeEngine.java +++ b/sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/dql/DQLMergeEngine.java @@ -101,7 +101,7 @@ public final class DQLMergeEngine implements MergeEngine { private Map<String, Integer> getColumnLabelIndexMap(final QueryResult queryResult) throws SQLException { Map<String, Integer> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - for (int i = 1; i <= queryResult.getColumnCount(); i++) { + for (int i = queryResult.getColumnCount(); i > 0; i--) { result.put(SQLUtil.getExactlyValue(queryResult.getColumnLabel(i)), i); } return result; diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java index d7655be20cd..f16b15b1de1 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java @@ -78,6 +78,7 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes ResultSet resultSet = mock(ResultSet.class); ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); when(resultSetMetaData.getColumnName(1)).thenReturn("column"); + when(resultSetMetaData.getColumnLabel(1)).thenReturn("column"); when(resultSetMetaData.getTableName(1)).thenReturn("table_x"); when(resultSetMetaData.getColumnCount()).thenReturn(1); when(resultSet.getString(1)).thenReturn("value"); @@ -95,6 +96,7 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes ResultSet resultSet2 = mock(ResultSet.class); ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); when(resultSetMetaData.getColumnName(1)).thenReturn("column"); + when(resultSetMetaData.getColumnLabel(1)).thenReturn("column"); when(resultSetMetaData.getTableName(1)).thenReturn("table_x"); when(resultSetMetaData.getColumnCount()).thenReturn(1); when(resultSet1.getMetaData()).thenReturn(resultSetMetaData); diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java index 424b3f7400e..058a9a90112 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java @@ -79,6 +79,7 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest { ResultSet resultSet = mock(ResultSet.class); ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); when(resultSetMetaData.getColumnName(1)).thenReturn("column"); + when(resultSetMetaData.getColumnLabel(1)).thenReturn("column"); when(resultSetMetaData.getTableName(1)).thenReturn("table_x"); when(resultSetMetaData.getColumnCount()).thenReturn(1); when(resultSet.getString(1)).thenReturn("value"); @@ -97,6 +98,7 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest { ResultSet resultSet2 = mock(ResultSet.class); ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); when(resultSetMetaData.getColumnName(1)).thenReturn("column"); + when(resultSetMetaData.getColumnLabel(1)).thenReturn("column"); when(resultSetMetaData.getTableName(1)).thenReturn("table_x"); when(resultSetMetaData.getColumnCount()).thenReturn(1); when(resultSet1.getMetaData()).thenReturn(resultSetMetaData);

['sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java', 'sharding-core/sharding-core-merge/src/main/java/org/apache/shardingsphere/core/merge/dql/DQLMergeEngine.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java', 'sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultMetaData.java']

{'.java': 4}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1987/1985

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1985

https://github.com/apache/shardingsphere/pull/1987

https://github.com/apache/shardingsphere/pull/1987

fixes

Exception fired during concurrently query

## Bug Report **For English only**, other languages will not accept. Before report a bug, make sure you have: - Searched open and closed [GitHub issues](https://github.com/sharding-sphere/sharding-sphere/issues). - Read documentation: [ShardingSphere Doc](http://shardingsphere.io/document/current/en/overview/). Please pay attention on issues you submitted, because we maybe need more details. If no response **more than 7 days** and we cannot reproduce it on current information, we will **close it**. Please answer these questions before submitting your issue. Thanks! ### Which version of ShardingSphere did you use? 4.0.0-M1 ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior Execute query correctly. ### Actual behavior Exception 1: java.lang.NullPointerException: null at com.mysql.jdbc.ResultSetImpl.checkColumnBounds(ResultSetImpl.java:766) at com.mysql.jdbc.ResultSetImpl.getObject(ResultSetImpl.java:4420) at com.zaxxer.hikari.pool.HikariProxyResultSet.getObject(HikariProxyResultSet.java) at org.apache.shardingsphere.core.executor.sql.execute.result.StreamQueryResult.getValue(StreamQueryResult.java:75) at org.apache.shardingsphere.core.merger.dql.common.StreamMergedResult.getValue(StreamMergedResult.java:49) at org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine.getQueryData(JDBCDatabaseCommunicationEngine.java:149) at org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.execute.MySQLQueryComStmtExecutePacketExecutor.getQueryData(MySQLQueryComStmtExecutePacketExecutor.java:1 13) at org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.execute.MySQLQueryComStmtExecutePacketExecutor.getQueryData(MySQLQueryComStmtExecutePacketExecutor.java:5 3) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.writeMoreResults(MySQLFrontendEngine.java:152) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.writePackets(MySQLFrontendEngine.java:133) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.executeCommand(MySQLFrontendEngine.java:108) at org.apache.shardingsphere.shardingproxy.frontend.common.netty.FrontendChannelInboundHandler$1.run(FrontendChannelInboundHandler.java:70) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Exception 2: java.sql.SQLException: Operation not allowed after ResultSet closed at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:965) at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:898) at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:887) at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:861) at com.mysql.jdbc.ResultSetImpl.checkClosed(ResultSetImpl.java:743) at com.mysql.jdbc.ResultSetImpl.next(ResultSetImpl.java:6289) at com.zaxxer.hikari.pool.HikariProxyResultSet.next(HikariProxyResultSet.java) at org.apache.shardingsphere.core.executor.sql.execute.result.StreamQueryResult.next(StreamQueryResult.java:68) at org.apache.shardingsphere.core.merger.dql.iterator.IteratorStreamMergedResult.next(IteratorStreamMergedResult.java:43) at org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.JDBCDatabaseCommunicationEngine.next(JDBCDatabaseCommunicationEngine.java:141) at org.apache.shardingsphere.shardingproxy.transport.mysql.packet.command.query.binary.execute.MySQLQueryComStmtExecutePacketExecutor.next(MySQLQueryComStmtExecutePacketExecutor.java:108) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.writeMoreResults(MySQLFrontendEngine.java:147) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.writePackets(MySQLFrontendEngine.java:134) at org.apache.shardingsphere.shardingproxy.frontend.mysql.MySQLFrontendEngine.executeCommand(MySQLFrontendEngine.java:108) at org.apache.shardingsphere.shardingproxy.frontend.common.netty.FrontendChannelInboundHandler$1.run(FrontendChannelInboundHandler.java:70) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Exception 3: [ERROR] 18:30:44.867 [ShardingSphere-Command-20] o.a.s.s.f.c.n.FrontendChannelInboundHandler - Exception occur: java.sql.SQLException: null at org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connection.BackendConnection.throwSQLExceptionIfNecessary(BackendConnection.java:296) at org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connection.BackendConnection.close(BackendConnection.java:246) at org.apache.shardingsphere.shardingproxy.backend.communication.jdbc.connection.BackendConnection.close(BackendConnection.java:228) at org.apache.shardingsphere.shardingproxy.frontend.common.netty.FrontendChannelInboundHandler$1.run(FrontendChannelInboundHandler.java:73) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) ### Reason analyze (If you can) MySQL connection closed during query. Defect of BackendConnection status management. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. 200 connections concurrently execute SQLs. ### Example codes for reproduce this issue (such as a github link).

9494940d8f0460c782331abb6117eba90ba3fd11

18f80bbbe4d12cd8a47267647fd68cf9d5f2b15e

https://github.com/apache/shardingsphere/compare/9494940d8f0460c782331abb6117eba90ba3fd11...18f80bbbe4d12cd8a47267647fd68cf9d5f2b15e

diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnection.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnection.java index 36099314411..0a1b6e687e6 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnection.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnection.java @@ -132,7 +132,6 @@ public final class BackendConnection implements AutoCloseable { * @throws SQLException SQL exception */ public List<Connection> getConnections(final ConnectionMode connectionMode, final String dataSourceName, final int connectionSize) throws SQLException { - stateHandler.setRunningStatusIfNecessary(); if (stateHandler.isInTransaction()) { return getConnectionsWithTransaction(connectionMode, dataSourceName, connectionSize); } else { diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/ConnectionStateHandler.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/ConnectionStateHandler.java index 18dc8bea4d4..213f785fd30 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/ConnectionStateHandler.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/ConnectionStateHandler.java @@ -57,8 +57,8 @@ public class ConnectionStateHandler { /** * Change connection status to running if necessary. */ - void setRunningStatusIfNecessary() { - if (ConnectionStatus.TRANSACTION != status.get()) { + public void setRunningStatusIfNecessary() { + if (ConnectionStatus.TRANSACTION != status.get() && ConnectionStatus.RUNNING != status.get()) { status.getAndSet(ConnectionStatus.RUNNING); } } diff --git a/sharding-proxy/sharding-proxy-backend/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnectionTest.java b/sharding-proxy/sharding-proxy-backend/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnectionTest.java index 3e9ab27416f..04db6ff0a7a 100644 --- a/sharding-proxy/sharding-proxy-backend/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnectionTest.java +++ b/sharding-proxy/sharding-proxy-backend/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnectionTest.java @@ -158,7 +158,8 @@ public final class BackendConnectionTest { backendConnection.setCurrentSchema("schema_0"); when(backendDataSource.getConnections((ConnectionMode) any(), anyString(), eq(12), eq(TransactionType.LOCAL))).thenReturn(MockConnectionUtil.mockNewConnections(12)); backendConnection.getConnections(ConnectionMode.MEMORY_STRICTLY, "ds1", 12); - assertThat(backendConnection.getStateHandler().getStatus(), is(ConnectionStatus.RUNNING)); + assertThat(backendConnection.getStateHandler().getStatus(), is(ConnectionStatus.INIT)); + backendConnection.getStateHandler().setRunningStatusIfNecessary(); mockResultSetAndStatement(backendConnection); actual = backendConnection; } diff --git a/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/command/CommandExecutorTask.java b/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/command/CommandExecutorTask.java index 1ecf27029fb..b6117210b1c 100644 --- a/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/command/CommandExecutorTask.java +++ b/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/command/CommandExecutorTask.java @@ -62,6 +62,7 @@ public final class CommandExecutorTask implements Runnable { try (BackendConnection backendConnection = this.backendConnection; PacketPayload payload = databaseFrontendEngine.getCodecEngine().createPacketPayload((ByteBuf) message)) { backendConnection.getStateHandler().waitUntilConnectionReleasedIfNecessary(); + backendConnection.getStateHandler().setRunningStatusIfNecessary(); isNeedFlush = executeCommand(context, payload, backendConnection); connectionSize = backendConnection.getConnectionSize(); // CHECKSTYLE:OFF

['sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/ConnectionStateHandler.java', 'sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-core/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/command/CommandExecutorTask.java', 'sharding-proxy/sharding-proxy-backend/src/test/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnectionTest.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/connection/BackendConnection.java']

{'.java': 4}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1964/1957

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1957

https://github.com/apache/shardingsphere/pull/1964

https://github.com/apache/shardingsphere/pull/1964

fixes

autogen key sharding-column can't be routed succeed while using default sharding strategy

## Bug Report ### Which version of ShardingSphere did you use? 4.0.0.M1-SNAPSHOT ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC ### Expected behavior order_id use SNOWFLAKE algorithm, which is the table sharding-colum. `INSERT INTO t_order (user_id, status) VALUES (?, ?) ` should be routed to t_order_0 or t_order_1 ### Actual behavior route to t_order_0 and t_order_1 ### Reason analyze (If you can) OptimizeEngine haven't make autogen sharding-column as `ShardingCondition` ### Example codes for reproduce this issue (such as a github link). following unit test case of sharding-example project. `io.shardingsphere.example.jdbc.nodep.JavaConfigurationExampleTest#assertShardingTables`

86c04995ff95b05c8d1c7998cc52ba3aa306a798

427c66a46ba63faed99a71b3f5f7018cdd04edd4

https://github.com/apache/shardingsphere/compare/86c04995ff95b05c8d1c7998cc52ba3aa306a798...427c66a46ba63faed99a71b3f5f7018cdd04edd4

diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/optimizer/engine/sharding/insert/InsertOptimizeEngine.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/optimizer/engine/sharding/insert/InsertOptimizeEngine.java index a8f4861efd8..a0b06b63037 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/optimizer/engine/sharding/insert/InsertOptimizeEngine.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/optimizer/engine/sharding/insert/InsertOptimizeEngine.java @@ -179,13 +179,9 @@ public final class InsertOptimizeEngine implements OptimizeEngine { private void fillShardingCondition(final ShardingCondition shardingCondition, final Comparable<?> currentGeneratedKey) { Column generateKeyColumn = shardingRule.findGenerateKeyColumn(insertStatement.getTables().getSingleTableName()).get(); - if (isShardingColumn(generateKeyColumn)) { + if (shardingRule.isShardingColumn(generateKeyColumn)) { shardingCondition.getShardingValues().add(new ListRouteValue<>(generateKeyColumn, new GeneratedKeyCondition(generateKeyColumn, -1, currentGeneratedKey).getConditionValues(parameters))); } insertStatement.setContainGenerateKey(true); } - - private boolean isShardingColumn(final Column generateKeyColumn) { - return shardingRule.getTableRule(generateKeyColumn.getTableName()).getAllShardingColumns().contains(generateKeyColumn.getName()); - } }

['sharding-core/src/main/java/org/apache/shardingsphere/core/optimizer/engine/sharding/insert/InsertOptimizeEngine.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1958/1959

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1959

https://github.com/apache/shardingsphere/pull/1958

https://github.com/apache/shardingsphere/pull/1958

fixes

Proxy will load all schema from registry when startup

## Bug Report **For English only**, other languages will not accept. Before report a bug, make sure you have: - Searched open and closed [GitHub issues](https://github.com/sharding-sphere/sharding-sphere/issues). - Read documentation: [ShardingSphere Doc](http://shardingsphere.io/document/current/en/overview/). Please pay attention on issues you submitted, because we maybe need more details. If no response **more than 7 days** and we cannot reproduce it on current information, we will **close it**. Please answer these questions before submitting your issue. Thanks! ### Which version of ShardingSphere did you use? 4.0.0.M1-SNAPSHOT ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior Only load some configurations user want from regsitry when startup. ### Actual behavior Load all the configs from registry when startup. ### Reason analyze (If you can) ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. ### Example codes for reproduce this issue (such as a github link).

5fd3c8662ef58d422547d2fb89f738b9f725840b

d31a27fc337a1b6d1739e01a304d457d04e83858

https://github.com/apache/shardingsphere/compare/5fd3c8662ef58d422547d2fb89f738b9f725840b...d31a27fc337a1b6d1739e01a304d457d04e83858

diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java index e46267be97d..59c9e8c2d9f 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java @@ -114,8 +114,7 @@ public final class SQLBuilder { result.append(each); } } - List<List<Object>> parameterSets = insertParameters.isEmpty() ? new ArrayList<>(Collections.singleton(parameters)) : new ArrayList<>(Collections.singleton(insertParameters)); - return new SQLUnit(result.toString(), parameterSets); + return insertParameters.isEmpty() ? new SQLUnit(result.toString(), new ArrayList<>(parameters)) : new SQLUnit(result.toString(), insertParameters); } /** @@ -156,8 +155,7 @@ public final class SQLBuilder { result.append(each); } } - List<List<Object>> parameterSets = insertParameters.isEmpty() ? new ArrayList<>(Collections.singleton(parameters)) : new ArrayList<>(Collections.singleton(insertParameters)); - return new SQLUnit(result.toString(), parameterSets); + return insertParameters.isEmpty() ? new SQLUnit(result.toString(), parameters) : new SQLUnit(result.toString(), insertParameters); } private void appendTablePlaceholder(final TablePlaceholder tablePlaceholder, final String actualTableName, final StringBuilder stringBuilder) { diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java index 186c3c40520..a66bb1c1d89 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java @@ -17,12 +17,16 @@ package org.apache.shardingsphere.core.routing; +import com.google.common.collect.Lists; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; +import java.util.Collections; import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; import java.util.Map; /** @@ -54,4 +58,19 @@ public final class BatchRouteUnit { public void mapAddBatchCount(final int jdbcAddBatchTimes) { jdbcAndActualAddBatchCallTimesMap.put(jdbcAddBatchTimes, actualCallAddBatchTimes++); } + + /** + * Get parameter sets. + * + * @return parameter sets + */ + public List<List<Object>> getParameterSets() { + List<List<Object>> result = new LinkedList<>(); + if (routeUnit.getSqlUnit().getParameters().isEmpty() || 0 == actualCallAddBatchTimes) { + result.add(Collections.emptyList()); + } else { + result.addAll(Lists.partition(routeUnit.getSqlUnit().getParameters(), routeUnit.getSqlUnit().getParameters().size() / actualCallAddBatchTimes)); + } + return result; + } } diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java index 6eb16a79b1b..9df2bd749c5 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java @@ -28,6 +28,7 @@ import java.util.List; * SQL unit. * * @author maxiaoguang + * @author panjuan */ @RequiredArgsConstructor @Getter @@ -37,5 +38,5 @@ public final class SQLUnit { private final String sql; - private final List<List<Object>> parameterSets; + private final List<Object> parameters; } diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java index c536137cabc..3bffd17c887 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java @@ -31,7 +31,6 @@ import org.apache.shardingsphere.core.rule.ShardingRule; import org.apache.shardingsphere.core.util.SQLLogger; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -60,7 +59,7 @@ public final class DatabaseHintSQLRouter implements ShardingRouter { RoutingResult routingResult = new DatabaseHintRoutingEngine( shardingRule.getShardingDataSourceNames().getDataSourceNames(), (HintShardingStrategy) shardingRule.getDefaultDatabaseShardingStrategy()).route(); for (TableUnit each : routingResult.getTableUnits().getTableUnits()) { - result.getRouteUnits().add(new RouteUnit(each.getDataSourceName(), new SQLUnit(logicSQL, new ArrayList<>(Collections.singleton(parameters))))); + result.getRouteUnits().add(new RouteUnit(each.getDataSourceName(), new SQLUnit(logicSQL, new ArrayList<>(parameters)))); } if (showSQL) { SQLLogger.logSQL(logicSQL, sqlStatement, result.getRouteUnits()); diff --git a/sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java b/sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java index c1741d0a001..4535e40d016 100644 --- a/sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java +++ b/sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java @@ -48,10 +48,10 @@ public final class SQLLogger { log("Logic SQL: {}", logicSQL); log("SQLStatement: {}", sqlStatement); for (RouteUnit each : routeUnits) { - if (each.getSqlUnit().getParameterSets().get(0).isEmpty()) { + if (each.getSqlUnit().getParameters().isEmpty()) { log("Actual SQL: {} ::: {}", each.getDataSourceName(), each.getSqlUnit().getSql()); } else { - log("Actual SQL: {} ::: {} ::: {}", each.getDataSourceName(), each.getSqlUnit().getSql(), each.getSqlUnit().getParameterSets()); + log("Actual SQL: {} ::: {} ::: {}", each.getDataSourceName(), each.getSqlUnit().getSql(), each.getSqlUnit().getParameters()); } } } diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java index 2f06298ed96..469b900ab9a 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java @@ -117,7 +117,7 @@ public class AbstractStatementExecutor { @Override public List<Object> apply(final StatementExecuteUnit input) { - return input.getRouteUnit().getSqlUnit().getParameterSets().get(0); + return input.getRouteUnit().getSqlUnit().getParameters(); } })); } diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java index 1c4b60bfd13..b2dd6a05b16 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java @@ -20,6 +20,7 @@ package org.apache.shardingsphere.shardingjdbc.executor; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; +import com.google.common.collect.Collections2; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import lombok.Getter; @@ -139,7 +140,7 @@ public final class BatchPreparedStatementExecutor extends AbstractStatementExecu } private void reviseBatchRouteUnit(final BatchRouteUnit oldBatchRouteUnit, final BatchRouteUnit newBatchRouteUnit) { - oldBatchRouteUnit.getRouteUnit().getSqlUnit().getParameterSets().add(newBatchRouteUnit.getRouteUnit().getSqlUnit().getParameterSets().get(0)); + oldBatchRouteUnit.getRouteUnit().getSqlUnit().getParameters().addAll(newBatchRouteUnit.getRouteUnit().getSqlUnit().getParameters()); oldBatchRouteUnit.mapAddBatchCount(batchCount); } @@ -214,24 +215,39 @@ public final class BatchPreparedStatementExecutor extends AbstractStatementExecu * @return parameter sets */ public List<List<Object>> getParameterSet(final Statement statement) { - Optional<StatementExecuteUnit> target; List<List<Object>> result = new LinkedList<>(); for (ShardingExecuteGroup<StatementExecuteUnit> each : getExecuteGroups()) { - target = Iterators.tryFind(each.getInputs().iterator(), new Predicate<StatementExecuteUnit>() { - - @Override - public boolean apply(final StatementExecuteUnit input) { - return input.getStatement().equals(statement); - } - }); + Optional<StatementExecuteUnit> target = getStatementExecuteUnit(statement, each); if (target.isPresent()) { - result.addAll(target.get().getRouteUnit().getSqlUnit().getParameterSets()); + result = getParameterSets(target.get()); break; } } return result; } + private Optional<StatementExecuteUnit> getStatementExecuteUnit(final Statement statement, final ShardingExecuteGroup<StatementExecuteUnit> executeGroup) { + return Iterators.tryFind(executeGroup.getInputs().iterator(), new Predicate<StatementExecuteUnit>() { + + @Override + public boolean apply(final StatementExecuteUnit input) { + return input.getStatement().equals(statement); + } + }); + } + + private List<List<Object>> getParameterSets(final StatementExecuteUnit executeUnit) { + List<List<Object>> result; + result = Collections2.filter(routeUnits, new Predicate<BatchRouteUnit>() { + + @Override + public boolean apply(final BatchRouteUnit input) { + return input.getRouteUnit().equals(executeUnit.getRouteUnit()); + } + }).iterator().next().getParameterSets(); + return result; + } + @Override public void clear() throws SQLException { super.clear(); diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java index f8254ea0233..17e67bc27d3 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java +++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java @@ -95,7 +95,7 @@ public final class EncryptPreparedStatement extends AbstractShardingPreparedStat try { SQLUnit sqlUnit = getSQLUnit(sql); preparedStatement = preparedStatementGenerator.createPreparedStatement(sqlUnit.getSql()); - replaySetParameter(preparedStatement, sqlUnit.getParameterSets().get(0)); + replaySetParameter(preparedStatement, sqlUnit.getParameters()); this.resultSet = new EncryptResultSet(this, preparedStatement.executeQuery(), preparedStatementGenerator.connection.getEncryptRule()); return resultSet; } finally { @@ -113,7 +113,7 @@ public final class EncryptPreparedStatement extends AbstractShardingPreparedStat try { SQLUnit sqlUnit = getSQLUnit(sql); preparedStatement = preparedStatementGenerator.createPreparedStatement(sqlUnit.getSql()); - replaySetParameter(preparedStatement, sqlUnit.getParameterSets().get(0)); + replaySetParameter(preparedStatement, sqlUnit.getParameters()); return preparedStatement.executeUpdate(); } finally { clearParameters(); @@ -125,7 +125,7 @@ public final class EncryptPreparedStatement extends AbstractShardingPreparedStat try { SQLUnit sqlUnit = getSQLUnit(sql); preparedStatement = preparedStatementGenerator.createPreparedStatement(sqlUnit.getSql()); - replaySetParameter(preparedStatement, sqlUnit.getParameterSets().get(0)); + replaySetParameter(preparedStatement, sqlUnit.getParameters()); boolean result = preparedStatement.execute(); this.resultSet = new EncryptResultSet(this, preparedStatement.getResultSet(), preparedStatementGenerator.connection.getEncryptRule()); return result; @@ -161,7 +161,7 @@ public final class EncryptPreparedStatement extends AbstractShardingPreparedStat private void replayBatchPreparedStatement() throws SQLException { for (SQLUnit each : sqlUnits) { - replaySetParameter(preparedStatement, each.getParameterSets().get(0)); + replaySetParameter(preparedStatement, each.getParameters()); preparedStatement.addBatch(); } } diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java index 8ed4154b571..3a091e3e353 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java @@ -127,9 +127,7 @@ public final class BatchPreparedStatementExecutorTest extends AbstractBaseExecut executeGroups.add(new ShardingExecuteGroup<>(preparedStatementExecuteUnits)); Collection<BatchRouteUnit> routeUnits = new LinkedList<>(); for (PreparedStatement each : preparedStatements) { - List<List<Object>> parameterSets = new LinkedList<>(); - parameterSets.add(Collections.singletonList((Object) 1)); - RouteUnit routeUnit = new RouteUnit("ds_0", new SQLUnit(SQL, parameterSets)); + RouteUnit routeUnit = new RouteUnit("ds_0", new SQLUnit(SQL, Collections.singletonList((Object) 1))); BatchRouteUnit batchRouteUnit = new BatchRouteUnit(routeUnit); batchRouteUnit.mapAddBatchCount(0); batchRouteUnit.mapAddBatchCount(1); diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java index b8defdadc8b..cecfa88b01f 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java @@ -263,8 +263,7 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes for (PreparedStatement each : preparedStatements) { List<List<Object>> parameterSets = new LinkedList<>(); String sql = SQLType.DQL.equals(sqlType) ? DQL_SQL : DML_SQL; - parameterSets.add(Collections.singletonList((Object) 1)); - preparedStatementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit(sql, parameterSets)), each, ConnectionMode.MEMORY_STRICTLY)); + preparedStatementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit(sql, Collections.singletonList((Object) 1))), each, ConnectionMode.MEMORY_STRICTLY)); } Field field = PreparedStatementExecutor.class.getSuperclass().getDeclaredField("executeGroups"); field.setAccessible(true); diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/SQLExecuteCallbackFactoryTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/SQLExecuteCallbackFactoryTest.java index c9c1710fed7..4871c70a4e8 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/SQLExecuteCallbackFactoryTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/SQLExecuteCallbackFactoryTest.java @@ -36,7 +36,6 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Collection; import java.util.Collections; -import java.util.List; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -61,7 +60,7 @@ public class SQLExecuteCallbackFactoryTest { when(connection.getMetaData()).thenReturn(metaData); when(metaData.getURL()).thenReturn("jdbc:mysql://localhost:3306/test"); units = Lists.newArrayList( - new StatementExecuteUnit(new RouteUnit("ds", new SQLUnit("SELECT now()", Collections.<List<Object>>emptyList())), preparedStatement, ConnectionMode.CONNECTION_STRICTLY) + new StatementExecuteUnit(new RouteUnit("ds", new SQLUnit("SELECT now()", Collections.emptyList())), preparedStatement, ConnectionMode.CONNECTION_STRICTLY) ); } diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java index fd97de4b019..00188208a1c 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java @@ -331,10 +331,8 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest { List<StatementExecuteUnit> statementExecuteUnits = new LinkedList<>(); executeGroups.add(new ShardingExecuteGroup<>(statementExecuteUnits)); for (Statement each : statements) { - List<List<Object>> parameterSets = new LinkedList<>(); String sql = SQLType.DQL.equals(sqlType) ? DQL_SQL : DML_SQL; - parameterSets.add(Collections.singletonList((Object) 1)); - statementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit(sql, parameterSets)), each, ConnectionMode.MEMORY_STRICTLY)); + statementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit(sql, Collections.singletonList((Object) 1))), each, ConnectionMode.MEMORY_STRICTLY)); } Field field = StatementExecutor.class.getSuperclass().getDeclaredField("executeGroups"); field.setAccessible(true); diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java index a413d563845..c3ffeadb672 100644 --- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java +++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java @@ -196,7 +196,6 @@ public final class ShardingPreparedStatementTest extends AbstractShardingJDBCDat preparedStatement.setString(1, "init"); preparedStatement.setString(2, "batch"); preparedStatement.addBatch(); - int[] result = preparedStatement.executeBatch(); assertThat(result.length, is(3)); assertThat(result[0], is(4)); diff --git a/sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java index 24877811ac6..33d2d38c0d1 100644 --- a/sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java +++ b/sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java @@ -27,7 +27,6 @@ import org.apache.shardingsphere.opentracing.ShardingTracer; import org.apache.shardingsphere.opentracing.constant.ShardingTags; import org.apache.shardingsphere.spi.hook.SQLExecutionHook; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -57,20 +56,12 @@ public final class OpenTracingSQLExecutionHook implements SQLExecutionHook { .withTag(Tags.DB_TYPE.getKey(), "sql") .withTag(Tags.DB_INSTANCE.getKey(), routeUnit.getDataSourceName()) .withTag(Tags.DB_STATEMENT.getKey(), routeUnit.getSqlUnit().getSql()) - .withTag(ShardingTags.DB_BIND_VARIABLES.getKey(), toString(routeUnit.getSqlUnit().getParameterSets())).startManual(); + .withTag(ShardingTags.DB_BIND_VARIABLES.getKey(), toString(routeUnit.getSqlUnit().getParameters())).startManual(); } - private String toString(final List<List<Object>> parameterSets) { - return parameterSets.isEmpty() ? "" : Joiner.on(", ").join(toStringList(parameterSets)); - } - - private List<String> toStringList(final List<List<Object>> parameterSets) { - List<String> result = new LinkedList<>(); - for (List<Object> each : parameterSets) { - result.add(String.format("[%s]", Joiner.on(", ").join(each))); - } - return result; + private String toString(final List<Object> parameterSets) { + return parameterSets.isEmpty() ? "" : String.format("[%s]", Joiner.on(", ").join(parameterSets)); } @Override diff --git a/sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java b/sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java index fd604a5290e..fa2652853bc 100644 --- a/sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java +++ b/sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java @@ -81,7 +81,7 @@ public final class OpenTracingSQLExecutionHookTest extends BaseOpenTracingHookTe DataSourceMetaData dataSourceMetaData = mock(DataSourceMetaData.class); when(dataSourceMetaData.getHostName()).thenReturn("localhost"); when(dataSourceMetaData.getPort()).thenReturn(8888); - sqlExecutionHook.start(createRouteUnit("success_ds", "SELECT * FROM success_tbl;", Collections.singletonList(Arrays.<Object>asList("1", 2))), dataSourceMetaData, true, null); + sqlExecutionHook.start(createRouteUnit("success_ds", "SELECT * FROM success_tbl;", Arrays.<Object>asList("1", 2)), dataSourceMetaData, true, null); sqlExecutionHook.finishSuccess(); MockSpan actual = getActualSpan(); assertThat(actual.operationName(), is("/Sharding-Sphere/executeSQL/")); @@ -103,7 +103,7 @@ public final class OpenTracingSQLExecutionHookTest extends BaseOpenTracingHookTe when(dataSourceMetaData.getHostName()).thenReturn("localhost"); when(dataSourceMetaData.getPort()).thenReturn(8888); sqlExecutionHook.start( - createRouteUnit("success_ds", "SELECT * FROM success_tbl;", Collections.singletonList(Arrays.<Object>asList("1", 2))), dataSourceMetaData, false, ShardingExecuteDataMap.getDataMap()); + createRouteUnit("success_ds", "SELECT * FROM success_tbl;", Arrays.<Object>asList("1", 2)), dataSourceMetaData, false, ShardingExecuteDataMap.getDataMap()); sqlExecutionHook.finishSuccess(); MockSpan actual = getActualSpan(); assertThat(actual.operationName(), is("/Sharding-Sphere/executeSQL/")); @@ -124,7 +124,7 @@ public final class OpenTracingSQLExecutionHookTest extends BaseOpenTracingHookTe DataSourceMetaData dataSourceMetaData = mock(DataSourceMetaData.class); when(dataSourceMetaData.getHostName()).thenReturn("localhost"); when(dataSourceMetaData.getPort()).thenReturn(8888); - sqlExecutionHook.start(createRouteUnit("failure_ds", "SELECT * FROM failure_tbl;", Collections.<List<Object>>emptyList()), dataSourceMetaData, true, null); + sqlExecutionHook.start(createRouteUnit("failure_ds", "SELECT * FROM failure_tbl;", Collections.emptyList()), dataSourceMetaData, true, null); sqlExecutionHook.finishFailure(new RuntimeException("SQL execution error")); MockSpan actual = getActualSpan(); assertThat(actual.operationName(), is("/Sharding-Sphere/executeSQL/")); @@ -141,8 +141,8 @@ public final class OpenTracingSQLExecutionHookTest extends BaseOpenTracingHookTe verify(activeSpan, times(0)).deactivate(); } - private RouteUnit createRouteUnit(final String dataSourceName, final String sql, final List<List<Object>> parameterSets) { - SQLUnit sqlUnit = new SQLUnit(sql, parameterSets); + private RouteUnit createRouteUnit(final String dataSourceName, final String sql, final List<Object> parameters) { + SQLUnit sqlUnit = new SQLUnit(sql, parameters); return new RouteUnit(dataSourceName, sqlUnit); } } diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java index eb9b88b5e38..13f93fdafee 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java @@ -37,9 +37,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; import java.util.List; /** @@ -68,7 +65,7 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp SQLRouteResult result = new SQLRouteResult(sqlStatement); for (String each : new MasterSlaveRouter( ((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), GLOBAL_REGISTRY.getShardingProperties().<Boolean>getValue(ShardingPropertiesConstant.SQL_SHOW)).route(rewriteSQL)) { - result.getRouteUnits().add(new RouteUnit(each, new SQLUnit(rewriteSQL, new ArrayList<>(Collections.singleton(parameters))))); + result.getRouteUnits().add(new RouteUnit(each, new SQLUnit(rewriteSQL, parameters))); } return result; } @@ -81,8 +78,7 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp @Override public Statement createStatement(final Connection connection, final SQLUnit sqlUnit, final boolean isReturnGeneratedKeys) throws SQLException { PreparedStatement result = isReturnGeneratedKeys ? connection.prepareStatement(sqlUnit.getSql(), Statement.RETURN_GENERATED_KEYS) : connection.prepareStatement(sqlUnit.getSql()); - List<Object> parameters = getRoutedParameters(sqlUnit); - for (int i = 0; i < parameters.size(); i++) { + for (int i = 0; i < sqlUnit.getParameters().size(); i++) { result.setObject(i + 1, parameters.get(i)); } return result; @@ -92,12 +88,4 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp public boolean executeSQL(final Statement statement, final String sql, final boolean isReturnGeneratedKeys) throws SQLException { return ((PreparedStatement) statement).execute(); } - - private List<Object> getRoutedParameters(final SQLUnit sqlUnit) { - List<Object> result = new LinkedList<>(); - for (List<Object> each : sqlUnit.getParameterSets()) { - result.addAll(each); - } - return result; - } } diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java index 1d2148e922a..c690941b79a 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java @@ -37,7 +37,6 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.Collections; -import java.util.List; /** * Executor wrapper for statement. @@ -62,7 +61,7 @@ public final class StatementExecutorWrapper implements JDBCExecutorWrapper { SQLRouteResult result = new SQLRouteResult(sqlStatement); for (String each : new MasterSlaveRouter( ((MasterSlaveSchema) logicSchema).getMasterSlaveRule(), GLOBAL_REGISTRY.getShardingProperties().<Boolean>getValue(ShardingPropertiesConstant.SQL_SHOW)).route(rewriteSQL)) { - result.getRouteUnits().add(new RouteUnit(each, new SQLUnit(rewriteSQL, Collections.<List<Object>>emptyList()))); + result.getRouteUnits().add(new RouteUnit(each, new SQLUnit(rewriteSQL, Collections.emptyList()))); } return result; } diff --git a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.java b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.java index f64d6e45e43..ab5fec3c0f9 100644 --- a/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.java +++ b/sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.java @@ -33,6 +33,7 @@ import org.apache.shardingsphere.shardingproxy.config.yaml.YamlDataSourceParamet import org.apache.shardingsphere.shardingproxy.context.GlobalContext; import org.apache.shardingsphere.shardingproxy.util.DataSourceConverter; +import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; @@ -44,6 +45,7 @@ import java.util.concurrent.ConcurrentHashMap; * Logic schemas. * * @author zhangliang + * @author panjuan */ @Getter public final class LogicSchemas { @@ -74,25 +76,29 @@ public final class LogicSchemas { * @param schemaRules schema rule map */ public void init(final Map<String, Map<String, YamlDataSourceParameter>> schemaDataSources, final Map<String, RuleConfiguration> schemaRules) { - init(schemaDataSources, schemaRules, false); + init(schemaRules.keySet(), schemaDataSources, schemaRules, false); } /** * Initialize proxy context. * + * @param localSchemaNames local schema names * @param schemaDataSources data source map * @param schemaRules schema rule map * @param isUsingRegistry is using registry or not */ - public void init(final Map<String, Map<String, YamlDataSourceParameter>> schemaDataSources, + public void init(final Collection<String> localSchemaNames, final Map<String, Map<String, YamlDataSourceParameter>> schemaDataSources, final Map<String, RuleConfiguration> schemaRules, final boolean isUsingRegistry) { databaseType = JDBCDriverURLRecognizerEngine.getDatabaseType(schemaDataSources.values().iterator().next().values().iterator().next().getUrl()); - initSchemas(schemaDataSources, schemaRules, isUsingRegistry); + initSchemas(localSchemaNames, schemaDataSources, schemaRules, isUsingRegistry); } - private void initSchemas(final Map<String, Map<String, YamlDataSourceParameter>> schemaDataSources, final Map<String, RuleConfiguration> schemaRules, final boolean isUsingRegistry) { + private void initSchemas(final Collection<String> localSchemaNames, + final Map<String, Map<String, YamlDataSourceParameter>> schemaDataSources, final Map<String, RuleConfiguration> schemaRules, final boolean isUsingRegistry) { for (Entry<String, RuleConfiguration> entry : schemaRules.entrySet()) { - logicSchemas.put(entry.getKey(), createLogicSchema(entry.getKey(), schemaDataSources, entry.getValue(), isUsingRegistry)); + if (localSchemaNames.isEmpty() || localSchemaNames.contains(entry.getKey())) { + logicSchemas.put(entry.getKey(), createLogicSchema(entry.getKey(), schemaDataSources, entry.getValue(), isUsingRegistry)); + } } } diff --git a/sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java b/sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java index 726be7d625a..4dfdcdfbebc 100644 --- a/sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java +++ b/sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java @@ -100,7 +100,7 @@ public final class Bootstrap { new OrchestrationConfigurationYamlSwapper().swap(serverConfig.getOrchestration()), shardingSchemaNames)) { initShardingOrchestrationFacade(serverConfig, ruleConfigs, shardingOrchestrationFacade); GlobalContext.getInstance().init(shardingOrchestrationFacade.getConfigService().loadAuthentication(), shardingOrchestrationFacade.getConfigService().loadProperties()); - LogicSchemas.getInstance().init(getSchemaDataSourceParameterMap(shardingOrchestrationFacade), getSchemaRules(shardingOrchestrationFacade), true); + LogicSchemas.getInstance().init(shardingSchemaNames, getSchemaDataSourceParameterMap(shardingOrchestrationFacade), getSchemaRules(shardingOrchestrationFacade), true); initOpenTracing(); ShardingProxy.getInstance().start(port); }

['sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/SQLExecuteCallbackFactoryTest.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java', 'sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java', 'sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java', 'sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/ShardingPreparedStatementTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/statement/EncryptPreparedStatement.java']

{'.java': 19}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1644/1643

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1643

https://github.com/apache/shardingsphere/pull/1644

https://github.com/apache/shardingsphere/pull/1644

fixes

Result data incomplete when there's Limit sub clause

## Bug Report ### Which version of ShardingSphere did you use? 3.0.1-SNAPSHOT ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-JDBC and Sharding-Proxy ### Expected behavior Take ShardingType.SHARDING_DATABASES for example: The SQL is single routed to demo_ds_0.t_order. SELECT * FROM t_order WHERE user_id = 0 LIMIT 5, 10; 10 rows are expected: order_id: 0, user_id: 0, status: 6 order_id: 0, user_id: 0, status: 7 order_id: 0, user_id: 0, status: 8 order_id: 0, user_id: 0, status: 9 order_id: 0, user_id: 0, status: 10 order_id: 0, user_id: 0, status: 11 order_id: 0, user_id: 0, status: 12 order_id: 0, user_id: 0, status: 13 order_id: 0, user_id: 0, status: 14 order_id: 0, user_id: 0, status: 15 ### Actual behavior Get 5 rows result: order_id: 0, user_id: 0, status: 11 order_id: 0, user_id: 0, status: 12 order_id: 0, user_id: 0, status: 13 order_id: 0, user_id: 0, status: 14 order_id: 0, user_id: 0, status: 15 ### Reason analyze (If you can) This will be happen only on single routing which do not rewrite the logical SQL's Limit sub clause. 5 rows is skipped. 5 is the offset of Limit sub clause. This is duo to offset skipping procedure in merge step. When single routing, offset should not be skipped. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. Take ShardingType.SHARDING_DATABASES for example: The SQL is single routed to demo_ds_0.t_order. SELECT * FROM t_order WHERE user_id = 0 LIMIT 5, 10; ### Example codes for reproduce this issue (such as a github link). Offical example.

421ebb4b9840da8a9c9e441ca23379c7d6c03be5

34ac2c256e11a3d770a67e235110e6cab0012c9e

https://github.com/apache/shardingsphere/compare/421ebb4b9840da8a9c9e441ca23379c7d6c03be5...34ac2c256e11a3d770a67e235110e6cab0012c9e

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java b/sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java index 9077f445e92..9cd897d915d 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java @@ -120,7 +120,7 @@ public final class DQLMergeEngine implements MergeEngine { private MergedResult decorate(final MergedResult mergedResult) throws SQLException { Limit limit = selectStatement.getLimit(); - if (null == limit) { + if (null == limit || 1 == queryResults.size()) { return mergedResult; } if (DatabaseType.MySQL == limit.getDatabaseType() || DatabaseType.PostgreSQL == limit.getDatabaseType() || DatabaseType.H2 == limit.getDatabaseType()) { diff --git a/sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java b/sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java index e3633e3e532..97939af1b12 100644 --- a/sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java +++ b/sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java @@ -18,6 +18,7 @@ package io.shardingsphere.core.merger.dql; import com.google.common.base.Optional; +import com.google.common.collect.Lists; import io.shardingsphere.core.constant.AggregationType; import io.shardingsphere.core.constant.DatabaseType; import io.shardingsphere.core.constant.OrderDirection; @@ -41,6 +42,7 @@ import org.junit.Test; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -53,6 +55,8 @@ public final class DQLMergeEngineTest { private DQLMergeEngine mergeEngine; + private List<QueryResult> singleQueryResult; + private List<QueryResult> queryResults; private SelectStatement selectStatement; @@ -65,7 +69,12 @@ public final class DQLMergeEngineTest { when(resultSet.getMetaData()).thenReturn(resultSetMetaData); when(resultSetMetaData.getColumnCount()).thenReturn(1); when(resultSetMetaData.getColumnLabel(1)).thenReturn("count(*)"); - queryResults = Collections.<QueryResult>singletonList(new TestQueryResult(resultSet)); + singleQueryResult = Collections.<QueryResult>singletonList(new TestQueryResult(resultSet)); + List<ResultSet> resultSets = Lists.newArrayList(resultSet, mock(ResultSet.class), mock(ResultSet.class), mock(ResultSet.class)); + queryResults = new ArrayList<>(resultSets.size()); + for (ResultSet each : resultSets) { + queryResults.add(new TestQueryResult(each)); + } selectStatement = new SelectStatement(); } @@ -75,6 +84,13 @@ public final class DQLMergeEngineTest { assertThat(mergeEngine.merge(), instanceOf(IteratorStreamMergedResult.class)); } + @Test + public void assertBuildIteratorStreamMergedResultWithLimit() throws SQLException { + selectStatement.setLimit(new Limit(DatabaseType.MySQL)); + mergeEngine = new DQLMergeEngine(singleQueryResult, selectStatement); + assertThat(mergeEngine.merge(), instanceOf(IteratorStreamMergedResult.class)); + } + @Test public void assertBuildIteratorStreamMergedResultWithMySQLLimit() throws SQLException { selectStatement.setLimit(new Limit(DatabaseType.MySQL));

['sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java', 'sharding-core/src/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java']

{'.java': 2}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1705/1704

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1704

https://github.com/apache/shardingsphere/pull/1705

https://github.com/apache/shardingsphere/pull/1705

fixes

CommandExecutor.writeMoreResults deadlock

## Bug Report **For English only**, other languages will not accept. Before report a bug, make sure you have: - Searched open and closed [GitHub issues](https://github.com/sharding-sphere/sharding-sphere/issues). - Read documentation: [ShardingSphere Doc](http://shardingsphere.io/document/current/en/overview/). Please pay attention on issues you submitted, because we maybe need more details. If no response **more than 7 days** and we cannot reproduce it on current information, we will **close it**. Please answer these questions before submitting your issue. Thanks! ### Which version of ShardingSphere did you use? 3.1.0-SNAPSHOT ### Which project did you use? Sharding-JDBC or Sharding-Proxy? Sharding-Proxy ### Expected behavior When flag isWritable turn to false, it can turn back to ture in future. ### Actual behavior When flag isWritable turn to false, it can't turn back to ture in future. ### Reason analyze (If you can) When flag isWritable turn to false, the data that has been written didn't flush. So the client can't read any data, this cause the water level high. ### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc. set proxy.frontend.flush.threshold: 1000000 ### Example codes for reproduce this issue (such as a github link). N.A.

37177982e5db638419e8ae42d6c53cba06057952

1d80445e0dabebf74536ed246a9b43fc51a1ffc3

https://github.com/apache/shardingsphere/compare/37177982e5db638419e8ae42d6c53cba06057952...1d80445e0dabebf74536ed246a9b43fc51a1ffc3

diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/mysql/CommandExecutor.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/mysql/CommandExecutor.java index 3c3d9cf89d1..a6b0e4e5cdc 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/mysql/CommandExecutor.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/mysql/CommandExecutor.java @@ -105,6 +105,7 @@ public final class CommandExecutor implements Runnable { while (queryCommandPacket.next()) { count++; while (!context.channel().isWritable() && context.channel().isActive()) { + context.flush(); synchronized (frontendHandler) { try { frontendHandler.wait();

['sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/frontend/mysql/CommandExecutor.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

apache/shardingsphere/1706/1671

apache

shardingsphere

https://github.com/apache/shardingsphere/issues/1671

https://github.com/apache/shardingsphere/pull/1706

https://github.com/apache/shardingsphere/pull/1706

fixes

Upgrade from 3.0.0 to 3.1.0.M1 error reporting，java.lang.NullPointerException: Cannot invoke method mod() on null object

sharding code: > sharding database column name : traceId sharding strategy :ds${traceId%4} ``` // 配置真实数据源 Map<String, DataSource> dataSourceMap = new HashMap<>(); dataSourceMap.put("ds0",ds0DataSource()); dataSourceMap.put("ds1",ds1DataSource()); dataSourceMap.put("ds2",ds2DataSource()); dataSourceMap.put("ds3",ds3DataSource()); dataSourceMap.put("mainDataSource",mainDataSource()); // 配置Order表规则 TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration(); orderTableRuleConfig.setLogicTable("push_message"); orderTableRuleConfig.setActualDataNodes("ds${0..3}.push_message"); //分布式主键 orderTableRuleConfig.setKeyGeneratorColumnName("id"); ShardingDefaultKeyGenerator shardingDefaultKeyGenerator = new ShardingDefaultKeyGenerator(); orderTableRuleConfig.setKeyGenerator(shardingDefaultKeyGenerator); // 配置分库策略 orderTableRuleConfig.setDatabaseShardingStrategyConfig( new InlineShardingStrategyConfiguration("traceId", "ds${traceId%4}")); // 配置分片规则 ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig); shardingRuleConfig.setDefaultDataSourceName("mainDataSource"); Properties properties = new Properties(); properties.setProperty("sql.show","true"); properties.setProperty("max.connections.size.per.query","200"); properties.setProperty("executor.size",String.valueOf(Runtime.getRuntime().availableProcessors() * 2)); DataSource dataSource = ShardingDataSourceFactory.createDataSource( dataSourceMap, shardingRuleConfig, new ConcurrentHashMap(), properties); return dataSource ``` error info: ``` java.lang.NullPointerException: Cannot invoke method mod() on null object at org.codehaus.groovy.runtime.NullObject.invokeMethod(NullObject.java:91) at org.codehaus.groovy.runtime.callsite.PogoMetaClassSite.call(PogoMetaClassSite.java:48) at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCall(CallSiteArray.java:48) at org.codehaus.groovy.runtime.callsite.NullCallSite.call(NullCallSite.java:35) at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCall(CallSiteArray.java:48) at org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:113) at org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:125) at Script2$_run_closure1.doCall(Script2.groovy:1) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.codehaus.groovy.reflection.CachedMethod.invoke(CachedMethod.java:93) at groovy.lang.MetaMethod.doMethodInvoke(MetaMethod.java:325) at org.codehaus.groovy.runtime.metaclass.ClosureMetaClass.invokeMethod(ClosureMetaClass.java:294) at groovy.lang.MetaClassImpl.invokeMethod(MetaClassImpl.java:1019) at groovy.lang.Closure.call(Closure.java:426) at groovy.lang.Closure.call(Closure.java:420) at com.fly.ApplicationTests.testInline(ApplicationTests.java:98) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17) at org.springframework.test.context.junit4.statements.RunBeforeTestMethodCallbacks.evaluate(RunBeforeTestMethodCallbacks.java:75) at org.springframework.test.context.junit4.statements.RunAfterTestMethodCallbacks.evaluate(RunAfterTestMethodCallbacks.java:86) at org.springframework.test.context.junit4.statements.SpringRepeat.evaluate(SpringRepeat.java:84) at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325) at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:252) at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.runChild(SpringJUnit4ClassRunner.java:94) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.springframework.test.context.junit4.statements.RunBeforeTestClassCallbacks.evaluate(RunBeforeTestClassCallbacks.java:61) at org.springframework.test.context.junit4.statements.RunAfterTestClassCallbacks.evaluate(RunAfterTestClassCallbacks.java:70) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.springframework.test.context.junit4.SpringJUnit4ClassRunner.run(SpringJUnit4ClassRunner.java:191) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:68) at com.intellij.rt.execution.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:47) at com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:242) at com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:70) ``` sharding key is hump naming，calculating rote Error, ```java //InlineShardingStrategy.java private String execute(final PreciseShardingValue shardingValue) { Closure<?> result = closure.rehydrate(new Expando(), null, null); result.setResolveStrategy(Closure.DELEGATE_ONLY); //method toLowerCase() result.setProperty(shardingValue.getColumnName().toLowerCase(), shardingValue.getValue()); return result.call().toString(); } ``` unit test : 1. test fail ``` @Test public void testInline(){ Closure<?> closure = new InlineExpressionParser("ds${traceId%4}").evaluateClosure(); Closure<?> result = closure.rehydrate(new Expando(), null, null); result.setResolveStrategy(Closure.DELEGATE_ONLY); PreciseShardingValue shardingValue = new PreciseShardingValue("push_message","traceId",342342); result.setProperty(shardingValue.getColumnName().toLowerCase(), shardingValue.getValue()); System.out.println("--------:"+result.call().toString()); } ``` 2. test pass ``` @Test public void testInline(){ Closure<?> closure = new InlineExpressionParser("ds${traceid%4}").evaluateClosure(); Closure<?> result = closure.rehydrate(new Expando(), null, null); result.setResolveStrategy(Closure.DELEGATE_ONLY); PreciseShardingValue shardingValue = new PreciseShardingValue("push_message","traceId",342342); result.setProperty(shardingValue.getColumnName().toLowerCase(), shardingValue.getValue()); System.out.println("--------:"+result.call().toString()); } ```

3dbe77790c3ff3fafa685823165890e20f439d04

2a61efcba24cc95a23e50ecff6586742bd3ae95d

https://github.com/apache/shardingsphere/compare/3dbe77790c3ff3fafa685823165890e20f439d04...2a61efcba24cc95a23e50ecff6586742bd3ae95d

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/routing/strategy/inline/InlineShardingStrategy.java b/sharding-core/src/main/java/io/shardingsphere/core/routing/strategy/inline/InlineShardingStrategy.java index 4923c1d4d37..cd7e7ed2691 100644 --- a/sharding-core/src/main/java/io/shardingsphere/core/routing/strategy/inline/InlineShardingStrategy.java +++ b/sharding-core/src/main/java/io/shardingsphere/core/routing/strategy/inline/InlineShardingStrategy.java @@ -82,7 +82,7 @@ public final class InlineShardingStrategy implements ShardingStrategy { private String execute(final PreciseShardingValue shardingValue) { Closure<?> result = closure.rehydrate(new Expando(), null, null); result.setResolveStrategy(Closure.DELEGATE_ONLY); - result.setProperty(shardingValue.getColumnName().toLowerCase(), shardingValue.getValue()); + result.setProperty(shardingValue.getColumnName(), shardingValue.getValue()); return result.call().toString(); }

['sharding-core/src/main/java/io/shardingsphere/core/routing/strategy/inline/InlineShardingStrategy.java']

{'.java': 1}

Java

{'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214}

Apache License 2.0

keycloak/keycloak/359/16818

keycloak

keycloak

https://github.com/keycloak/keycloak/issues/16818

https://github.com/keycloak/keycloak/pull/359

https://github.com/keycloak/keycloak/issues/16818#issuecomment-1415724725

resolve

Any tests using PhantomJS failing in some newer linux environments

### Before reporting an issue - [X] I have searched existing issues - [X] I have reproduced the issue with the latest release ### Area testsuite ### Describe the bug After setup new laptop, Any test using PhantomJS is failing for me with the error like this: ``` 09:01:26,169 INFO [org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest] [DemoServletsAdapterTest] testWithoutKeycloakConf() STARTED Feb 03, 2023 9:01:26 AM org.openqa.selenium.phantomjs.PhantomJSDriverService <init> INFO: executable: /home/mposolda/IdeaProjects/keycloak/testsuite/integration-arquillian/tests/base/target/drone/1c947d57fce2f21ce0b43fe2ed7cd361/phantomjs-2.1.1-linux-x86_64/bin/phantomjs Feb 03, 2023 9:01:26 AM org.openqa.selenium.phantomjs.PhantomJSDriverService <init> INFO: port: 1443 Feb 03, 2023 9:01:26 AM org.openqa.selenium.phantomjs.PhantomJSDriverService <init> INFO: arguments: [--ignore-ssl-errors=true, --web-security=false, --webdriver=1443, --webdriver-logfile=/home/mposolda/IdeaProjects/keycloak/testsuite/integration-arquillian/tests/base/phantomjsdriver.log] Feb 03, 2023 9:01:26 AM org.openqa.selenium.phantomjs.PhantomJSDriverService <init> INFO: environment: {} Auto configuration failed 139991832651712:error:25066067:DSO support routines:DLFCN_LOAD:could not load the shared library:dso_dlfcn.c:185:filename(libproviders.so): libproviders.so: cannot open shared object file: No such file or directory 139991832651712:error:25070067:DSO support routines:DSO_load:could not load the shared library:dso_lib.c:244: 139991832651712:error:0E07506E:configuration file routines:MODULE_LOAD_DSO:error loading dso:conf_mod.c:285:module=providers, path=providers 139991832651712:error:0E076071:configuration file routines:MODULE_RUN:unknown module name:conf_mod.c:222:module=providers Feb 03, 2023 9:01:46 AM org.openqa.selenium.os.OsProcess checkForError SEVERE: org.apache.commons.exec.ExecuteException: Process exited with an error: 1 (Exit value: 1) 09:01:46,486 ERROR [org.keycloak.testsuite.adapter.servlet.DemoServletsAdapterTest] [DemoServletsAdapterTest] testWithoutKeycloakConf() FAILED ``` I am seeing this on Ubuntu 22.04 as well as on RHEL 9.1 virtual machine. Java version is OpenJDK11 or OpenJDK17. ### Solution It helps to set this environment variable: ``` export OPENSSL_CONF=/dev/null ``` See for example here for more details https://github.com/nodejs/node/issues/43132 Can we eventually set this variable by default to avoid such issues? ### Version 20.0.3 ### How to Reproduce? For example run this test on Ubuntu 22.04 or on RHEL 9.1 (reproduced with RHEL 9.1 virtual machine). Java version is OpenJDK11 or OpenJDK17. ``` mvn clean install -Dtest=DemoServletsAdapterTest ```

e25b2b05aee074a0ec2bf51118d4249e17e230b8

201b35be54575d9c83a6ee4b08c5d5b7a094b5d9

https://github.com/keycloak/keycloak/compare/e25b2b05aee074a0ec2bf51118d4249e17e230b8...201b35be54575d9c83a6ee4b08c5d5b7a094b5d9

diff --git a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java index 9088533faa..541fc90ceb 100755 --- a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java +++ b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java @@ -11,6 +11,7 @@ import org.apache.catalina.Valve; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; +import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AuthenticatedActionsHandler; import org.keycloak.adapters.KeycloakDeployment; @@ -27,10 +28,10 @@ import org.keycloak.adapters.KeycloakDeployment; */ public class AuthenticatedActionsValve extends ValveBase { private static final Logger log = Logger.getLogger(""+AuthenticatedActionsValve.class); - protected KeycloakDeployment deployment; + protected AdapterDeploymentContext deploymentContext; - public AuthenticatedActionsValve(KeycloakDeployment deployment, Valve next, Container container, ObjectName objectName) { - this.deployment = deployment; + public AuthenticatedActionsValve(AdapterDeploymentContext deploymentContext, Valve next, Container container, ObjectName controller) { + this.deploymentContext = deploymentContext; if (next == null) throw new RuntimeException("WTF is next null?!"); setNext(next); setContainer(container); @@ -40,10 +41,17 @@ public class AuthenticatedActionsValve extends ValveBase { @Override public void invoke(Request request, Response response) throws IOException, ServletException { log.finer("AuthenticatedActionsValve.invoke" + request.getRequestURI()); - AuthenticatedActionsHandler handler = new AuthenticatedActionsHandler(deployment, new CatalinaHttpFacade(request, response)); - if (handler.handledRequest()) { - return; + CatalinaHttpFacade facade = new CatalinaHttpFacade(request, response); + KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade); + if (deployment != null && deployment.isConfigured()) { + AuthenticatedActionsHandler handler = new AuthenticatedActionsHandler(deployment, new CatalinaHttpFacade(request, response)); + if (handler.handledRequest()) { + return; + } + } getNext().invoke(request, response); } + + } diff --git a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java index 2dd4e97563..5ce3050d5c 100755 --- a/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java +++ b/integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java @@ -23,8 +23,10 @@ import org.apache.catalina.core.StandardContext; import org.apache.catalina.deploy.LoginConfig; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterConstants; +import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AuthChallenge; import org.keycloak.adapters.AuthOutcome; +import org.keycloak.adapters.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.PreAuthActionsHandler; @@ -43,7 +45,7 @@ import org.keycloak.adapters.RefreshableKeycloakSecurityContext; public class KeycloakAuthenticatorValve extends FormAuthenticator implements LifecycleListener { private final static Logger log = Logger.getLogger(""+KeycloakAuthenticatorValve.class); protected CatalinaUserSessionManagement userSessionManagement = new CatalinaUserSessionManagement(); - protected KeycloakDeployment deployment; + protected AdapterDeploymentContext deploymentContext; @Override public void lifecycleEvent(LifecycleEvent event) { @@ -64,9 +66,17 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif } public void initInternal() { - this.deployment = KeycloakDeploymentBuilder.build(getConfigInputStream(context)); - log.info("deployment realm:" + deployment.getRealm() + " resource:" + deployment.getResourceName()); - AuthenticatedActionsValve actions = new AuthenticatedActionsValve(deployment, getNext(), getContainer(), getObjectName()); + InputStream configInputStream = getConfigInputStream(context); + KeycloakDeployment kd = null; + if (configInputStream == null) { + log.warning("No adapter configuration. Keycloak is unconfigured and will deny all requests."); + kd = new KeycloakDeployment(); + } else { + kd = KeycloakDeploymentBuilder.build(configInputStream); + } + deploymentContext = new AdapterDeploymentContext(kd); + context.getServletContext().setAttribute(AdapterDeploymentContext.class.getName(), deploymentContext); + AuthenticatedActionsValve actions = new AuthenticatedActionsValve(deploymentContext, getNext(), getContainer(), getObjectName()); setNext(actions); } @@ -102,12 +112,12 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif @Override public void invoke(Request request, Response response) throws IOException, ServletException { try { - PreAuthActionsHandler handler = new PreAuthActionsHandler(userSessionManagement, deployment, - new CatalinaHttpFacade(request, response)); + CatalinaHttpFacade facade = new CatalinaHttpFacade(request, response); + PreAuthActionsHandler handler = new PreAuthActionsHandler(userSessionManagement, deploymentContext, facade); if (handler.handleRequest()) { return; } - checkKeycloakSession(request); + checkKeycloakSession(request, facade); super.invoke(request, response); } finally { } @@ -116,6 +126,11 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif @Override public boolean authenticate(Request request, HttpServletResponse response, LoginConfig config) throws IOException { CatalinaHttpFacade facade = new CatalinaHttpFacade(request, response); + KeycloakDeployment deployment = deploymentContext.resolveDeployment(facade); + if (deployment == null || !deployment.isConfigured()) { + return false; + } + CatalinaRequestAuthenticator authenticator = new CatalinaRequestAuthenticator(deployment, this, userSessionManagement, facade, request); AuthOutcome outcome = authenticator.authenticate(); if (outcome == AuthOutcome.AUTHENTICATED) { @@ -132,29 +147,22 @@ public class KeycloakAuthenticatorValve extends FormAuthenticator implements Lif } /** - * Checks that access token is still valid. Will attempt refresh of token if - * it is not. - * + * Checks that access token is still valid. Will attempt refresh of token if it is not. + * * @param request */ - protected void checkKeycloakSession(Request request) { - if (request.getSessionInternal(false) == null || request.getSessionInternal().getPrincipal() == null) - return; - RefreshableKeycloakSecurityContext session = (RefreshableKeycloakSecurityContext) request.getSessionInternal() - .getNote(KeycloakSecurityContext.class.getName()); - if (session == null) - return; + protected void checkKeycloakSession(Request request, HttpFacade facade) { + if (request.getSessionInternal(false) == null || request.getSessionInternal().getPrincipal() == null) return; + RefreshableKeycloakSecurityContext session = (RefreshableKeycloakSecurityContext) request.getSessionInternal().getNote(KeycloakSecurityContext.class.getName()); + if (session == null) return; // just in case session got serialized - session.setDeployment(deployment); - if (session.isActive()) - return; + if (session.getDeployment() == null) session.setDeployment(deploymentContext.resolveDeployment(facade)); + if (session.isActive()) return; - // FYI: A refresh requires same scope, so same roles will be set. - // Otherwise, refresh will fail and token will + // FYI: A refresh requires same scope, so same roles will be set. Otherwise, refresh will fail and token will // not be updated session.refreshExpiredToken(); - if (session.isActive()) - return; + if (session.isActive()) return; request.getSessionInternal().removeNote(KeycloakSecurityContext.class.getName()); request.setUserPrincipal(null);

['integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java', 'integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java']

{'.java': 2}

Java

{'Java': 35144476, 'TypeScript': 3163746, 'JavaScript': 205312, 'FreeMarker': 164182, 'Python': 79730, 'Scala': 67371, 'XSLT': 43979, 'CSS': 43935, 'Shell': 30081, 'HTML': 25543, 'Batchfile': 5364, 'Groovy': 4915, 'Mustache': 4694, 'Dockerfile': 2543, 'Gnuplot': 2173, 'AMPL': 1552, 'Fluent': 217}

Apache License 2.0

ibotpeaches/apktool/1570/1564

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1564

https://github.com/iBotPeaches/Apktool/pull/1570

https://github.com/iBotPeaches/Apktool/pull/1570

fixes

Could not decode res(arsc)

### Information 1. **Apktool Version (`2.2.3`)** - 2. **Operating System (Windows)** - 3. **APK From? I don't know.** - ### Stacktrace/Logcat ``` I: Using Apktool 2.2.3 on test.zip I: Loading resource table... W: null Exception in thread "main" java.lang.NullPointerException at brut.androlib.res.data.value.ResValueFactory.factory(ResValueFactory.java:74) at brut.androlib.res.decoder.ARSCDecoder.readValue(ARSCDecoder.java:315) at brut.androlib.res.decoder.ARSCDecoder.readEntry(ARSCDecoder.java:241) at brut.androlib.res.decoder.ARSCDecoder.readTableType(ARSCDecoder.java:226) at brut.androlib.res.decoder.ARSCDecoder.readTableTypeSpec(ARSCDecoder.java:156) at brut.androlib.res.decoder.ARSCDecoder.readTablePackage(ARSCDecoder.java:118) at brut.androlib.res.decoder.ARSCDecoder.readTableHeader(ARSCDecoder.java:80) at brut.androlib.res.decoder.ARSCDecoder.decode(ARSCDecoder.java:47) at brut.androlib.res.AndrolibResources.getResPackagesFromApk(AndrolibResources.java:562) at brut.androlib.res.AndrolibResources.loadMainPkg(AndrolibResources.java:72) at brut.androlib.res.AndrolibResources.getResTable(AndrolibResources.java:64) at brut.androlib.Androlib.getResTable(Androlib.java:68) at brut.androlib.ApkDecoder.setTargetSdkVersion(ApkDecoder.java:207) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:109) at brut.apktool.Main.cmdDecode(Main.java:166) at brut.apktool.Main.main(Main.java:81) ``` ### Steps to Reproduce 1. `apktool d -s test.zip ` ### APK [test.zip](https://github.com/iBotPeaches/Apktool/files/1157951/test.zip)

ad59fdd378fe56fb108a53be2a89c9c05b1018d1

15bc16c6bd40eec1ce5de6177fa178675ac5b9fa

https://github.com/ibotpeaches/apktool/compare/ad59fdd378fe56fb108a53be2a89c9c05b1018d1...15bc16c6bd40eec1ce5de6177fa178675ac5b9fa

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java index c8d30b85..e3db655f 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java @@ -71,6 +71,9 @@ public class ResValueFactory { } public ResIntBasedValue factory(String value, int rawValue) { + if (value == null) { + return new ResFileValue("", rawValue); + } if (value.startsWith("res/")) { return new ResFileValue(value, rawValue); }

['brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java']

{'.java': 1}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1764/1741

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1741

https://github.com/iBotPeaches/Apktool/pull/1764

https://github.com/iBotPeaches/Apktool/pull/1764

fixes

Bugs during apktool.jar compieltion from sources

@iBotPeaches With latest updates on source code (3 days ago) I got this error during compilation on final tests ``` [MENTION=292510]brut[/MENTION].androlib.aapt1.BuildAndDecodeTest > classMethod FAILED java.lang.NullPointerException at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:132) at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:115) at brut.androlib.res.AndrolibResources.decode(AndrolibResources.java:258) at brut.androlib.Androlib.decodeResourcesFull(Androlib.java:131) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:124) at brut.androlib.aapt1.BuildAndDecodeTest.beforeClass(BuildAndDecodeTest.java:61) brut.androlib.aapt1.LargeIntsInManifestTest > checkIfLargeIntsAreHandledTest FAILED java.lang.NullPointerException at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:132) at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:115) at brut.androlib.res.AndrolibResources.decode(AndrolibResources.java:258) at brut.androlib.Androlib.decodeResourcesFull(Androlib.java:131) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:124) at brut.androlib.aapt1.LargeIntsInManifestTest.checkIfLargeIntsAreHandledTest(LargeIntsInManifestTest.java:66) brut.androlib.aapt1.ProviderAttributeTest > isProviderStringReplacementWorking FAILED java.lang.NullPointerException at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:132) at brut.androlib.res.decoder.ResFileDecoder.decode(ResFileDecoder.java:115) at brut.androlib.res.AndrolibResources.decode(AndrolibResources.java:258) at brut.androlib.Androlib.decodeResourcesFull(Androlib.java:131) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:124) at brut.androlib.aapt1.ProviderAttributeTest.isProviderStringReplacementWorking(ProviderAttributeTest.java:70) brut.androlib.aapt1.UnknownCompressionTest > doubleExtensionStoredTest FAILED brut.directory.PathNotExist: Entry not found: assets/bin/Data/two.extension.file at brut.directory.ZipRODirectory.getCompressionLevel(ZipRODirectory.java:108) at brut.androlib.aapt1.UnknownCompressionTest.doubleExtensionStoredTest(UnknownCompressionTest.java:80) brut.androlib.aapt1.UnknownCompressionTest > pkmExtensionDeflatedTest FAILED brut.directory.PathNotExist: Entry not found: assets/bin/Data/test.pkm at brut.directory.ZipRODirectory.getCompressionLevel(ZipRODirectory.java:108) at brut.androlib.aapt1.UnknownCompressionTest.pkmExtensionDeflatedTest(UnknownCompressionTest.java:69) 59 tests completed, 5 failed ```

e679d7161561145b02220535c9c229ae8603e524

6b9fb5bb51ca647cfc0c6966716ac00a0513282e

https://github.com/ibotpeaches/apktool/compare/e679d7161561145b02220535c9c229ae8603e524...6b9fb5bb51ca647cfc0c6966716ac00a0513282e

diff --git a/brut.j.dir/src/main/java/brut/directory/ZipUtils.java b/brut.j.dir/src/main/java/brut/directory/ZipUtils.java index 7898b19d..57cfd017 100644 --- a/brut.j.dir/src/main/java/brut/directory/ZipUtils.java +++ b/brut.j.dir/src/main/java/brut/directory/ZipUtils.java @@ -54,7 +54,8 @@ public class ZipUtils { throws BrutException, IOException { for (final File file : folder.listFiles()) { if (file.isFile()) { - final ZipEntry zipEntry = new ZipEntry(BrutIO.sanitizeUnknownFile(folder, file.getPath().substring(prefixLength))); + final String cleanedPath = BrutIO.sanitizeUnknownFile(folder, file.getPath().substring(prefixLength)); + final ZipEntry zipEntry = new ZipEntry(BrutIO.normalizePath(cleanedPath)); // aapt binary by default takes in parameters via -0 arsc to list extensions that shouldn't be // compressed. We will replicate that behavior diff --git a/brut.j.util/src/main/java/brut/util/BrutIO.java b/brut.j.util/src/main/java/brut/util/BrutIO.java index e58c7964..20d5b09f 100644 --- a/brut.j.util/src/main/java/brut/util/BrutIO.java +++ b/brut.j.util/src/main/java/brut/util/BrutIO.java @@ -97,6 +97,16 @@ public class BrutIO { return canonicalEntryPath.substring(canonicalDirPath.length()); } + public static String normalizePath(String path) { + char separator = File.separatorChar; + + if (separator != '/') { + return path.replace(separator, '/'); + } + + return path; + } + public static void copy(File inputFile, ZipOutputStream outputFile) throws IOException { try ( FileInputStream fis = new FileInputStream(inputFile)

['brut.j.util/src/main/java/brut/util/BrutIO.java', 'brut.j.dir/src/main/java/brut/directory/ZipUtils.java']

{'.java': 2}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1641/1639

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1639

https://github.com/iBotPeaches/Apktool/pull/1641

https://github.com/iBotPeaches/Apktool/pull/1641

fixes

Regression: if frame-path does not exist

https://github.com/iBotPeaches/Apktool/blob/3ec4f360ab09782421e47d16f88a95dd7f7d2058/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java#L793 Ten lines further down the directory is created if it does not exist already.

97003d5c70eebd73ea57b1faca8a2f4531126276

c23c1303dd79d057af0132e697ffc62260704969

https://github.com/ibotpeaches/apktool/compare/97003d5c70eebd73ea57b1faca8a2f4531126276...c23c1303dd79d057af0132e697ffc62260704969

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index 05c8e840..76aea94f 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -790,7 +790,7 @@ final public class AndrolibResources { File dir = new File(path); - if (!dir.isDirectory()) { + if (!dir.isDirectory() && dir.isFile()) { throw new AndrolibException("--frame-path is set to a file, not a directory."); }

['brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java']

{'.java': 1}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1601/1444

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1444

https://github.com/iBotPeaches/Apktool/pull/1601

https://github.com/iBotPeaches/Apktool/pull/1601

fixes

APKTool 2.2.2 - ClassCastException ResColorValue -> ResAttr

https://github.com/iBotPeaches/Apktool/issues/1060 It is almost the same issue with above. Apktook tried to cast ResStringValue to ResAttr and it got an exception. Only this time it is ResColorValue. I personally modified the source as above and rebuilt the apktool, and it decompiled the apk without a problem. I'd like to report here just in case it is a bug. ``` 10:36 $ git diff diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java index cc96e65..acba323 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java @@ -68,7 +68,7 @@ public class ResStyleValue extends ResBagValue implements if (resource.contains("ResReferenceValue@")) { continue; } else if (resource.contains("ResStringValue@") || resource.contains("ResStyleValue@") || - resource.contains("ResBoolValue@")) { + resource.contains("ResBoolValue@") || resource.contains("ResColorValue@")) { name = "@" + spec.getFullName(res.getResSpec().getPackage(), false); } else { ResAttr attr = (ResAttr) spec.getDefaultResource().getValue(); ``` ### Information 1. **Apktool Version (`apktool -version`)** - 2.2.2 2. **Operating System (Mac, Linux, Windows)** - Windows 3. **APK From? (Playstore, ROM, Other)** - Playstore ### Stacktrace/Logcat ``` $ java -jar ../apktool_2.2.2.jar d -f xxx.apk I: Using Apktool 2.2.2 on xxx.apk I: Loading resource table... I: Decoding AndroidManifest.xml with resources... I: Loading resource table from file: C:\\Users\\yyy\\AppData\\Local\\apktool\\framework\\1.apk I: Regular manifest package... I: Decoding file-resources... I: Decoding values */* XMLs... Exception in thread "main" java.lang.ClassCastException: brut.androlib.res.data.value.ResColorValue cannot be cast to brut.androlib.res.data.value.ResAttr at brut.androlib.res.data.value.ResStyleValue.serializeToResValuesXml(ResStyleValue.java:74) at brut.androlib.res.AndrolibResources.generateValuesFile(AndrolibResources.java:517) at brut.androlib.res.AndrolibResources.decode(AndrolibResources.java:267) at brut.androlib.Androlib.decodeResourcesFull(Androlib.java:131) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:108) at brut.apktool.Main.cmdDecode(Main.java:166) at brut.apktool.Main.main(Main.java:81) ``` ### Steps to Reproduce 1. java -jar ../apktool_2.2.2.jar d -f xxx.apk

481299c748bb7d692cd9da4971a7879c17234e35

9abaa4ee30e5dcab9182f6d835a30ea8f406733f

https://github.com/ibotpeaches/apktool/compare/481299c748bb7d692cd9da4971a7879c17234e35...9abaa4ee30e5dcab9182f6d835a30ea8f406733f

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java index 297d3d51..d6df9629 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java @@ -63,17 +63,15 @@ public class ResStyleValue extends ResBagValue implements String name = null; String value = null; - String resource = spec.getDefaultResource().getValue().toString(); - // hacky-fix remove bad ReferenceVars - if (resource.contains("ResReferenceValue@")) { + ResValue resource = spec.getDefaultResource().getValue(); + if (resource instanceof ResReferenceValue) { continue; - } else if (resource.contains("ResStringValue@") || resource.contains("ResStyleValue@") || - resource.contains("ResBoolValue@")) { - name = "@" + spec.getFullName(res.getResSpec().getPackage(), false); - } else { - ResAttr attr = (ResAttr) spec.getDefaultResource().getValue(); + } else if (resource instanceof ResAttr) { + ResAttr attr = (ResAttr) resource; value = attr.convertToResXmlFormat(mItems[i].m2); name = spec.getFullName(res.getResSpec().getPackage(), true); + } else { + name = "@" + spec.getFullName(res.getResSpec().getPackage(), false); } if (value == null) {

['brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStyleValue.java']

{'.java': 1}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1568/1534

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1534

https://github.com/iBotPeaches/Apktool/pull/1568

https://github.com/iBotPeaches/Apktool/pull/1568

fixes

Error decompiling Hangouts v.20+

### Information 1. 2.2.4-acb004-SNAPSHOT (and 2.2.3) 2. Mac 3. Play Store ### Stacktrace/Logcat ``` I: Using Apktool 2.2.4-acb004-SNAPSHOT on Hangouts.apk I: Loading resource table... Exception in thread "main" brut.androlib.AndrolibException: Could not decode arsc file at brut.androlib.res.decoder.ARSCDecoder.decode(ARSCDecoder.java:52) at brut.androlib.res.AndrolibResources.getResPackagesFromApk(AndrolibResources.java:562) at brut.androlib.res.AndrolibResources.loadMainPkg(AndrolibResources.java:72) at brut.androlib.res.AndrolibResources.getResTable(AndrolibResources.java:64) at brut.androlib.Androlib.getResTable(Androlib.java:68) at brut.androlib.ApkDecoder.setTargetSdkVersion(ApkDecoder.java:207) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:109) at brut.apktool.Main.cmdDecode(Main.java:166) at brut.apktool.Main.main(Main.java:81) Caused by: java.io.IOException: Expected: 0x00000008, got: 0x00000202 at brut.util.ExtDataInput.skipCheckShort(ExtDataInput.java:56) at brut.androlib.res.decoder.ARSCDecoder.readValue(ARSCDecoder.java:309) at brut.androlib.res.decoder.ARSCDecoder.readEntry(ARSCDecoder.java:241) at brut.androlib.res.decoder.ARSCDecoder.readTableType(ARSCDecoder.java:226) at brut.androlib.res.decoder.ARSCDecoder.readTableTypeSpec(ARSCDecoder.java:156) at brut.androlib.res.decoder.ARSCDecoder.readTablePackage(ARSCDecoder.java:118) at brut.androlib.res.decoder.ARSCDecoder.readTableHeader(ARSCDecoder.java:80) at brut.androlib.res.decoder.ARSCDecoder.decode(ARSCDecoder.java:47) ... 8 more ``` ### Steps to Reproduce 1. apktool d Hangouts.apk

e93ae011a8a8bdf05f0c9dc3d3ed03f1d1283d59

eda95b3da2b93700b3e3abe0991b584b83553f91

https://github.com/ibotpeaches/apktool/compare/e93ae011a8a8bdf05f0c9dc3d3ed03f1d1283d59...eda95b3da2b93700b3e3abe0991b584b83553f91

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index 1888e954..95c5610b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -156,7 +156,7 @@ public class ARSCDecoder { readTableType(); // skip "TYPE 8 chunks" and/or padding data at the end of this chunk - if(mCountIn.getCount() < mHeader.endPosition) { + if (mCountIn.getCount() < mHeader.endPosition) { mCountIn.skip(mHeader.endPosition - mCountIn.getCount()); } @@ -238,6 +238,12 @@ public class ARSCDecoder { short flags = mIn.readShort(); int specNamesId = mIn.readInt(); + // If we are here, we probably already inserted any remaining dummy resources. No need to parse + // any resources that doesn't have type information + if (mCountIn.getCount() == mHeader.endPosition) { + return; + } + ResValue value = (flags & ENTRY_FLAG_COMPLEX) == 0 ? readValue() : readComplexEntry(); if (mTypeSpec.isString() && value instanceof ResFileValue) { @@ -519,6 +525,8 @@ public class ARSCDecoder { private HashMap<Integer, ResTypeSpec> mResTypeSpecs = new HashMap<>(); private final static short ENTRY_FLAG_COMPLEX = 0x0001; + private final static short ENTRY_FLAG_PUBLIC = 0x0002; + private final static short ENTRY_FLAG_WEAK = 0x0004; public static class Header { public final short type;

['brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java']

{'.java': 1}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1490/1160

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1160

https://github.com/iBotPeaches/Apktool/pull/1490

https://github.com/iBotPeaches/Apktool/pull/1490

fix

ApkDecoder locks input file

Running ``` ApkDecoder decoder = new ApkDecoder(); try { decoder.setDecodeSources(ApkDecoder.DECODE_SOURCES_NONE); decoder.setDecodeResources(ApkDecoder.DECODE_RESOURCES_FULL); decoder.setApkFile(new File("i.apk")); decoder.setOutDir(new File("out")); decoder.setAnalysisMode(true, true); decoder.decode(); Thread.sleep(60000 * 100); } catch (Exception e) { e.printStackTrace(); } ``` causes Apktool to lock the input file under Windows until the JVM is exited.

4800bd7b449c63d237c78b980e21cd7906ddb5d1

66c1b468655d363087a3a58d7d65a1e267bd53b3

https://github.com/ibotpeaches/apktool/compare/4800bd7b449c63d237c78b980e21cd7906ddb5d1...66c1b468655d363087a3a58d7d65a1e267bd53b3

diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index 74470801..6e292713 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -187,6 +187,11 @@ public class Main { } catch (DirectoryException ex) { System.err.println("Could not modify internal dex files. Please ensure you have permission."); System.exit(1); + } finally { + try { + decoder.close(); + } catch (IOException e) { + } } } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index 8a1aaf55..d51cb8d4 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -741,6 +741,10 @@ public class Androlib { return files; } + public void close() throws IOException { + mAndRes.close(); + } + private final static Logger LOGGER = Logger.getLogger(Androlib.class.getName()); private final static String SMALI_DIRNAME = "smali"; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java index aa2ca555..72a10488 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java @@ -60,6 +60,14 @@ public class ApkDecoder { } public void setApkFile(File apkFile) { + if (mApkFile != null) + { + try { + mApkFile.close(); + } catch (IOException e) { + } + } + mApkFile = new ExtFile(apkFile); mResTable = null; } @@ -73,93 +81,100 @@ public class ApkDecoder { } public void decode() throws AndrolibException, IOException, DirectoryException { - File outDir = getOutDir(); - AndrolibResources.sKeepBroken = mKeepBrokenResources; - - if (!mForceDelete && outDir.exists()) { - throw new OutDirExistsException(); - } - - if (!mApkFile.isFile() || !mApkFile.canRead()) { - throw new InFileNotFoundException(); - } - try { - OS.rmdir(outDir); - } catch (BrutException ex) { - throw new AndrolibException(ex); - } - outDir.mkdirs(); + File outDir = getOutDir(); + AndrolibResources.sKeepBroken = mKeepBrokenResources; - LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + mApkFile.getName()); + if (!mForceDelete && outDir.exists()) { + throw new OutDirExistsException(); + } - if (hasResources()) { - switch (mDecodeResources) { - case DECODE_RESOURCES_NONE: - mAndrolib.decodeResourcesRaw(mApkFile, outDir); - break; - case DECODE_RESOURCES_FULL: - setTargetSdkVersion(); - setAnalysisMode(mAnalysisMode, true); + if (!mApkFile.isFile() || !mApkFile.canRead()) { + throw new InFileNotFoundException(); + } - if (hasManifest()) { - mAndrolib.decodeManifestWithResources(mApkFile, outDir, getResTable()); - } - mAndrolib.decodeResourcesFull(mApkFile, outDir, getResTable()); - break; + try { + OS.rmdir(outDir); + } catch (BrutException ex) { + throw new AndrolibException(ex); } - } else { - // if there's no resources.asrc, decode the manifest without looking - // up attribute references - if (hasManifest()) { + outDir.mkdirs(); + + LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + mApkFile.getName()); + + if (hasResources()) { switch (mDecodeResources) { case DECODE_RESOURCES_NONE: - mAndrolib.decodeManifestRaw(mApkFile, outDir); + mAndrolib.decodeResourcesRaw(mApkFile, outDir); break; case DECODE_RESOURCES_FULL: - mAndrolib.decodeManifestFull(mApkFile, outDir, - getResTable()); + setTargetSdkVersion(); + setAnalysisMode(mAnalysisMode, true); + + if (hasManifest()) { + mAndrolib.decodeManifestWithResources(mApkFile, outDir, getResTable()); + } + mAndrolib.decodeResourcesFull(mApkFile, outDir, getResTable()); break; } + } else { + // if there's no resources.asrc, decode the manifest without looking + // up attribute references + if (hasManifest()) { + switch (mDecodeResources) { + case DECODE_RESOURCES_NONE: + mAndrolib.decodeManifestRaw(mApkFile, outDir); + break; + case DECODE_RESOURCES_FULL: + mAndrolib.decodeManifestFull(mApkFile, outDir, + getResTable()); + break; + } + } } - } - if (hasSources()) { - switch (mDecodeSources) { - case DECODE_SOURCES_NONE: - mAndrolib.decodeSourcesRaw(mApkFile, outDir, "classes.dex"); - break; - case DECODE_SOURCES_SMALI: - mAndrolib.decodeSourcesSmali(mApkFile, outDir, "classes.dex", mBakDeb, mApi); - break; + if (hasSources()) { + switch (mDecodeSources) { + case DECODE_SOURCES_NONE: + mAndrolib.decodeSourcesRaw(mApkFile, outDir, "classes.dex"); + break; + case DECODE_SOURCES_SMALI: + mAndrolib.decodeSourcesSmali(mApkFile, outDir, "classes.dex", mBakDeb, mApi); + break; + } } - } - if (hasMultipleSources()) { - // foreach unknown dex file in root, lets disassemble it - Set<String> files = mApkFile.getDirectory().getFiles(true); - for (String file : files) { - if (file.endsWith(".dex")) { - if (! file.equalsIgnoreCase("classes.dex")) { - switch(mDecodeSources) { - case DECODE_SOURCES_NONE: - mAndrolib.decodeSourcesRaw(mApkFile, outDir, file); - break; - case DECODE_SOURCES_SMALI: - mAndrolib.decodeSourcesSmali(mApkFile, outDir, file, mBakDeb, mApi); - break; + if (hasMultipleSources()) { + // foreach unknown dex file in root, lets disassemble it + Set<String> files = mApkFile.getDirectory().getFiles(true); + for (String file : files) { + if (file.endsWith(".dex")) { + if (! file.equalsIgnoreCase("classes.dex")) { + switch(mDecodeSources) { + case DECODE_SOURCES_NONE: + mAndrolib.decodeSourcesRaw(mApkFile, outDir, file); + break; + case DECODE_SOURCES_SMALI: + mAndrolib.decodeSourcesSmali(mApkFile, outDir, file, mBakDeb, mApi); + break; + } } } } } - } - mAndrolib.decodeRawFiles(mApkFile, outDir); - mAndrolib.decodeUnknownFiles(mApkFile, outDir, mResTable); - mUncompressedFiles = new ArrayList<String>(); - mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles); - mAndrolib.writeOriginalFiles(mApkFile, outDir); - writeMetaFile(); + mAndrolib.decodeRawFiles(mApkFile, outDir); + mAndrolib.decodeUnknownFiles(mApkFile, outDir, mResTable); + mUncompressedFiles = new ArrayList<String>(); + mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles); + mAndrolib.writeOriginalFiles(mApkFile, outDir); + writeMetaFile(); + } finally { + try { + mApkFile.close(); + } catch (IOException e) { + } + } } public void setDecodeSources(short mode) throws AndrolibException { @@ -273,6 +288,10 @@ public class ApkDecoder { } } + public void close() throws IOException { + mAndrolib.close(); + } + public final static short DECODE_SOURCES_NONE = 0x0000; public final static short DECODE_SOURCES_SMALI = 0x0001; diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index ae884321..3b308422 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -121,7 +121,8 @@ final public class AndrolibResources { File apk = getFrameworkApk(id, frameTag); LOGGER.info("Loading resource table from file: " + apk); - ResPackage[] pkgs = getResPackagesFromApk(new ExtFile(apk), resTable, true); + mFramework = new ExtFile(apk); + ResPackage[] pkgs = getResPackagesFromApk(mFramework, resTable, true); ResPackage pkg; if (pkgs.length > 1) { @@ -555,15 +556,23 @@ final public class AndrolibResources { private ResPackage[] getResPackagesFromApk(ExtFile apkFile,ResTable resTable, boolean keepBroken) throws AndrolibException { try { - BufferedInputStream bfi = new BufferedInputStream(apkFile.getDirectory().getFileInput("resources.arsc")); - return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages(); + Directory dir = apkFile.getDirectory(); + BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc")); + try { + return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages(); + } finally { + try { + bfi.close(); + } catch (IOException e) { + } + } } catch (DirectoryException ex) { throw new AndrolibException("Could not load resources.arsc from file: " + apkFile, ex); } } public File getFrameworkApk(int id, String frameTag) - throws AndrolibException { + throws AndrolibException { File dir = getFrameworkDir(); File apk; @@ -810,6 +819,10 @@ final public class AndrolibResources { } } + public void close() throws IOException { + mFramework.close(); + } + public ApkOptions apkOptions; // TODO: dirty static hack. I have to refactor decoding mechanisms. @@ -819,6 +832,8 @@ final public class AndrolibResources { private File mFrameworkDirectory = null; + private ExtFile mFramework = null; + private String mMinSdkVersion = null; private String mMaxSdkVersion = null; private String mTargetSdkVersion = null; diff --git a/brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java b/brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java index c2befcbe..ea906c7a 100644 --- a/brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java +++ b/brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java @@ -17,6 +17,7 @@ package brut.directory; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.LinkedHashMap; @@ -235,6 +236,11 @@ public abstract class AbstractDirectory implements Directory { return dirs; } + + public void close() throws IOException { + + } + private SubPath getSubPath(String path) throws PathNotExist { ParsedPath parsed = parsePath(path); if (parsed.dir == null) { diff --git a/brut.j.dir/src/main/java/brut/directory/Directory.java b/brut.j.dir/src/main/java/brut/directory/Directory.java index 0199135d..e7a972be 100644 --- a/brut.j.dir/src/main/java/brut/directory/Directory.java +++ b/brut.j.dir/src/main/java/brut/directory/Directory.java @@ -50,5 +50,8 @@ public interface Directory { public int getCompressionLevel(String fileName) throws DirectoryException; + + public void close() throws IOException; + public final char separator = '/'; } diff --git a/brut.j.dir/src/main/java/brut/directory/ExtFile.java b/brut.j.dir/src/main/java/brut/directory/ExtFile.java index 583c3fa1..008e1b45 100644 --- a/brut.j.dir/src/main/java/brut/directory/ExtFile.java +++ b/brut.j.dir/src/main/java/brut/directory/ExtFile.java @@ -17,6 +17,7 @@ package brut.directory; import java.io.File; +import java.io.IOException; import java.net.URI; /** @@ -54,5 +55,9 @@ public class ExtFile extends File { return mDirectory; } + public void close() throws IOException { + mDirectory.close(); + } + private Directory mDirectory; } diff --git a/brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java b/brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java index bb76298a..a400ce34 100644 --- a/brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java +++ b/brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java @@ -151,4 +151,8 @@ public class ZipRODirectory extends AbstractDirectory { return mZipFile; } + + public void close() throws IOException { + mZipFile.close(); + } }

['brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java', 'brut.j.dir/src/main/java/brut/directory/ExtFile.java', 'brut.j.dir/src/main/java/brut/directory/Directory.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java', 'brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java', 'brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java']

{'.java': 8}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

ibotpeaches/apktool/1147/1145

ibotpeaches

apktool

https://github.com/iBotPeaches/Apktool/issues/1145

https://github.com/iBotPeaches/Apktool/pull/1147

https://github.com/iBotPeaches/Apktool/pull/1147

fixes

I found a problem while unpacking a apk named by “xxx .apk” --- with the blank space at the end of the apk name.

hi, I found a problem while unpacking a apk named by “xxx .apk” --- with the blank space at the end of the apk name. (apktool V2.0.3 on Win7 ) ``` F:\\test>apktool.bat d -f "test .apk" I: Using Apktool 2.1.0-a64a03-SNAPSHOT on test .apk I: Loading resource table... I: Decoding AndroidManifest.xml with resources... Exception in thread "main" brut.androlib.AndrolibException: brut.directory.Direc toryException: java.io.FileNotFoundException: test \\AndroidManifest.xml (系统找 不到指定的路径。) at brut.androlib.res.decoder.ResFileDecoder.decodeManifest(ResFileDecode r.java:142) at brut.androlib.res.AndrolibResources.decodeManifestWithResources(Andro libResources.java:199) at brut.androlib.Androlib.decodeManifestWithResources(Androlib.java:142) at brut.androlib.ApkDecoder.decode(ApkDecoder.java:100) at brut.apktool.Main.cmdDecode(Main.java:165) at brut.apktool.Main.main(Main.java:81) Caused by: brut.directory.DirectoryException: java.io.FileNotFoundException: tes t \\AndroidManifest.xml (系统找不到指定的路径。) at brut.directory.FileDirectory.getFileOutputLocal(FileDirectory.java:64 ) at brut.directory.AbstractDirectory.getFileOutput(AbstractDirectory.java :115) at brut.androlib.res.decoder.ResFileDecoder.decodeManifest(ResFileDecode r.java:138) ... 5 more Caused by: java.io.FileNotFoundException: test \\AndroidManifest.xml (系统找不到 指定的路径。) at java.io.FileOutputStream.open0(Native Method) at java.io.FileOutputStream.open(Unknown Source) at java.io.FileOutputStream.<init>(Unknown Source) at java.io.FileOutputStream.<init>(Unknown Source) at brut.directory.FileDirectory.getFileOutputLocal(FileDirectory.java:62 ) ... 7 more ``` --- But, It is OK with the param "-o" F:\\test>apktool.bat d -f "test .apk" -o test so, Apktool do not handle the path correctly ?

114af9799d00d05d225ea2cda539d576c807eadf

ce66e17ee07629ddc9a46c473be4419339fd074a

https://github.com/ibotpeaches/apktool/compare/114af9799d00d05d225ea2cda539d576c807eadf...ce66e17ee07629ddc9a46c473be4419339fd074a

diff --git a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java index 2256ca9e..eac49618 100644 --- a/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java +++ b/brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java @@ -151,7 +151,7 @@ public class Main { // make out folder manually using name of apk String outName = apkName; outName = outName.endsWith(".apk") ? outName.substring(0, - outName.length() - 4) : outName + ".out"; + outName.length() - 4).trim() : outName + ".out"; // make file from path outName = new File(outName).getName();

['brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java']

{'.java': 1}

Java

{'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154}

Apache License 2.0

appium/appium/1695/1549

appium

appium

https://github.com/appium/appium/issues/1549

https://github.com/appium/appium/pull/1695

https://github.com/appium/appium/pull/1695

fixes

Getting "unknown server-side error..." when real error is "Could not find an element…"

Android only: appium 11.2 python android native app If I'm on a page without a button and I try driver.find_element_by_xpath('//button') I see in the log: 2013-11-27T21:17:07.542Z - info: [BOOTSTRAP] [debug] Finding //button using XPATH with the contextId: 2013-11-27 15:17:07,552 [DEBUG] exec_logger.AppiumServer:info: [BOOTSTRAP] [info] Returning result: {"value":"Could not find an element using supplied strategy. ","status":13} [service.py:47] 2013-11-27 15:17:07,552 [DEBUG] exec_logger.AppiumServer:info: Responding to client with error: {"status":13,"value":{"message":"An unknown server-side error occurred while processing the command.","origValue":"Could not find an element using supplied strategy. "},"sessionId":"fe3c866f-81d6-4fff-a28f-5e9c40a17562"} [service.py:47] and the exception that is returned to my call is WebDriverException: Message: u'An unknown server-side error occurred while processing the command.' I did some digging in the bootstrap java and every time I convinced myself I knew where it was I would find something that changed my mind, but I did see that in handlers/Find.java it was doing stuff like catch (final ElementNotFoundException e) { return getErrorResult(e.getMessage()); } and getErrorResult is defined in Find's superclass CommandHandler as protected AndroidCommandResult getErrorResult(final String msg) { return new AndroidCommandResult(WDStatus.UNKNOWN_ERROR, msg); } I believe instead of the 13: UNKNOWN_ERROR, bootstrap should throw 7: NO_SUCH_ELEMENT

0dc74e9874cb66b5a836c7519ae3d828f8359b86

5d88a0eb4866a0cde8e6cbdfdeb01e6089045415

https://github.com/appium/appium/compare/0dc74e9874cb66b5a836c7519ae3d828f8359b86...5d88a0eb4866a0cde8e6cbdfdeb01e6089045415

diff --git a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java index fe95c4585..6317a869d 100644 --- a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java +++ b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java @@ -33,10 +33,10 @@ import com.android.uiautomator.core.UiSelector; /** * This handler is used to find elements in the Android UI. - * + * * Based on which {@link Strategy}, {@link UiSelector}, and optionally the * contextId, the element Id or Ids are returned to the user. - * + * */ public class Find extends CommandHandler { AndroidElementsHash elements = AndroidElementsHash.getInstance(); @@ -60,11 +60,11 @@ public class Find extends CommandHandler { /* * @param command The {@link AndroidCommand} used for this handler. - * + * * @return {@link AndroidCommandResult} - * + * * @throws JSONException - * + * * @see io.appium.android.bootstrap.CommandHandler#execute(io.appium.android. * bootstrap.AndroidCommand) */ @@ -211,15 +211,15 @@ public class Find extends CommandHandler { return getSuccessResult(fetchElement(sel, contextId)); } } catch (final AndroidCommandException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.UNKNOWN_ERROR, e.getMessage()); } catch (final ElementNotFoundException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } catch (final UnallowedTagNameException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.UNKNOWN_ERROR, e.getMessage()); } catch (final ElementNotInHashException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } catch (final UiObjectNotFoundException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } } else { try { @@ -260,13 +260,13 @@ public class Find extends CommandHandler { } catch (final InvalidStrategyException e) { return getErrorResult(e.getMessage()); } catch (final UnallowedTagNameException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.UNKNOWN_ERROR, e.getMessage()); } catch (final AndroidCommandException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.UNKNOWN_ERROR, e.getMessage()); } catch (final UiObjectNotFoundException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } catch (final ElementNotFoundException e) { - return getErrorResult(e.getMessage()); + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } } } @@ -274,12 +274,12 @@ public class Find extends CommandHandler { /** * Get the element from the {@link AndroidElementsHash} and return the element * id using JSON. - * + * * @param sel * A UiSelector that targets the element to fetch. * @param contextId * The Id of the element used for the context. - * + * * @return JSONObject * @throws JSONException * @throws ElementNotFoundException @@ -295,12 +295,12 @@ public class Find extends CommandHandler { /** * Get an array of elements from the {@link AndroidElementsHash} and return * the element's ids using JSON. - * + * * @param sel * A UiSelector that targets the element to fetch. * @param contextId * The Id of the element used for the context. - * + * * @return JSONObject * @throws JSONException * @throws UiObjectNotFoundException @@ -320,7 +320,7 @@ public class Find extends CommandHandler { /** * Create and return a UiSelector based on the strategy, text, and how many * you want returned. - * + * * @param strategy * The {@link Strategy} used to search for the element. * @param text @@ -400,7 +400,7 @@ public class Find extends CommandHandler { /** * Create and return a UiSelector based on Xpath attributes. - * + * * @param path * The Xpath path. * @param attr @@ -409,7 +409,7 @@ public class Find extends CommandHandler { * Any constraint. * @param substr * Any substr. - * + * * @return UiSelector * @throws AndroidCommandException */

['lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java']

{'.java': 1}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

appium/appium/4365/4200

appium

appium

https://github.com/appium/appium/issues/4200

https://github.com/appium/appium/pull/4365

https://github.com/appium/appium/pull/4365

fixes

Restart UIAutomator to find missing elements

Read the end of [this issue](https://github.com/appium/java-client/issues/74#issuecomment-61511540). According to @ranbena restarting UIAutomator works %100 of the time to fix an issue where sometimes elements aren't returned by getPAgeSource(). It's definitely a bug in Android UIAutomator, but it seems like we can work around it by restarting the UIAutomator process. Right now, restarting the process causes the Appium session to fail. What should we consider for fixing these missing elements? Options I've thought of so far: 1) Make a "restart UIAutomator" function available to clients. 2) Restart UIAutomator whenever an element isn't found (or add it to some retry logic) 3) Create a "Setting" (from our settings api) which when enabled restarts UIAutomator when elements aren't found, and doesn't restart UIAutomator when disabled. Any more ideas? @jlipps @bootstraponline @sebv @imurchie @0x1mason @JessicaSachs

23e1f6b5084ed1b8e474a7b6d21960696a93ca78

7971429ce9cc395f42da69527fa48aa4a6ef34e9

https://github.com/appium/appium/compare/23e1f6b5084ed1b8e474a7b6d21960696a93ca78...7971429ce9cc395f42da69527fa48aa4a6ef34e9

diff --git a/lib/devices/android/bootstrap/src/com/android/uiautomator/common/ReflectionUtils.java b/lib/devices/android/bootstrap/src/com/android/uiautomator/common/ReflectionUtils.java index 29ab12461..e5c5b6cd6 100644 --- a/lib/devices/android/bootstrap/src/com/android/uiautomator/common/ReflectionUtils.java +++ b/lib/devices/android/bootstrap/src/com/android/uiautomator/common/ReflectionUtils.java @@ -7,6 +7,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import static io.appium.android.bootstrap.utils.API.API_18; +import java.lang.reflect.InvocationTargetException; public class ReflectionUtils { private static Field enableField(final Class<?> clazz, final String field) @@ -47,6 +48,32 @@ public class ReflectionUtils { public Object getBridge() { return bridge; } + + /** + * Clears the in-process Accessibility cache, removing any stale references. + * Because the AccessibilityInteractionClient singleton stores copies of AccessibilityNodeInfo + * instances, calls to public APIs such as `recycle` do not guarantee cached references get + * updated. See the android.view.accessibility AIC and ANI source code for more information. + */ + public static boolean clearAccessibilityCache() { + boolean success = false; + + try { + ReflectionUtils utils = new ReflectionUtils(); + Class c = Class.forName("android.view.accessibility.AccessibilityInteractionClient"); + Method getInstance = utils.getMethod(c, "getInstance"); + Object instance = getInstance.invoke(null); + Method clearCache = utils.getMethod(instance.getClass(), "clearCache"); + clearCache.invoke(instance); + success = true; + } catch (Exception ex) { + // Expected: ClassNotFoundException, NoSuchMethodException, IllegalAccessException, + // InvocationTargetException, NoSuchFieldException + Logger.error("Failed to clear Accessibility Node cache. " + ex.getMessage()); + } + + return success; + } public Method getControllerMethod(final String name, final Class<?>... parameterTypes) throws NoSuchMethodException, SecurityException { diff --git a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java index d9b2f5bf6..d781eaae2 100644 --- a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java +++ b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java @@ -1,7 +1,17 @@ package io.appium.android.bootstrap.handler; +import com.android.uiautomator.common.ReflectionUtils; import com.android.uiautomator.core.UiObjectNotFoundException; import com.android.uiautomator.core.UiSelector; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import javax.xml.parsers.ParserConfigurationException; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import java.util.regex.Pattern; + import io.appium.android.bootstrap.*; import io.appium.android.bootstrap.exceptions.ElementNotFoundException; import io.appium.android.bootstrap.exceptions.InvalidSelectorException; @@ -12,15 +22,6 @@ import io.appium.android.bootstrap.utils.ClassInstancePair; import io.appium.android.bootstrap.utils.ElementHelpers; import io.appium.android.bootstrap.utils.UiAutomatorParser; import io.appium.android.bootstrap.utils.XMLHierarchy; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import javax.xml.parsers.ParserConfigurationException; -import java.util.ArrayList; -import java.util.Hashtable; -import java.util.List; -import java.util.regex.Pattern; import static io.appium.android.bootstrap.utils.API.API_18; @@ -62,6 +63,24 @@ public class Find extends CommandHandler { @Override public AndroidCommandResult execute(final AndroidCommand command) throws JSONException { + return execute(command, false); + } + + /** + * execute implementation. + * + * @see io.appium.android.bootstrap.handler.Find#execute(io.appium.android. + * bootstrap.AndroidCommand) + * + * @param command The {@link AndroidCommand} used for this handler. + * + * @param isRetry Is this invocation a second attempt? + * + * @return {@link AndroidCommandResult} + * @throws JSONException + */ + private AndroidCommandResult execute(final AndroidCommand command, boolean isRetry) + throws JSONException { final Hashtable<String, Object> params = command.params(); // only makes sense on a device @@ -82,7 +101,6 @@ public class Find extends CommandHandler { try { Object result = null; List<UiSelector> selectors = getSelectors(strategy, text, multiple); - if (!multiple) { for (final UiSelector sel : selectors) { try { @@ -97,8 +115,7 @@ public class Find extends CommandHandler { } else { List<AndroidElement> foundElements = new ArrayList<AndroidElement>(); for (final UiSelector sel : selectors) { - // With multiple selectors, we expect that some elements may not - // exist. + // With multiple selectors, we expect that some elements may not exist. try { Logger.debug("Using: " + sel.toString()); List<AndroidElement> elementsFromSelector = fetchElements(sel, contextId); @@ -112,10 +129,20 @@ public class Find extends CommandHandler { result = elementsToJSONArray(foundElements); } - // If there are no results, then return an error. if (result == null) { - return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, - "No element found"); + if (!isRetry) { + Logger.debug("Failed to locate element. Clearing Accessibility cache and retrying."); + // some control updates fail to trigger AccessibilityEvents, resulting in stale AccessibilityNodeInfo + // instances. In these cases, UIAutomator will fail to locate visible elements. As a work-around, + // force clear the AccessibilityInteractionClient's cache and search again. This technique also + // appears to make Appium's searches conclude more quickly. See Appium issue #4200 + // https://github.com/appium/appium/issues/4200 + if (ReflectionUtils.clearAccessibilityCache()) { + return execute(command, true); + } + } + // If there are no results and we've already retried, return an error. + return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, "No element found"); } return getSuccessResult(result); @@ -132,6 +159,7 @@ public class Find extends CommandHandler { } } + /** * Get the element from the {@link AndroidElementsHash} and return the element * id using JSON. diff --git a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Source.java b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Source.java index 1097ab336..82c32eab9 100644 --- a/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Source.java +++ b/lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Source.java @@ -1,5 +1,6 @@ package io.appium.android.bootstrap.handler; +import com.android.uiautomator.common.ReflectionUtils; import io.appium.android.bootstrap.AndroidCommand; import io.appium.android.bootstrap.AndroidCommandResult; import io.appium.android.bootstrap.CommandHandler; @@ -21,6 +22,7 @@ import java.io.StringWriter; public class Source extends CommandHandler { @Override public AndroidCommandResult execute(AndroidCommand command) throws JSONException { + ReflectionUtils.clearAccessibilityCache(); Document doc = (Document) XMLHierarchy.getFormattedXMLDoc();

['lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Source.java', 'lib/devices/android/bootstrap/src/io/appium/android/bootstrap/handler/Find.java', 'lib/devices/android/bootstrap/src/com/android/uiautomator/common/ReflectionUtils.java']

{'.java': 3}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

appium/appium/1145/1140

appium

appium

https://github.com/appium/appium/issues/1140

https://github.com/appium/appium/pull/1145

https://github.com/appium/appium/pull/1145

fix

catch NullPointerExceptions instead of crashing

As reported on the mailing list: ``` info: [ADB STDOUT] java.lang.NullPointerException info: [ADB STDOUT] at io.appium.android.bootstrap.handler.Click.execute(Click.java:42) ``` The server methods should never crash on a NullPointerException. The fix is to add NullPointerException to the existing try/catch blocks on every command.

868a3202bfe7c99966c9760dde4c0b12780cd95b

935e12bf6fae07eccdf3ed4970eca771376950c0

https://github.com/appium/appium/compare/868a3202bfe7c99966c9760dde4c0b12780cd95b...935e12bf6fae07eccdf3ed4970eca771376950c0

diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java index 095b19255..a8871bdf1 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java @@ -43,8 +43,10 @@ public class Clear extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error clearing text"); } } - return getErrorResult("Unknown error clearing text"); + return getErrorResult("Unknown error"); } } diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java index 599184020..9700a348c 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java @@ -47,6 +47,8 @@ public class Click extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } } else { final Hashtable<String, Object> params = command.params(); diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java index 596bc3c97..a6717556f 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java @@ -50,9 +50,10 @@ public class Drag extends CommandHandler { if (params.get("elementId") != JSONObject.NULL) { el = command.getElement(); } - } catch (final ElementNotInHashException e) { + } catch (final Exception e) { el = null; } + try { if (params.get("destElId") != JSONObject.NULL) { destEl = command.getDestElement(); diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java index 3d360d446..63bcf8778 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java @@ -5,7 +5,6 @@ import io.appium.android.bootstrap.AndroidCommandResult; import io.appium.android.bootstrap.AndroidElement; import io.appium.android.bootstrap.CommandHandler; import io.appium.android.bootstrap.Logger; -import io.appium.android.bootstrap.exceptions.ElementNotInHashException; import io.appium.android.bootstrap.exceptions.InvalidCoordinatesException; import io.appium.android.bootstrap.utils.Point; @@ -14,7 +13,6 @@ import java.util.Hashtable; import org.json.JSONException; import com.android.uiautomator.core.UiDevice; -import com.android.uiautomator.core.UiObjectNotFoundException; /** * This handler is used to flick elements in the Android UI. @@ -83,11 +81,7 @@ public class Flick extends CommandHandler { end.x = start.x + xoffset; end.y = start.y + yoffset; - } catch (final ElementNotInHashException e) { - return getErrorResult(e.getMessage()); - } catch (final UiObjectNotFoundException e) { - return getErrorResult(e.getMessage()); - } catch (final InvalidCoordinatesException e) { + } catch (final Exception e) { return getErrorResult(e.getMessage()); } } else { diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java index 20f19a8fe..092346fd3 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java @@ -54,7 +54,7 @@ public class GetAttribute extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); - } catch (final NullPointerException e) { // el is null + } catch (final Exception e) { // el is null return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java index c50db3ba6..623e5f121 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java @@ -41,6 +41,8 @@ public class GetName extends CommandHandler { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } } } diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java index 7436fb413..3c2e65fe5 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java @@ -48,6 +48,8 @@ public class GetSize extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } return getSuccessResult(res); } else { diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java index e6b048461..61af00218 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java @@ -41,6 +41,8 @@ public class GetText extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } } else { return getErrorResult("Unable to get text without an element."); diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java index de5bef203..8a91c9c18 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java @@ -46,7 +46,10 @@ public class SetAttribute extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } + } else { final Hashtable<String, Object> params = command.params(); diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java index d4939d2ac..30b48a4f2 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java @@ -58,6 +58,8 @@ public class SetText extends CommandHandler { } catch (final ElementNotInHashException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } } else { return getErrorResult("Unable to set text without an element."); diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java index ae09f3749..5d2fe87e9 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java @@ -55,6 +55,8 @@ public class Swipe extends CommandHandler { return getErrorResult(e.getMessage()); } catch (final InvalidCoordinatesException e) { return getErrorResult(e.getMessage()); + } catch (final Exception e) { // handle NullPointerException + return getErrorResult("Unknown error"); } } else { try {

['android/bootstrap/src/io/appium/android/bootstrap/handler/SetAttribute.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java']

{'.java': 11}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

appium/appium/1104/1100

appium

appium

https://github.com/appium/appium/issues/1100

https://github.com/appium/appium/pull/1104

https://github.com/appium/appium/pull/1104

fix

Android button click returns false on success

When clicking a button on Android, uiautomator always returns false even though it was a successful click. Other buttons return the expected `true` value when clicked.

88f8bb47d82cacde31a2344808d31a0ce51a52f5

6844140adfe04167bee66dd27b196e8b2fc8e909

https://github.com/appium/appium/compare/88f8bb47d82cacde31a2344808d31a0ce51a52f5...6844140adfe04167bee66dd27b196e8b2fc8e909

diff --git a/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java b/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java index ee0e21e6d..599184020 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java @@ -39,8 +39,8 @@ public class Click extends CommandHandler { if (command.isElementCommand()) { try { final AndroidElement el = command.getElement(); - final boolean res = el.click(); - return getSuccessResult(res); + el.click(); + return getSuccessResult(true); } catch (final UiObjectNotFoundException e) { return new AndroidCommandResult(WDStatus.NO_SUCH_ELEMENT, e.getMessage());

['android/bootstrap/src/io/appium/android/bootstrap/handler/Click.java']

{'.java': 1}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

appium/appium/703/675

appium

appium

https://github.com/appium/appium/issues/675

https://github.com/appium/appium/pull/703

https://github.com/appium/appium/pull/703

fixes

Source is broken

``` warn: remote object '/data/local/tmp/dump.xml' does not exist ``` I'm seeing this when testing on a local emulator. > info: [ADB STDOUT] Error in testRunServer: > info: [ADB STDOUT] java.lang.IllegalStateException: UiAutomationService not connected. Did you call #register()? The response to dump is strange. > adb -s emulator-5554 shell uiautomator dump /data/local/tmp/dump.xml > Killed

3c1b180073b92b4219799eb1ad5bac508a639ff1

4a2b957ae5edca0382c10b41523d1c8e72a22060

https://github.com/appium/appium/compare/3c1b180073b92b4219799eb1ad5bac508a639ff1...4a2b957ae5edca0382c10b41523d1c8e72a22060

diff --git a/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java b/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java index d77c243d4..f5b659265 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java @@ -117,7 +117,7 @@ class SocketServer { final TimerTask updateWatchers = new TimerTask() { @Override public void run() { - watchers.check(); + try { watchers.check(); } catch (Exception e) {} } }; timer.scheduleAtFixedRate(updateWatchers, 100, 100);

['android/bootstrap/src/io/appium/android/bootstrap/SocketServer.java']

{'.java': 1}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

appium/appium/679/678

appium

appium

https://github.com/appium/appium/issues/678

https://github.com/appium/appium/pull/679

https://github.com/appium/appium/pull/679

fixes

finding android.webkit.WebView object fails

I am trying to find the android.webkit.WebView element in my hybrid android app. I am using XPATH "//web" to find_element. Appium server is searching for "android.widget.WebView" instead of "android.webkit.WebView" and fails. AndroidElementClassMap seems to look only in android.widget namespace. Used android 4.2 OS to test this. Thanks in advance. -Vishwanath

df073431e761173b7c62c79adde0a4ee76003585

745c170bdd68c54a7b87af947e9769fa74c0f75d

https://github.com/appium/appium/compare/df073431e761173b7c62c79adde0a4ee76003585...745c170bdd68c54a7b87af947e9769fa74c0f75d

diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java b/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java index 2a56eafad..6d306a0d6 100644 --- a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java +++ b/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java @@ -134,7 +134,7 @@ public class AndroidElementClassMap { map.put("viewpager", "ViewPager"); map.put("viewstub", "ViewStub"); map.put("viewswitcher", "ViewSwitcher"); - map.put("web", "WebView"); + map.put("web", "android.webkit.WebView"); map.put("window", "FrameLayout"); map.put("zoom", "ZoomButton"); map.put("zoomcontrols", "ZoomControls");

['android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java']

{'.java': 1}

JavaScript

{'JavaScript': 1508008, 'TypeScript': 514934, 'Java': 28622, 'C#': 18579, 'HTML': 15974, 'Shell': 13107, 'RobotFramework': 7582, 'Handlebars': 2875, 'Python': 783, 'Ruby': 680, 'CSS': 122}

Apache License 2.0

material-components/material-components-android/2718/2615

material-components

material-components-android

https://github.com/material-components/material-components-android/issues/2615

https://github.com/material-components/material-components-android/pull/2718

https://github.com/material-components/material-components-android/pull/2718

resolves

[TextInputLayout] DropdownMenuEndIconDelegate is leaking ContextThemeWrapper instance

**Description:** DropdownMenuEndIconDelegate is leaking ContextThemeWrapper instance **Expected behavior:** Should not leak. **Source code:** Your own code of DropdownMenuEndIconDelegate **Minimal sample app repro:** Use LeakCanary to check this in your samples when switching between light/dark mode. **Android API version:** 25 **Material Library version:** 1.6.0-beta01 **Device:** PAX Aries 8

768d0cfa2ba99dfb207453e4882ab73abf824db0

08997f33e004111f4db4c5be7b83adb8418ae8b8

https://github.com/material-components/material-components-android/compare/768d0cfa2ba99dfb207453e4882ab73abf824db0...08997f33e004111f4db4c5be7b83adb8418ae8b8

diff --git a/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java b/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java index 011f5553c..45c625725 100644 --- a/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java +++ b/lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java @@ -40,12 +40,12 @@ import android.text.Editable; import android.text.TextWatcher; import android.view.MotionEvent; import android.view.View; +import android.view.View.OnAttachStateChangeListener; import android.view.View.OnClickListener; import android.view.View.OnFocusChangeListener; import android.view.View.OnTouchListener; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener; import android.widget.AutoCompleteTextView; import android.widget.AutoCompleteTextView.OnDismissListener; import android.widget.EditText; @@ -54,6 +54,8 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityManagerCompat; +import androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import com.google.android.material.animation.AnimationUtils; import com.google.android.material.color.MaterialColors; @@ -190,6 +192,38 @@ class DropdownMenuEndIconDelegate extends EndIconDelegate { editText.setOnDismissListener(null); } } + if (previousIcon == TextInputLayout.END_ICON_DROPDOWN_MENU) { + textInputLayout.removeOnAttachStateChangeListener(onAttachStateChangeListener); + removeTouchExplorationStateChangeListenerIfNeeded(); + } + } + }; + + private final OnAttachStateChangeListener onAttachStateChangeListener = new OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View ignored) { + addTouchExplorationStateChangeListenerIfNeeded(); + } + + @Override + public void onViewDetachedFromWindow(View ignored) { + removeTouchExplorationStateChangeListenerIfNeeded(); + } + }; + + private final TouchExplorationStateChangeListener touchExplorationStateChangeListener = + new TouchExplorationStateChangeListener() { + @Override + public void onTouchExplorationStateChanged(boolean enabled) { + if (textInputLayout != null) { + final AutoCompleteTextView autoCompleteTextView = + (AutoCompleteTextView) textInputLayout.getEditText(); + if (autoCompleteTextView != null && !isEditable(autoCompleteTextView)) { + ViewCompat.setImportantForAccessibility( + endIconView, + enabled ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES); + } + } } }; @@ -265,20 +299,8 @@ class DropdownMenuEndIconDelegate extends EndIconDelegate { initAnimators(); accessibilityManager = (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE); - if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) { - accessibilityManager.addTouchExplorationStateChangeListener( - new TouchExplorationStateChangeListener() { - @Override - public void onTouchExplorationStateChanged(boolean enabled) { - if (textInputLayout.getEditText() != null - && !isEditable(textInputLayout.getEditText())) { - ViewCompat.setImportantForAccessibility( - endIconView, - enabled ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES); - } - } - }); - } + textInputLayout.addOnAttachStateChangeListener(onAttachStateChangeListener); + addTouchExplorationStateChangeListenerIfNeeded(); } @Override @@ -530,4 +552,20 @@ class DropdownMenuEndIconDelegate extends EndIconDelegate { return animator; } + + private void addTouchExplorationStateChangeListenerIfNeeded() { + if (accessibilityManager != null + && textInputLayout != null + && ViewCompat.isAttachedToWindow(textInputLayout)) { + AccessibilityManagerCompat.addTouchExplorationStateChangeListener( + accessibilityManager, touchExplorationStateChangeListener); + } + } + + private void removeTouchExplorationStateChangeListenerIfNeeded() { + if (accessibilityManager != null) { + AccessibilityManagerCompat.removeTouchExplorationStateChangeListener( + accessibilityManager, touchExplorationStateChangeListener); + } + } }

['lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java']

{'.java': 1}

Java

{'Java': 6714445}

Apache License 2.0

williamfiset/algorithms/98/59

williamfiset

algorithms

https://github.com/williamfiset/Algorithms/issues/59

https://github.com/williamfiset/Algorithms/pull/98

https://github.com/williamfiset/Algorithms/pull/98

solved

Cut polygon additional points

The [cut polygon](https://github.com/williamfiset/Algorithms/blob/master/Geometry/ConvexPolygonCutWithLineSegment.java) snippet seems to provide additional points when a cut operation is performed which probably shouldn't be there. For example, when the following runs the additional point (2,2) appears out of nowhere. ```java Pt[] squarePolygon = {new Pt(0, 0), new Pt(0, 4), new Pt(4, 0), new Pt(4, 4)}; Pt p1 = new Pt(-1, -1); Pt p2 = new Pt(5, 5); Pt[] poly1 = cut(squarePolygon, p1, p2); Pt[] poly2 = cut(squarePolygon, p2, p1); System.out.println("First polygon:"); for (Pt pt : poly1) System.out.println(pt); // Prints: // First polygon: // (4.0,4.0) // (0.0,0.0) // (0.0,4.0) // (2.0,2.0) <-- Probably should not be here? System.out.println("\\nSecond polygon:"); for (Pt pt : poly2) System.out.println(pt); // Second polygon: // (4.0,4.0) // (0.0,0.0) // (2.0,2.0) <-- Probably should not be here? // (4.0,0.0) ``` @FinnLidbetter assigning you since made this snippet right? Perhaps you can offer some insight.

dcf94d6cef0100a83acab2349a4ca9194d7056ba

2e4f2521663be0fd068ebdae4c313b35a5cc178e

https://github.com/williamfiset/algorithms/compare/dcf94d6cef0100a83acab2349a4ca9194d7056ba...2e4f2521663be0fd068ebdae4c313b35a5cc178e

diff --git a/com/williamfiset/algorithms/geometry/ConvexPolygonCutWithLineSegment.java b/com/williamfiset/algorithms/geometry/ConvexPolygonCutWithLineSegment.java index cc75a61..df72ad7 100644 --- a/com/williamfiset/algorithms/geometry/ConvexPolygonCutWithLineSegment.java +++ b/com/williamfiset/algorithms/geometry/ConvexPolygonCutWithLineSegment.java @@ -1,13 +1,14 @@ /** - * This algorithm cuts a convex polygon with a line segment and returns the two resulting pieces. + * This algorithm cuts a ordered convex polygon with a line segment and returns the two resulting pieces. * - * <p>Time Complexity: O(n) + * <p>Time Complexity: O(nlogn) * * @author Finn Lidbetter */ package com.williamfiset.algorithms.geometry; import java.util.*; +import java.lang.*; public class ConvexPolygonCutWithLineSegment { @@ -27,6 +28,29 @@ public class ConvexPolygonCutWithLineSegment { return "(" + x + "," + y + ")"; } } + + + //sorts the points in CW direction. + public static List<Pt> sortCW(List<Pt> poly){ + + int l = poly.size(); + double centroidX = 0; + double centroidY = 0; + for(int i = 0; i<l; i++){ + centroidX+= poly.get(i).x; + centroidY+= poly.get(i).y; + } + centroidX = centroidX/l; + centroidY = centroidY/l; + Pt center = new Pt(centroidX, centroidY); + + Collections.sort(poly, (a, b) -> { + double a1 = (Math.toDegrees(Math.atan2(a.x - center.x, a.y - center.y)) + 360) % 360; + double a2 = (Math.toDegrees(Math.atan2(b.x - center.x, b.y - center.y)) + 360) % 360; + return (int) (a1 - a2); + }); + return poly; + } // Cuts a convex polygon by a specified line and returns one part // of the polygon (swapping the endpoints p1 and p2 of the line @@ -61,14 +85,38 @@ public class ConvexPolygonCutWithLineSegment { double cross = bx * cy - by * cx; return cross < -EPS ? -1 : cross > EPS ? 1 : 0; } + + //takes Pt[] as an argument and returns List<Pt> + public static List<Pt> makeList(Pt[] squarePolygon){ + List<Pt> list = new ArrayList<Pt>(); + for (int i=0; i<squarePolygon.length; i++){ + list.add(squarePolygon[i]); + } + return list; + } + + //takes List<Pt> as an argument and returns Pt[] + public static Pt[] makeArray(List<Pt> list){ + int l = list.size(); + Pt[] temp = new Pt[l]; + for (int i=0; i<l; i++){ + temp[i] = list.get(i); + } + return temp; + } // Example usage public static void main(String[] args) { - - Pt[] squarePolygon = {new Pt(0, 0), new Pt(0, 4), new Pt(4, 0), new Pt(4, 4)}; + + Pt[] squarePolygon = {new Pt(0, 0), new Pt(0, 4), new Pt(4, 0), new Pt(4, 4), new Pt(0, 2)}; Pt p1 = new Pt(-1, -1); Pt p2 = new Pt(5, 5); - + + int l = squarePolygon.length; + List list = makeList(squarePolygon); + list = sortCW(list); + squarePolygon = makeArray(list); + Pt[] poly1 = cut(squarePolygon, p1, p2); Pt[] poly2 = cut(squarePolygon, p2, p1); @@ -76,18 +124,18 @@ public class ConvexPolygonCutWithLineSegment { for (Pt pt : poly1) System.out.println(pt); // Prints: // First polygon: + // (0.0,4.0) // (4.0,4.0) // (0.0,0.0) - // (0.0,4.0) - // (2.0,2.0) <-- Probably should not be here? + // (0.0,2.0) System.out.println("\\nSecond polygon:"); for (Pt pt : poly2) System.out.println(pt); + //Prints: // Second polygon: // (4.0,4.0) - // (0.0,0.0) - // (2.0,2.0) <-- Probably should not be here? // (4.0,0.0) + // (0.0,0.0) } }

['com/williamfiset/algorithms/geometry/ConvexPolygonCutWithLineSegment.java']

{'.java': 1}