id
int64 0
10.6k
| text_id
stringlengths 16
67
| repo_owner
stringclasses 237
values | repo_name
stringclasses 302
values | issue_url
stringlengths 38
89
| pull_url
stringlengths 37
87
| comment_url
stringlengths 37
94
| links_count
int64 1
2
| issue_title
stringlengths 7
197
| link_keyword
stringclasses 12
values | issue_body
stringlengths 18
133k
| base_sha
stringlengths 40
40
| head_sha
stringlengths 40
40
| diff_url
stringlengths 120
170
| diff
stringlengths 478
1.18M
| changed_files
stringlengths 46
71.4k
| changed_files_count
int64 1
809
| java_changed_files_count
int64 1
809
| py_changed_files_count
int64 0
0
| kt_changed_files_count
int64 0
0
| code_changed_files_count
int64 1
809
| changed_files_exts
stringclasses 34
values | pull_create_at
unknown | stars
int64 10
44.3k
| language
stringclasses 9
values | languages
stringclasses 303
values | license
stringclasses 2
values |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
3,637 | apache/shardingsphere/2352/2343 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2343 | https://github.com/apache/shardingsphere/pull/2352 | https://github.com/apache/shardingsphere/pull/2352 | 1 | Sharding-proxy Query result :extraneous data in "D" message ,reason: have chinese | fixes | ## 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-RC1
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Expected behavior
table data have Chinese .select * from table show error message :
extraneous data in "D" message
### Actual behavior
proxy backend POSTGRES , frontend postgres
### Reason analyze (If you can)
reason Chinese , Postgres server_encoding ,client_encoding UTF-8
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
any table ,have Chinese is error.
### Example codes for reproduce this issue (such as a github link). | 6c49107d434c31e5f95365bb1bfcbcd52f7f4585 | a4adf6df82926c267a74fb287249106a9582715d | https://github.com/apache/shardingsphere/compare/6c49107d434c31e5f95365bb1bfcbcd52f7f4585...a4adf6df82926c267a74fb287249106a9582715d | diff --git a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/postgresql/packet/command/query/text/PostgreSQLDataRowPacket.java b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/postgresql/packet/command/query/text/PostgreSQLDataRowPacket.java
index ee4b0ac0032..9eabe5a9c31 100644
--- a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/postgresql/packet/command/query/text/PostgreSQLDataRowPacket.java
+++ b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/postgresql/packet/command/query/text/PostgreSQLDataRowPacket.java
@@ -50,7 +50,7 @@ public final class PostgreSQLDataRowPacket implements PostgreSQLPacket {
payload.writeBytes((byte[]) each);
} else {
String columnData = each.toString();
- payload.writeInt4(columnData.length());
+ payload.writeInt4(columnData.getBytes().length);
payload.writeStringEOF(columnData);
}
} | ['sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/postgresql/packet/command/query/text/PostgreSQLDataRowPacket.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-05-08T09:25:56" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,635 | apache/shardingsphere/2424/2417 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2417 | https://github.com/apache/shardingsphere/pull/2424 | https://github.com/apache/shardingsphere/pull/2424 | 1 | Get error index info when use hibernate.hbm2ddl.auto=update | fixes | ## Version
* Spring Boot 2.1.5.RELEASE
* ShardingSphere 4.0.0-RC1
* MySQL 5.7
## Question
I have set the option "spring.jpa.properties.hibernate.hbm2ddl.auto=update"
config application.yml:
```
datasource:
names: ds0, ds1, ds2
# ****
sharding:
default-data-source-name: ds0
# ...
tables:
cpn_code:
actual-data-nodes: ds$->{1..2}.cpn_code$->{0..9}
# ...
```
* Apllication start always send sql **CREATE INDEX idx_cpnId ON cpn_code...**
Because Index Name in MySql is 'idx_cpnId_cpn_code0, idx_cpnId_cpn_code2...' , hibernate entity
```
@Entity
@Table(name = "cpn_code", indexes = {
@Index(name = "idx_cpnId", columnList = "cpnId")
})
public class CouponCode {
```
* Sometimes application start fail because got Exception **Cannot find actual data node for data source name: 'ds0' and logic table name: 'cpn_code'**
```
//org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl#performTablesMigration
//org.hibernate.tool.schema.internal.AbstractSchemaMigrator#applyIndexes
//org.hibernate.tool.schema.internal.AbstractSchemaMigrator#findMatchingIndex
//org.hibernate.tool.schema.extract.internal.TableInformationImpl#getIndex
//org.hibernate.tool.schema.extract.internal.TableInformationImpl#indexes
//org.hibernate.tool.schema.extract.internal.InformationExtractorJdbcDatabaseMetaDataImpl#getIndexes
//org.apache.shardingsphere.shardingjdbc.jdbc.core.datasource.metadata.ResultSetReturnedDatabaseMetaData#getIndexInfo
// when currentDataSourceName is 'ds0' , method getDataNode will throw Exception
return null == table || null == shardingRule ? table : (shardingRule.findTableRule(table).isPresent() ? shardingRule.getDataNode(currentDataSourceName, table).getTableName() : table);
// so I config actual-data-nodes: ds$->{0..2} to avoid error
```
| e298fc8b022e24f5465ee66fbf25c505267a417e | 30f895655a2cef66d6506de45daebfcbfa869e62 | https://github.com/apache/shardingsphere/compare/e298fc8b022e24f5465ee66fbf25c505267a417e...30f895655a2cef66d6506de45daebfcbfa869e62 | diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
index e029f4baa9e..3db568a57c2 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.shardingjdbc.jdbc.core.datasource.metadata;
+import org.apache.shardingsphere.core.rule.DataNode;
import org.apache.shardingsphere.core.rule.ShardingRule;
import org.apache.shardingsphere.shardingjdbc.jdbc.adapter.WrapperAdapter;
import org.apache.shardingsphere.shardingjdbc.jdbc.core.resultset.DatabaseMetaDataResultSet;
@@ -257,7 +258,7 @@ public abstract class ResultSetReturnedDatabaseMetaData extends WrapperAdapter i
}
private String getCurrentDataSourceName() {
- currentDataSourceName = shardingRule.getShardingDataSourceNames().getRandomDataSourceName();
+ currentDataSourceName = null == currentDataSourceName ? shardingRule.getShardingDataSourceNames().getRandomDataSourceName() : currentDataSourceName;
return shardingRule.getShardingDataSourceNames().getRawMasterDataSourceName(currentDataSourceName);
}
@@ -266,6 +267,15 @@ public abstract class ResultSetReturnedDatabaseMetaData extends WrapperAdapter i
}
private String getActualTable(final String table) {
- return null == table || null == shardingRule ? table : (shardingRule.findTableRule(table).isPresent() ? shardingRule.getDataNode(currentDataSourceName, table).getTableName() : table);
+ if (null == table || null == shardingRule) {
+ return table;
+ }
+ String result = table;
+ if (shardingRule.findTableRule(table).isPresent()) {
+ DataNode dataNode = shardingRule.getDataNode(table);
+ currentDataSourceName = dataNode.getDataSourceName();
+ result = dataNode.getTableName();
+ }
+ return result;
}
}
diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
index aa4ff31c13c..b71bf21f0a1 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -45,6 +45,8 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
private static final String TABLE_NAME = "TABLE_NAME";
+ private static final String INDEX_NAME = "INDEX_NAME";
+
private final int type;
private final int concurrency;
@@ -82,8 +84,9 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
ArrayList<DatabaseMetaDataObject> result = Lists.newArrayList();
Set<DatabaseMetaDataObject> removeDuplicationSet = new HashSet<>();
int tableNameColumnIndex = columnLabelIndexMap.containsKey(TABLE_NAME) ? columnLabelIndexMap.get(TABLE_NAME) : -1;
+ int indexNameColumnIndex = columnLabelIndexMap.containsKey(INDEX_NAME) ? columnLabelIndexMap.get(INDEX_NAME) : -1;
while (resultSet.next()) {
- DatabaseMetaDataObject databaseMetaDataObject = generateDatabaseMetaDataObject(tableNameColumnIndex, resultSet);
+ DatabaseMetaDataObject databaseMetaDataObject = generateDatabaseMetaDataObject(tableNameColumnIndex, indexNameColumnIndex, resultSet);
if (!removeDuplicationSet.contains(databaseMetaDataObject)) {
result.add(databaseMetaDataObject);
removeDuplicationSet.add(databaseMetaDataObject);
@@ -92,13 +95,17 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
return result.iterator();
}
- private DatabaseMetaDataObject generateDatabaseMetaDataObject(final int tableNameColumnIndex, final ResultSet resultSet) throws SQLException {
+ private DatabaseMetaDataObject generateDatabaseMetaDataObject(final int tableNameColumnIndex, final int indexNameColumnIndex, final ResultSet resultSet) throws SQLException {
DatabaseMetaDataObject result = new DatabaseMetaDataObject(resultSetMetaData.getColumnCount());
for (int i = 1; i <= columnLabelIndexMap.size(); i++) {
if (tableNameColumnIndex == i) {
String tableName = resultSet.getString(i);
Collection<String> logicTableNames = shardingRule.getLogicTableNames(tableName);
result.addObject(logicTableNames.isEmpty() ? tableName : logicTableNames.iterator().next());
+ } else if (indexNameColumnIndex == i) {
+ String tableName = resultSet.getString(tableNameColumnIndex);
+ String indexName = resultSet.getString(i);
+ result.addObject(indexName.endsWith(tableName) ? indexName.substring(0, indexName.indexOf(tableName) - 1) : indexName);
} else {
result.addObject(resultSet.getObject(i));
}
diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
index 47a26a5bcb2..875519df792 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
@@ -17,8 +17,10 @@
package org.apache.shardingsphere.shardingjdbc.jdbc.core.datasource.metadata;
+import org.apache.shardingsphere.core.rule.DataNode;
import org.apache.shardingsphere.core.rule.ShardingDataSourceNames;
import org.apache.shardingsphere.core.rule.ShardingRule;
+import org.apache.shardingsphere.core.rule.TableRule;
import org.apache.shardingsphere.shardingjdbc.jdbc.core.resultset.DatabaseMetaDataResultSet;
import org.junit.Before;
import org.junit.Test;
@@ -43,9 +45,15 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import com.google.common.base.Optional;
+
@RunWith(MockitoJUnitRunner.class)
public final class CachedDatabaseMetaDataTest {
+ private final String DATASOURCE_NAME = "ds";
+
+ private final String TABLE_NAME = "table";
+
@Mock
private DataSource dataSource;
@@ -64,7 +72,7 @@ public final class CachedDatabaseMetaDataTest {
@Before
public void setUp() throws SQLException {
- dataSourceMap.put("ds", dataSource);
+ dataSourceMap.put(DATASOURCE_NAME, dataSource);
when(dataSource.getConnection()).thenReturn(connection);
when(connection.getMetaData()).thenReturn(databaseMetaData);
when(resultSet.getMetaData()).thenReturn(mock(ResultSetMetaData.class));
@@ -74,9 +82,11 @@ public final class CachedDatabaseMetaDataTest {
private ShardingRule mockShardingRule() {
ShardingRule result = mock(ShardingRule.class);
ShardingDataSourceNames shardingDataSourceNames = mock(ShardingDataSourceNames.class);
- when(shardingDataSourceNames.getRandomDataSourceName()).thenReturn("ds");
- when(shardingDataSourceNames.getRawMasterDataSourceName("ds")).thenReturn("ds");
+ when(shardingDataSourceNames.getRandomDataSourceName()).thenReturn(DATASOURCE_NAME);
+ when(shardingDataSourceNames.getRawMasterDataSourceName(DATASOURCE_NAME)).thenReturn(DATASOURCE_NAME);
when(result.getShardingDataSourceNames()).thenReturn(shardingDataSourceNames);
+ when(result.findTableRule(TABLE_NAME)).thenReturn(Optional.of(new TableRule(DATASOURCE_NAME, TABLE_NAME)));
+ when(result.getDataNode(TABLE_NAME)).thenReturn(new DataNode(DATASOURCE_NAME, TABLE_NAME));
return result;
}
@@ -938,8 +948,8 @@ public final class CachedDatabaseMetaDataTest {
@Test
public void assertGetIndexInfo() throws SQLException {
- when(databaseMetaData.getIndexInfo("test", null, null, true, true)).thenReturn(resultSet);
- assertThat(cachedDatabaseMetaData.getIndexInfo("test", null, null, true, true), instanceOf(DatabaseMetaDataResultSet.class));
+ when(databaseMetaData.getIndexInfo("test", null, TABLE_NAME, true, true)).thenReturn(resultSet);
+ assertThat(cachedDatabaseMetaData.getIndexInfo("test", null, TABLE_NAME, true, true), instanceOf(DatabaseMetaDataResultSet.class));
}
@Test
diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
index d0440a854c3..00030b4a8d0 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java
@@ -65,6 +65,12 @@ public class DatabaseMetaDataResultSetTest {
private static final Date DATE = new Date(System.currentTimeMillis());
+ private static final String INDEX_NAME_COLUMN_LABEL = "INDEX_NAME";
+
+ private static final String ACTUAL_INDEX_NAME = "idx_index_test_table_0";
+
+ private static final String LOGIC_INDEX_NAME = "idx_index";
+
@Mock
private ResultSetMetaData resultSetMetaData;
@@ -78,12 +84,13 @@ public class DatabaseMetaDataResultSetTest {
@SneakyThrows
private void mockResultSetMetaData() {
- when(resultSetMetaData.getColumnCount()).thenReturn(5);
+ when(resultSetMetaData.getColumnCount()).thenReturn(6);
when(resultSetMetaData.getColumnLabel(1)).thenReturn(TABLE_NAME_COLUMN_LABEL);
when(resultSetMetaData.getColumnLabel(2)).thenReturn(NON_TABLE_NAME_COLUMN_LABEL);
when(resultSetMetaData.getColumnLabel(3)).thenReturn(NUMBER_COLUMN_LABEL);
when(resultSetMetaData.getColumnLabel(4)).thenReturn(BYTES_COLUMN_LABEL);
when(resultSetMetaData.getColumnLabel(5)).thenReturn(DATE_COLUMN_LABEL);
+ when(resultSetMetaData.getColumnLabel(6)).thenReturn(INDEX_NAME_COLUMN_LABEL);
}
@SneakyThrows
@@ -95,6 +102,7 @@ public class DatabaseMetaDataResultSetTest {
when(result.getObject(3)).thenReturn(NUMBER);
when(result.getObject(4)).thenReturn(BYTES);
when(result.getObject(5)).thenReturn(DATE);
+ when(result.getString(6)).thenReturn(ACTUAL_INDEX_NAME);
when(result.getType()).thenReturn(ResultSet.TYPE_FORWARD_ONLY);
when(result.getConcurrency()).thenReturn(ResultSet.CONCUR_READ_ONLY);
when(result.next()).thenReturn(true, true, false);
@@ -131,6 +139,7 @@ public class DatabaseMetaDataResultSetTest {
assertThat(databaseMetaDataResultSet.getString(1), is(LOGIC_TABLE_NAME));
assertThat(databaseMetaDataResultSet.getString(2), is("true"));
assertThat(databaseMetaDataResultSet.getString(3), is("100"));
+ assertThat(databaseMetaDataResultSet.getString(6), is(LOGIC_INDEX_NAME));
}
@Test
@@ -139,6 +148,7 @@ public class DatabaseMetaDataResultSetTest {
assertThat(databaseMetaDataResultSet.getString(TABLE_NAME_COLUMN_LABEL), is(LOGIC_TABLE_NAME));
assertThat(databaseMetaDataResultSet.getString(NON_TABLE_NAME_COLUMN_LABEL), is("true"));
assertThat(databaseMetaDataResultSet.getString(NUMBER_COLUMN_LABEL), is("100"));
+ assertThat(databaseMetaDataResultSet.getString(INDEX_NAME_COLUMN_LABEL), is(LOGIC_INDEX_NAME));
}
@Test
@@ -314,7 +324,7 @@ public class DatabaseMetaDataResultSetTest {
@Test(expected = SQLException.class)
public void assertGetObjectOutOfIndexRange() throws SQLException {
databaseMetaDataResultSet.next();
- databaseMetaDataResultSet.getObject(6);
+ databaseMetaDataResultSet.getObject(7);
}
@Test(expected = SQLException.class) | ['sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSetTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java'] | 4 | 4 | 0 | 0 | 4 | {'.java': 4} | "2019-05-22T06:27:31" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,677 | 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 | 1 | Lost the BinaryResultSetRowPacket when there's null value | fixes | 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'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2018-08-29T07:30:29" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,633 | apache/shardingsphere/2529/2528 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2528 | https://github.com/apache/shardingsphere/pull/2529 | https://github.com/apache/shardingsphere/pull/2529 | 1 | tinyint column don't return a 8-bit integer value but a boolean value | fixes | ## 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-RC1-SNAPSHOT
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Expected behavior
When the column type is **tinyint**, return a 8-bit integer in MySQL protocol
### Actual behavior
When the column type is **tinyint**, return a boolean value in MySQL protocol
### Reason analyze (If you can)
JDBC's getObject() return a boolean value if the column occupy one byte.
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
Any query SQL.
### Example codes for reproduce this issue (such as a github link).
| 7a56c4ba2a4a63a3b1cf2846de6fc3c70cd5ccf6 | ba8c9e48052cd04c6dbeaeefb1ffba3579f772c0 | https://github.com/apache/shardingsphere/compare/7a56c4ba2a4a63a3b1cf2846de6fc3c70cd5ccf6...ba8c9e48052cd04c6dbeaeefb1ffba3579f772c0 | diff --git a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/StreamQueryResult.java b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/StreamQueryResult.java
index a7dcbb9b07c..ee8d6833be1 100644
--- a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/StreamQueryResult.java
+++ b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/StreamQueryResult.java
@@ -24,15 +24,9 @@ import org.apache.shardingsphere.core.rule.ShardingRule;
import org.apache.shardingsphere.spi.encrypt.ShardingEncryptor;
import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Blob;
-import java.sql.Clob;
import java.sql.Date;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.SQLXML;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -74,96 +68,12 @@ public final class StreamQueryResult implements QueryResult {
@Override
public Object getValue(final int columnIndex, final Class<?> type) throws SQLException {
- Object result;
- if (Object.class == type) {
- result = decrypt(columnIndex, resultSet.getObject(columnIndex));
- } else if (boolean.class == type) {
- result = decrypt(columnIndex, resultSet.getBoolean(columnIndex));
- } else if (byte.class == type) {
- result = decrypt(columnIndex, resultSet.getByte(columnIndex));
- } else if (short.class == type) {
- result = decrypt(columnIndex, resultSet.getShort(columnIndex));
- } else if (int.class == type) {
- result = decrypt(columnIndex, resultSet.getInt(columnIndex));
- } else if (long.class == type) {
- result = decrypt(columnIndex, resultSet.getLong(columnIndex));
- } else if (float.class == type) {
- result = decrypt(columnIndex, resultSet.getFloat(columnIndex));
- } else if (double.class == type) {
- result = decrypt(columnIndex, resultSet.getDouble(columnIndex));
- } else if (String.class == type) {
- result = decrypt(columnIndex, resultSet.getString(columnIndex));
- } else if (BigDecimal.class == type) {
- result = decrypt(columnIndex, resultSet.getBigDecimal(columnIndex));
- } else if (byte[].class == type) {
- result = resultSet.getBytes(columnIndex);
- } else if (Date.class == type) {
- result = resultSet.getDate(columnIndex);
- } else if (Time.class == type) {
- result = resultSet.getTime(columnIndex);
- } else if (Timestamp.class == type) {
- result = resultSet.getTimestamp(columnIndex);
- } else if (URL.class == type) {
- result = resultSet.getURL(columnIndex);
- } else if (Blob.class == type) {
- result = resultSet.getBlob(columnIndex);
- } else if (Clob.class == type) {
- result = resultSet.getClob(columnIndex);
- } else if (SQLXML.class == type) {
- result = resultSet.getSQLXML(columnIndex);
- } else if (Reader.class == type) {
- result = resultSet.getCharacterStream(columnIndex);
- } else {
- result = decrypt(columnIndex, resultSet.getObject(columnIndex));
- }
- return result;
+ return decrypt(columnIndex, QueryResultUtil.getValue(resultSet, columnIndex));
}
@Override
public Object getValue(final String columnLabel, final Class<?> type) throws SQLException {
- Object result;
- if (Object.class == type) {
- result = decrypt(columnLabel, resultSet.getObject(columnLabel));
- } else if (boolean.class == type) {
- result = decrypt(columnLabel, resultSet.getBoolean(columnLabel));
- } else if (byte.class == type) {
- result = decrypt(columnLabel, resultSet.getByte(columnLabel));
- } else if (short.class == type) {
- result = decrypt(columnLabel, resultSet.getShort(columnLabel));
- } else if (int.class == type) {
- result = decrypt(columnLabel, resultSet.getInt(columnLabel));
- } else if (long.class == type) {
- result = decrypt(columnLabel, resultSet.getLong(columnLabel));
- } else if (float.class == type) {
- result = decrypt(columnLabel, resultSet.getFloat(columnLabel));
- } else if (double.class == type) {
- result = decrypt(columnLabel, resultSet.getDouble(columnLabel));
- } else if (String.class == type) {
- result = decrypt(columnLabel, resultSet.getString(columnLabel));
- } else if (BigDecimal.class == type) {
- result = decrypt(columnLabel, resultSet.getBigDecimal(columnLabel));
- } else if (byte[].class == type) {
- result = resultSet.getBytes(columnLabel);
- } else if (Date.class == type) {
- result = resultSet.getDate(columnLabel);
- } else if (Time.class == type) {
- result = resultSet.getTime(columnLabel);
- } else if (Timestamp.class == type) {
- result = resultSet.getTimestamp(columnLabel);
- } else if (URL.class == type) {
- result = resultSet.getURL(columnLabel);
- } else if (Blob.class == type) {
- result = resultSet.getBlob(columnLabel);
- } else if (Clob.class == type) {
- result = resultSet.getClob(columnLabel);
- } else if (SQLXML.class == type) {
- result = resultSet.getSQLXML(columnLabel);
- } else if (Reader.class == type) {
- result = resultSet.getCharacterStream(columnLabel);
- } else {
- result = decrypt(columnLabel, resultSet.getObject(columnLabel));
- }
- return result;
+ return decrypt(columnLabel, QueryResultUtil.getValue(resultSet, metaData.getColumnIndex(columnLabel)));
}
@Override
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 f16b15b1de1..88a94151f73 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
@@ -34,6 +34,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -81,6 +82,7 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes
when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
when(resultSetMetaData.getTableName(1)).thenReturn("table_x");
when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnType(1)).thenReturn(Types.VARCHAR);
when(resultSet.getString(1)).thenReturn("value");
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
when(preparedStatement.executeQuery()).thenReturn(resultSet);
@@ -99,6 +101,7 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes
when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
when(resultSetMetaData.getTableName(1)).thenReturn("table_x");
when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnType(1)).thenReturn(Types.INTEGER);
when(resultSet1.getMetaData()).thenReturn(resultSetMetaData);
when(resultSet2.getMetaData()).thenReturn(resultSetMetaData);
when(resultSet1.getInt(1)).thenReturn(1);
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 058a9a90112..068e7913aaa 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
@@ -35,6 +35,7 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
+import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -82,6 +83,7 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest {
when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
when(resultSetMetaData.getTableName(1)).thenReturn("table_x");
when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnType(1)).thenReturn(Types.VARCHAR);
when(resultSet.getString(1)).thenReturn("value");
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
when(statement.executeQuery(DQL_SQL)).thenReturn(resultSet);
@@ -101,6 +103,7 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest {
when(resultSetMetaData.getColumnLabel(1)).thenReturn("column");
when(resultSetMetaData.getTableName(1)).thenReturn("table_x");
when(resultSetMetaData.getColumnCount()).thenReturn(1);
+ when(resultSetMetaData.getColumnType(1)).thenReturn(Types.INTEGER);
when(resultSet1.getMetaData()).thenReturn(resultSetMetaData);
when(resultSet2.getMetaData()).thenReturn(resultSetMetaData);
when(resultSet1.getInt(1)).thenReturn(1); | ['sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/StreamQueryResult.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'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2019-06-10T12:19:47" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,631 | apache/shardingsphere/2539/2527 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2527 | https://github.com/apache/shardingsphere/pull/2539 | https://github.com/apache/shardingsphere/pull/2539 | 1 | CachedDatabaseMetaData.getTables throw NullPointerException when use MasterSlaveDataSource | fixes | ## 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-RC1
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-JDBC
### Expected behavior
Return table names
### Actual behavior
Get npe
### Reason analyze (If you can)
asset shardingRule is null
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
DatabaseMetaData databaseMetaData = connection.getMetaData();
databaseMetaData.getTables(null, null, "ACT_ID_PROPERTY", new String[]{ "TABLE" });
### Example codes for reproduce this issue (such as a github link).
| 6981f690ae2864fa4927fdb5fc74f795a981191e | d367e25213a530a87c9242225dcf64310f70691d | https://github.com/apache/shardingsphere/compare/6981f690ae2864fa4927fdb5fc74f795a981191e...d367e25213a530a87c9242225dcf64310f70691d | diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
index 3db568a57c2..13c2a12d1e1 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java
@@ -263,7 +263,10 @@ public abstract class ResultSetReturnedDatabaseMetaData extends WrapperAdapter i
}
private String getActualTableNamePattern(final String tableNamePattern) {
- return null == tableNamePattern ? tableNamePattern : (shardingRule.findTableRule(tableNamePattern).isPresent() ? "%" + tableNamePattern + "%" : tableNamePattern);
+ if (null == tableNamePattern || null == shardingRule) {
+ return tableNamePattern;
+ }
+ return shardingRule.findTableRule(tableNamePattern).isPresent() ? "%" + tableNamePattern + "%" : tableNamePattern;
}
private String getActualTable(final String table) {
diff --git a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
index b71bf21f0a1..5aff76a5d4b 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java
@@ -30,6 +30,7 @@ import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -100,7 +101,7 @@ public final class DatabaseMetaDataResultSet extends AbstractUnsupportedDatabase
for (int i = 1; i <= columnLabelIndexMap.size(); i++) {
if (tableNameColumnIndex == i) {
String tableName = resultSet.getString(i);
- Collection<String> logicTableNames = shardingRule.getLogicTableNames(tableName);
+ Collection<String> logicTableNames = null == shardingRule ? Collections.<String>emptyList() : shardingRule.getLogicTableNames(tableName);
result.addObject(logicTableNames.isEmpty() ? tableName : logicTableNames.iterator().next());
} else if (indexNameColumnIndex == i) {
String tableName = resultSet.getString(tableNameColumnIndex);
diff --git a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
index 875519df792..7b3c07fc90e 100644
--- a/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
+++ b/sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java
@@ -858,8 +858,8 @@ public final class CachedDatabaseMetaDataTest {
@Test
public void assertGetTables() throws SQLException {
- when(databaseMetaData.getTables("test", null, null, null)).thenReturn(resultSet);
- assertThat(cachedDatabaseMetaData.getTables("test", null, null, null), instanceOf(DatabaseMetaDataResultSet.class));
+ when(databaseMetaData.getTables("test", null, "%" + TABLE_NAME + "%", null)).thenReturn(resultSet);
+ assertThat(cachedDatabaseMetaData.getTables("test", null, TABLE_NAME, null), instanceOf(DatabaseMetaDataResultSet.class));
}
@Test | ['sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/CachedDatabaseMetaDataTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/resultset/DatabaseMetaDataResultSet.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/jdbc/core/datasource/metadata/ResultSetReturnedDatabaseMetaData.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2019-06-12T02:03:30" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,630 | apache/shardingsphere/2540/2538 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2538 | https://github.com/apache/shardingsphere/pull/2540 | https://github.com/apache/shardingsphere/pull/2540 | 1 | null and pagination question | fixes | ## Question
I am using the sharding-proxy, the PreparedStatement setString, I set the field to be null object not the 'null' string, the sharding-proxy will treat it as a string to be inserted into table,which is not my expected result is also not the same as in jdbc.
for the pagination, it is not support the sql like 'limit 20 offset 0' ;only support the 'limit 0,20'. if this limit offset statement can be supported in the future?
| a52c6575d18103f1b2dbce21c8939b43fa6c6fbf | b3842463d6809c303bf81f53893e3d89131830f8 | https://github.com/apache/shardingsphere/compare/a52c6575d18103f1b2dbce21c8939b43fa6c6fbf...b3842463d6809c303bf81f53893e3d89131830f8 | diff --git a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLBinaryProtocolValueFactory.java b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLBinaryProtocolValueFactory.java
index 2096db93c05..c761768d170 100644
--- a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLBinaryProtocolValueFactory.java
+++ b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLBinaryProtocolValueFactory.java
@@ -45,6 +45,7 @@ public final class MySQLBinaryProtocolValueFactory {
setFloatBinaryProtocolValue();
setDateBinaryProtocolValue();
setTimeBinaryProtocolValue();
+ setNullBinaryProtocolValue();
}
private static void setStringLenencBinaryProtocolValue() {
@@ -108,6 +109,10 @@ public final class MySQLBinaryProtocolValueFactory {
BINARY_PROTOCOL_VALUES.put(MySQLColumnType.MYSQL_TYPE_TIME, binaryProtocolValue);
}
+ private static void setNullBinaryProtocolValue() {
+ BINARY_PROTOCOL_VALUES.put(MySQLColumnType.MYSQL_TYPE_NULL, null);
+ }
+
/**
* Get binary protocol value.
*
diff --git a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/test/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLMySQLBinaryProtocolValueFactoryTest.java b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/test/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLMySQLBinaryProtocolValueFactoryTest.java
index e30d9a3daa4..e2d542a1403 100644
--- a/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/test/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLMySQLBinaryProtocolValueFactoryTest.java
+++ b/sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/test/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLMySQLBinaryProtocolValueFactoryTest.java
@@ -21,6 +21,8 @@ import org.apache.shardingsphere.shardingproxy.transport.mysql.constant.MySQLCol
import org.junit.Test;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public final class MySQLMySQLBinaryProtocolValueFactoryTest {
@@ -150,8 +152,13 @@ public final class MySQLMySQLBinaryProtocolValueFactoryTest {
assertThat(MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(MySQLColumnType.MYSQL_TYPE_TIME), instanceOf(MySQLTimeBinaryProtocolValue.class));
}
+ @Test
+ public void assertGetBinaryProtocolValueWithMySQLTypeNull() {
+ assertThat(MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(MySQLColumnType.MYSQL_TYPE_NULL), is(nullValue()));
+ }
+
@Test(expected = IllegalArgumentException.class)
public void assertGetBinaryProtocolValueWithUnsupportedType() {
- MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(MySQLColumnType.MYSQL_TYPE_NULL);
+ MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(null);
}
} | ['sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/main/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLBinaryProtocolValueFactory.java', 'sharding-proxy/sharding-proxy-transport/sharding-proxy-transport-mysql/src/test/java/org/apache/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/MySQLMySQLBinaryProtocolValueFactoryTest.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2019-06-12T04:17:58" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,629 | apache/shardingsphere/2541/2142 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2142 | https://github.com/apache/shardingsphere/pull/2541 | https://github.com/apache/shardingsphere/pull/2541 | 1 | OpenTracingSQLExecutionHook.toStringList NullPointerException | fixes | ## 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.0.1
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-JDBC
### Expected behavior
sharding-opentracing log trace without effect main execute
### Actual behavior
log trace throw NullPointerException effect sql execute
### Reason analyze (If you can)
OpenTracingSQLExecutionHook.toStringList method, when params has null, such as insert, call guava Joiner.toString throw NullPointerException
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
As above
### Example codes for reproduce this issue (such as a github link).
As above | a52c6575d18103f1b2dbce21c8939b43fa6c6fbf | c2f4425ee749a288078c5c3045fc984e691ae6c8 | https://github.com/apache/shardingsphere/compare/a52c6575d18103f1b2dbce21c8939b43fa6c6fbf...c2f4425ee749a288078c5c3045fc984e691ae6c8 | 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 0e2589543c7..edd0ad6018a 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
@@ -64,7 +64,7 @@ public final class OpenTracingSQLExecutionHook implements SQLExecutionHook {
if (null == parameterSets || parameterSets.isEmpty()) {
return "";
}
- return String.format("[%s]", Joiner.on(", ").join(parameterSets));
+ return String.format("[%s]", Joiner.on(", ").useForNull("Null").join(parameterSets));
}
@Override | ['sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-06-12T04:40:27" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,628 | apache/shardingsphere/2598/2596 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2596 | https://github.com/apache/shardingsphere/pull/2598 | https://github.com/apache/shardingsphere/pull/2598 | 1 | use sharding-jdbc-spring-boot-starter throw java.util.NoSuchElementException: No value bound | fix | ## 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/apache/incubator-shardingsphere-example/issues).
- Read documentation: [ShardingSphere Doc](https://shardingsphere.apache.org/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-RC2-SNAPSHOT
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-JDBC
### Expected behavior
Do not throw an exception
### Actual behavior
throw an exception
### Reason analyze (If you can)
spring.shardingsphere.encrypt.encryptors is not configured
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
pom.xml
```xml
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<!-- <sharding-sphere.version>4.0.0-RC1</sharding-sphere.version> -->
<sharding-sphere.version>4.0.0-RC2-SNAPSHOT</sharding-sphere.version>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.0.1.RELEASE</version>
<relativePath />
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>sharding-jdbc-spring-boot-starter</artifactId>
<version>${sharding-sphere.version}</version>
</dependency>
</dependencies>
```
application.yml
```yml
spring:
shardingsphere:
datasource:
names: d0,d1
d0:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
jdbc-url: jdbc:mysql://dbserver:3306/d0?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
username: root
password:
d1:
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.jdbc.Driver
jdbc-url: jdbc:mysql://dbserver:3306/d1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
username: root
password:
props:
sql:
show: true
```
DemoApplication.java
```java
@SpringBootApplication
public class DemoApplication {
public static void main(String[] args) {
SpringApplication.run(DemoApplication.class, args);
}
}
```
Log
```
java.lang.reflect.InvocationTargetException: null
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_191]
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_191]
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_191]
at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_191]
at org.apache.shardingsphere.shardingjdbc.spring.boot.util.PropertyUtil.v2(PropertyUtil.java:98) ~[sharding-jdbc-spring-boot-starter-4.0.0-RC2-SNAPSHOT.jar:4.0.0-RC2-SNAPSHOT]
at org.apache.shardingsphere.shardingjdbc.spring.boot.util.PropertyUtil.handle(PropertyUtil.java:61) ~[sharding-jdbc-spring-boot-starter-4.0.0-RC2-SNAPSHOT.jar:4.0.0-RC2-SNAPSHOT]
at org.apache.shardingsphere.shardingjdbc.spring.boot.encrypt.EncryptRuleCondition.getMatchOutcome(EncryptRuleCondition.java:40) ~[sharding-jdbc-spring-boot-starter-4.0.0-RC2-SNAPSHOT.jar:4.0.0-RC2-SNAPSHOT]
at org.springframework.boot.autoconfigure.condition.SpringBootCondition.matches(SpringBootCondition.java:47) ~[spring-boot-autoconfigure-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.context.annotation.ConditionEvaluator.shouldSkip(ConditionEvaluator.java:108) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForBeanMethod(ConfigurationClassBeanDefinitionReader.java:179) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitionsForConfigurationClass(ConfigurationClassBeanDefinitionReader.java:141) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.annotation.ConfigurationClassBeanDefinitionReader.loadBeanDefinitions(ConfigurationClassBeanDefinitionReader.java:117) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.annotation.ConfigurationClassPostProcessor.processConfigBeanDefinitions(ConfigurationClassPostProcessor.java:328) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.annotation.ConfigurationClassPostProcessor.postProcessBeanDefinitionRegistry(ConfigurationClassPostProcessor.java:233) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanDefinitionRegistryPostProcessors(PostProcessorRegistrationDelegate.java:273) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.support.PostProcessorRegistrationDelegate.invokeBeanFactoryPostProcessors(PostProcessorRegistrationDelegate.java:93) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.support.AbstractApplicationContext.invokeBeanFactoryPostProcessors(AbstractApplicationContext.java:694) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:532) ~[spring-context-5.0.5.RELEASE.jar:5.0.5.RELEASE]
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) ~[spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:759) [spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:395) [spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) [spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1255) [spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1243) [spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
at net.saisimon.demo.DemoApplication.main(DemoApplication.java:10) [classes/:na]
Caused by: java.util.NoSuchElementException: No value bound
at org.springframework.boot.context.properties.bind.BindResult.get(BindResult.java:56) ~[spring-boot-2.0.1.RELEASE.jar:2.0.1.RELEASE]
... 25 common frames omitted
```
### Example codes for reproduce this issue (such as a github link).
| a4ec12b259bc3d0349e3e2369f4ef7927254787c | f9fa5dbcc7f941206e52446b9d69bb7b21f89f47 | https://github.com/apache/shardingsphere/compare/a4ec12b259bc3d0349e3e2369f4ef7927254787c...f9fa5dbcc7f941206e52446b9d69bb7b21f89f47 | diff --git a/sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java b/sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java
index 30bcee5a36c..61316090f78 100644
--- a/sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java
+++ b/sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java
@@ -53,8 +53,14 @@ public final class PropertyUtil {
*/
@SuppressWarnings("unchecked")
public static boolean containPropertyPrefix(final Environment environment, final String prefix) {
- Map<String, Object> properties = (Map<String, Object>) (1 == springBootVersion ? v1(environment, prefix, false) : v2(environment, prefix, Map.class));
- return !properties.isEmpty();
+ try {
+ Map<String, Object> properties = (Map<String, Object>) (1 == springBootVersion ? v1(environment, prefix, false) : v2(environment, prefix, Map.class));
+ return !properties.isEmpty();
+ // CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ // CHECKSTYLE:ON
+ return false;
+ }
}
/**
diff --git a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/encrypt/EncryptRuleCondition.java b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/encrypt/EncryptRuleCondition.java
index 95adbf923dd..3163973c313 100644
--- a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/encrypt/EncryptRuleCondition.java
+++ b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/encrypt/EncryptRuleCondition.java
@@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata;
-import java.util.Map;
/**
* Encrypt condition.
@@ -35,9 +34,8 @@ public final class EncryptRuleCondition extends SpringBootCondition {
private static final String ENCRYPT_PREFIX = "spring.shardingsphere.encrypt.encryptors";
@Override
- @SuppressWarnings("unchecked")
public ConditionOutcome getMatchOutcome(final ConditionContext conditionContext, final AnnotatedTypeMetadata annotatedTypeMetadata) {
- Map<String, Object> encryptors = PropertyUtil.handle(conditionContext.getEnvironment(), ENCRYPT_PREFIX.trim(), Map.class);
- return encryptors.isEmpty() ? ConditionOutcome.noMatch("Can't find ShardingSphere encrypt rule configuration in environment.") : ConditionOutcome.match();
+ boolean isEncrypt = PropertyUtil.containPropertyPrefix(conditionContext.getEnvironment(), ENCRYPT_PREFIX);
+ return isEncrypt ? ConditionOutcome.match() : ConditionOutcome.noMatch("Can't find ShardingSphere encrypt rule configuration in environment.");
}
}
diff --git a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
index 61673badf60..468dc8f2dee 100644
--- a/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
+++ b/sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java
@@ -44,6 +44,25 @@ public final class PropertyUtil {
}
}
+ /**
+ * Whether environment contain properties with specified prefix.
+ *
+ * @param environment the environment context
+ * @param prefix the prefix part of property key
+ * @return true if contain, otherwise false
+ */
+ @SuppressWarnings("unchecked")
+ public static boolean containPropertyPrefix(final Environment environment, final String prefix) {
+ try {
+ Map<String, Object> properties = (Map<String, Object>) (1 == springBootVersion ? v1(environment, prefix, false) : v2(environment, prefix, Map.class));
+ return !properties.isEmpty();
+ // CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ // CHECKSTYLE:ON
+ return false;
+ }
+ }
+
/**
* Spring Boot 1.x is compatible with Spring Boot 2.x by Using Java Reflect.
* @param environment : the environment context
@@ -56,7 +75,7 @@ public final class PropertyUtil {
public static <T> T handle(final Environment environment, final String prefix, final Class<T> targetClass) {
switch (springBootVersion) {
case 1:
- return (T) v1(environment, prefix);
+ return (T) v1(environment, prefix, true);
default:
return (T) v2(environment, prefix, targetClass);
}
@@ -64,7 +83,7 @@ public final class PropertyUtil {
@SuppressWarnings("unchecked")
@SneakyThrows
- private static Object v1(final Environment environment, final String prefix) {
+ private static Object v1(final Environment environment, final String prefix, final boolean handlePlaceholder) {
Class<?> resolverClass = Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
Method getSubPropertiesMethod = resolverClass.getDeclaredMethod("getSubProperties", String.class);
@@ -76,7 +95,7 @@ public final class PropertyUtil {
for (Entry<String, Object> entry : dataSourceProps.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
- if (value instanceof String && ((String) value).contains(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX)) {
+ if (handlePlaceholder && value instanceof String && ((String) value).contains(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX)) {
String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParam + key);
propertiesWithPlaceholderResolved.put(key, resolvedValue);
} else { | ['sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/encrypt/EncryptRuleCondition.java', 'sharding-spring/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java', 'sharding-spring/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/org/apache/shardingsphere/shardingjdbc/spring/boot/util/PropertyUtil.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2019-06-24T02:04:23" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,627 | apache/shardingsphere/2678/2629 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2629 | https://github.com/apache/shardingsphere/pull/2678 | https://github.com/apache/shardingsphere/pull/2678 | 1 | Get NullPointerException when execute SQL on tables without sharding rule | fixes | ## 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/apache/incubator-shardingsphere-example/issues).
- Read documentation: [ShardingSphere Doc](https://shardingsphere.apache.org/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?
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-JDBC and Sharding-Proxy
### Expected behavior
Get Sharding Execption when execute SQL on tables without sharding rule
### Actual behavior
Get NullPointerException when execute SQL on tables without sharding rule
### Reason analyze (If you can)
Parse engine will parse tableName, Route engine pass the SQLStatement to UnicastRoutingEngine, which return RoutingResult with null datasource name.
Ref:
```
RoutingEngineFactory.java
if (shardingRule.isAllBroadcastTables(tableNames)) {
return sqlStatement instanceof SelectStatement ? new UnicastRoutingEngine(shardingRule, tableNames) : new DatabaseBroadcastRoutingEngine(shardingRule);
}
ShardingDataSourceNames.java
public String getDefaultDataSourceName() {
return 1 == dataSourceNames.size() ? dataSourceNames.iterator().next() : shardingRuleConfig.getDefaultDataSourceName();
}
```
### 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).
| ae3ea6a8edbd2bc709e507b78c1fb90021b8f7f5 | 3b9f933ca11b84e67e86cb8bc362e78c45501b12 | https://github.com/apache/shardingsphere/compare/ae3ea6a8edbd2bc709e507b78c1fb90021b8f7f5...3b9f933ca11b84e67e86cb8bc362e78c45501b12 | diff --git a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
index 79d5acf97dc..64d007846cb 100644
--- a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
+++ b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.core.rule;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import lombok.Getter;
import org.apache.shardingsphere.api.config.masterslave.MasterSlaveRuleConfiguration;
@@ -41,6 +42,7 @@ public final class ShardingDataSourceNames {
private final Collection<String> dataSourceNames;
public ShardingDataSourceNames(final ShardingRuleConfiguration shardingRuleConfig, final Collection<String> rawDataSourceNames) {
+ Preconditions.checkArgument(null != shardingRuleConfig, "can not construct ShardingDataSourceNames with null ShardingRuleConfig");
this.shardingRuleConfig = shardingRuleConfig;
dataSourceNames = getAllDataSourceNames(rawDataSourceNames);
}
diff --git a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java
index 8490e7f4db8..48bf8699de6 100644
--- a/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java
+++ b/sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java
@@ -73,7 +73,8 @@ public class ShardingRule implements BaseRule {
private final EncryptRule encryptRule;
public ShardingRule(final ShardingRuleConfiguration shardingRuleConfig, final Collection<String> dataSourceNames) {
- Preconditions.checkArgument(!dataSourceNames.isEmpty(), "Data sources cannot be empty.");
+ Preconditions.checkArgument(null != shardingRuleConfig, "ShardingRuleConfig cannot be null.");
+ Preconditions.checkArgument(null != dataSourceNames && !dataSourceNames.isEmpty(), "Data sources cannot be empty.");
this.shardingRuleConfig = shardingRuleConfig;
shardingDataSourceNames = new ShardingDataSourceNames(shardingRuleConfig, dataSourceNames);
tableRules = createTableRules(shardingRuleConfig);
diff --git a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
index e127f5b2613..a0140a60033 100644
--- a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
+++ b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
@@ -31,6 +31,7 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
public final class ShardingDataSourceNamesTest {
@@ -90,4 +91,9 @@ public final class ShardingDataSourceNamesTest {
String actual = new ShardingDataSourceNames(shardingRuleConfig, Arrays.asList("master_ds", "slave_ds")).getRawMasterDataSourceName("default_ds");
assertThat(actual, is("default_ds"));
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void assertConstructShardingDataSourceNamesWithNullShardingRuleConfiguration() {
+ new ShardingDataSourceNames(null, Arrays.asList("master_ds", "slave_ds")).getRawMasterDataSourceName("default_ds");
+ }
}
diff --git a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
index 60df86596e1..8b48c1ce954 100644
--- a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
+++ b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
@@ -43,6 +43,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -328,6 +329,21 @@ public final class ShardingRuleTest {
ShardingRule actual = createMaximumShardingRule();
assertThat(actual.getShardingLogicTableNames(Arrays.asList("LOGIC_TABLE", "BROADCAST_TABLE")), CoreMatchers.<Collection<String>>is(Collections.singletonList("LOGIC_TABLE")));
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void assertConstructShardingRuleWithNullShardingRuleConfiguration() {
+ new ShardingRule(null, createDataSourceNames());
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void assertConstructShardingRuleWithNullDataSourceNames(){
+ ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration();
+ TableRuleConfiguration tableRuleConfiguration = createTableRuleConfiguration("LOGIC_TABLE", "ms_ds_${0..1}.table_${0..2}");
+ shardingRuleConfiguration.getTableRuleConfigs().add(tableRuleConfiguration);
+ shardingRuleConfiguration.getMasterSlaveRuleConfigs().add(createMasterSlaveRuleConfiguration("ms_ds_0", "master_ds_0", "slave_ds_0"));
+ shardingRuleConfiguration.getMasterSlaveRuleConfigs().add(createMasterSlaveRuleConfiguration("ms_ds_1", "master_ds_1", "slave_ds_1"));
+ new ShardingRule(shardingRuleConfiguration, null);
+ }
private ShardingRule createMaximumShardingRule() {
ShardingRuleConfiguration shardingRuleConfiguration = new ShardingRuleConfiguration(); | ['sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNames.java', 'sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java', 'sharding-core/sharding-core-common/src/main/java/org/apache/shardingsphere/core/rule/ShardingRule.java', 'sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java'] | 4 | 4 | 0 | 0 | 4 | {'.java': 4} | "2019-07-08T12:55:40" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,626 | apache/shardingsphere/2680/2629 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2629 | https://github.com/apache/shardingsphere/pull/2680 | https://github.com/apache/shardingsphere/pull/2680 | 1 | Get NullPointerException when execute SQL on tables without sharding rule | fixes | ## 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/apache/incubator-shardingsphere-example/issues).
- Read documentation: [ShardingSphere Doc](https://shardingsphere.apache.org/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?
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-JDBC and Sharding-Proxy
### Expected behavior
Get Sharding Execption when execute SQL on tables without sharding rule
### Actual behavior
Get NullPointerException when execute SQL on tables without sharding rule
### Reason analyze (If you can)
Parse engine will parse tableName, Route engine pass the SQLStatement to UnicastRoutingEngine, which return RoutingResult with null datasource name.
Ref:
```
RoutingEngineFactory.java
if (shardingRule.isAllBroadcastTables(tableNames)) {
return sqlStatement instanceof SelectStatement ? new UnicastRoutingEngine(shardingRule, tableNames) : new DatabaseBroadcastRoutingEngine(shardingRule);
}
ShardingDataSourceNames.java
public String getDefaultDataSourceName() {
return 1 == dataSourceNames.size() ? dataSourceNames.iterator().next() : shardingRuleConfig.getDefaultDataSourceName();
}
```
### 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).
| 22635077af811509c3c443b507eb048a25b9954b | 9a633af41b15c736158ff86ea547d65e091099c8 | https://github.com/apache/shardingsphere/compare/22635077af811509c3c443b507eb048a25b9954b...9a633af41b15c736158ff86ea547d65e091099c8 | diff --git a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
index a0140a60033..2261a10858e 100644
--- a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
+++ b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java
@@ -31,7 +31,6 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
public final class ShardingDataSourceNamesTest {
diff --git a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
index 8b48c1ce954..802c24cfc6e 100644
--- a/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
+++ b/sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java
@@ -43,7 +43,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
| ['sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingRuleTest.java', 'sharding-core/sharding-core-common/src/test/java/org/apache/shardingsphere/core/rule/ShardingDataSourceNamesTest.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2019-07-09T03:53:25" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,608 | apache/shardingsphere/7449/7200 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/7200 | https://github.com/apache/shardingsphere/pull/7449 | https://github.com/apache/shardingsphere/pull/7449 | 1 | LockSegment absent of PostgreSQL parser | fixes | ## 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/apache/shardingsphere/issues).
- Read documentation: [ShardingSphere Doc](https://shardingsphere.apache.org/document/current/en/overview).
Please pay attention on issues you submitted, because we maybe need more details.
If no response anymore 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?
5.0.0-RC1-SNAPSHOT
### Which project did you use? ShardingSphere-JDBC or ShardingSphere-Proxy?
ShardingSphere-JDBC
### Expected behavior
Under MasterSlave rule:
`SELECT * FROM t_order WHERE user_id = ? FOR UPDATE`
should be routed to Master node
### Actual behavior
The SQL is routed to Slave node
### Reason analyze (If you can)
LockSegment absent of PostgreSQL parser
Please refer to the route logic in MasterSlaveDataSourceRouter:
```
private boolean isMasterRoute(final SQLStatement sqlStatement) {
return containsLockSegment(sqlStatement) || !(sqlStatement instanceof SelectStatement) || MasterVisitedManager.isMasterVisited() || HintManager.isMasterRouteOnly();
}
private boolean containsLockSegment(final SQLStatement sqlStatement) {
return sqlStatement instanceof SelectStatement && ((SelectStatement) sqlStatement).getLock().isPresent();
}
```
### 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).
| 140e487b8949995a61ec94db68d753cc8b425721 | f892a63f058068daef8aed9a3838ec34f6985c2b | https://github.com/apache/shardingsphere/compare/140e487b8949995a61ec94db68d753cc8b425721...f892a63f058068daef8aed9a3838ec34f6985c2b | diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
index 70d3050dab5..64eb9a8dfd6 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
@@ -28,6 +28,7 @@ import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.Co
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.DeleteContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.DoStatementContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.ExprListContext;
+import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.ForLockingClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.FromClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.FromListContext;
import org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.GroupByItemContext;
@@ -326,6 +327,12 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
return result;
}
+ @Override
+ public ASTNode visitForLockingClause(final ForLockingClauseContext ctx) {
+ LockSegment result = new LockSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex());
+ return result;
+ }
+
@Override
public ASTNode visitSelectWithParens(final SelectWithParensContext ctx) {
if (null != ctx.selectWithParens()) { | ['shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2020-09-15T02:39:36" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,607 | apache/shardingsphere/7468/6643 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/6643 | https://github.com/apache/shardingsphere/pull/7468 | https://github.com/apache/shardingsphere/pull/7468 | 1 | Rewrite error of derived alias | fix | ## 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/apache/shardingsphere/issues).
- Read documentation: [ShardingSphere Doc](https://shardingsphere.apache.org/document/current/en/overview).
Please pay attention on issues you submitted, because we maybe need more details.
If no response anymore 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?
5.0.0-RC1-SNAPSHOT
### Which project did you use? ShardingSphere-JDBC or ShardingSphere-Proxy?
Both
### Expected behavior
Correctly rewrite the following SQL:
```
SELECT SUM(order_id) AS orders_sum, user_id as `key` FROM t_order GROUP BY `key`
```
### Actual behavior
The logical SQL is rewritten to:
```
Actual SQL: ds_0 ::: SELECT SUM(order_id) AS orders_sum, user_id as `key` , `key` AS GROUP_BY_DERIVED_0 FROM t_order_0 GROUP BY `key` ORDER BY `key` ASC
Actual SQL: ds_0 ::: SELECT SUM(order_id) AS orders_sum, user_id as `key` , `key` AS GROUP_BY_DERIVED_0 FROM t_order_1 GROUP BY `key` ORDER BY `key` ASC
Actual SQL: ds_1 ::: SELECT SUM(order_id) AS orders_sum, user_id as `key` , `key` AS GROUP_BY_DERIVED_0 FROM t_order_0 GROUP BY `key` ORDER BY `key` ASC
Actual SQL: ds_1 ::: SELECT SUM(order_id) AS orders_sum, user_id as `key` , `key` AS GROUP_BY_DERIVED_0 FROM t_order_1 GROUP BY `key` ORDER BY `key` ASC
```
Lead to MySQL server respond error:
`ERROR 1054 (42S22): Unknown column 'key' in 'field list'`
### Reason analyze (If you can)
Rewrite error of derived alias
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
Refer to **Actual behavior**
### Example codes for reproduce this issue (such as a github link).
Refer to https://github.com/apache/shardingsphere/issues/6603 | 0b5ee351bad3ce2dbe52003b55d4f9fa52fcaf36 | 4fb7ea269d59e25a1719ad74e95030bda7ea0744 | https://github.com/apache/shardingsphere/compare/0b5ee351bad3ce2dbe52003b55d4f9fa52fcaf36...4fb7ea269d59e25a1719ad74e95030bda7ea0744 | diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/Projection.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/Projection.java
index 37f06b18d99..b6ababb8c00 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/Projection.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/Projection.java
@@ -37,7 +37,7 @@ public interface Projection {
* @return alias
*/
Optional<String> getAlias();
-
+
/**
* Get columnLabel.
*
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/engine/ProjectionsContextEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/engine/ProjectionsContextEngine.java
index 6ecce295937..b282f2ecc23 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/engine/ProjectionsContextEngine.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/engine/ProjectionsContextEngine.java
@@ -34,6 +34,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.In
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.OrderByItemSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.TextOrderByItemSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
+import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
import java.util.Collection;
import java.util.LinkedList;
@@ -180,7 +181,8 @@ public final class ProjectionsContextEngine {
}
private boolean isSameAlias(final Projection projection, final TextOrderByItemSegment orderItem) {
- return projection.getAlias().isPresent() && (orderItem.getText().equalsIgnoreCase(projection.getAlias().get()) || orderItem.getText().equalsIgnoreCase(projection.getExpression()));
+ return projection.getAlias().isPresent()
+ && (SQLUtil.getExactlyValue(orderItem.getText()).equalsIgnoreCase(projection.getAlias().get()) || orderItem.getText().equalsIgnoreCase(projection.getExpression()));
}
private boolean isSameQualifiedName(final Projection projection, final TextOrderByItemSegment orderItem) { | ['shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/engine/ProjectionsContextEngine.java', 'shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/segment/select/projection/Projection.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2020-09-15T15:41:30" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,650 | 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 | 1 | autogen key sharding-column can't be routed succeed while using default sharding strategy | fixes | ## 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-03-04T11:16:50" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,634 | apache/shardingsphere/2467/2460 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/2460 | https://github.com/apache/shardingsphere/pull/2467 | https://github.com/apache/shardingsphere/pull/2467 | 1 | The problem that the value of the bit type cannot be returned correctly | fixes | I used shardingproxy to do the sharding, but there is a field of bit type. The value stored in this field is 1 regardless of the number of questions. Please ask how to solve this problem. Thank you. | 529a1e80231d4ac2efc49d4884644cb716570f4c | 2e0a7ebe1fd49b596242f62e68c877cb766a5092 | https://github.com/apache/shardingsphere/compare/529a1e80231d4ac2efc49d4884644cb716570f4c...2e0a7ebe1fd49b596242f62e68c877cb766a5092 | diff --git a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtil.java b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtil.java
index e41c8c2a35b..82bbd806543 100644
--- a/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtil.java
+++ b/sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtil.java
@@ -54,6 +54,7 @@ public class QueryResultUtil {
ResultSetMetaData metaData = resultSet.getMetaData();
switch (metaData.getColumnType(columnIndex)) {
case Types.BIT:
+ return resultSet.getBytes(columnIndex);
case Types.BOOLEAN:
return resultSet.getBoolean(columnIndex);
case Types.TINYINT:
diff --git a/sharding-core/sharding-core-execute/src/test/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtilTest.java b/sharding-core/sharding-core-execute/src/test/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtilTest.java
index 89531decbcc..7d5fc308701 100644
--- a/sharding-core/sharding-core-execute/src/test/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtilTest.java
+++ b/sharding-core/sharding-core-execute/src/test/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtilTest.java
@@ -61,8 +61,9 @@ public class QueryResultUtilTest {
@SneakyThrows
public void assertGetValueByBit() {
when(resultSetMetaData.getColumnType(1)).thenReturn(Types.BIT);
- when(resultSet.getBoolean(1)).thenReturn(true);
- assertTrue((boolean) QueryResultUtil.getValue(resultSet, 1));
+ byte[] bytes = {1};
+ when(resultSet.getBytes(1)).thenReturn(bytes);
+ assertThat((byte[]) QueryResultUtil.getValue(resultSet, 1), is(bytes));
}
@Test | ['sharding-core/sharding-core-execute/src/main/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtil.java', 'sharding-core/sharding-core-execute/src/test/java/org/apache/shardingsphere/core/execute/sql/execute/result/QueryResultUtilTest.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2019-05-29T09:51:26" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,652 | 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 | 1 | Proxy will load all schema from registry when startup | fixes | ## 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-core/src/main/java/org/apache/shardingsphere/core/routing/SQLUnit.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/routing/BatchRouteUnit.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/util/SQLLogger.java', 'sharding-proxy/sharding-proxy-bootstrap/src/main/java/org/apache/shardingsphere/shardingproxy/Bootstrap.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/schema/LogicSchemas.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/jdbc/core/statement/EncryptPreparedStatement.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutor.java', '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/jdbc/core/statement/ShardingPreparedStatementTest.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/routing/router/sharding/DatabaseHintSQLRouter.java', 'sharding-core/src/main/java/org/apache/shardingsphere/core/rewrite/SQLBuilder.java', 'sharding-proxy/sharding-proxy-backend/src/main/java/org/apache/shardingsphere/shardingproxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/PreparedStatementExecutorTest.java', 'sharding-opentracing/src/test/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java', 'sharding-jdbc/sharding-jdbc-core/src/main/java/org/apache/shardingsphere/shardingjdbc/executor/AbstractStatementExecutor.java', 'sharding-opentracing/src/main/java/org/apache/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/BatchPreparedStatementExecutorTest.java', 'sharding-jdbc/sharding-jdbc-core/src/test/java/org/apache/shardingsphere/shardingjdbc/executor/StatementExecutorTest.java'] | 19 | 19 | 0 | 0 | 19 | {'.java': 19} | "2019-03-01T14:18:29" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,664 | 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 | 1 | After the integration of mybatis, mybatis Mapper is loop dead | fixes | ## 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2018-12-13T08:49:38" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,675 | 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 | 1 | Sql-Server exception : The URL of JDBC is not supported. | fixes | 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/MySQLDataSourceMetaData.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/H2DataSourceMetaData.java', 'sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/PostgreSQLDataSourceMetaData.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2018-09-27T12:30:16" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,676 | 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 | 1 | RoundRobinMasterSlaveLoadBalanceAlgorithm throw an ArrayIndexOutOfBoundsException | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2018-09-19T07:39:06" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,673 | apache/shardingsphere/1341/1340 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1340 | https://github.com/apache/shardingsphere/pull/1341 | https://github.com/apache/shardingsphere/pull/1341 | 1 | Proxy gets NULL Pointer exception when disable datasource from registry. | fixes | ## 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: [Sharding-Sphere 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 Sharding-Sphere did you use?
3.0.0.M5
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### The problem is:
If we have no disabled datasource in registry, the proxy will renew the datasource map, but will get null exception. | 90b411eee57fd7370f2a6072150c921861234d21 | 086431405f8a4083c77cfce188b1e556075577c4 | https://github.com/apache/shardingsphere/compare/90b411eee57fd7370f2a6072150c921861234d21...086431405f8a4083c77cfce188b1e556075577c4 | diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
index c2f905f8b79..aade829a5dc 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
@@ -36,6 +36,7 @@ import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -196,7 +197,15 @@ public final class GlobalRegistry {
@Subscribe
public void renewDisabledDataSourceNames(final ProxyDisabledStateEventBusEvent disabledStateEventBusEvent) {
for (Entry<String, ShardingSchema> entry : shardingSchemas.entrySet()) {
- entry.getValue().getBackendDataSource().setAvailableDataSources(disabledStateEventBusEvent.getDisabledSchemaDataSourceMap().get(entry.getKey()));
+ entry.getValue().getBackendDataSource().setAvailableDataSources(getDisabledDataSourceNames(disabledStateEventBusEvent.getDisabledSchemaDataSourceMap(), entry.getKey()));
}
}
+
+ private Collection<String> getDisabledDataSourceNames(final Map<String, Collection<String>> disabledSchemaDataSourceMap, final String shardingSchemaName) {
+ Collection<String> result = new LinkedList<>();
+ if (disabledSchemaDataSourceMap.containsKey(shardingSchemaName)) {
+ result.addAll(disabledSchemaDataSourceMap.get(shardingSchemaName));
+ }
+ return result;
+ }
} | ['sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2018-10-14T10:31:59" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,672 | apache/shardingsphere/1353/1351 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1351 | https://github.com/apache/shardingsphere/pull/1353 | https://github.com/apache/shardingsphere/pull/1353 | 1 | Parsing error from sql "SHOW FULL TABLES FROM `sharding_db` WHERE Table_type != 'VIEW'" | fixes | ## 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: [Sharding-Sphere 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 Sharding-Sphere did you use?
3.0.0.M5-SNAPSHOT
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Expected behavior
"SHOW FULL TABLES FROM `sharding_db` WHERE Table_type != 'VIEW'" execute success
### Actual behavior
execute failure：
You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'Table_type != 'VIEW'' at line 1
### Reason analyze (If you can)
parsing error:
Logic SQL: SHOW FULL TABLES FROM `sharding_db` WHERE Table_type != 'VIEW'
Actual SQL: ds_0 ::: SHOW FULL TABLES Table_type != 'VIEW'
### 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).
| 837a2925a38a6784908f62ada033e7945fc0cf00 | 966c221ae670432cddf1fafbaa5cb80e16010c6e | https://github.com/apache/shardingsphere/compare/837a2925a38a6784908f62ada033e7945fc0cf00...966c221ae670432cddf1fafbaa5cb80e16010c6e | diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/mysql/sql/MySQLShowParser.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/mysql/sql/MySQLShowParser.java
index 391a578e0b5..cc39eedae63 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/mysql/sql/MySQLShowParser.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/mysql/sql/MySQLShowParser.java
@@ -108,7 +108,6 @@ public final class MySQLShowParser extends AbstractShowParser {
if (lexerEngine.equalAny(DefaultKeyword.FROM, DefaultKeyword.IN)) {
int beginPosition = lexerEngine.getCurrentToken().getEndPosition() - lexerEngine.getCurrentToken().getLiterals().length();
lexerEngine.nextToken();
- lexerEngine.nextToken();
result.getSqlTokens().add(new RemoveToken(beginPosition, lexerEngine.getCurrentToken().getEndPosition()));
}
return result;
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/JDBCBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/JDBCBackendHandler.java
index b1eb913eaa8..e62907a3fcc 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/JDBCBackendHandler.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/JDBCBackendHandler.java
@@ -139,7 +139,10 @@ public final class JDBCBackendHandler extends AbstractBackendHandler {
private void setResponseColumnLabelForShowTablesMergedResult(final QueryResponsePackets queryResponsePackets) {
for (ColumnDefinition41Packet each : queryResponsePackets.getColumnDefinition41Packets()) {
- each.setName("Tables_in_" + shardingSchema.getName());
+ if (each.getName().startsWith("Tables_in_")) {
+ each.setName("Tables_in_" + shardingSchema.getName());
+ break;
+ }
}
}
| ['sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/JDBCBackendHandler.java', 'sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/dialect/mysql/sql/MySQLShowParser.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2018-10-18T04:24:42" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,671 | apache/shardingsphere/1369/1349 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1349 | https://github.com/apache/shardingsphere/pull/1369 | https://github.com/apache/shardingsphere/pull/1369 | 1 | Registry can not watch changes from sharding proxy clients. | fixes | ## 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: [Sharding-Sphere 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 Sharding-Sphere did you use?
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Reason analyze (If you can)
The registry can not watch changes from clients, if sharding proxy loads configurations from local. So it is necessary to modify some APIs of orchestration.
| 32d08cc13bd948d3f7d62186a78d76d4feed5c77 | 40d28cf217625c182d0a044b22798423353cca39 | https://github.com/apache/shardingsphere/compare/32d08cc13bd948d3f7d62186a78d76d4feed5c77...40d28cf217625c182d0a044b22798423353cca39 | diff --git a/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java b/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
index 7582b696e3f..e0e6b225af4 100644
--- a/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
+++ b/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java
@@ -25,6 +25,7 @@ import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.rule.MasterSlaveRule;
import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.internal.OrchestrationFacade;
import io.shardingsphere.orchestration.internal.config.ConfigurationService;
import io.shardingsphere.orchestration.internal.event.config.MasterSlaveConfigurationEventBusEvent;
@@ -58,7 +59,7 @@ public class OrchestrationMasterSlaveDataSource extends AbstractOrchestrationDat
Preconditions.checkState(null != masterSlaveRuleConfig && !Strings.isNullOrEmpty(masterSlaveRuleConfig.getMasterDataSourceName()), "No available master slave rule configuration to load.");
dataSource = new MasterSlaveDataSource(configService.loadDataSourceMap(), new OrchestrationMasterSlaveRule(masterSlaveRuleConfig), configService.loadMasterSlaveConfigMap(),
new ShardingProperties(configService.loadMasterSlaveProperties()));
- initOrchestrationFacade(dataSource);
+ getOrchestrationFacade().init(OrchestrationType.MASTER_SLAVE);
}
private void initOrchestrationFacade(final MasterSlaveDataSource masterSlaveDataSource) {
diff --git a/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java b/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java
index c20bf3aa2e2..94ae1c3b659 100644
--- a/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java
+++ b/sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java
@@ -22,6 +22,7 @@ import com.google.common.eventbus.Subscribe;
import io.shardingsphere.api.ConfigMapContext;
import io.shardingsphere.api.config.ShardingRuleConfiguration;
import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.internal.OrchestrationFacade;
import io.shardingsphere.orchestration.internal.config.ConfigurationService;
import io.shardingsphere.orchestration.internal.event.config.ShardingConfigurationEventBusEvent;
@@ -56,7 +57,7 @@ public class OrchestrationShardingDataSource extends AbstractOrchestrationDataSo
Preconditions.checkState(null != shardingRuleConfig && !shardingRuleConfig.getTableRuleConfigs().isEmpty(), "Missing the sharding rule configuration on register center");
dataSource = new ShardingDataSource(configService.loadDataSourceMap(),
new OrchestrationShardingRule(shardingRuleConfig, configService.loadDataSourceMap().keySet()), configService.loadShardingConfigMap(), configService.loadShardingProperties());
- initOrchestrationFacade(dataSource);
+ getOrchestrationFacade().init(OrchestrationType.SHARDING);
}
private void initOrchestrationFacade(final ShardingDataSource shardingDataSource) {
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
index 78b457f5921..367cf330a0f 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java
@@ -25,5 +25,5 @@ package io.shardingsphere.orchestration.config;
*/
public enum OrchestrationType {
- SHARDING, MASTER_SLAVE
+ SHARDING, MASTER_SLAVE, PROXY
}
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
index 5b4690e9af0..8c30ba08c91 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java
@@ -24,6 +24,7 @@ import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
+import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.internal.config.ConfigurationService;
import io.shardingsphere.orchestration.internal.listener.ListenerFactory;
import io.shardingsphere.orchestration.internal.state.datasource.DataSourceService;
@@ -137,6 +138,27 @@ public final class OrchestrationFacade implements AutoCloseable {
listenerManager.initProxyListeners();
}
+ /**
+ * Initialize for proxy orchestration.
+ *
+ *@param orchestrationType orchestration type
+ */
+ public void init(final OrchestrationType orchestrationType) {
+ switch (orchestrationType) {
+ case MASTER_SLAVE:
+ listenerManager.initMasterSlaveListeners();
+ break;
+ case SHARDING:
+ listenerManager.initShardingListeners();
+ break;
+ case PROXY:
+ listenerManager.initProxyListeners();
+ break;
+ default:
+ throw new UnsupportedOperationException(orchestrationType.name());
+ }
+ }
+
private void reviseShardingRuleConfigurationForMasterSlave(final Map<String, DataSource> dataSourceMap, final ShardingRuleConfiguration shardingRuleConfig) {
for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
if (entry.getValue() instanceof MasterSlaveDataSource) {
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
index 935e5577efb..4984905b5fa 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
@@ -21,6 +21,7 @@ import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
import io.shardingsphere.opentracing.ShardingTracer;
+import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.internal.OrchestrationFacade;
import io.shardingsphere.shardingproxy.config.ShardingConfiguration;
import io.shardingsphere.shardingproxy.config.ShardingConfigurationLoader;
@@ -87,10 +88,9 @@ public final class Bootstrap {
private static void startWithRegistryCenter(
final ProxyYamlServerConfiguration serverConfig, final Map<String, ProxyYamlRuleConfiguration> ruleConfigs, final int port) throws InterruptedException {
+
try (OrchestrationFacade orchestrationFacade = new OrchestrationFacade(serverConfig.getOrchestration().getOrchestrationConfiguration())) {
- if (!ruleConfigs.isEmpty()) {
- orchestrationFacade.init(getYamlServerConfiguration(serverConfig), getSchemaDataSourceMap(ruleConfigs), getRuleConfiguration(ruleConfigs));
- }
+ initOrchestrationFacade(serverConfig, ruleConfigs, orchestrationFacade);
GlobalRegistry.getInstance().init(orchestrationFacade.getConfigService().loadYamlServerConfiguration(),
orchestrationFacade.getConfigService().loadProxyDataSources(), orchestrationFacade.getConfigService().loadProxyConfiguration(), true);
initOpenTracing();
@@ -98,6 +98,14 @@ public final class Bootstrap {
}
}
+ private static void initOrchestrationFacade(final ProxyYamlServerConfiguration serverConfig, final Map<String, ProxyYamlRuleConfiguration> ruleConfigs, final OrchestrationFacade orchestrationFacade) {
+ if (ruleConfigs.isEmpty()) {
+ orchestrationFacade.init(OrchestrationType.PROXY);
+ } else {
+ orchestrationFacade.init(getYamlServerConfiguration(serverConfig), getSchemaDataSourceMap(ruleConfigs), getRuleConfiguration(ruleConfigs));
+ }
+ }
+
private static void initOpenTracing() {
if (GlobalRegistry.getInstance().isOpenTracingEnable()) {
ShardingTracer.init(); | ['sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/OrchestrationFacade.java', 'sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java', 'sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/config/OrchestrationType.java', 'sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java', 'sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2018-10-23T08:16:27" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,670 | apache/shardingsphere/1377/1373 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1373 | https://github.com/apache/shardingsphere/pull/1377 | https://github.com/apache/shardingsphere/pull/1377 | 2 | Mysql aurora version not supported | fixes | ## Bug Report
jdbcUrl = jdbc:mysql:aurora://host:3306/..
Then throws exception: "The URL of JDBC is not supported. Please refer to this pattern: jdbc:mysql://([\w\-\.]+):?([0-9]*)/([\w\-]+);?\S* "
See: https://github.com/sharding-sphere/sharding-sphere/blob/dev/sharding-core/src/main/java/io/shardingsphere/core/metadata/datasource/dialect/MySQLDataSourceMetaData.java#L44
| 15615247de30e69461adba8caca9498a22f06151 | ed4895486c9ed499df206edfbf6218d826548c6a | https://github.com/apache/shardingsphere/compare/15615247de30e69461adba8caca9498a22f06151...ed4895486c9ed499df206edfbf6218d826548c6a | 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 f9a202c76c0..00a79826cc3 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,14 +41,14 @@ public final class MySQLDataSourceMetaData implements DataSourceMetaData {
private final String schemeName;
- private final Pattern pattern = Pattern.compile("jdbc:mysql://([\\w\\-\\.]+):?([0-9]*)/([\\w\\-]+);?\\S*", Pattern.CASE_INSENSITIVE);
+ private final Pattern pattern = Pattern.compile("jdbc:mysql:(\\w*:)?//([\\w\\-\\.]+):?([0-9]*)/([\\w\\-]+);?\\S*", Pattern.CASE_INSENSITIVE);
public MySQLDataSourceMetaData(final String url) {
Matcher matcher = pattern.matcher(url);
if (matcher.find()) {
- hostName = matcher.group(1);
- port = Strings.isNullOrEmpty(matcher.group(2)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(2));
- schemeName = matcher.group(3);
+ hostName = matcher.group(2);
+ port = Strings.isNullOrEmpty(matcher.group(3)) ? DEFAULT_PORT : Integer.valueOf(matcher.group(3));
+ schemeName = matcher.group(4);
} else {
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/MySQLDataSourceMetaData.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2018-10-25T02:57:01" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,668 | apache/shardingsphere/1471/1415 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1415 | https://github.com/apache/shardingsphere/pull/1471 | https://github.com/apache/shardingsphere/pull/1471 | 1 | mysql workbench cannot connect in 3.0.0 | fixes | I config username and password and can connect in mysql wordbench in **3.0.0.M2**.
But i cannot connect in **3.0.0**, return is
_"Failed to Connect to MySQL at 127.0.0.1:3307 with user root
Unknown database '`sharding_db`'"_
| 878ed163b080365ad7ff04f90a3ebdb6be92d0e0 | 6dd758a8ae218e49a6baffe2e2f4f198b113d6cc | https://github.com/apache/shardingsphere/compare/878ed163b080365ad7ff04f90a3ebdb6be92d0e0...6dd758a8ae218e49a6baffe2e2f4f198b113d6cc | diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/SchemaIgnoreBackendHandler.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/SchemaIgnoreBackendHandler.java
index 3f70ebe653a..a5c52c37db4 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/SchemaIgnoreBackendHandler.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/SchemaIgnoreBackendHandler.java
@@ -22,6 +22,7 @@ import io.shardingsphere.core.merger.dal.show.ShowDatabasesMergedResult;
import io.shardingsphere.core.parsing.parser.dialect.mysql.statement.ShowDatabasesStatement;
import io.shardingsphere.core.parsing.parser.dialect.mysql.statement.UseStatement;
import io.shardingsphere.core.parsing.parser.sql.SQLStatement;
+import io.shardingsphere.core.util.SQLUtil;
import io.shardingsphere.shardingproxy.frontend.common.FrontendHandler;
import io.shardingsphere.shardingproxy.runtime.GlobalRegistry;
import io.shardingsphere.shardingproxy.transport.mysql.constant.ColumnType;
@@ -90,7 +91,7 @@ public final class SchemaIgnoreBackendHandler implements BackendHandler {
}
private CommandResponsePackets handleUseStatement(final UseStatement useStatement, final FrontendHandler frontendHandler) {
- String schema = useStatement.getSchema();
+ String schema = SQLUtil.getExactlyValue(useStatement.getSchema());
if (!GLOBAL_REGISTRY.schemaExists(schema)) {
return new CommandResponsePackets(new ErrPacket(1, ServerErrorCode.ER_BAD_DB_ERROR, schema));
} | ['sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/SchemaIgnoreBackendHandler.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2018-11-14T06:41:26" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,665 | apache/shardingsphere/1588/1533 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1533 | https://github.com/apache/shardingsphere/pull/1588 | https://github.com/apache/shardingsphere/pull/1588 | 1 | The result of `getBytes` is wrong. | fixes | ## Bug Report
### Which version of Sharding-Sphere did you use?
3.0.0
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Expected behavior
The result of bytes should be:
[88, -99, -9, 80, 65, -64, 65, -70, -83, -98, 49, 15, -115, -103, 13, 116]
### Actual behavior
The result change every time:
[91, 66, 64, 49, 50, 57, 52, 99, 50, 51, 52]
[91, 66, 64, 55, 50, 101, 49, 56, 57, 100, 54]
[91, 66, 64, 52, 54, 55, 54, 98, 48, 53, 56]
[91, 66, 64, 51, 48, 52, 51, 98, 49, 99, 99]
[91, 66, 64, 49, 97, 99, 102, 97, 99, 53, 56]
### Reason analyze (If you can)
### Steps to reproduce the behavior, such as: SQL to execute, sharding rule configuration, when exception occur etc.
```sql
CREATE TABLE `binary_test` (
`id` binary(16) NOT NULL
) ENGINE=InnoDB;
insert into binary_test (id) value (0x589df75041c041baad9e310f8d990d74);
```
### Example codes for reproduce this issue (such as a github link).
```java
Connection connection = ds.getConnection();
PreparedStatement ps = connection.prepareStatement("SELECT * FROM binary_test");
ps.execute();
ResultSet rs = ps.getResultSet();
rs.next();
byte[] result = rs.getBytes("id");
System.out.println(Arrays.toString(result));
``` | 2da4913fc627d38da54ed3cc46d15a87179dab28 | 938442f3eb38e00b93f67d091b0e9e7dd132e952 | https://github.com/apache/shardingsphere/compare/2da4913fc627d38da54ed3cc46d15a87179dab28...938442f3eb38e00b93f67d091b0e9e7dd132e952 | diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnType.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnType.java
index e65b43894bc..fdd19647ffd 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnType.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnType.java
@@ -116,9 +116,9 @@ public enum ColumnType {
JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.DATE, MYSQL_TYPE_DATE);
JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.TIME, MYSQL_TYPE_TIME);
JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.TIMESTAMP, MYSQL_TYPE_TIMESTAMP);
- JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.BINARY, MYSQL_TYPE_BLOB);
- JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.VARBINARY, MYSQL_TYPE_MEDIUM_BLOB);
- JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.LONGVARBINARY, MYSQL_TYPE_LONG_BLOB);
+ JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.BINARY, MYSQL_TYPE_VARCHAR);
+ JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.VARBINARY, MYSQL_TYPE_VARCHAR);
+ JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.LONGVARBINARY, MYSQL_TYPE_VARCHAR);
JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.NULL, MYSQL_TYPE_NULL);
JDBC_TYPE_AND_COLUMN_TYPE_MAP.put(Types.BLOB, MYSQL_TYPE_BLOB);
}
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/MySQLPacketPayload.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/MySQLPacketPayload.java
index 717b08945c9..5d5f79d0318 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/MySQLPacketPayload.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/MySQLPacketPayload.java
@@ -266,6 +266,20 @@ public final class MySQLPacketPayload implements AutoCloseable {
byteBuf.writeBytes(value.getBytes());
}
+ /**
+ * Write lenenc bytes to byte buffers.
+ *
+ * @param value fixed length bytes
+ */
+ public void writeBytesLenenc(final byte[] value) {
+ if (0 == value.length) {
+ byteBuf.writeByte(0);
+ return;
+ }
+ writeIntLenenc(value.length);
+ byteBuf.writeBytes(value);
+ }
+
/**
* Read fixed length string from byte buffers.
*
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/StringLenencBinaryProtocolValue.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/StringLenencBinaryProtocolValue.java
index fdb23893c11..15119066d81 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/StringLenencBinaryProtocolValue.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/StringLenencBinaryProtocolValue.java
@@ -34,6 +34,10 @@ public final class StringLenencBinaryProtocolValue implements BinaryProtocolValu
@Override
public void write(final MySQLPacketPayload payload, final Object value) {
- payload.writeStringLenenc(value.toString());
+ if (value instanceof byte[]) {
+ payload.writeBytesLenenc((byte[]) value);
+ } else {
+ payload.writeStringLenenc(value.toString());
+ }
}
}
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/TextResultSetRowPacket.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/TextResultSetRowPacket.java
index cfe1df2aba7..11accce219a 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/TextResultSetRowPacket.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/TextResultSetRowPacket.java
@@ -56,7 +56,11 @@ public final class TextResultSetRowPacket implements MySQLPacket {
if (null == each) {
payload.writeInt1(NULL);
} else {
- payload.writeStringLenenc(each.toString());
+ if (each instanceof byte[]) {
+ payload.writeBytesLenenc((byte[]) each);
+ } else {
+ payload.writeStringLenenc(each.toString());
+ }
}
}
}
diff --git a/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnTypeTest.java b/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnTypeTest.java
index 3b19a49ccf2..a13dfad5e6f 100644
--- a/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnTypeTest.java
+++ b/sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnTypeTest.java
@@ -44,9 +44,9 @@ public final class ColumnTypeTest {
assertThat(ColumnType.valueOfJDBCType(Types.DATE), is(ColumnType.MYSQL_TYPE_DATE));
assertThat(ColumnType.valueOfJDBCType(Types.TIME), is(ColumnType.MYSQL_TYPE_TIME));
assertThat(ColumnType.valueOfJDBCType(Types.TIMESTAMP), is(ColumnType.MYSQL_TYPE_TIMESTAMP));
- assertThat(ColumnType.valueOfJDBCType(Types.BINARY), is(ColumnType.MYSQL_TYPE_BLOB));
- assertThat(ColumnType.valueOfJDBCType(Types.VARBINARY), is(ColumnType.MYSQL_TYPE_MEDIUM_BLOB));
- assertThat(ColumnType.valueOfJDBCType(Types.LONGVARBINARY), is(ColumnType.MYSQL_TYPE_LONG_BLOB));
+ assertThat(ColumnType.valueOfJDBCType(Types.BINARY), is(ColumnType.MYSQL_TYPE_VARCHAR));
+ assertThat(ColumnType.valueOfJDBCType(Types.VARBINARY), is(ColumnType.MYSQL_TYPE_VARCHAR));
+ assertThat(ColumnType.valueOfJDBCType(Types.LONGVARBINARY), is(ColumnType.MYSQL_TYPE_VARCHAR));
assertThat(ColumnType.valueOfJDBCType(Types.NULL), is(ColumnType.MYSQL_TYPE_NULL));
assertThat(ColumnType.valueOfJDBCType(Types.BLOB), is(ColumnType.MYSQL_TYPE_BLOB));
} | ['sharding-proxy/src/test/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnTypeTest.java', 'sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/text/TextResultSetRowPacket.java', 'sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ColumnType.java', 'sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/MySQLPacketPayload.java', 'sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/packet/command/query/binary/execute/protocol/StringLenencBinaryProtocolValue.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2018-12-10T02:26:45" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,667 | apache/shardingsphere/1488/1467 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1467 | https://github.com/apache/shardingsphere/pull/1488 | https://github.com/apache/shardingsphere/pull/1488 | 1 | read-write splitting many thread | fixes | Read and write separation, no proper routing when multithreading
version:3.0.0
Our requirement is to force the main library to be routed at the beginning of the "add", "create", "save", "insert", "update", "del" methods. In the process of using high-concurrency, the route is not correct。
Found in the middleware, found that the judgment route is a static variable， `private static boolean isMasterRouteOnly` 。
This static variable is shared by all threads. The a thread is not executed. The b thread modifies this value. Then, when routing, it uses this variable to judge the route, resulting in no correct route.
sharding code
``` java
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class HintManagerHolder {
public static final String DB_TABLE_NAME = "DB_TABLE_NAME";
public static final String DB_COLUMN_NAME = "DB_COLUMN_NAME";
private static final ThreadLocal<HintManager> HINT_MANAGER_HOLDER = new ThreadLocal<>();
private static final Multimap<String, Comparable<?>> DATABASE_SHARDING_VALUES = HashMultimap.create();
private static final Multimap<String, Comparable<?>> TABLE_SHARDING_VALUES = HashMultimap.create();
@Setter
private static boolean databaseShardingOnly;
@Setter
private static boolean isMasterRouteOnly;
```
our code
``` java
private static final ThreadLocal<Boolean> CUS_HINT_MANAGER_HOLDER = new ThreadLocal<>();
@Order(Ordered.HIGHEST_PRECEDENCE)
@Around("execution(public * com.xhg..dao..*.*(..)) || execution(public * com.xhg..service.impl..*.*(..))")
public Object hintMasterCalls(ProceedingJoinPoint jp) throws Throwable {
String methodName = jp.getSignature().getName();
if (HintManagerHolder.isMasterRouteOnly() || HintManagerHolder.get() != null) {
if (CUS_HINT_MANAGER_HOLDER.get() == null || !CUS_HINT_MANAGER_HOLDER.get()) {
CUS_HINT_MANAGER_HOLDER.set(true);
}
return jp.proceed();
}
if (CUS_HINT_MANAGER_HOLDER.get() == null || !CUS_HINT_MANAGER_HOLDER.get()) {
String[] methodPreArr = {"add", "create", "save", "insert", "update", "del"};
for (String methodPre : methodPreArr) {
if (methodName.startsWith(methodPre)) {
CUS_HINT_MANAGER_HOLDER.set(true);
break;
}
}
}
if (CUS_HINT_MANAGER_HOLDER.get() != null && CUS_HINT_MANAGER_HOLDER.get()) {
HintManager hintManager = HintManager.getInstance();
hintManager.setMasterRouteOnly();
}
return jp.proceed();
}
```
| 73a20b577a79bce969183026262bab033d13db0a | ed155384a86d74142accad8acc869c89896d7f3c | https://github.com/apache/shardingsphere/compare/73a20b577a79bce969183026262bab033d13db0a...ed155384a86d74142accad8acc869c89896d7f3c | diff --git a/sharding-core/src/main/java/io/shardingsphere/api/HintManager.java b/sharding-core/src/main/java/io/shardingsphere/api/HintManager.java
index d060ef2db29..01c725f4c8d 100644
--- a/sharding-core/src/main/java/io/shardingsphere/api/HintManager.java
+++ b/sharding-core/src/main/java/io/shardingsphere/api/HintManager.java
@@ -17,8 +17,11 @@
package io.shardingsphere.api;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
import io.shardingsphere.core.hint.HintManagerHolder;
import lombok.AccessLevel;
+import lombok.Getter;
import lombok.NoArgsConstructor;
/**
@@ -31,6 +34,18 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class HintManager implements AutoCloseable {
+ @Getter
+ private final Multimap<String, Comparable<?>> databaseShardingValues = HashMultimap.create();
+
+ @Getter
+ private final Multimap<String, Comparable<?>> tableShardingValues = HashMultimap.create();
+
+ @Getter
+ private boolean databaseShardingOnly;
+
+ @Getter
+ private boolean masterRouteOnly;
+
/**
* Get a new instance for {@code HintManager}.
*
@@ -51,14 +66,16 @@ public final class HintManager implements AutoCloseable {
* @param value sharding value
*/
public void setDatabaseShardingValue(final Comparable<?> value) {
- HintManagerHolder.setDatabaseShardingValue(value);
+ databaseShardingValues.clear();
+ addDatabaseShardingValue(HintManagerHolder.DB_TABLE_NAME, value);
+ databaseShardingOnly = true;
}
/**
* Set CRUD operation force route to master database only.
*/
public void setMasterRouteOnly() {
- HintManagerHolder.setMasterRouteOnly(true);
+ masterRouteOnly = true;
}
/**
@@ -70,7 +87,8 @@ public final class HintManager implements AutoCloseable {
* @param value sharding value
*/
public void addDatabaseShardingValue(final String logicTable, final Comparable<?> value) {
- HintManagerHolder.addDatabaseShardingValue(logicTable, value);
+ databaseShardingValues.put(logicTable, value);
+ databaseShardingOnly = false;
}
/**
@@ -82,7 +100,8 @@ public final class HintManager implements AutoCloseable {
* @param value sharding value
*/
public void addTableShardingValue(final String logicTable, final Comparable<?> value) {
- HintManagerHolder.addTableShardingValue(logicTable, value);
+ tableShardingValues.put(logicTable, value);
+ databaseShardingOnly = false;
}
@Override
diff --git a/sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java b/sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java
index 01af1ca25de..199a572d7c2 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java
@@ -19,14 +19,11 @@ package io.shardingsphere.core.hint;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
import io.shardingsphere.api.HintManager;
import io.shardingsphere.api.algorithm.sharding.ListShardingValue;
import io.shardingsphere.api.algorithm.sharding.ShardingValue;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import lombok.Setter;
import java.util.Collection;
@@ -47,16 +44,6 @@ public final class HintManagerHolder {
private static final ThreadLocal<HintManager> HINT_MANAGER_HOLDER = new ThreadLocal<>();
- private static final Multimap<String, Comparable<?>> DATABASE_SHARDING_VALUES = HashMultimap.create();
-
- private static final Multimap<String, Comparable<?>> TABLE_SHARDING_VALUES = HashMultimap.create();
-
- @Setter
- private static boolean databaseShardingOnly;
-
- @Setter
- private static boolean isMasterRouteOnly;
-
/**
* Set hint manager.
*
@@ -67,53 +54,13 @@ public final class HintManagerHolder {
HINT_MANAGER_HOLDER.set(hintManager);
}
- /**
- * Add sharding value for one certain sharding database.
- *
- * <p>The sharding operator is {@code =}</p>
- * When you need to assign the values to one certain sharding database, use this method to add sharding value for this database.
- *
- * @param value sharding value
- */
- public static void setDatabaseShardingValue(final Comparable<?> value) {
- DATABASE_SHARDING_VALUES.clear();
- addDatabaseShardingValue(DB_TABLE_NAME, value);
- databaseShardingOnly = true;
- }
-
- /**
- * Add sharding value for database.
- *
- * <p>The sharding operator is {@code =}</p>
- *
- * @param logicTable logic table name
- * @param value sharding value
- */
- public static void addDatabaseShardingValue(final String logicTable, final Comparable<?> value) {
- DATABASE_SHARDING_VALUES.put(logicTable, value);
- databaseShardingOnly = false;
- }
-
- /**
- * Add sharding value for table.
- *
- * <p>The sharding operator is {@code =}</p>
- *
- * @param logicTable logic table name
- * @param value sharding value
- */
- public static void addTableShardingValue(final String logicTable, final Comparable<?> value) {
- TABLE_SHARDING_VALUES.put(logicTable, value);
- databaseShardingOnly = false;
- }
-
/**
* Judge whether only database is sharding.
*
* @return database sharding or not
*/
public static boolean isDatabaseShardingOnly() {
- return null != HINT_MANAGER_HOLDER.get() && databaseShardingOnly;
+ return null != HINT_MANAGER_HOLDER.get() && HINT_MANAGER_HOLDER.get().isDatabaseShardingOnly();
}
/**
@@ -122,7 +69,7 @@ public final class HintManagerHolder {
* @return is force route to master database only or not
*/
public static boolean isMasterRouteOnly() {
- return null != HINT_MANAGER_HOLDER.get() && isMasterRouteOnly;
+ return null != HINT_MANAGER_HOLDER.get() && HINT_MANAGER_HOLDER.get().isMasterRouteOnly();
}
/**
@@ -132,10 +79,10 @@ public final class HintManagerHolder {
* @return database sharding value
*/
public static Optional<ShardingValue> getDatabaseShardingValue(final String logicTable) {
- if (null == HINT_MANAGER_HOLDER.get() || !DATABASE_SHARDING_VALUES.containsKey(logicTable)) {
+ if (null == HINT_MANAGER_HOLDER.get() || !HINT_MANAGER_HOLDER.get().getDatabaseShardingValues().containsKey(logicTable)) {
return Optional.absent();
}
- return Optional.of(getShardingValue(logicTable, DATABASE_SHARDING_VALUES.get(logicTable)));
+ return Optional.of(getShardingValue(logicTable, HINT_MANAGER_HOLDER.get().getDatabaseShardingValues().get(logicTable)));
}
/**
@@ -145,10 +92,10 @@ public final class HintManagerHolder {
* @return table sharding value
*/
public static Optional<ShardingValue> getTableShardingValue(final String logicTable) {
- if (null == HINT_MANAGER_HOLDER.get() || !TABLE_SHARDING_VALUES.containsKey(logicTable)) {
+ if (null == HINT_MANAGER_HOLDER.get() || !HINT_MANAGER_HOLDER.get().getTableShardingValues().containsKey(logicTable)) {
return Optional.absent();
}
- return Optional.of(getShardingValue(logicTable, TABLE_SHARDING_VALUES.get(logicTable)));
+ return Optional.of(getShardingValue(logicTable, HINT_MANAGER_HOLDER.get().getTableShardingValues().get(logicTable)));
}
@SuppressWarnings("unchecked")
@@ -171,9 +118,5 @@ public final class HintManagerHolder {
*/
public static void clear() {
HINT_MANAGER_HOLDER.remove();
- DATABASE_SHARDING_VALUES.clear();
- TABLE_SHARDING_VALUES.clear();
- databaseShardingOnly = false;
- isMasterRouteOnly = false;
}
}
diff --git a/sharding-core/src/test/java/io/shardingsphere/core/hint/HintManagerHolderTest.java b/sharding-core/src/test/java/io/shardingsphere/core/hint/HintManagerHolderTest.java
index e6927db6c9b..7b22d770d25 100644
--- a/sharding-core/src/test/java/io/shardingsphere/core/hint/HintManagerHolderTest.java
+++ b/sharding-core/src/test/java/io/shardingsphere/core/hint/HintManagerHolderTest.java
@@ -66,6 +66,12 @@ public final class HintManagerHolderTest {
hintManager.close();
assertFalse(HintManagerHolder.isMasterRouteOnly());
}
+
+ @Test
+ public void assertIsDatabaseShardingOnly() {
+ hintManager.setDatabaseShardingValue("1");
+ assertTrue(HintManagerHolder.isDatabaseShardingOnly());
+ }
@Test
public void assertIsDatabaseShardingOnlyWithoutSet() {
@@ -77,6 +83,8 @@ public final class HintManagerHolderTest {
public void assertIsMasterRouteOnly() {
hintManager.setMasterRouteOnly();
assertTrue(HintManagerHolder.isMasterRouteOnly());
+ hintManager.close();
+ assertFalse(HintManagerHolder.isMasterRouteOnly());
}
@Test | ['sharding-core/src/main/java/io/shardingsphere/core/hint/HintManagerHolder.java', 'sharding-core/src/main/java/io/shardingsphere/api/HintManager.java', 'sharding-core/src/test/java/io/shardingsphere/core/hint/HintManagerHolderTest.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2018-11-16T13:02:29" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,653 | 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 | 1 | oracle getAllTableNames returns oracle build-in table | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-02-28T08:09:26" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,655 | apache/shardingsphere/1895/1830 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1830 | https://github.com/apache/shardingsphere/pull/1895 | https://github.com/apache/shardingsphere/pull/1895 | 1 | 4.0.0.M1-SNAPSHOT report a error : current logic schema is null | fixes | The version using sharding-sphere is 4.0.0.M1-SNAPSHOT.
I use sharding-Proxy.
I configure a config-sharding file, there is no problem in querying data with java code, but I will get an error when connecting to the service with navicat.
Unknown exception: current logic schema is null
| 4b1cc76450542840d42d076faae89458484ecee4 | d06ae376c2e53001f41cfea603814939047e4e67 | https://github.com/apache/shardingsphere/compare/4b1cc76450542840d42d076faae89458484ecee4...d06ae376c2e53001f41cfea603814939047e4e67 | diff --git a/sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/text/ComQueryBackendHandlerFactory.java b/sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/text/ComQueryBackendHandlerFactory.java
index 7d55f1389d0..f874705f857 100644
--- a/sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/text/ComQueryBackendHandlerFactory.java
+++ b/sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/text/ComQueryBackendHandlerFactory.java
@@ -39,6 +39,9 @@ import org.apache.shardingsphere.shardingproxy.backend.text.transaction.SkipBack
import org.apache.shardingsphere.shardingproxy.backend.text.transaction.TransactionBackendHandler;
import org.apache.shardingsphere.transaction.core.TransactionOperationType;
+import java.util.Arrays;
+import java.util.List;
+
/**
* Com query backend handler factory.
*
@@ -53,9 +56,7 @@ public final class ComQueryBackendHandlerFactory {
private static final String SET_AUTOCOMMIT_1 = "SET AUTOCOMMIT=1";
- private static final String GUI_SET_NAMES = "SET NAMES";
-
- private static final String GUI_SHOW_VARIABLES = "SHOW VARIABLES LIKE";
+ private static final List<String> GUI_SQL = Arrays.asList("SET NAMES", "SHOW VARIABLES LIKE", "SHOW CHARACTER SET", "SHOW COLLATION");
/**
* Create new text protocol backend handler instance.
@@ -81,10 +82,13 @@ public final class ComQueryBackendHandlerFactory {
return SQLType.DAL == sqlStatement.getType() ? createDALBackendHandler(sqlStatement, sql, backendConnection) : new QueryBackendHandler(sql, backendConnection);
}
- private static TextProtocolBackendHandler createDALBackendHandler(
- final SQLStatement sqlStatement, final String sql, final BackendConnection backendConnection) {
- if (null == backendConnection.getLogicSchema() && (sql.toUpperCase().startsWith(GUI_SET_NAMES) || sql.toUpperCase().startsWith(GUI_SHOW_VARIABLES))) {
- return new GUICompatibilityBackendHandler();
+ private static TextProtocolBackendHandler createDALBackendHandler(final SQLStatement sqlStatement, final String sql, final BackendConnection backendConnection) {
+ if (null == backendConnection.getLogicSchema()) {
+ for (String each : GUI_SQL) {
+ if (sql.toUpperCase().startsWith(each)) {
+ return new GUICompatibilityBackendHandler();
+ }
+ }
}
if (sqlStatement instanceof SetStatement) {
return new BroadcastBackendHandler(sql, backendConnection); | ['sharding-proxy/src/main/java/org/apache/shardingsphere/shardingproxy/backend/text/ComQueryBackendHandlerFactory.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-02-20T08:40:22" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,657 | apache/shardingsphere/1736/1722 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1722 | https://github.com/apache/shardingsphere/pull/1736 | https://github.com/apache/shardingsphere/pull/1736 | 1 | default datasource page limit problem | fixes | version：4.0.0.M1-SNAPSHOT
branch：dev
orm: spring jpa
not sharding table use default datasource，but page data is the same，for the following limit:
```
limit 1,10
limit 2,10
limt 3,10
```
java code
```
//junit test java code
Pageable pageable1 = new PageRequest(1,10);
List<UserPo> pos1 = userRepository.getWithoutUserIdListBy("appcode_idxyer_android", new Date(),pageable1);
log.info("pos1:{}",pos1.toString());
Pageable pageable2 = new PageRequest(2,10);
List<UserPo> pos2 = userRepository.getWithoutUserIdListBy("appcode_idxyer_android", new Date(),pageable2);
log.info("pos2:{}",pos2.toString());
Pageable pageable3 = new PageRequest(3,10);
List<UserPo> pos3 = userRepository.getWithoutUserIdListBy("appcode_idxyer_android", new Date(),pageable3);
log.info("pos3:{}",pos3.toString());
//orm code
@Query("SELECT u FROM UserPo u WHERE u.userId is NULL and u.appName = ?1 and u.modifyTime < ?2")
List<UserPo> getWithoutUserIdListBy(String appName, Date date, Pageable pageable);
```
output log
```
2019-01-10 17:04:51.158 INFO 95981 --- [ main] ShardingSphere-SQL : Rule Type: sharding
2019-01-10 17:04:51.158 INFO 95981 --- [ main] ShardingSphere-SQL : Logic SQL: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ?
2019-01-10 17:04:51.158 INFO 95981 --- [ main] ShardingSphere-SQL : SQLStatement: SelectStatement(super=DQLStatement(super=io.shardingsphere.core.parsing.parser.sql.dql.select.SelectStatement@7da70124), containStar=false, firstSelectItemStartPosition=7, selectListLastPosition=460, groupByLastPosition=0, items=[CommonSelectItem(expression=userpo0_.id, alias=Optional.of(id1_5_)), CommonSelectItem(expression=userpo0_.createTime, alias=Optional.of(createTi2_5_)), CommonSelectItem(expression=userpo0_.appCode, alias=Optional.of(appCode3_5_)), CommonSelectItem(expression=userpo0_.appName, alias=Optional.of(appName4_5_)), CommonSelectItem(expression=userpo0_.appVersion, alias=Optional.of(appVersi5_5_)), CommonSelectItem(expression=userpo0_.deviceMc, alias=Optional.of(deviceMc6_5_)), CommonSelectItem(expression=userpo0_.deviceToken, alias=Optional.of(deviceTo7_5_)), CommonSelectItem(expression=userpo0_.deviceTokenType, alias=Optional.of(deviceTo8_5_)), CommonSelectItem(expression=userpo0_.deviceType, alias=Optional.of(deviceTy9_5_)), CommonSelectItem(expression=userpo0_.modifyTime, alias=Optional.of(modifyT10_5_)), CommonSelectItem(expression=userpo0_.osVersion, alias=Optional.of(osVersi11_5_)), CommonSelectItem(expression=userpo0_.userId, alias=Optional.of(userId12_5_)), CommonSelectItem(expression=userpo0_.version, alias=Optional.of(version13_5_))], groupByItems=[], orderByItems=[], limit=Limit(offset=LimitValue(value=10, index=2, boundOpened=false), rowCount=LimitValue(value=10, index=3, boundOpened=false)), subQueryStatement=null, subQueryStatements=[], subQueryConditions=[])
2019-01-10 17:04:51.159 INFO 95981 --- [ main] ShardingSphere-SQL : Actual SQL: main ::: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ? ::: [[appcode_idxyer_android, 2019-01-10 17:04:49.417, 0, 20]]
2019-01-10 17:04:51.324 INFO 95981 --- [ main] c.d.p.push.service.UserServiceTest : pos1:[UserPo{userId='13870325', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4', osVersion='8.0.0', deviceType='Android', deviceMc='87c894be5f7b4c42a3927985a72018bf', deviceTokenType='ANDROID', deviceToken='Gj3Gfge3dCygO1uUq0V8qVMuqIdu+N758R+dd4M46Jg=', modifyTime=2018-02-06 16:29:42.0, version=0}, UserPo{userId='13873758', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='379326c5a69a42cd80989c2472a28ac5', deviceTokenType='GETUI', deviceToken='9c53678a8234a30e2fc625f9f13e3b3f', modifyTime=2018-11-27 13:17:14.0, version=2}, UserPo{userId='13874733', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='d5f32b5998cd4b208c69f117f6955470', deviceTokenType='GETUI', deviceToken='e277f89da8d2e622f6260cf328072625', modifyTime=2019-01-08 20:07:36.0, version=8}, UserPo{userId='13874828', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='37ba63ce0ba94b5ea7daa76a64a0affb', deviceTokenType='GETUI', deviceToken='20bb8e121d44843f74dc47046076b804', modifyTime=2019-01-09 13:35:34.0, version=3}, UserPo{userId='13874848', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='40e16380c87f44518bf3a53493969d41', deviceTokenType='GETUI', deviceToken='480e564536a70b5842d9d041d45909ab', modifyTime=2019-01-09 19:15:17.0, version=2}, UserPo{userId='13871480', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.3', osVersion='6.0.1', deviceType='HUAWEI ATH-AL00', deviceMc='0000000040bb4e89dc87704f1e8dc50b', deviceTokenType='ANDROID', deviceToken='7mrI8oEJONd1rrTszdw50VdZYFfDNEN3L/gIWul+GtcMqaCFSl5+aGDZDTwf/B1S', modifyTime=2018-06-28 15:08:55.0, version=0}, UserPo{userId='13871210', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.0', osVersion='8.0.0', deviceType='HUAWEI DUK-AL20', deviceMc='84f05e03749b4b54872fda60d3ff8c29', deviceTokenType='ANDROID', deviceToken='7RP7dly55jRaVZqKcJpsv4hUZtZUF9J3bIBQn3VkGUk=', modifyTime=2018-06-01 17:54:19.0, version=0}, UserPo{userId='13869945', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4.2', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='y5Etn5TKVUksjFg8urjiBHb11gy+kiVWbDCCgB3fSuA=~', modifyTime=2018-01-19 18:34:57.0, version=0}, UserPo{userId='13870431', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.3', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='kfCT4MbWnJWZL4XUNLcV6OD/u9TbNoTIRaStPXEzTjQ=', modifyTime=2018-03-13 18:20:28.0, version=0}, UserPo{userId='13871082', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.6', osVersion='6.0', deviceType='HUAWEI GRA-CL00', deviceMc='00000000337246391a93c1ae0033c587', deviceTokenType='ANDROID', deviceToken='H1/h8RhkYATVtPuqwduPzMfCAJwRP47h4YFxPhFmyRw=', modifyTime=2018-05-25 14:18:03.0, version=0}]
Hibernate: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ?
2019-01-10 17:04:51.327 INFO 95981 --- [ main] ShardingSphere-SQL : Rule Type: sharding
2019-01-10 17:04:51.327 INFO 95981 --- [ main] ShardingSphere-SQL : Logic SQL: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ?
2019-01-10 17:04:51.327 INFO 95981 --- [ main] ShardingSphere-SQL : SQLStatement: SelectStatement(super=DQLStatement(super=io.shardingsphere.core.parsing.parser.sql.dql.select.SelectStatement@7da70124), containStar=false, firstSelectItemStartPosition=7, selectListLastPosition=460, groupByLastPosition=0, items=[CommonSelectItem(expression=userpo0_.id, alias=Optional.of(id1_5_)), CommonSelectItem(expression=userpo0_.createTime, alias=Optional.of(createTi2_5_)), CommonSelectItem(expression=userpo0_.appCode, alias=Optional.of(appCode3_5_)), CommonSelectItem(expression=userpo0_.appName, alias=Optional.of(appName4_5_)), CommonSelectItem(expression=userpo0_.appVersion, alias=Optional.of(appVersi5_5_)), CommonSelectItem(expression=userpo0_.deviceMc, alias=Optional.of(deviceMc6_5_)), CommonSelectItem(expression=userpo0_.deviceToken, alias=Optional.of(deviceTo7_5_)), CommonSelectItem(expression=userpo0_.deviceTokenType, alias=Optional.of(deviceTo8_5_)), CommonSelectItem(expression=userpo0_.deviceType, alias=Optional.of(deviceTy9_5_)), CommonSelectItem(expression=userpo0_.modifyTime, alias=Optional.of(modifyT10_5_)), CommonSelectItem(expression=userpo0_.osVersion, alias=Optional.of(osVersi11_5_)), CommonSelectItem(expression=userpo0_.userId, alias=Optional.of(userId12_5_)), CommonSelectItem(expression=userpo0_.version, alias=Optional.of(version13_5_))], groupByItems=[], orderByItems=[], limit=Limit(offset=LimitValue(value=20, index=2, boundOpened=false), rowCount=LimitValue(value=10, index=3, boundOpened=false)), subQueryStatement=null, subQueryStatements=[], subQueryConditions=[])
2019-01-10 17:04:51.327 INFO 95981 --- [ main] ShardingSphere-SQL : Actual SQL: main ::: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ? ::: [[appcode_idxyer_android, 2019-01-10 17:04:51.325, 0, 30]]
2019-01-10 17:04:51.343 INFO 95981 --- [ main] c.d.p.push.service.UserServiceTest : pos2:[UserPo{userId='13870325', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4', osVersion='8.0.0', deviceType='Android', deviceMc='87c894be5f7b4c42a3927985a72018bf', deviceTokenType='ANDROID', deviceToken='Gj3Gfge3dCygO1uUq0V8qVMuqIdu+N758R+dd4M46Jg=', modifyTime=2018-02-06 16:29:42.0, version=0}, UserPo{userId='13873758', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='379326c5a69a42cd80989c2472a28ac5', deviceTokenType='GETUI', deviceToken='9c53678a8234a30e2fc625f9f13e3b3f', modifyTime=2018-11-27 13:17:14.0, version=2}, UserPo{userId='13874733', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='d5f32b5998cd4b208c69f117f6955470', deviceTokenType='GETUI', deviceToken='e277f89da8d2e622f6260cf328072625', modifyTime=2019-01-08 20:07:36.0, version=8}, UserPo{userId='13874828', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='37ba63ce0ba94b5ea7daa76a64a0affb', deviceTokenType='GETUI', deviceToken='20bb8e121d44843f74dc47046076b804', modifyTime=2019-01-09 13:35:34.0, version=3}, UserPo{userId='13874848', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='40e16380c87f44518bf3a53493969d41', deviceTokenType='GETUI', deviceToken='480e564536a70b5842d9d041d45909ab', modifyTime=2019-01-09 19:15:17.0, version=2}, UserPo{userId='13871480', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.3', osVersion='6.0.1', deviceType='HUAWEI ATH-AL00', deviceMc='0000000040bb4e89dc87704f1e8dc50b', deviceTokenType='ANDROID', deviceToken='7mrI8oEJONd1rrTszdw50VdZYFfDNEN3L/gIWul+GtcMqaCFSl5+aGDZDTwf/B1S', modifyTime=2018-06-28 15:08:55.0, version=0}, UserPo{userId='13871210', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.0', osVersion='8.0.0', deviceType='HUAWEI DUK-AL20', deviceMc='84f05e03749b4b54872fda60d3ff8c29', deviceTokenType='ANDROID', deviceToken='7RP7dly55jRaVZqKcJpsv4hUZtZUF9J3bIBQn3VkGUk=', modifyTime=2018-06-01 17:54:19.0, version=0}, UserPo{userId='13869945', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4.2', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='y5Etn5TKVUksjFg8urjiBHb11gy+kiVWbDCCgB3fSuA=~', modifyTime=2018-01-19 18:34:57.0, version=0}, UserPo{userId='13870431', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.3', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='kfCT4MbWnJWZL4XUNLcV6OD/u9TbNoTIRaStPXEzTjQ=', modifyTime=2018-03-13 18:20:28.0, version=0}, UserPo{userId='13871082', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.6', osVersion='6.0', deviceType='HUAWEI GRA-CL00', deviceMc='00000000337246391a93c1ae0033c587', deviceTokenType='ANDROID', deviceToken='H1/h8RhkYATVtPuqwduPzMfCAJwRP47h4YFxPhFmyRw=', modifyTime=2018-05-25 14:18:03.0, version=0}]
Hibernate: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ?
2019-01-10 17:04:51.346 INFO 95981 --- [ main] ShardingSphere-SQL : Rule Type: sharding
2019-01-10 17:04:51.346 INFO 95981 --- [ main] ShardingSphere-SQL : Logic SQL: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ?
2019-01-10 17:04:51.346 INFO 95981 --- [ main] ShardingSphere-SQL : SQLStatement: SelectStatement(super=DQLStatement(super=io.shardingsphere.core.parsing.parser.sql.dql.select.SelectStatement@7da70124), containStar=false, firstSelectItemStartPosition=7, selectListLastPosition=460, groupByLastPosition=0, items=[CommonSelectItem(expression=userpo0_.id, alias=Optional.of(id1_5_)), CommonSelectItem(expression=userpo0_.createTime, alias=Optional.of(createTi2_5_)), CommonSelectItem(expression=userpo0_.appCode, alias=Optional.of(appCode3_5_)), CommonSelectItem(expression=userpo0_.appName, alias=Optional.of(appName4_5_)), CommonSelectItem(expression=userpo0_.appVersion, alias=Optional.of(appVersi5_5_)), CommonSelectItem(expression=userpo0_.deviceMc, alias=Optional.of(deviceMc6_5_)), CommonSelectItem(expression=userpo0_.deviceToken, alias=Optional.of(deviceTo7_5_)), CommonSelectItem(expression=userpo0_.deviceTokenType, alias=Optional.of(deviceTo8_5_)), CommonSelectItem(expression=userpo0_.deviceType, alias=Optional.of(deviceTy9_5_)), CommonSelectItem(expression=userpo0_.modifyTime, alias=Optional.of(modifyT10_5_)), CommonSelectItem(expression=userpo0_.osVersion, alias=Optional.of(osVersi11_5_)), CommonSelectItem(expression=userpo0_.userId, alias=Optional.of(userId12_5_)), CommonSelectItem(expression=userpo0_.version, alias=Optional.of(version13_5_))], groupByItems=[], orderByItems=[], limit=Limit(offset=LimitValue(value=30, index=2, boundOpened=false), rowCount=LimitValue(value=10, index=3, boundOpened=false)), subQueryStatement=null, subQueryStatements=[], subQueryConditions=[])
2019-01-10 17:04:51.346 INFO 95981 --- [ main] ShardingSphere-SQL : Actual SQL: main ::: select userpo0_.id as id1_5_, userpo0_.createTime as createTi2_5_, userpo0_.appCode as appCode3_5_, userpo0_.appName as appName4_5_, userpo0_.appVersion as appVersi5_5_, userpo0_.deviceMc as deviceMc6_5_, userpo0_.deviceToken as deviceTo7_5_, userpo0_.deviceTokenType as deviceTo8_5_, userpo0_.deviceType as deviceTy9_5_, userpo0_.modifyTime as modifyT10_5_, userpo0_.osVersion as osVersi11_5_, userpo0_.userId as userId12_5_, userpo0_.version as version13_5_ from push_user userpo0_ where (userpo0_.userId is null) and userpo0_.appName=? and userpo0_.modifyTime<? limit ?, ? ::: [[appcode_idxyer_android, 2019-01-10 17:04:51.344, 0, 40]]
2019-01-10 17:04:51.358 INFO 95981 --- [ main] c.d.p.push.service.UserServiceTest : pos3:[UserPo{userId='13870325', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4', osVersion='8.0.0', deviceType='Android', deviceMc='87c894be5f7b4c42a3927985a72018bf', deviceTokenType='ANDROID', deviceToken='Gj3Gfge3dCygO1uUq0V8qVMuqIdu+N758R+dd4M46Jg=', modifyTime=2018-02-06 16:29:42.0, version=0}, UserPo{userId='13873758', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='379326c5a69a42cd80989c2472a28ac5', deviceTokenType='GETUI', deviceToken='9c53678a8234a30e2fc625f9f13e3b3f', modifyTime=2018-11-27 13:17:14.0, version=2}, UserPo{userId='13874733', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='d5f32b5998cd4b208c69f117f6955470', deviceTokenType='GETUI', deviceToken='e277f89da8d2e622f6260cf328072625', modifyTime=2019-01-08 20:07:36.0, version=8}, UserPo{userId='13874828', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='37ba63ce0ba94b5ea7daa76a64a0affb', deviceTokenType='GETUI', deviceToken='20bb8e121d44843f74dc47046076b804', modifyTime=2019-01-09 13:35:34.0, version=3}, UserPo{userId='13874848', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0', osVersion='9', deviceType='Google Pixel 2', deviceMc='40e16380c87f44518bf3a53493969d41', deviceTokenType='GETUI', deviceToken='480e564536a70b5842d9d041d45909ab', modifyTime=2019-01-09 19:15:17.0, version=2}, UserPo{userId='13871480', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.3', osVersion='6.0.1', deviceType='HUAWEI ATH-AL00', deviceMc='0000000040bb4e89dc87704f1e8dc50b', deviceTokenType='ANDROID', deviceToken='7mrI8oEJONd1rrTszdw50VdZYFfDNEN3L/gIWul+GtcMqaCFSl5+aGDZDTwf/B1S', modifyTime=2018-06-28 15:08:55.0, version=0}, UserPo{userId='13871210', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='8.0.0', osVersion='8.0.0', deviceType='HUAWEI DUK-AL20', deviceMc='84f05e03749b4b54872fda60d3ff8c29', deviceTokenType='ANDROID', deviceToken='7RP7dly55jRaVZqKcJpsv4hUZtZUF9J3bIBQn3VkGUk=', modifyTime=2018-06-01 17:54:19.0, version=0}, UserPo{userId='13869945', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.4.2', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='y5Etn5TKVUksjFg8urjiBHb11gy+kiVWbDCCgB3fSuA=~', modifyTime=2018-01-19 18:34:57.0, version=0}, UserPo{userId='13870431', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.3', osVersion='4.4.2', deviceType='HUAWEI G750-T01', deviceMc='ffffffffb971f1cccf7a5bf70033c587', deviceTokenType='ANDROID', deviceToken='kfCT4MbWnJWZL4XUNLcV6OD/u9TbNoTIRaStPXEzTjQ=', modifyTime=2018-03-13 18:20:28.0, version=0}, UserPo{userId='13871082', appName='appcode_idxyer_android', appCode='4124c5f1-2029-4fda-b06f-a87ac5ad8d11', appVersion='7.7.6', osVersion='6.0', deviceType='HUAWEI GRA-CL00', deviceMc='00000000337246391a93c1ae0033c587', deviceTokenType='ANDROID', deviceToken='H1/h8RhkYATVtPuqwduPzMfCAJwRP47h4YFxPhFmyRw=', modifyTime=2018-05-25 14:18:03.0, version=0}]
```
now look this log,limit is not same ,but data is same.
expect：output of other page data.
| 1d00fd73eec47efd04e4c53c1e40182ad4d4fd1b | c220928fc82dd6c203e21c019d32929a3f12a1f5 | https://github.com/apache/shardingsphere/compare/1d00fd73eec47efd04e4c53c1e40182ad4d4fd1b...c220928fc82dd6c203e21c019d32929a3f12a1f5 | diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java
index 0ddf67f0a12..ff6b3e029c8 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java
@@ -65,10 +65,11 @@ public final class Limit {
* @param parameters parameters
* @param isFetchAll is fetch all data or not
* @param databaseType database type
+ * @param isSingleRouting is single routing or not
*/
- public void processParameters(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType) {
+ public void processParameters(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType, final boolean isSingleRouting) {
fill(parameters);
- rewrite(parameters, isFetchAll, databaseType);
+ rewrite(parameters, isFetchAll, databaseType, isSingleRouting);
}
private void fill(final List<Object> parameters) {
@@ -87,17 +88,17 @@ public final class Limit {
}
}
- private void rewrite(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType) {
+ private void rewrite(final List<Object> parameters, final boolean isFetchAll, final DatabaseType databaseType, final boolean isSingleRouting) {
int rewriteOffset = 0;
int rewriteRowCount;
if (isFetchAll) {
rewriteRowCount = Integer.MAX_VALUE;
- } else if (isNeedRewriteRowCount(databaseType)) {
+ } else if (isNeedRewriteRowCount(databaseType) && !isSingleRouting) {
rewriteRowCount = null == rowCount ? -1 : getOffsetValue() + rowCount.getValue();
} else {
rewriteRowCount = rowCount.getValue();
}
- if (null != offset && offset.getIndex() > -1) {
+ if (null != offset && offset.getIndex() > -1 && !isSingleRouting) {
parameters.set(offset.getIndex(), rewriteOffset);
}
if (null != rowCount && rowCount.getIndex() > -1) {
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 8f53ab6f1cb..959482676f9 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
@@ -101,11 +101,12 @@ public final class ParsingSQLRouter implements ShardingRouter {
mergeShardingValues(shardingConditions);
}
RoutingResult routingResult = RoutingEngineFactory.newInstance(shardingRule, shardingMetaData.getDataSource(), sqlStatement, shardingConditions).route();
+ boolean isSingleRouting = routingResult.isSingleRouting();
SQLRewriteEngine rewriteEngine = new SQLRewriteEngine(shardingRule, logicSQL, databaseType, sqlStatement, shardingConditions, parameters);
if (sqlStatement instanceof SelectStatement && null != ((SelectStatement) sqlStatement).getLimit()) {
- processLimit(parameters, (SelectStatement) sqlStatement);
+ processLimit(parameters, (SelectStatement) sqlStatement, isSingleRouting);
}
- SQLBuilder sqlBuilder = rewriteEngine.rewrite(routingResult.isSingleRouting());
+ SQLBuilder sqlBuilder = rewriteEngine.rewrite(isSingleRouting);
for (TableUnit each : routingResult.getTableUnits().getTableUnits()) {
result.getRouteUnits().add(new RouteUnit(each.getDataSourceName(), rewriteEngine.generateSQL(each, sqlBuilder, shardingMetaData.getDataSource())));
}
@@ -246,8 +247,8 @@ public final class ParsingSQLRouter implements ShardingRouter {
}
}
- private void processLimit(final List<Object> parameters, final SelectStatement selectStatement) {
+ private void processLimit(final List<Object> parameters, final SelectStatement selectStatement, final boolean isSingleRouting) {
boolean isNeedFetchAll = (!selectStatement.getGroupByItems().isEmpty() || !selectStatement.getAggregationSelectItems().isEmpty()) && !selectStatement.isSameGroupByAndOrderByItems();
- selectStatement.getLimit().processParameters(parameters, isNeedFetchAll, databaseType);
+ selectStatement.getLimit().processParameters(parameters, isNeedFetchAll, databaseType, isSingleRouting);
}
} | ['sharding-core/src/main/java/io/shardingsphere/core/parsing/parser/context/limit/Limit.java', 'sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2019-01-11T08:37:26" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,658 | apache/shardingsphere/1727/1715 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1715 | https://github.com/apache/shardingsphere/pull/1727 | https://github.com/apache/shardingsphere/pull/1727 | 1 | error when Logic table have the same name as Actual table . | fixes | ### update
it looks like a driver compatibility problem with `mysql-connector-java` of 6.0.6 or above
the issue title should updated in some days
---
i just use database sharding not table sharding, but when Logic table have the same name as Actual table, some error occurs
```
Caused by: java.sql.SQLException: Column name pattern can not be NULL or empty.
```
here is my config of yaml
```yaml
shardingRule:
tables:
# same name as Actual table， but when i use ms_ds${1..2}.t_user1, it will be ok
# but when i change table name in mysql to t_user1，then ms_ds${1..2}.t_user1 does not work either
t_user:
actualDataNodes: ms_ds${1..2}.t_user
databaseStrategy:
inline:
shardingColumn: id
algorithmExpression: ms_ds${id % 2 + 1}
keyGeneratorColumnName: id
```
i think it may be a bug
| c19f40f8c15571a6c2a7784985e34cc9f37f211e | ba3b92287556ae99825f67e04ff75223d429beba | https://github.com/apache/shardingsphere/compare/c19f40f8c15571a6c2a7784985e34cc9f37f211e...ba3b92287556ae99825f67e04ff75223d429beba | diff --git a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java
index db34b6f2696..19cda450549 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java
@@ -133,7 +133,7 @@ public final class TableMetaDataLoader {
private List<ColumnMetaData> getColumnMetaDataList(final Connection connection, final String catalog, final String actualTableName) throws SQLException {
List<ColumnMetaData> result = new LinkedList<>();
Collection<String> primaryKeys = getPrimaryKeys(connection, catalog, actualTableName);
- try (ResultSet resultSet = connection.getMetaData().getColumns(catalog, null, actualTableName, null)) {
+ try (ResultSet resultSet = connection.getMetaData().getColumns(catalog, null, actualTableName, "%")) {
while (resultSet.next()) {
String columnName = resultSet.getString("COLUMN_NAME");
String columnType = resultSet.getString("TYPE_NAME"); | ['sharding-core/src/main/java/io/shardingsphere/core/metadata/table/executor/TableMetaDataLoader.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-01-09T11:06:16" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,659 | 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 | 1 | Upgrade from 3.0.0 to 3.1.0.M1 error reporting，java.lang.NullPointerException: Cannot invoke method mod() on null object | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-01-02T10:54:42" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,660 | 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 | 1 | CommandExecutor.writeMoreResults deadlock | fixes | ## 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-01-02T08:56:34" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,661 | 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 | 1 | SS 3.1.0.M1 count sql throw an error,3.1.0 works well | fixes | ## 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'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2018-12-24T01:34:55" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,663 | 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 | 1 | Result data incomplete when there's Limit sub clause | fixes | ## 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/main/java/io/shardingsphere/core/merger/dql/DQLMergeEngine.java', 'sharding-core/src/test/java/io/shardingsphere/core/merger/dql/DQLMergeEngineTest.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2018-12-19T04:01:36" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
3,656 | apache/shardingsphere/1760/1754 | apache | shardingsphere | https://github.com/apache/shardingsphere/issues/1754 | https://github.com/apache/shardingsphere/pull/1760 | https://github.com/apache/shardingsphere/pull/1760 | 1 | can't get partition key value | fixes | ## 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
### Which project did you use? Sharding-JDBC or Sharding-Proxy?
Sharding-Proxy
### Expected behavior
ps = connection.prepareStatement("select * from t_order where merc_no='1234567891' and tx_dt in ('20190102', '20190103') limit 0,10 ");
08:38:35.467 [main] INFO MyComplexKeysShardingAlgorithm - collection:["ds_0","ds_1","ds_2","ds_3"],shardingValues:[{"columnName":"merc_no","logicTableName":"t_order","values"**:[-1]**},{"columnName":"tx_dt","logicTableName":"t_order",**"values":[-1,-1]}**]
t_order:
databaseStrategy:
complex:
shardingColumns: merc_no, tx_dt
algorithmClassName: MyComplexKeysShardingAlgorithm
tableStrategy:
inline:
shardingColumn: tx_dt
algorithmExpression: t_order_${tx_dt}
### Actual behavior
### 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).
| 66fb25b3cc7e760f9495cd19bb92c4dd3df4b9ca | 316991ec0c1bd9369c9e7b23a62077d8f3e02453 | https://github.com/apache/shardingsphere/compare/66fb25b3cc7e760f9495cd19bb92c4dd3df4b9ca...316991ec0c1bd9369c9e7b23a62077d8f3e02453 | diff --git a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/expr/CommonExpressionSegment.java b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/expr/CommonExpressionSegment.java
index d1e0e029c8f..13a4ed01a43 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/expr/CommonExpressionSegment.java
+++ b/sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/expr/CommonExpressionSegment.java
@@ -37,5 +37,5 @@ public final class CommonExpressionSegment extends ExpressionWithAliasSegment {
private int index = -1;
- private Number value = -1;
+ private Number value;
} | ['sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/expr/CommonExpressionSegment.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-01-16T02:31:36" | 18,658 | Java | {'Java': 22772685, 'ANTLR': 1011078, 'FreeMarker': 120878, 'Shell': 14522, 'Dockerfile': 13922, 'Batchfile': 3214} | Apache License 2.0 |
345 | 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 | 1 | Any tests using PhantomJS failing in some newer linux environments | resolve | ### 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/AuthenticatedActionsValve.java', 'integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/KeycloakAuthenticatorValve.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2014-05-02T17:00:30" | 16,979 | 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 |
125 | 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 | 1 | Could not decode res(arsc) | fixes | ### 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2017-07-27T10:57:19" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
128 | 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 | 1 | I found a problem while unpacking a apk named by “xxx .apk” --- with the blank space at the end of the apk name. | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2016-01-26T08:03:43" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
122 | ibotpeaches/apktool/1758/1272 | ibotpeaches | apktool | https://github.com/iBotPeaches/Apktool/issues/1272 | https://github.com/iBotPeaches/Apktool/pull/1758 | https://github.com/iBotPeaches/Apktool/pull/1758 | 1 | filename or extension is too long when recompile apk | fixes | ### Information
1. **Apktool Version (`apktool -version`)** - 2.1.1
2. **Operating System (Mac, Linux, Windows)** -Windows 7
3. **APK From? (Playstore, ROM, Other)** - exported from Unity 5.3.5
### Stacktrace/Logcat
```
2016-06-08 19:00:35,311: *******ERROR*******
2016-06-08 19:00:35,312: Exception in thread "main" brut.androlib.AndrolibException: brut.androlib.AndrolibException: brut.common.BrutException: could not exec: [C:\Users\Zachary\AppData\Local\Temp\brut_util_Jar_4106740525864047267.tmp, p, --forced-package-id, 127, --min-sdk-version, 9, --target-sdk-version, 23, --version-code, 1, --version-name, 1.0, -F, C:\Users\Zachary\AppData\Local\Temp\APKTOOL764050849277430384.tmp, -0, arsc, -0, cfg, -0, assets/LuaScriptDB, -0, assets/ResVersionDB, -0, assets/ScriptVersionDB, -0, resource, -0, assets/Resource/Resource, -0, assets/Resource/shader, -0, assets/Resource/building/base, -0, assets/Resource/building/construct, -0, assets/Resource/building/environment, -0, assets/Resource/building/npc, -0, assets/Resource/building/public, -0, assets/Resource/building/shop/1101, -0, assets/Resource/building/shop/1102, -0, assets/Resource/building/shop/1103, -0, assets/Resource/building/shop/1104, -0, assets/Resource/building/shop/1105, -0, assets/Resource/building/shop/1106, -0, assets/Resource/building/shop/1107, -0, assets/Resource/building/shop/1108, -0, assets/Resource/building/shop/1109, -0, assets/Resource/building/shop/1110, -0, assets/Resource/building/shop/1201, -0, assets/Resource/building/shop/1202, -0, assets/Resource/building/shop/1203, -0, assets/Resource/building/shop/1204, -0, assets/Resource/building/shop/1205, -0, assets/Resource/building/shop/1206, -0, assets/Resource/building/shop/1207, -0, assets/Resource/building/shop/1208, -0, assets/Resource/building/shop/1209, -0, assets/Resource/building/shop/1210, -0, assets/Resource/building/shop/1301, -0, assets/Resource/building/shop/1302, -0, assets/Resource/building/shop/1303, -0, assets/Resource/building/shop/1304, -0, assets/Resource/building/shop/1305, -0, assets/Resource/building/shop/1306, -0, assets/Resource/building/shop/1307, -0, assets/Resource/building/shop/1308, -0, assets/Resource/building/shop/1309, -0, assets/Resource/building/shop/1310, -0, assets/Resource/building/shop/1401, -0, assets/Resource/building/shop/1402, -0, assets/Resource/building/shop/1403, -0, assets/Resource/building/shop/1404, -0, assets/Resource/building/shop/1405, -0, assets/Resource/building/shop/1406, -0, assets/Resource/building/shop/1407, -0, assets/Resource/building/shop/1408, -0, assets/Resource/building/shop/1409, -0, assets/Resource/building/shop/1410, -0, assets/Resource/chunk/common, -0, assets/Resource/chunk/dreamisland/0_0, -0, assets/Resource/chunk/dreamisland/0_1, -0, assets/Resource/chunk/dreamisland/0_2, -0, assets/Resource/chunk/dreamisland/0_3, -0, assets/Resource/chunk/dreamisland/0_4, -0, assets/Resource/chunk/dreamisland/0_5, -0, assets/Resource/chunk/dreamisland/0_6, -0, assets/Resource/chunk/dreamisland/0_7, -0, assets/Resource/chunk/dreamisland/1_0, -0, assets/Resource/chunk/dreamisland/1_1, -0, assets/Resource/chunk/dreamisland/1_2, -0, assets/Resource/chunk/dreamisland/1_3, -0, assets/Resource/chunk/dreamisland/1_4, -0, assets/Resource/chunk/dreamisland/1_5, -0, assets/Resource/chunk/dreamisland/1_6, -0, assets/Resource/chunk/dreamisland/1_7, -0, assets/Resource/chunk/dreamisland/2_0, -0, assets/Resource/chunk/dreamisland/2_1, -0, assets/Resource/chunk/dreamisland/2_2, -0, assets/Resource/chunk/dreamisland/2_3, -0, assets/Resource/chunk/dreamisland/2_4, -0, assets/Resource/chunk/dreamisland/2_5, -0, assets/Resource/chunk/dreamisland/2_6, -0, assets/Resource/chunk/dreamisland/2_7, -0, assets/Resource/chunk/dreamisland/3_0, -0, assets/Resource/chunk/dreamisland/3_1, -0, assets/Resource/chunk/dreamisland/3_2, -0, assets/Resource/chunk/dreamisland/3_3, -0, assets/Resource/chunk/dreamisland/3_4, -0, assets/Resource/chunk/dreamisland/3_5, -0, assets/Resource/chunk/dreamisland/3_6, -0, assets/Resource/chunk/dreamisland/3_7, -0, assets/Resource/chunk/dreamisland/4_0, -0, assets/Resource/chunk/dreamisland/4_1, -0, assets/Resource/chunk/dreamisland/4_2, -0, assets/Resource/chunk/dreamisland/4_3, -0, assets/Resource/chunk/dreamisland/4_4, -0, assets/Resource/chunk/dreamisland/4_5, -0, assets/Resource/chunk/dreamisland/4_6, -0, assets/Resource/chunk/dreamisland/4_7, -0, assets/Resource/chunk/dreamisland/5_0, -0, assets/Resource/chunk/dreamisland/5_1, -0, assets/Resource/chunk/dreamisland/5_2, -0, assets/Resource/chunk/dreamisland/5_3, -0, assets/Resource/chunk/dreamisland/5_4, -0, assets/Resource/chunk/dreamisland/5_5, -0, assets/Resource/chunk/dreamisland/5_6, -0, assets/Resource/chunk/dreamisland/5_7, -0, assets/Resource/chunk/dreamisland/maptile, -0, assets/Resource/chunk/dreamisland/maptilecollider, -0, assets/Resource/chunk/dreamisland/mapwater, -0, assets/Resource/chunk/main/0_0, -0, assets/Resource/chunk/main/0_1, -0, assets/Resource/chunk/main/0_2, -0, assets/Resource/chunk/main/0_3, -0, assets/Resource/chunk/main/0_4, -0, assets/Resource/chunk/main/0_5, -0, assets/Resource/chunk/main/0_6, -0, assets/Resource/chunk/main/1_0, -0, assets/Resource/chunk/main/1_1, -0, assets/Resource/chunk/main/1_2, -0, assets/Resource/chunk/main/1_3, -0, assets/Resource/chunk/main/1_4, -0, assets/Resource/chunk/main/1_5, -0, assets/Resource/chunk/main/1_6, -0, assets/Resource/chunk/main/2_0, -0, assets/Resource/chunk/main/2_1, -0, assets/Resource/chunk/main/2_2, -0, assets/Resource/chunk/main/2_3, -0, assets/Resource/chunk/main/2_4, -0, assets/Resource/chunk/main/2_5, -0, assets/Resource/chunk/main/2_6, -0, assets/Resource/chunk/main/3_0, -0, assets/Resource/chunk/main/3_1, -0, assets/Resource/chunk/main/3_2, -0, assets/Resource/chunk/main/3_3, -0, assets/Resource/chunk/main/3_4, -0, assets/Resource/chunk/main/3_5, -0, assets/Resource/chunk/main/3_6, -0, assets/Resource/chunk/main/4_0, -0, assets/Resource/chunk/main/4_1, -0, assets/Resource/chunk/main/4_2, -0, assets/Resource/chunk/main/4_3, -0, assets/Resource/chunk/main/4_4, -0, assets/Resource/chunk/main/4_5, -0, assets/Resource/chunk/main/4_6, -0, assets/Resource/chunk/main/maptile, -0, assets/Resource/chunk/main/maptilecollider, -0, assets/Resource/chunk/main/mapwater, -0, assets/Resource/particle/scene/fenceani, -0, assets/Resource/particle/scene/landhighlight, -0, assets/Resource/particle/scene/npc3001, -0, assets/Resource/particle/scene/npc3002, -0, assets/Resource/particle/scene/npc3003, -0, assets/Resource/particle/scene/npc3004, -0, assets/Resource/particle/scene/npc3005, -0, assets/Resource/particle/scene/npc3006, -0, assets/Resource/particle/scene/npc3007, -0, assets/Resource/particle/scene/npc3008, -0, assets/Resource/particle/scene/npc3009, -0, assets/Resource/particle/scene/npc3010, -0, assets/Resource/particle/scene/npc3011, -0, assets/Resource/particle/scene/npc3012, -0, assets/Resource/particle/scene/parachute, -0, assets/Resource/particle/scene/public2001, -0, assets/Resource/particle/scene/public2002, -0, assets/Resource/particle/scene/public2003, -0, assets/Resource/particle/scene/public2004, -0, assets/Resource/particle/scene/public2005, -0, assets/Resource/particle/scene/public2006, -0, assets/Resource/particle/scene/public2007, -0, assets/Resource/particle/scene/public2008, -0, assets/Resource/particle/scene/public2009, -0, assets/Resource/particle/scene/public2010, -0, assets/Resource/particle/scene/public2011, -0, assets/Resource/particle/scene/public2012, -0, assets/Resource/particle/scene/public2013, -0, assets/Resource/particle/scene/public2014, -0, assets/Resource/particle/scene/public2015, -0, assets/Resource/particle/scene/public2016, -0, assets/Resource/particle/scene/public2017, -0, assets/Resource/particle/scene/public2018, -0, assets/Resource/particle/scene/public2019, -0, assets/Resource/particle/scene/public2020, -0, assets/Resource/particle/scene/public2021, -0, assets/Resource/particle/scene/public2022, -0, assets/Resource/particle/scene/public2023, -0, assets/Resource/particle/scene/public2024, -0, assets/Resource/particle/scene/public2025, -0, assets/Resource/particle/scene/public2026, -0, assets/Resource/particle/scene/public2027, -0, assets/Resource/particle/scene/public2028, -0, assets/Resource/particle/scene/public2029, -0, assets/Resource/particle/scene/public2030, -0, assets/Resource/particle/scene/public2031, -0, assets/Resource/particle/scene/public2032, -0, assets/Resource/particle/scene/public2033, -0, assets/Resource/particle/scene/public2034, -0, assets/Resource/particle/scene/ship, -0, assets/Resource/particle/scene/shopbuidingsmoke10x10, -0, assets/Resource/particle/scene/shopbuidingsmoke12x12, -0, assets/Resource/particle/scene/shopbuidingsmoke24x24, -0, assets/Resource/particle/scene/shopbuidingsmoke5x5, -0, assets/Resource/particle/scene/shopbuidingsmoke6x6, -0, assets/Resource/particle/scene/shopbuidingsmoke7x7, -0, assets/Resource/particle/scene/shopbuidingsmoke8x8, -0, assets/Resource/particle/scene/shopbuidingsmoke9x9, -0, assets/Resource/particle/scene/shopbuildcomplete, -0, assets/Resource/particle/scene/shopbuildinganchor, -0, assets/Resource/particle/scene/shopremovesmoke10x10, -0, assets/Resource/particle/scene/shopremovesmoke12x12, -0, assets/Resource/particle/scene/shopremovesmoke24x24, -0, assets/Resource/particle/scene/shopremovesmoke5x5, -0, assets/Resource/particle/scene/shopremovesmoke6x6, -0, assets/Resource/particle/scene/shopremovesmoke7x7, -0, assets/Resource/particle/scene/shopremovesmoke8x8, -0, assets/Resource/particle/scene/shopremovesmoke9x9, -0, assets/Resource/particle/scene/trailer, -0, assets/Resource/particle/scene/waterfall, -0, assets/Resource/particle/scene/waterfollwerfollwer, -0, assets/Resource/particle/scene/yacht, -0, assets/Resource/particle/ui3d/cashcollect, -0, assets/Resource/particle/ui3d/cashready, -0, assets/Resource/particle/ui/addcash, -0, assets/Resource/particle/ui/addgold, -0, assets/Resource/particle/ui/addsilver, -0, assets/Resource/particle/ui/cardidentificationbackparticles, -0, assets/Resource/particle/ui/cardidentificationfrontparticles, -0, assets/Resource/particle/ui/cardidentificationlightsweep, -0, assets/Resource/particle/ui/cardindentificationeffect, -0, assets/Resource/particle/ui/cardindentificationeffect02, -0, assets/Resource/particle/ui/chamberofcommercecircle, -0, assets/Resource/particle/ui/chamberofcommerceclearing, -0, assets/Resource/particle/ui/chamberofcommerceglow, -0, assets/Resource/particle/ui/chamberofcommercevs, -0, assets/Resource/particle/ui/chamberofcommercewin, -0, assets/Resource/particle/ui/chamberofgetfinish, -0, assets/Resource/particle/ui/clearancesuccess, -0, assets/Resource/particle/ui/companylevelupeffect, -0, assets/Resource/particle/ui/companylevelupeffect02, -0, assets/Resource/particle/ui/completionoftask, -0, assets/Resource/particle/ui/createfinish, -0, assets/Resource/particle/ui/createsuccess, -0, assets/Resource/particle/ui/cursor, -0, assets/Resource/particle/ui/departmentupgrade, -0, assets/Resource/particle/ui/employeestoupgradecontractionlight, -0, assets/Resource/particle/ui/employeestoupgradecontractionparticle, -0, assets/Resource/particle/ui/employeestoupgradeexplodeparticle, -0, assets/Resource/particle/ui/employeestoupgradewhitelight, -0, assets/Resource/particle/ui/employeesupgoldstarexplode, -0, assets/Resource/particle/ui/employeesupgoldstarfail, -0, assets/Resource/particle/ui/employeesupgoldstarmotion, -0, assets/Resource/particle/ui/employeesupgoldstarmotionexplode, -0, assets/Resource/particle/ui/employeesuplightexplode, -0, assets/Resource/particle/ui/employeesupphotosphere, -0, assets/Resource/particle/ui/employeesupsilverstarexplode, -0, assets/Resource/particle/ui/employeesupsilverstarfail, -0, assets/Resource/particle/ui/employeesupsilverstarmotion, -0, assets/Resource/particle/ui/employeesupstar, -0, assets/Resource/particle/ui/employeesupstarexplode, -0, assets/Resource/particle/ui/employeesupstarstar, -0, assets/Resource/particle/ui/employeesupstaryellow, -0, assets/Resource/particle/ui/employeesuptransform, -0, assets/Resource/particle/ui/environmentdowneffect, -0, assets/Resource/particle/ui/fireworksone, -0, assets/Resource/particle/ui/fireworkstwo, -0, assets/Resource/particle/ui/growthinadvance, -0, assets/Resource/particle/ui/learnskilleffect, -0, assets/Resource/particle/ui/promptparticle, -0, assets/Resource/particle/ui/public2001, -0, assets/Resource/particle/ui/public2002, -0, assets/Resource/particle/ui/public2003, -0, assets/Resource/particle/ui/public2004, -0, assets/Resource/particle/ui/public2005, -0, assets/Resource/particle/ui/public2006, -0, assets/Resource/particle/ui/public2007, -0, assets/Resource/particle/ui/public2008, -0, assets/Resource/particle/ui/public2009, -0, assets/Resource/particle/ui/public2010, -0, assets/Resource/particle/ui/public2011, -0, assets/Resource/particle/ui/public2012, -0, assets/Resource/particle/ui/public2013, -0, assets/Resource/particle/ui/public2014, -0, assets/Resource/particle/ui/public2015, -0, assets/Resource/particle/ui/public2016, -0, assets/Resource/particle/ui/public2017, -0, assets/Resource/particle/ui/public2018, -0, assets/Resource/particle/ui/public2019, -0, assets/Resource/particle/ui/public2020, -0, assets/Resource/particle/ui/public2021, -0, assets/Resource/particle/ui/public2022, -0, assets/Resource/particle/ui/public2023, -0, assets/Resource/particle/ui/public2024, -0, assets/Resource/particle/ui/public2025, -0, assets/Resource/particle/ui/public2026, -0, assets/Resource/particle/ui/public2027, -0, assets/Resource/particle/ui/public2028, -0, assets/Resource/particle/ui/public2029, -0, assets/Resource/particle/ui/public2030, -0, assets/Resource/particle/ui/public2031, -0, assets/Resource/particle/ui/public2032, -0, assets/Resource/particle/ui/public2033, -0, assets/Resource/particle/ui/shopdownsmoke10x10, -0, assets/Resource/particle/ui/shopdownsmoke12x12, -0, assets/Resource/particle/ui/shopdownsmoke24x24, -0, assets/Resource/particle/ui/shopdownsmoke5x5, -0, assets/Resource/particle/ui/shopdownsmoke6x6, -0, assets/Resource/particle/ui/shopdownsmoke7x7, -0, assets/Resource/particle/ui/shopdownsmoke8x8, -0, assets/Resource/particle/ui/shopdownsmoke9x9, -0, assets/Resource/particle/ui/skilllearningparticle, -0, assets/Resource/particle/ui/staffappraisal, -0, assets/Resource/particle/ui/stafftrain, -0, assets/Resource/particle/ui/staffupgrade, -0, assets/Resource/particle/ui/staffupgradfail, -0, assets/Resource/particle/ui/suipianhechengeffect01, -0, assets/Resource/particle/ui/suipianhechengeffect02, -0, assets/Resource/particle/ui/suipianresearcheffect01, -0, assets/Resource/particle/ui/suipianresearcheffect02, -0, assets/Resource/particle/ui/titleparticle, -0, assets/Resource/particle/ui/trailcommon, -0, assets/Resource/particle/ui/uiloadcloudeffect, -0, assets/Resource/particle/ui/upgradesuccess, -0, assets/Resource/particle/ui/vipparticle, -0, assets/Resource/particledepends/ani_003, -0, assets/Resource/particledepends/bulestar, -0, assets/Resource/particledepends/fashanguang, -0, assets/Resource/particledepends/littlemorelight, -0, assets/Resource/particledepends/lizi_00048, -0, assets/Resource/particledepends/matanim01, -0, assets/Resource/particledepends/matanim04, -0, assets/Resource/particledepends/matanim05, -0, assets/Resource/particledepends/matanim07, -0, assets/Resource/particledepends/matanim08, -0, assets/Resource/particledepends/matanim09, -0, assets/Resource/particledepends/matanim10, -0, assets/Resource/particledepends/matanim11, -0, assets/Resource/particledepends/matbiggoldenstar, -0, assets/Resource/particledepends/matbigsilverstar, -0, assets/Resource/particledepends/matcash, -0, assets/Resource/particledepends/matgold, -0, assets/Resource/particledepends/maticon01, -0, assets/Resource/particledepends/matlabeladvanceicon, -0, assets/Resource/particledepends/matlabelcash, -0, assets/Resource/particledepends/matlabelclearancesuccess, -0, assets/Resource/particledepends/matlabelcreatesuccess, -0, assets/Resource/particledepends/matlabeldetermine, -0, assets/Resource/particledepends/matlabelnumber, -0, assets/Resource/particledepends/matlabelquantityceiling, -0, assets/Resource/particledepends/matlabelupgradesuccess, -0, assets/Resource/particledepends/matlight01, -0, assets/Resource/particledepends/matlight010, -0, assets/Resource/particledepends/matlight011, -0, assets/Resource/particledepends/matlight015, -0, assets/Resource/particledepends/matlight015blend, -0, assets/Resource/particledepends/matlight016, -0, assets/Resource/particledepends/matlight017, -0, assets/Resource/particledepends/matlight018, -0, assets/Resource/particledepends/matlight019, -0, assets/Resource/particledepends/matlight02, -0, assets/Resource/particledepends/matlight023, -0, assets/Resource/particledepends/matlight024, -0, assets/Resource/particledepends/matlight025, -0, assets/Resource/particledepends/matlight026, -0, assets/Resource/particledepends/matlight027, -0, assets/Resource/particledepends/matlight028, -0, assets/Resource/particledepends/matlight029, -0, assets/Resource/particledepends/matlight03, -0, assets/Resource/particledepends/matlight032, -0, assets/Resource/particledepends/matlight033, -0, assets/Resource/particledepends/matlight034, -0, assets/Resource/particledepends/matlight036, -0, assets/Resource/particledepends/matlight037, -0, assets/Resource/particledepends/matlight038, -0, assets/Resource/particledepends/matlight04, -0, assets/Resource/particledepends/matlight05, -0, assets/Resource/particledepends/matlight06, -0, assets/Resource/particledepends/matlight07, -0, assets/Resource/particledepends/matlight08, -0, assets/Resource/particledepends/matlight09, -0, assets/Resource/particledepends/matlight351, -0, assets/Resource/particledepends/matnumber02, -0, assets/Resource/particledepends/matnumber04, -0, assets/Resource/particledepends/matnumber05, -0, assets/Resource/particledepends/matnumber06, -0, assets/Resource/particledepends/matnumber07, -0, assets/Resource/particledepends/matparachute, -0, assets/Resource/particledepends/matparticle01, -0, assets/Resource/particledepends/matparticle012, -0, assets/Resource/particledepends/matparticle013, -0, assets/Resource/particledepends/matparticle014, -0, assets/Resource/particledepends/matparticle016, -0, assets/Resource/particledepends/matparticle017, -0, assets/Resource/particledepends/matparticle018, -0, assets/Resource/particledepends/matparticle019, -0, assets/Resource/particledepends/matparticle02, -0, assets/Resource/particledepends/matparticle020, -0, assets/Resource/particledepends/matparticle021, -0, assets/Resource/particledepends/matparticle022, -0, assets/Resource/particledepends/matparticle023, -0, assets/Resource/particledepends/matparticle024, -0, assets/Resource/particledepends/matparticle025, -0, assets/Resource/particledepends/matparticle027, -0, assets/Resource/particledepends/matparticle028, -0, assets/Resource/particledepends/matparticle029, -0, assets/Resource/particledepends/matparticle030, -0, assets/Resource/particledepends/matparticle031, -0, assets/Resource/particledepends/matparticle036, -0, assets/Resource/particledepends/matparticle037, -0, assets/Resource/particledepends/matparticle038, -0, assets/Resource/particledepends/matparticle03802, -0, assets/Resource/particledepends/matparticle04, -0, assets/Resource/particledepends/matparticle047, -0, assets/Resource/particledepends/matparticle048, -0, assets/Resource/particledepends/matparticle049, -0, assets/Resource/particledepends/matparticle05, -0, assets/Resource/particledepends/matparticle050, -0, assets/Resource/particledepends/matparticle051, -0, assets/Resource/particledepends/matparticle052, -0, assets/Resource/particledepends/matparticle053, -0, assets/Resource/particledepends/matparticle054, -0, assets/Resource/particledepends/matparticle06, -0, assets/Resource/particledepends/matparticle07, -0, assets/Resource/particledepends/matparticle08, -0, assets/Resource/particledepends/matparticle09, -0, assets/Resource/particledepends/matparticle39, -0, assets/Resource/particledepends/matparticle40, -0, assets/Resource/particledepends/matparticle41, -0, assets/Resource/particledepends/matparticle42, -0, assets/Resource/particledepends/matparticle43, -0, assets/Resource/particledepends/matparticle44, -0, assets/Resource/particledepends/matperson, -0, assets/Resource/particledepends/matsilver, -0, assets/Resource/particledepends/matstaffupgradfail, -0, assets/Resource/particledepends/mattexanim02, -0, assets/Resource/particledepends/mattexanim05, -0, assets/Resource/particledepends/mattexcloud, -0, assets/Resource/particledepends/mattexlabelzi01, -0, assets/Resource/particledepends/mattexlabelzi02, -0, assets/Resource/particledepends/mattexlight027, -0, assets/Resource/particledepends/mattexlight0331, -0, assets/Resource/particledepends/mattexlight100, -0, assets/Resource/particledepends/mattexlightglow01, -0, assets/Resource/particledepends/mattexlingt4008, -0, assets/Resource/particledepends/mattexparticle03, -0, assets/Resource/particledepends/mattexparticle4007, -0, assets/Resource/particledepends/matupgradesuccess, -0, assets/Resource/particledepends/matwaterlang1, -0, assets/Resource/particledepends/matyacht, -0, assets/Resource/particledepends/modefountain01, -0, assets/Resource/particledepends/modefountain02, -0, assets/Resource/particledepends/modefountain03, -0, assets/Resource/particledepends/modefountain04, -0, assets/Resource/particledepends/modelbar, -0, assets/Resource/particledepends/modelgold, -0, assets/Resource/particledepends/modelnumber, -0, assets/Resource/particledepends/modelre, -0, assets/Resource/particledepends/modelrect01, -0, assets/Resource/particledepends/modelrect03, -0, assets/Resource/particledepends/modelrect04, -0, assets/Resource/particledepends/modelrect06, -0, assets/Resource/particledepends/modelrect07, -0, assets/Resource/particledepends/modelrect08, -0, assets/Resource/particledepends/modelrect09, -0, assets/Resource/particledepends/modelrect10, -0, assets/Resource/particledepends/modelrect11, -0, assets/Resource/particledepends/modelstar, -0, assets/Resource/particledepends/modeltorus, -0, assets/Resource/particledepends/modelwater, -0, assets/Resource/particledepends/modelwater01, -0, assets/Resource/particledepends/modelwater03, -0, assets/Resource/particledepends/modelwater04, -0, assets/Resource/particledepends/modelwater2, -0, assets/Resource/particledepends/modelwater3, -0, assets/Resource/particledepends/modelwaterflollwer, -0, assets/Resource/particledepends/modeperson, -0, assets/Resource/particledepends/modeplandlgetc, -0, assets/Resource/particledepends/modewatermark01, -0, assets/Resource/particledepends/modeyacht, -0, assets/Resource/particledepends/orangeball, -0, assets/Resource/particledepends/orangepoint, -0, assets/Resource/particledepends/point01, -0, assets/Resource/particledepends/purplestar, -0, assets/Resource/particledepends/redstar, -0, assets/Resource/particledepends/shanguang_00013, -0, assets/Resource/particledepends/suzi, -0, assets/Resource/particledepends/texanim01, -0, assets/Resource/particledepends/texanim02, -0, assets/Resource/particledepends/texanim04, -0, assets/Resource/particledepends/texanim05, -0, assets/Resource/particledepends/texanim06, -0, assets/Resource/particledepends/texanim07, -0, assets/Resource/particledepends/texanim08, -0, assets/Resource/particledepends/texanim09, -0, assets/Resource/particledepends/texanim10, -0, assets/Resource/particledepends/texanim11, -0, assets/Resource/particledepends/texbulding, -0, assets/Resource/particledepends/texcash, -0, assets/Resource/particledepends/texgold, -0, assets/Resource/particledepends/texlabelbigstar, -0, assets/Resource/particledepends/texlabelsillerstar, -0, assets/Resource/particledepends/texlabelzi01, -0, assets/Resource/particledepends/texlabelzi02, -0, assets/Resource/particledepends/texlight01, -0, assets/Resource/particledepends/texlight010, -0, assets/Resource/particledepends/texlight016, -0, assets/Resource/particledepends/texlight017, -0, assets/Resource/particledepends/texlight018, -0, assets/Resource/particledepends/texlight02, -0, assets/Resource/particledepends/texlight022, -0, assets/Resource/particledepends/texlight023, -0, assets/Resource/particledepends/texlight024, -0, assets/Resource/particledepends/texlight025, -0, assets/Resource/particledepends/texlight026, -0, assets/Resource/particledepends/texlight027, -0, assets/Resource/particledepends/texlight028, -0, assets/Resource/particledepends/texlight029, -0, assets/Resource/particledepends/texlight03, -0, assets/Resource/particledepends/texlight032, -0, assets/Resource/particledepends/texlight033, -0, assets/Resource/particledepends/texlight0331, -0, assets/Resource/particledepends/texlight034, -0, assets/Resource/particledepends/texlight0351, -0, assets/Resource/particledepends/texlight04, -0, assets/Resource/particledepends/texlight05, -0, assets/Resource/particledepends/texlight06, -0, assets/Resource/particledepends/texlight07, -0, assets/Resource/particledepends/texlight09, -0, assets/Resource/particledepends/texlight100, -0, assets/Resource/particledepends/texlightglow01, -0, assets/Resource/particledepends/texlightvisa, -0, assets/Resource/particledepends/texlingt4008, -0, assets/Resource/particledepends/texparachute, -0, assets/Resource/particledepends/texparticle01, -0, assets/Resource/particledepends/texparticle012, -0, assets/Resource/particledepends/texparticle013, -0, assets/Resource/particledepends/texparticle014, -0, assets/Resource/particledepends/texparticle016, -0, assets/Resource/particledepends/texparticle017, -0, assets/Resource/particledepends/texparticle018, -0, assets/Resource/particledepends/texparticle019, -0, assets/Resource/particledepends/texparticle02, -0, assets/Resource/particledepends/texparticle020, -0, assets/Resource/particledepends/texparticle021, -0, assets/Resource/particledepends/texparticle022, -0, assets/Resource/particledepends/texparticle023, -0, assets/Resource/particledepends/texparticle024, -0, assets/Resource/particledepends/texparticle025, -0, assets/Resource/particledepends/texparticle027, -0, assets/Resource/particledepends/texparticle028, -0, assets/Resource/particledepends/texparticle029, -0, assets/Resource/particledepends/texparticle03, -0, assets/Resource/particledepends/texparticle030, -0, assets/Resource/particledepends/texparticle031, -0, assets/Resource/particledepends/texparticle037, -0, assets/Resource/particledepends/texparticle038, -0, assets/Resource/particledepends/texparticle039, -0, assets/Resource/particledepends/texparticle04, -0, assets/Resource/particledepends/texparticle041, -0, assets/Resource/particledepends/texparticle042, -0, assets/Resource/particledepends/texparticle043, -0, assets/Resource/particledepends/texparticle044, -0, assets/Resource/particledepends/texparticle047, -0, assets/Resource/particledepends/texparticle048, -0, assets/Resource/particledepends/texparticle049, -0, assets/Resource/particledepends/texparticle05, -0, assets/Resource/particledepends/texparticle050, -0, assets/Resource/particledepends/texparticle052, -0, assets/Resource/particledepends/texparticle053, -0, assets/Resource/particledepends/texparticle054, -0, assets/Resource/particledepends/texparticle06, -0, assets/Resource/particledepends/texparticle07, -0, assets/Resource/particledepends/texparticle08, -0, assets/Resource/particledepends/texparticle09, -0, assets/Resource/particledepends/texparticle4007, -0, assets/Resource/particledepends/texperson, -0, assets/Resource/particledepends/texship1, -0, assets/Resource/particledepends/texship2, -0, assets/Resource/particledepends/texship3, -0, assets/Resource/particledepends/texsilver, -0, assets/Resource/particledepends/textlabelcash, -0, assets/Resource/particledepends/textlabelfinsh01, -0, assets/Resource/particledepends/textlabelfinsh02, -0, assets/Resource/particledepends/textlabelwin, -0, assets/Resource/particledepends/texwaterlang1, -0, assets/Resource/particledepends/texwhiteboard, -0, assets/Resource/particledepends/texyacht, -0, assets/Resource/particledepends/whitepoint, -0, assets/Resource/particledepends/yellowlightoutput, -0, assets/Resource/sound/effect/btnclick, -0, assets/Resource/sound/effect/buildingdrop, -0, assets/Resource/sound/effect/buildingmoving, -0, assets/Resource/sound/effect/buyblock, -0, assets/Resource/sound/effect/clanvslose, -0, assets/Resource/sound/effect/clanvswin, -0, assets/Resource/sound/effect/collectcash, -0, assets/Resource/sound/effect/combatcard, -0, assets/Resource/sound/effect/combatlose, -0, assets/Resource/sound/effect/combatvs, -0, assets/Resource/sound/effect/combatwin, -0, assets/Resource/sound/effect/commonfail, -0, assets/Resource/sound/effect/commonlevelup, -0, assets/Resource/sound/effect/commonmsgup, -0, assets/Resource/sound/effect/companylevelupbegin, -0, assets/Resource/sound/effect/companylevelupplayerrank, -0, assets/Resource/sound/effect/companyleveluprankbg, -0, assets/Resource/sound/effect/companylevelupreward, -0, assets/Resource/sound/effect/companyleveluptransform, -0, assets/Resource/sound/effect/createclan, -0, assets/Resource/sound/effect/developmentcomposite, -0, assets/Resource/sound/effect/developmentcompositehide, -0, assets/Resource/sound/effect/developmentresearchhide, -0, assets/Resource/sound/effect/developmentresearchshow, -0, assets/Resource/sound/effect/environmentdrop, -0, assets/Resource/sound/effect/gamestartbtnclk, -0, assets/Resource/sound/effect/moneyadd, -0, assets/Resource/sound/effect/moneysub, -0, assets/Resource/sound/effect/shopbuildingfinish, -0, assets/Resource/sound/effect/shopbuildingremove, -0, assets/Resource/sound/effect/shopbuildingstart, -0, assets/Resource/sound/effect/skillicontween, -0, assets/Resource/sound/effect/skillplan, -0, assets/Resource/sound/effect/skillplanend, -0, assets/Resource/sound/effect/staffidentifybegin, -0, assets/Resource/sound/effect/staffidentifycardshow, -0, assets/Resource/sound/effect/staffsetpositiondetail, -0, assets/Resource/sound/effect/staffsetpositionhead, -0, assets/Resource/sound/effect/staffsetpositionstart, -0, assets/Resource/sound/effect/staffupgradefailure, -0, assets/Resource/sound/effect/staffupgradelevel, -0, assets/Resource/sound/effect/staffupgradepop, -0, assets/Resource/sound/effect/staffupgradeskill, -0, assets/Resource/sound/effect/staffupgradestatus, -0, assets/Resource/sound/effect/staffupgradesuccess, -0, assets/Resource/sound/effect/staffupstar_success, -0, assets/Resource/sound/effect/staffupstarfailed, -0, assets/Resource/sound/effect/taskfinish, -0, assets/Resource/sound/effect/titleupgrade, -0, assets/Resource/sound/effect/vipupgrade, -0, assets/Resource/sound/effect/vscarnet, -0, assets/Resource/sound/effect/shopopen/shop1101, -0, assets/Resource/sound/effect/shopopen/shop1102, -0, assets/Resource/sound/effect/shopopen/shop1103, -0, assets/Resource/sound/effect/shopopen/shop1104, -0, assets/Resource/sound/effect/shopopen/shop1105, -0, assets/Resource/sound/effect/shopopen/shop1106, -0, assets/Resource/sound/effect/shopopen/shop1107, -0, assets/Resource/sound/effect/shopopen/shop1108, -0, assets/Resource/sound/effect/shopopen/shop1109, -0, assets/Resource/sound/effect/shopopen/shop1110, -0, assets/Resource/sound/effect/shopopen/shop1201, -0, assets/Resource/sound/effect/shopopen/shop1202, -0, assets/Resource/sound/effect/shopopen/shop1203, -0, assets/Resource/sound/effect/shopopen/shop1204, -0, assets/Resource/sound/effect/shopopen/shop1205, -0, assets/Resource/sound/effect/shopopen/shop1206, -0, assets/Resource/sound/effect/shopopen/shop1207, -0, assets/Resource/sound/effect/shopopen/shop1208, -0, assets/Resource/sound/effect/shopopen/shop1209, -0, assets/Resource/sound/effect/shopopen/shop1210, -0, assets/Resource/sound/effect/shopopen/shop1301, -0, assets/Resource/sound/effect/shopopen/shop1302, -0, assets/Resource/sound/effect/shopopen/shop1303, -0, assets/Resource/sound/effect/shopopen/shop1304, -0, assets/Resource/sound/effect/shopopen/shop1305, -0, assets/Resource/sound/effect/shopopen/shop1306, -0, assets/Resource/sound/effect/shopopen/shop1307, -0, assets/Resource/sound/effect/shopopen/shop1308, -0, assets/Resource/sound/effect/shopopen/shop1309, -0, assets/Resource/sound/effect/shopopen/shop1310, -0, assets/Resource/sound/effect/shopopen/shop1401, -0, assets/Resource/sound/effect/shopopen/shop1402, -0, assets/Resource/sound/effect/shopopen/shop1403, -0, assets/Resource/sound/effect/shopopen/shop1404, -0, assets/Resource/sound/effect/shopopen/shop1405, -0, assets/Resource/sound/effect/shopopen/shop1406, -0, assets/Resource/sound/effect/shopopen/shop1407, -0, assets/Resource/sound/effect/shopopen/shop1408, -0, assets/Resource/sound/effect/shopopen/shop1409, -0, assets/Resource/sound/effect/shopopen/shop1410, -0, assets/Resource/sound/music/bank, -0, assets/Resource/sound/music/clanvs, -0, assets/Resource/sound/music/music1, -0, assets/Resource/sound/music/musiccreaterole, -0, assets/Resource/sound/music/musiclogin, -0, assets/Resource/sound/music/official, -0, assets/Resource/sound/music/tradebackgroundmusic, -0, assets/Resource/ui/uifont, -0, assets/Resource/ui/uilaunch, -0, assets/Resource/ui/uistyle, -0, assets/Resource/ui/uiicon/auction, -0, assets/Resource/ui/uiicon/building, -0, assets/Resource/ui/uiicon/frametitle, -0, assets/Resource/ui/uiicon/playerhalf, -0, assets/Resource/ui/uiicon/staffhalf, -0, assets/Resource/ui/uilayout/athletice, -0, assets/Resource/ui/uilayout/auction, -0, assets/Resource/ui/uilayout/bag, -0, assets/Resource/ui/uilayout/bank, -0, assets/Resource/ui/uilayout/building, -0, assets/Resource/ui/uilayout/car, -0, assets/Resource/ui/uilayout/charitycenter, -0, assets/Resource/ui/uilayout/chat, -0, assets/Resource/ui/uilayout/clan, -0, assets/Resource/ui/uilayout/clancreat, -0, assets/Resource/ui/uilayout/clandonation, -0, assets/Resource/ui/uilayout/clanfunction, -0, assets/Resource/ui/uilayout/claninvest, -0, assets/Resource/ui/uilayout/clanlandmark, -0, assets/Resource/ui/uilayout/clanmember, -0, assets/Resource/ui/uilayout/common, -0, assets/Resource/ui/uilayout/commonupgrade, -0, assets/Resource/ui/uilayout/company, -0, assets/Resource/ui/uilayout/consortium, -0, assets/Resource/ui/uilayout/department, -0, assets/Resource/ui/uilayout/development, -0, assets/Resource/ui/uilayout/financecenter, -0, assets/Resource/ui/uilayout/headhuntingcenter, -0, assets/Resource/ui/uilayout/help, -0, assets/Resource/ui/uilayout/invest, -0, assets/Resource/ui/uilayout/login, -0, assets/Resource/ui/uilayout/mainrole, -0, assets/Resource/ui/uilayout/mainui, -0, assets/Resource/ui/uilayout/mall, -0, assets/Resource/ui/uilayout/map, -0, assets/Resource/ui/uilayout/official, -0, assets/Resource/ui/uilayout/onlinemessage, -0, assets/Resource/ui/uilayout/public, -0, assets/Resource/ui/uilayout/purchasecenter, -0, assets/Resource/ui/uilayout/purchasecommon, -0, assets/Resource/ui/uilayout/purchaselimit, -0, assets/Resource/ui/uilayout/purchasepower, -0, assets/Resource/ui/uilayout/rank, -0, assets/Resource/ui/uilayout/robbed, -0, assets/Resource/ui/uilayout/rolecard, -0, assets/Resource/ui/uilayout/sceneoper, -0, assets/Resource/ui/uilayout/secretary, -0, assets/Resource/ui/uilayout/setting, -0, assets/Resource/ui/uilayout/shop, -0, assets/Resource/ui/uilayout/social, -0, assets/Resource/ui/uilayout/socialfriends, -0, assets/Resource/ui/uilayout/socialinvest, -0, assets/Resource/ui/uilayout/square, -0, assets/Resource/ui/uilayout/staff, -0, assets/Resource/ui/uilayout/staffadjust, -0, assets/Resource/ui/uilayout/staffcenter, -0, assets/Resource/ui/uilayout/stafffire, -0, assets/Resource/ui/uilayout/staffhire, -0, assets/Resource/ui/uilayout/staffidentify, -0, assets/Resource/ui/uilayout/staffinfo, -0, assets/Resource/ui/uilayout/staffskill, -0, assets/Resource/ui/uilayout/stafftrain, -0, assets/Resource/ui/uilayout/staffupgrade, -0, assets/Resource/ui/uilayout/stock, -0, assets/Resource/ui/uilayout/task, -0, assets/Resource/ui/uilayout/taskguidance, -0, assets/Resource/ui/uilayout/trade, -0, assets/Resource/ui/uilayout/tradecenter, -0, assets/Resource/ui/uisprite/bag, -0, assets/Resource/ui/uisprite/fbagicon, -0, assets/Resource/ui/uisprite/fclan, -0, assets/Resource/ui/uisprite/fcommon, -0, assets/Resource/ui/uisprite/fcommonex1, -0, assets/Resource/ui/uisprite/fcompany, -0, assets/Resource/ui/uisprite/fmainrole, -0, assets/Resource/ui/uisprite/fmainui, -0, assets/Resource/ui/uisprite/fmap, -0, assets/Resource/ui/uisprite/fpublic, -0, assets/Resource/ui/uisprite/fsceneoper, -0, assets/Resource/ui/uisprite/fsetting, -0, assets/Resource/ui/uisprite/fshop, -0, assets/Resource/ui/uisprite/fstaff, -0, assets/Resource/ui/uisprite/fstaffskill, -0, assets/Resource/ui/uisprite/ftask, -0, assets/Resource/ui/uisprite/ftrade, -0, assets/Resource/ui/uisprite/logo, -0, assets/Resource/ui/uisprite/wauction, -0, assets/Resource/ui/uisprite/wbank, -0, assets/Resource/ui/uisprite/wcar, -0, assets/Resource/ui/uisprite/wcharitycenter, -0, assets/Resource/ui/uisprite/wchat, -0, assets/Resource/ui/uisprite/wclan, -0, assets/Resource/ui/uisprite/wclanhead, -0, assets/Resource/ui/uisprite/wcommon, -0, assets/Resource/ui/uisprite/wcommonex1, -0, assets/Resource/ui/uisprite/wcompany, -0, assets/Resource/ui/uisprite/wconsortium, -0, assets/Resource/ui/uisprite/wdepartment, -0, assets/Resource/ui/uisprite/wdevelopment, -0, assets/Resource/ui/uisprite/wguidance, -0, assets/Resource/ui/uisprite/wincreaseui, -0, assets/Resource/ui/uisprite/wlaunch, -0, assets/Resource/ui/uisprite/wlogin, -0, assets/Resource/ui/uisprite/wmainrole, -0, assets/Resource/ui/uisprite/wmainui, -0, assets/Resource/ui/uisprite/wmall, -0, assets/Resource/ui/uisprite/wmap, -0, assets/Resource/ui/uisprite/wofficial, -0, assets/Resource/ui/uisprite/wpurchase, -0, assets/Resource/ui/uisprite/wrank, -0, assets/Resource/ui/uisprite/wrolecard, -0, assets/Resource/ui/uisprite/wrolehead, -0, assets/Resource/ui/uisprite/wsceneoper, -0, assets/Resource/ui/uisprite/wsecretary, -0, assets/Resource/ui/uisprite/wsetting, -0, assets/Resource/ui/uisprite/wshop, -0, assets/Resource/ui/uisprite/wsocial, -0, assets/Resource/ui/uisprite/wsquare, -0, assets/Resource/ui/uisprite/wstaff, -0, assets/Resource/ui/uisprite/wstaffani, -0, assets/Resource/ui/uisprite/wstaffhead, -0, assets/Resource/ui/uisprite/wstaffskill, -0, assets/Resource/ui/uisprite/wstock, -0, assets/Resource/ui/uisprite/wstockicon, -0, assets/Resource/ui/uisprite/wtask, -0, assets/Resource/ui/uisprite/wtrade, -0, assets/Resource/ui/uisprite/wtradecenter, -0, assets/Resource/ui/uisprite/wtrademap, -0, assets/Resource/ui/uisprite/wvipanim, -0, arsc, -I, C:\Users\Zachary\apktool\framework\1.apk, -S, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\res, -M, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\AndroidManifest.xml]
at brut.androlib.Androlib.buildResourcesFull(Androlib.java:437)
at brut.androlib.Androlib.buildResources(Androlib.java:371)
at brut.androlib.Androlib.build(Androlib.java:281)
at brut.androlib.Androlib.build(Androlib.java:254)
at brut.apktool.Main.cmdBuild(Main.java:224)
at brut.apktool.Main.main(Main.java:84)
Caused by: brut.androlib.AndrolibException: brut.common.BrutException: could not exec: [C:\Users\Zachary\AppData\Local\Temp\brut_util_Jar_4106740525864047267.tmp, p, --forced-package-id, 127, --min-sdk-version, 9, --target-sdk-version, 23, --version-code, 1, --version-name, 1.0, -F, C:\Users\Zachary\AppData\Local\Temp\APKTOOL764050849277430384.tmp, -0, arsc, -0, cfg, -0, assets/LuaScriptDB, -0, assets/ResVersionDB, -0, assets/ScriptVersionDB, -0, resource, -0, assets/Resource/Resource, -0, assets/Resource/shader, -0, assets/Resource/building/base, -0, assets/Resource/building/construct, -0, assets/Resource/building/environment, -0, assets/Resource/building/npc, -0, assets/Resource/building/public, -0, assets/Resource/building/shop/1101, -0, assets/Resource/building/shop/1102, -0, assets/Resource/building/shop/1103, -0, assets/Resource/building/shop/1104, -0, assets/Resource/building/shop/1105, -0, assets/Resource/building/shop/1106, -0, assets/Resource/building/shop/1107, -0, assets/Resource/building/shop/1108, -0, assets/Resource/building/shop/1109, -0, assets/Resource/building/shop/1110, -0, assets/Resource/building/shop/1201, -0, assets/Resource/building/shop/1202, -0, assets/Resource/building/shop/1203, -0, assets/Resource/building/shop/1204, -0, assets/Resource/building/shop/1205, -0, assets/Resource/building/shop/1206, -0, assets/Resource/building/shop/1207, -0, assets/Resource/building/shop/1208, -0, assets/Resource/building/shop/1209, -0, assets/Resource/building/shop/1210, -0, assets/Resource/building/shop/1301, -0, assets/Resource/building/shop/1302, -0, assets/Resource/building/shop/1303, -0, assets/Resource/building/shop/1304, -0, assets/Resource/building/shop/1305, -0, assets/Resource/building/shop/1306, -0, assets/Resource/building/shop/1307, -0, assets/Resource/building/shop/1308, -0, assets/Resource/building/shop/1309, -0, assets/Resource/building/shop/1310, -0, assets/Resource/building/shop/1401, -0, assets/Resource/building/shop/1402, -0, assets/Resource/building/shop/1403, -0, assets/Resource/building/shop/1404, -0, assets/Resource/building/shop/1405, -0, assets/Resource/building/shop/1406, -0, assets/Resource/building/shop/1407, -0, assets/Resource/building/shop/1408, -0, assets/Resource/building/shop/1409, -0, assets/Resource/building/shop/1410, -0, assets/Resource/chunk/common, -0, assets/Resource/chunk/dreamisland/0_0, -0, assets/Resource/chunk/dreamisland/0_1, -0, assets/Resource/chunk/dreamisland/0_2, -0, assets/Resource/chunk/dreamisland/0_3, -0, assets/Resource/chunk/dreamisland/0_4, -0, assets/Resource/chunk/dreamisland/0_5, -0, assets/Resource/chunk/dreamisland/0_6, -0, assets/Resource/chunk/dreamisland/0_7, -0, assets/Resource/chunk/dreamisland/1_0, -0, assets/Resource/chunk/dreamisland/1_1, -0, assets/Resource/chunk/dreamisland/1_2, -0, assets/Resource/chunk/dreamisland/1_3, -0, assets/Resource/chunk/dreamisland/1_4, -0, assets/Resource/chunk/dreamisland/1_5, -0, assets/Resource/chunk/dreamisland/1_6, -0, assets/Resource/chunk/dreamisland/1_7, -0, assets/Resource/chunk/dreamisland/2_0, -0, assets/Resource/chunk/dreamisland/2_1, -0, assets/Resource/chunk/dreamisland/2_2, -0, assets/Resource/chunk/dreamisland/2_3, -0, assets/Resource/chunk/dreamisland/2_4, -0, assets/Resource/chunk/dreamisland/2_5, -0, assets/Resource/chunk/dreamisland/2_6, -0, assets/Resource/chunk/dreamisland/2_7, -0, assets/Resource/chunk/dreamisland/3_0, -0, assets/Resource/chunk/dreamisland/3_1, -0, assets/Resource/chunk/dreamisland/3_2, -0, assets/Resource/chunk/dreamisland/3_3, -0, assets/Resource/chunk/dreamisland/3_4, -0, assets/Resource/chunk/dreamisland/3_5, -0, assets/Resource/chunk/dreamisland/3_6, -0, assets/Resource/chunk/dreamisland/3_7, -0, assets/Resource/chunk/dreamisland/4_0, -0, assets/Resource/chunk/dreamisland/4_1, -0, assets/Resource/chunk/dreamisland/4_2, -0, assets/Resource/chunk/dreamisland/4_3, -0, assets/Resource/chunk/dreamisland/4_4, -0, assets/Resource/chunk/dreamisland/4_5, -0, assets/Resource/chunk/dreamisland/4_6, -0, assets/Resource/chunk/dreamisland/4_7, -0, assets/Resource/chunk/dreamisland/5_0, -0, assets/Resource/chunk/dreamisland/5_1, -0, assets/Resource/chunk/dreamisland/5_2, -0, assets/Resource/chunk/dreamisland/5_3, -0, assets/Resource/chunk/dreamisland/5_4, -0, assets/Resource/chunk/dreamisland/5_5, -0, assets/Resource/chunk/dreamisland/5_6, -0, assets/Resource/chunk/dreamisland/5_7, -0, assets/Resource/chunk/dreamisland/maptile, -0, assets/Resource/chunk/dreamisland/maptilecollider, -0, assets/Resource/chunk/dreamisland/mapwater, -0, assets/Resource/chunk/main/0_0, -0, assets/Resource/chunk/main/0_1, -0, assets/Resource/chunk/main/0_2, -0, assets/Resource/chunk/main/0_3, -0, assets/Resource/chunk/main/0_4, -0, assets/Resource/chunk/main/0_5, -0, assets/Resource/chunk/main/0_6, -0, assets/Resource/chunk/main/1_0, -0, assets/Resource/chunk/main/1_1, -0, assets/Resource/chunk/main/1_2, -0, assets/Resource/chunk/main/1_3, -0, assets/Resource/chunk/main/1_4, -0, assets/Resource/chunk/main/1_5, -0, assets/Resource/chunk/main/1_6, -0, assets/Resource/chunk/main/2_0, -0, assets/Resource/chunk/main/2_1, -0, assets/Resource/chunk/main/2_2, -0, assets/Resource/chunk/main/2_3, -0, assets/Resource/chunk/main/2_4, -0, assets/Resource/chunk/main/2_5, -0, assets/Resource/chunk/main/2_6, -0, assets/Resource/chunk/main/3_0, -0, assets/Resource/chunk/main/3_1, -0, assets/Resource/chunk/main/3_2, -0, assets/Resource/chunk/main/3_3, -0, assets/Resource/chunk/main/3_4, -0, assets/Resource/chunk/main/3_5, -0, assets/Resource/chunk/main/3_6, -0, assets/Resource/chunk/main/4_0, -0, assets/Resource/chunk/main/4_1, -0, assets/Resource/chunk/main/4_2, -0, assets/Resource/chunk/main/4_3, -0, assets/Resource/chunk/main/4_4, -0, assets/Resource/chunk/main/4_5, -0, assets/Resource/chunk/main/4_6, -0, assets/Resource/chunk/main/maptile, -0, assets/Resource/chunk/main/maptilecollider, -0, assets/Resource/chunk/main/mapwater, -0, assets/Resource/particle/scene/fenceani, -0, assets/Resource/particle/scene/landhighlight, -0, assets/Resource/particle/scene/npc3001, -0, assets/Resource/particle/scene/npc3002, -0, assets/Resource/particle/scene/npc3003, -0, assets/Resource/particle/scene/npc3004, -0, assets/Resource/particle/scene/npc3005, -0, assets/Resource/particle/scene/npc3006, -0, assets/Resource/particle/scene/npc3007, -0, assets/Resource/particle/scene/npc3008, -0, assets/Resource/particle/scene/npc3009, -0, assets/Resource/particle/scene/npc3010, -0, assets/Resource/particle/scene/npc3011, -0, assets/Resource/particle/scene/npc3012, -0, assets/Resource/particle/scene/parachute, -0, assets/Resource/particle/scene/public2001, -0, assets/Resource/particle/scene/public2002, -0, assets/Resource/particle/scene/public2003, -0, assets/Resource/particle/scene/public2004, -0, assets/Resource/particle/scene/public2005, -0, assets/Resource/particle/scene/public2006, -0, assets/Resource/particle/scene/public2007, -0, assets/Resource/particle/scene/public2008, -0, assets/Resource/particle/scene/public2009, -0, assets/Resource/particle/scene/public2010, -0, assets/Resource/particle/scene/public2011, -0, assets/Resource/particle/scene/public2012, -0, assets/Resource/particle/scene/public2013, -0, assets/Resource/particle/scene/public2014, -0, assets/Resource/particle/scene/public2015, -0, assets/Resource/particle/scene/public2016, -0, assets/Resource/particle/scene/public2017, -0, assets/Resource/particle/scene/public2018, -0, assets/Resource/particle/scene/public2019, -0, assets/Resource/particle/scene/public2020, -0, assets/Resource/particle/scene/public2021, -0, assets/Resource/particle/scene/public2022, -0, assets/Resource/particle/scene/public2023, -0, assets/Resource/particle/scene/public2024, -0, assets/Resource/particle/scene/public2025, -0, assets/Resource/particle/scene/public2026, -0, assets/Resource/particle/scene/public2027, -0, assets/Resource/particle/scene/public2028, -0, assets/Resource/particle/scene/public2029, -0, assets/Resource/particle/scene/public2030, -0, assets/Resource/particle/scene/public2031, -0, assets/Resource/particle/scene/public2032, -0, assets/Resource/particle/scene/public2033, -0, assets/Resource/particle/scene/public2034, -0, assets/Resource/particle/scene/ship, -0, assets/Resource/particle/scene/shopbuidingsmoke10x10, -0, assets/Resource/particle/scene/shopbuidingsmoke12x12, -0, assets/Resource/particle/scene/shopbuidingsmoke24x24, -0, assets/Resource/particle/scene/shopbuidingsmoke5x5, -0, assets/Resource/particle/scene/shopbuidingsmoke6x6, -0, assets/Resource/particle/scene/shopbuidingsmoke7x7, -0, assets/Resource/particle/scene/shopbuidingsmoke8x8, -0, assets/Resource/particle/scene/shopbuidingsmoke9x9, -0, assets/Resource/particle/scene/shopbuildcomplete, -0, assets/Resource/particle/scene/shopbuildinganchor, -0, assets/Resource/particle/scene/shopremovesmoke10x10, -0, assets/Resource/particle/scene/shopremovesmoke12x12, -0, assets/Resource/particle/scene/shopremovesmoke24x24, -0, assets/Resource/particle/scene/shopremovesmoke5x5, -0, assets/Resource/particle/scene/shopremovesmoke6x6, -0, assets/Resource/particle/scene/shopremovesmoke7x7, -0, assets/Resource/particle/scene/shopremovesmoke8x8, -0, assets/Resource/particle/scene/shopremovesmoke9x9, -0, assets/Resource/particle/scene/trailer, -0, assets/Resource/particle/scene/waterfall, -0, assets/Resource/particle/scene/waterfollwerfollwer, -0, assets/Resource/particle/scene/yacht, -0, assets/Resource/particle/ui3d/cashcollect, -0, assets/Resource/particle/ui3d/cashready, -0, assets/Resource/particle/ui/addcash, -0, assets/Resource/particle/ui/addgold, -0, assets/Resource/particle/ui/addsilver, -0, assets/Resource/particle/ui/cardidentificationbackparticles, -0, assets/Resource/particle/ui/cardidentificationfrontparticles, -0, assets/Resource/particle/ui/cardidentificationlightsweep, -0, assets/Resource/particle/ui/cardindentificationeffect, -0, assets/Resource/particle/ui/cardindentificationeffect02, -0, assets/Resource/particle/ui/chamberofcommercecircle, -0, assets/Resource/particle/ui/chamberofcommerceclearing, -0, assets/Resource/particle/ui/chamberofcommerceglow, -0, assets/Resource/particle/ui/chamberofcommercevs, -0, assets/Resource/particle/ui/chamberofcommercewin, -0, assets/Resource/particle/ui/chamberofgetfinish, -0, assets/Resource/particle/ui/clearancesuccess, -0, assets/Resource/particle/ui/companylevelupeffect, -0, assets/Resource/particle/ui/companylevelupeffect02, -0, assets/Resource/particle/ui/completionoftask, -0, assets/Resource/particle/ui/createfinish, -0, assets/Resource/particle/ui/createsuccess, -0, assets/Resource/particle/ui/cursor, -0, assets/Resource/particle/ui/departmentupgrade, -0, assets/Resource/particle/ui/employeestoupgradecontractionlight, -0, assets/Resource/particle/ui/employeestoupgradecontractionparticle, -0, assets/Resource/particle/ui/employeestoupgradeexplodeparticle, -0, assets/Resource/particle/ui/employeestoupgradewhitelight, -0, assets/Resource/particle/ui/employeesupgoldstarexplode, -0, assets/Resource/particle/ui/employeesupgoldstarfail, -0, assets/Resource/particle/ui/employeesupgoldstarmotion, -0, assets/Resource/particle/ui/employeesupgoldstarmotionexplode, -0, assets/Resource/particle/ui/employeesuplightexplode, -0, assets/Resource/particle/ui/employeesupphotosphere, -0, assets/Resource/particle/ui/employeesupsilverstarexplode, -0, assets/Resource/particle/ui/employeesupsilverstarfail, -0, assets/Resource/particle/ui/employeesupsilverstarmotion, -0, assets/Resource/particle/ui/employeesupstar, -0, assets/Resource/particle/ui/employeesupstarexplode, -0, assets/Resource/particle/ui/employeesupstarstar, -0, assets/Resource/particle/ui/employeesupstaryellow, -0, assets/Resource/particle/ui/employeesuptransform, -0, assets/Resource/particle/ui/environmentdowneffect, -0, assets/Resource/particle/ui/fireworksone, -0, assets/Resource/particle/ui/fireworkstwo, -0, assets/Resource/particle/ui/growthinadvance, -0, assets/Resource/particle/ui/learnskilleffect, -0, assets/Resource/particle/ui/promptparticle, -0, assets/Resource/particle/ui/public2001, -0, assets/Resource/particle/ui/public2002, -0, assets/Resource/particle/ui/public2003, -0, assets/Resource/particle/ui/public2004, -0, assets/Resource/particle/ui/public2005, -0, assets/Resource/particle/ui/public2006, -0, assets/Resource/particle/ui/public2007, -0, assets/Resource/particle/ui/public2008, -0, assets/Resource/particle/ui/public2009, -0, assets/Resource/particle/ui/public2010, -0, assets/Resource/particle/ui/public2011, -0, assets/Resource/particle/ui/public2012, -0, assets/Resource/particle/ui/public2013, -0, assets/Resource/particle/ui/public2014, -0, assets/Resource/particle/ui/public2015, -0, assets/Resource/particle/ui/public2016, -0, assets/Resource/particle/ui/public2017, -0, assets/Resource/particle/ui/public2018, -0, assets/Resource/particle/ui/public2019, -0, assets/Resource/particle/ui/public2020, -0, assets/Resource/particle/ui/public2021, -0, assets/Resource/particle/ui/public2022, -0, assets/Resource/particle/ui/public2023, -0, assets/Resource/particle/ui/public2024, -0, assets/Resource/particle/ui/public2025, -0, assets/Resource/particle/ui/public2026, -0, assets/Resource/particle/ui/public2027, -0, assets/Resource/particle/ui/public2028, -0, assets/Resource/particle/ui/public2029, -0, assets/Resource/particle/ui/public2030, -0, assets/Resource/particle/ui/public2031, -0, assets/Resource/particle/ui/public2032, -0, assets/Resource/particle/ui/public2033, -0, assets/Resource/particle/ui/shopdownsmoke10x10, -0, assets/Resource/particle/ui/shopdownsmoke12x12, -0, assets/Resource/particle/ui/shopdownsmoke24x24, -0, assets/Resource/particle/ui/shopdownsmoke5x5, -0, assets/Resource/particle/ui/shopdownsmoke6x6, -0, assets/Resource/particle/ui/shopdownsmoke7x7, -0, assets/Resource/particle/ui/shopdownsmoke8x8, -0, assets/Resource/particle/ui/shopdownsmoke9x9, -0, assets/Resource/particle/ui/skilllearningparticle, -0, assets/Resource/particle/ui/staffappraisal, -0, assets/Resource/particle/ui/stafftrain, -0, assets/Resource/particle/ui/staffupgrade, -0, assets/Resource/particle/ui/staffupgradfail, -0, assets/Resource/particle/ui/suipianhechengeffect01, -0, assets/Resource/particle/ui/suipianhechengeffect02, -0, assets/Resource/particle/ui/suipianresearcheffect01, -0, assets/Resource/particle/ui/suipianresearcheffect02, -0, assets/Resource/particle/ui/titleparticle, -0, assets/Resource/particle/ui/trailcommon, -0, assets/Resource/particle/ui/uiloadcloudeffect, -0, assets/Resource/particle/ui/upgradesuccess, -0, assets/Resource/particle/ui/vipparticle, -0, assets/Resource/particledepends/ani_003, -0, assets/Resource/particledepends/bulestar, -0, assets/Resource/particledepends/fashanguang, -0, assets/Resource/particledepends/littlemorelight, -0, assets/Resource/particledepends/lizi_00048, -0, assets/Resource/particledepends/matanim01, -0, assets/Resource/particledepends/matanim04, -0, assets/Resource/particledepends/matanim05, -0, assets/Resource/particledepends/matanim07, -0, assets/Resource/particledepends/matanim08, -0, assets/Resource/particledepends/matanim09, -0, assets/Resource/particledepends/matanim10, -0, assets/Resource/particledepends/matanim11, -0, assets/Resource/particledepends/matbiggoldenstar, -0, assets/Resource/particledepends/matbigsilverstar, -0, assets/Resource/particledepends/matcash, -0, assets/Resource/particledepends/matgold, -0, assets/Resource/particledepends/maticon01, -0, assets/Resource/particledepends/matlabeladvanceicon, -0, assets/Resource/particledepends/matlabelcash, -0, assets/Resource/particledepends/matlabelclearancesuccess, -0, assets/Resource/particledepends/matlabelcreatesuccess, -0, assets/Resource/particledepends/matlabeldetermine, -0, assets/Resource/particledepends/matlabelnumber, -0, assets/Resource/particledepends/matlabelquantityceiling, -0, assets/Resource/particledepends/matlabelupgradesuccess, -0, assets/Resource/particledepends/matlight01, -0, assets/Resource/particledepends/matlight010, -0, assets/Resource/particledepends/matlight011, -0, assets/Resource/particledepends/matlight015, -0, assets/Resource/particledepends/matlight015blend, -0, assets/Resource/particledepends/matlight016, -0, assets/Resource/particledepends/matlight017, -0, assets/Resource/particledepends/matlight018, -0, assets/Resource/particledepends/matlight019, -0, assets/Resource/particledepends/matlight02, -0, assets/Resource/particledepends/matlight023, -0, assets/Resource/particledepends/matlight024, -0, assets/Resource/particledepends/matlight025, -0, assets/Resource/particledepends/matlight026, -0, assets/Resource/particledepends/matlight027, -0, assets/Resource/particledepends/matlight028, -0, assets/Resource/particledepends/matlight029, -0, assets/Resource/particledepends/matlight03, -0, assets/Resource/particledepends/matlight032, -0, assets/Resource/particledepends/matlight033, -0, assets/Resource/particledepends/matlight034, -0, assets/Resource/particledepends/matlight036, -0, assets/Resource/particledepends/matlight037, -0, assets/Resource/particledepends/matlight038, -0, assets/Resource/particledepends/matlight04, -0, assets/Resource/particledepends/matlight05, -0, assets/Resource/particledepends/matlight06, -0, assets/Resource/particledepends/matlight07, -0, assets/Resource/particledepends/matlight08, -0, assets/Resource/particledepends/matlight09, -0, assets/Resource/particledepends/matlight351, -0, assets/Resource/particledepends/matnumber02, -0, assets/Resource/particledepends/matnumber04, -0, assets/Resource/particledepends/matnumber05, -0, assets/Resource/particledepends/matnumber06, -0, assets/Resource/particledepends/matnumber07, -0, assets/Resource/particledepends/matparachute, -0, assets/Resource/particledepends/matparticle01, -0, assets/Resource/particledepends/matparticle012, -0, assets/Resource/particledepends/matparticle013, -0, assets/Resource/particledepends/matparticle014, -0, assets/Resource/particledepends/matparticle016, -0, assets/Resource/particledepends/matparticle017, -0, assets/Resource/particledepends/matparticle018, -0, assets/Resource/particledepends/matparticle019, -0, assets/Resource/particledepends/matparticle02, -0, assets/Resource/particledepends/matparticle020, -0, assets/Resource/particledepends/matparticle021, -0, assets/Resource/particledepends/matparticle022, -0, assets/Resource/particledepends/matparticle023, -0, assets/Resource/particledepends/matparticle024, -0, assets/Resource/particledepends/matparticle025, -0, assets/Resource/particledepends/matparticle027, -0, assets/Resource/particledepends/matparticle028, -0, assets/Resource/particledepends/matparticle029, -0, assets/Resource/particledepends/matparticle030, -0, assets/Resource/particledepends/matparticle031, -0, assets/Resource/particledepends/matparticle036, -0, assets/Resource/particledepends/matparticle037, -0, assets/Resource/particledepends/matparticle038, -0, assets/Resource/particledepends/matparticle03802, -0, assets/Resource/particledepends/matparticle04, -0, assets/Resource/particledepends/matparticle047, -0, assets/Resource/particledepends/matparticle048, -0, assets/Resource/particledepends/matparticle049, -0, assets/Resource/particledepends/matparticle05, -0, assets/Resource/particledepends/matparticle050, -0, assets/Resource/particledepends/matparticle051, -0, assets/Resource/particledepends/matparticle052, -0, assets/Resource/particledepends/matparticle053, -0, assets/Resource/particledepends/matparticle054, -0, assets/Resource/particledepends/matparticle06, -0, assets/Resource/particledepends/matparticle07, -0, assets/Resource/particledepends/matparticle08, -0, assets/Resource/particledepends/matparticle09, -0, assets/Resource/particledepends/matparticle39, -0, assets/Resource/particledepends/matparticle40, -0, assets/Resource/particledepends/matparticle41, -0, assets/Resource/particledepends/matparticle42, -0, assets/Resource/particledepends/matparticle43, -0, assets/Resource/particledepends/matparticle44, -0, assets/Resource/particledepends/matperson, -0, assets/Resource/particledepends/matsilver, -0, assets/Resource/particledepends/matstaffupgradfail, -0, assets/Resource/particledepends/mattexanim02, -0, assets/Resource/particledepends/mattexanim05, -0, assets/Resource/particledepends/mattexcloud, -0, assets/Resource/particledepends/mattexlabelzi01, -0, assets/Resource/particledepends/mattexlabelzi02, -0, assets/Resource/particledepends/mattexlight027, -0, assets/Resource/particledepends/mattexlight0331, -0, assets/Resource/particledepends/mattexlight100, -0, assets/Resource/particledepends/mattexlightglow01, -0, assets/Resource/particledepends/mattexlingt4008, -0, assets/Resource/particledepends/mattexparticle03, -0, assets/Resource/particledepends/mattexparticle4007, -0, assets/Resource/particledepends/matupgradesuccess, -0, assets/Resource/particledepends/matwaterlang1, -0, assets/Resource/particledepends/matyacht, -0, assets/Resource/particledepends/modefountain01, -0, assets/Resource/particledepends/modefountain02, -0, assets/Resource/particledepends/modefountain03, -0, assets/Resource/particledepends/modefountain04, -0, assets/Resource/particledepends/modelbar, -0, assets/Resource/particledepends/modelgold, -0, assets/Resource/particledepends/modelnumber, -0, assets/Resource/particledepends/modelre, -0, assets/Resource/particledepends/modelrect01, -0, assets/Resource/particledepends/modelrect03, -0, assets/Resource/particledepends/modelrect04, -0, assets/Resource/particledepends/modelrect06, -0, assets/Resource/particledepends/modelrect07, -0, assets/Resource/particledepends/modelrect08, -0, assets/Resource/particledepends/modelrect09, -0, assets/Resource/particledepends/modelrect10, -0, assets/Resource/particledepends/modelrect11, -0, assets/Resource/particledepends/modelstar, -0, assets/Resource/particledepends/modeltorus, -0, assets/Resource/particledepends/modelwater, -0, assets/Resource/particledepends/modelwater01, -0, assets/Resource/particledepends/modelwater03, -0, assets/Resource/particledepends/modelwater04, -0, assets/Resource/particledepends/modelwater2, -0, assets/Resource/particledepends/modelwater3, -0, assets/Resource/particledepends/modelwaterflollwer, -0, assets/Resource/particledepends/modeperson, -0, assets/Resource/particledepends/modeplandlgetc, -0, assets/Resource/particledepends/modewatermark01, -0, assets/Resource/particledepends/modeyacht, -0, assets/Resource/particledepends/orangeball, -0, assets/Resource/particledepends/orangepoint, -0, assets/Resource/particledepends/point01, -0, assets/Resource/particledepends/purplestar, -0, assets/Resource/particledepends/redstar, -0, assets/Resource/particledepends/shanguang_00013, -0, assets/Resource/particledepends/suzi, -0, assets/Resource/particledepends/texanim01, -0, assets/Resource/particledepends/texanim02, -0, assets/Resource/particledepends/texanim04, -0, assets/Resource/particledepends/texanim05, -0, assets/Resource/particledepends/texanim06, -0, assets/Resource/particledepends/texanim07, -0, assets/Resource/particledepends/texanim08, -0, assets/Resource/particledepends/texanim09, -0, assets/Resource/particledepends/texanim10, -0, assets/Resource/particledepends/texanim11, -0, assets/Resource/particledepends/texbulding, -0, assets/Resource/particledepends/texcash, -0, assets/Resource/particledepends/texgold, -0, assets/Resource/particledepends/texlabelbigstar, -0, assets/Resource/particledepends/texlabelsillerstar, -0, assets/Resource/particledepends/texlabelzi01, -0, assets/Resource/particledepends/texlabelzi02, -0, assets/Resource/particledepends/texlight01, -0, assets/Resource/particledepends/texlight010, -0, assets/Resource/particledepends/texlight016, -0, assets/Resource/particledepends/texlight017, -0, assets/Resource/particledepends/texlight018, -0, assets/Resource/particledepends/texlight02, -0, assets/Resource/particledepends/texlight022, -0, assets/Resource/particledepends/texlight023, -0, assets/Resource/particledepends/texlight024, -0, assets/Resource/particledepends/texlight025, -0, assets/Resource/particledepends/texlight026, -0, assets/Resource/particledepends/texlight027, -0, assets/Resource/particledepends/texlight028, -0, assets/Resource/particledepends/texlight029, -0, assets/Resource/particledepends/texlight03, -0, assets/Resource/particledepends/texlight032, -0, assets/Resource/particledepends/texlight033, -0, assets/Resource/particledepends/texlight0331, -0, assets/Resource/particledepends/texlight034, -0, assets/Resource/particledepends/texlight0351, -0, assets/Resource/particledepends/texlight04, -0, assets/Resource/particledepends/texlight05, -0, assets/Resource/particledepends/texlight06, -0, assets/Resource/particledepends/texlight07, -0, assets/Resource/particledepends/texlight09, -0, assets/Resource/particledepends/texlight100, -0, assets/Resource/particledepends/texlightglow01, -0, assets/Resource/particledepends/texlightvisa, -0, assets/Resource/particledepends/texlingt4008, -0, assets/Resource/particledepends/texparachute, -0, assets/Resource/particledepends/texparticle01, -0, assets/Resource/particledepends/texparticle012, -0, assets/Resource/particledepends/texparticle013, -0, assets/Resource/particledepends/texparticle014, -0, assets/Resource/particledepends/texparticle016, -0, assets/Resource/particledepends/texparticle017, -0, assets/Resource/particledepends/texparticle018, -0, assets/Resource/particledepends/texparticle019, -0, assets/Resource/particledepends/texparticle02, -0, assets/Resource/particledepends/texparticle020, -0, assets/Resource/particledepends/texparticle021, -0, assets/Resource/particledepends/texparticle022, -0, assets/Resource/particledepends/texparticle023, -0, assets/Resource/particledepends/texparticle024, -0, assets/Resource/particledepends/texparticle025, -0, assets/Resource/particledepends/texparticle027, -0, assets/Resource/particledepends/texparticle028, -0, assets/Resource/particledepends/texparticle029, -0, assets/Resource/particledepends/texparticle03, -0, assets/Resource/particledepends/texparticle030, -0, assets/Resource/particledepends/texparticle031, -0, assets/Resource/particledepends/texparticle037, -0, assets/Resource/particledepends/texparticle038, -0, assets/Resource/particledepends/texparticle039, -0, assets/Resource/particledepends/texparticle04, -0, assets/Resource/particledepends/texparticle041, -0, assets/Resource/particledepends/texparticle042, -0, assets/Resource/particledepends/texparticle043, -0, assets/Resource/particledepends/texparticle044, -0, assets/Resource/particledepends/texparticle047, -0, assets/Resource/particledepends/texparticle048, -0, assets/Resource/particledepends/texparticle049, -0, assets/Resource/particledepends/texparticle05, -0, assets/Resource/particledepends/texparticle050, -0, assets/Resource/particledepends/texparticle052, -0, assets/Resource/particledepends/texparticle053, -0, assets/Resource/particledepends/texparticle054, -0, assets/Resource/particledepends/texparticle06, -0, assets/Resource/particledepends/texparticle07, -0, assets/Resource/particledepends/texparticle08, -0, assets/Resource/particledepends/texparticle09, -0, assets/Resource/particledepends/texparticle4007, -0, assets/Resource/particledepends/texperson, -0, assets/Resource/particledepends/texship1, -0, assets/Resource/particledepends/texship2, -0, assets/Resource/particledepends/texship3, -0, assets/Resource/particledepends/texsilver, -0, assets/Resource/particledepends/textlabelcash, -0, assets/Resource/particledepends/textlabelfinsh01, -0, assets/Resource/particledepends/textlabelfinsh02, -0, assets/Resource/particledepends/textlabelwin, -0, assets/Resource/particledepends/texwaterlang1, -0, assets/Resource/particledepends/texwhiteboard, -0, assets/Resource/particledepends/texyacht, -0, assets/Resource/particledepends/whitepoint, -0, assets/Resource/particledepends/yellowlightoutput, -0, assets/Resource/sound/effect/btnclick, -0, assets/Resource/sound/effect/buildingdrop, -0, assets/Resource/sound/effect/buildingmoving, -0, assets/Resource/sound/effect/buyblock, -0, assets/Resource/sound/effect/clanvslose, -0, assets/Resource/sound/effect/clanvswin, -0, assets/Resource/sound/effect/collectcash, -0, assets/Resource/sound/effect/combatcard, -0, assets/Resource/sound/effect/combatlose, -0, assets/Resource/sound/effect/combatvs, -0, assets/Resource/sound/effect/combatwin, -0, assets/Resource/sound/effect/commonfail, -0, assets/Resource/sound/effect/commonlevelup, -0, assets/Resource/sound/effect/commonmsgup, -0, assets/Resource/sound/effect/companylevelupbegin, -0, assets/Resource/sound/effect/companylevelupplayerrank, -0, assets/Resource/sound/effect/companyleveluprankbg, -0, assets/Resource/sound/effect/companylevelupreward, -0, assets/Resource/sound/effect/companyleveluptransform, -0, assets/Resource/sound/effect/createclan, -0, assets/Resource/sound/effect/developmentcomposite, -0, assets/Resource/sound/effect/developmentcompositehide, -0, assets/Resource/sound/effect/developmentresearchhide, -0, assets/Resource/sound/effect/developmentresearchshow, -0, assets/Resource/sound/effect/environmentdrop, -0, assets/Resource/sound/effect/gamestartbtnclk, -0, assets/Resource/sound/effect/moneyadd, -0, assets/Resource/sound/effect/moneysub, -0, assets/Resource/sound/effect/shopbuildingfinish, -0, assets/Resource/sound/effect/shopbuildingremove, -0, assets/Resource/sound/effect/shopbuildingstart, -0, assets/Resource/sound/effect/skillicontween, -0, assets/Resource/sound/effect/skillplan, -0, assets/Resource/sound/effect/skillplanend, -0, assets/Resource/sound/effect/staffidentifybegin, -0, assets/Resource/sound/effect/staffidentifycardshow, -0, assets/Resource/sound/effect/staffsetpositiondetail, -0, assets/Resource/sound/effect/staffsetpositionhead, -0, assets/Resource/sound/effect/staffsetpositionstart, -0, assets/Resource/sound/effect/staffupgradefailure, -0, assets/Resource/sound/effect/staffupgradelevel, -0, assets/Resource/sound/effect/staffupgradepop, -0, assets/Resource/sound/effect/staffupgradeskill, -0, assets/Resource/sound/effect/staffupgradestatus, -0, assets/Resource/sound/effect/staffupgradesuccess, -0, assets/Resource/sound/effect/staffupstar_success, -0, assets/Resource/sound/effect/staffupstarfailed, -0, assets/Resource/sound/effect/taskfinish, -0, assets/Resource/sound/effect/titleupgrade, -0, assets/Resource/sound/effect/vipupgrade, -0, assets/Resource/sound/effect/vscarnet, -0, assets/Resource/sound/effect/shopopen/shop1101, -0, assets/Resource/sound/effect/shopopen/shop1102, -0, assets/Resource/sound/effect/shopopen/shop1103, -0, assets/Resource/sound/effect/shopopen/shop1104, -0, assets/Resource/sound/effect/shopopen/shop1105, -0, assets/Resource/sound/effect/shopopen/shop1106, -0, assets/Resource/sound/effect/shopopen/shop1107, -0, assets/Resource/sound/effect/shopopen/shop1108, -0, assets/Resource/sound/effect/shopopen/shop1109, -0, assets/Resource/sound/effect/shopopen/shop1110, -0, assets/Resource/sound/effect/shopopen/shop1201, -0, assets/Resource/sound/effect/shopopen/shop1202, -0, assets/Resource/sound/effect/shopopen/shop1203, -0, assets/Resource/sound/effect/shopopen/shop1204, -0, assets/Resource/sound/effect/shopopen/shop1205, -0, assets/Resource/sound/effect/shopopen/shop1206, -0, assets/Resource/sound/effect/shopopen/shop1207, -0, assets/Resource/sound/effect/shopopen/shop1208, -0, assets/Resource/sound/effect/shopopen/shop1209, -0, assets/Resource/sound/effect/shopopen/shop1210, -0, assets/Resource/sound/effect/shopopen/shop1301, -0, assets/Resource/sound/effect/shopopen/shop1302, -0, assets/Resource/sound/effect/shopopen/shop1303, -0, assets/Resource/sound/effect/shopopen/shop1304, -0, assets/Resource/sound/effect/shopopen/shop1305, -0, assets/Resource/sound/effect/shopopen/shop1306, -0, assets/Resource/sound/effect/shopopen/shop1307, -0, assets/Resource/sound/effect/shopopen/shop1308, -0, assets/Resource/sound/effect/shopopen/shop1309, -0, assets/Resource/sound/effect/shopopen/shop1310, -0, assets/Resource/sound/effect/shopopen/shop1401, -0, assets/Resource/sound/effect/shopopen/shop1402, -0, assets/Resource/sound/effect/shopopen/shop1403, -0, assets/Resource/sound/effect/shopopen/shop1404, -0, assets/Resource/sound/effect/shopopen/shop1405, -0, assets/Resource/sound/effect/shopopen/shop1406, -0, assets/Resource/sound/effect/shopopen/shop1407, -0, assets/Resource/sound/effect/shopopen/shop1408, -0, assets/Resource/sound/effect/shopopen/shop1409, -0, assets/Resource/sound/effect/shopopen/shop1410, -0, assets/Resource/sound/music/bank, -0, assets/Resource/sound/music/clanvs, -0, assets/Resource/sound/music/music1, -0, assets/Resource/sound/music/musiccreaterole, -0, assets/Resource/sound/music/musiclogin, -0, assets/Resource/sound/music/official, -0, assets/Resource/sound/music/tradebackgroundmusic, -0, assets/Resource/ui/uifont, -0, assets/Resource/ui/uilaunch, -0, assets/Resource/ui/uistyle, -0, assets/Resource/ui/uiicon/auction, -0, assets/Resource/ui/uiicon/building, -0, assets/Resource/ui/uiicon/frametitle, -0, assets/Resource/ui/uiicon/playerhalf, -0, assets/Resource/ui/uiicon/staffhalf, -0, assets/Resource/ui/uilayout/athletice, -0, assets/Resource/ui/uilayout/auction, -0, assets/Resource/ui/uilayout/bag, -0, assets/Resource/ui/uilayout/bank, -0, assets/Resource/ui/uilayout/building, -0, assets/Resource/ui/uilayout/car, -0, assets/Resource/ui/uilayout/charitycenter, -0, assets/Resource/ui/uilayout/chat, -0, assets/Resource/ui/uilayout/clan, -0, assets/Resource/ui/uilayout/clancreat, -0, assets/Resource/ui/uilayout/clandonation, -0, assets/Resource/ui/uilayout/clanfunction, -0, assets/Resource/ui/uilayout/claninvest, -0, assets/Resource/ui/uilayout/clanlandmark, -0, assets/Resource/ui/uilayout/clanmember, -0, assets/Resource/ui/uilayout/common, -0, assets/Resource/ui/uilayout/commonupgrade, -0, assets/Resource/ui/uilayout/company, -0, assets/Resource/ui/uilayout/consortium, -0, assets/Resource/ui/uilayout/department, -0, assets/Resource/ui/uilayout/development, -0, assets/Resource/ui/uilayout/financecenter, -0, assets/Resource/ui/uilayout/headhuntingcenter, -0, assets/Resource/ui/uilayout/help, -0, assets/Resource/ui/uilayout/invest, -0, assets/Resource/ui/uilayout/login, -0, assets/Resource/ui/uilayout/mainrole, -0, assets/Resource/ui/uilayout/mainui, -0, assets/Resource/ui/uilayout/mall, -0, assets/Resource/ui/uilayout/map, -0, assets/Resource/ui/uilayout/official, -0, assets/Resource/ui/uilayout/onlinemessage, -0, assets/Resource/ui/uilayout/public, -0, assets/Resource/ui/uilayout/purchasecenter, -0, assets/Resource/ui/uilayout/purchasecommon, -0, assets/Resource/ui/uilayout/purchaselimit, -0, assets/Resource/ui/uilayout/purchasepower, -0, assets/Resource/ui/uilayout/rank, -0, assets/Resource/ui/uilayout/robbed, -0, assets/Resource/ui/uilayout/rolecard, -0, assets/Resource/ui/uilayout/sceneoper, -0, assets/Resource/ui/uilayout/secretary, -0, assets/Resource/ui/uilayout/setting, -0, assets/Resource/ui/uilayout/shop, -0, assets/Resource/ui/uilayout/social, -0, assets/Resource/ui/uilayout/socialfriends, -0, assets/Resource/ui/uilayout/socialinvest, -0, assets/Resource/ui/uilayout/square, -0, assets/Resource/ui/uilayout/staff, -0, assets/Resource/ui/uilayout/staffadjust, -0, assets/Resource/ui/uilayout/staffcenter, -0, assets/Resource/ui/uilayout/stafffire, -0, assets/Resource/ui/uilayout/staffhire, -0, assets/Resource/ui/uilayout/staffidentify, -0, assets/Resource/ui/uilayout/staffinfo, -0, assets/Resource/ui/uilayout/staffskill, -0, assets/Resource/ui/uilayout/stafftrain, -0, assets/Resource/ui/uilayout/staffupgrade, -0, assets/Resource/ui/uilayout/stock, -0, assets/Resource/ui/uilayout/task, -0, assets/Resource/ui/uilayout/taskguidance, -0, assets/Resource/ui/uilayout/trade, -0, assets/Resource/ui/uilayout/tradecenter, -0, assets/Resource/ui/uisprite/bag, -0, assets/Resource/ui/uisprite/fbagicon, -0, assets/Resource/ui/uisprite/fclan, -0, assets/Resource/ui/uisprite/fcommon, -0, assets/Resource/ui/uisprite/fcommonex1, -0, assets/Resource/ui/uisprite/fcompany, -0, assets/Resource/ui/uisprite/fmainrole, -0, assets/Resource/ui/uisprite/fmainui, -0, assets/Resource/ui/uisprite/fmap, -0, assets/Resource/ui/uisprite/fpublic, -0, assets/Resource/ui/uisprite/fsceneoper, -0, assets/Resource/ui/uisprite/fsetting, -0, assets/Resource/ui/uisprite/fshop, -0, assets/Resource/ui/uisprite/fstaff, -0, assets/Resource/ui/uisprite/fstaffskill, -0, assets/Resource/ui/uisprite/ftask, -0, assets/Resource/ui/uisprite/ftrade, -0, assets/Resource/ui/uisprite/logo, -0, assets/Resource/ui/uisprite/wauction, -0, assets/Resource/ui/uisprite/wbank, -0, assets/Resource/ui/uisprite/wcar, -0, assets/Resource/ui/uisprite/wcharitycenter, -0, assets/Resource/ui/uisprite/wchat, -0, assets/Resource/ui/uisprite/wclan, -0, assets/Resource/ui/uisprite/wclanhead, -0, assets/Resource/ui/uisprite/wcommon, -0, assets/Resource/ui/uisprite/wcommonex1, -0, assets/Resource/ui/uisprite/wcompany, -0, assets/Resource/ui/uisprite/wconsortium, -0, assets/Resource/ui/uisprite/wdepartment, -0, assets/Resource/ui/uisprite/wdevelopment, -0, assets/Resource/ui/uisprite/wguidance, -0, assets/Resource/ui/uisprite/wincreaseui, -0, assets/Resource/ui/uisprite/wlaunch, -0, assets/Resource/ui/uisprite/wlogin, -0, assets/Resource/ui/uisprite/wmainrole, -0, assets/Resource/ui/uisprite/wmainui, -0, assets/Resource/ui/uisprite/wmall, -0, assets/Resource/ui/uisprite/wmap, -0, assets/Resource/ui/uisprite/wofficial, -0, assets/Resource/ui/uisprite/wpurchase, -0, assets/Resource/ui/uisprite/wrank, -0, assets/Resource/ui/uisprite/wrolecard, -0, assets/Resource/ui/uisprite/wrolehead, -0, assets/Resource/ui/uisprite/wsceneoper, -0, assets/Resource/ui/uisprite/wsecretary, -0, assets/Resource/ui/uisprite/wsetting, -0, assets/Resource/ui/uisprite/wshop, -0, assets/Resource/ui/uisprite/wsocial, -0, assets/Resource/ui/uisprite/wsquare, -0, assets/Resource/ui/uisprite/wstaff, -0, assets/Resource/ui/uisprite/wstaffani, -0, assets/Resource/ui/uisprite/wstaffhead, -0, assets/Resource/ui/uisprite/wstaffskill, -0, assets/Resource/ui/uisprite/wstock, -0, assets/Resource/ui/uisprite/wstockicon, -0, assets/Resource/ui/uisprite/wtask, -0, assets/Resource/ui/uisprite/wtrade, -0, assets/Resource/ui/uisprite/wtradecenter, -0, assets/Resource/ui/uisprite/wtrademap, -0, assets/Resource/ui/uisprite/wvipanim, -0, arsc, -I, C:\Users\Zachary\apktool\framework\1.apk, -S, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\res, -M, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\AndroidManifest.xml]
at brut.androlib.res.AndrolibResources.aaptPackage(AndrolibResources.java:436)
at brut.androlib.Androlib.buildResourcesFull(Androlib.java:423)
... 5 more
Caused by: brut.common.BrutException: could not exec: [C:\Users\Zachary\AppData\Local\Temp\brut_util_Jar_4106740525864047267.tmp, p, --forced-package-id, 127, --min-sdk-version, 9, --target-sdk-version, 23, --version-code, 1, --version-name, 1.0, -F, C:\Users\Zachary\AppData\Local\Temp\APKTOOL764050849277430384.tmp, -0, arsc, -0, cfg, -0, assets/LuaScriptDB, -0, assets/ResVersionDB, -0, assets/ScriptVersionDB, -0, resource, -0, assets/Resource/Resource, -0, assets/Resource/shader, -0, assets/Resource/building/base, -0, assets/Resource/building/construct, -0, assets/Resource/building/environment, -0, assets/Resource/building/npc, -0, assets/Resource/building/public, -0, assets/Resource/building/shop/1101, -0, assets/Resource/building/shop/1102, -0, assets/Resource/building/shop/1103, -0, assets/Resource/building/shop/1104, -0, assets/Resource/building/shop/1105, -0, assets/Resource/building/shop/1106, -0, assets/Resource/building/shop/1107, -0, assets/Resource/building/shop/1108, -0, assets/Resource/building/shop/1109, -0, assets/Resource/building/shop/1110, -0, assets/Resource/building/shop/1201, -0, assets/Resource/building/shop/1202, -0, assets/Resource/building/shop/1203, -0, assets/Resource/building/shop/1204, -0, assets/Resource/building/shop/1205, -0, assets/Resource/building/shop/1206, -0, assets/Resource/building/shop/1207, -0, assets/Resource/building/shop/1208, -0, assets/Resource/building/shop/1209, -0, assets/Resource/building/shop/1210, -0, assets/Resource/building/shop/1301, -0, assets/Resource/building/shop/1302, -0, assets/Resource/building/shop/1303, -0, assets/Resource/building/shop/1304, -0, assets/Resource/building/shop/1305, -0, assets/Resource/building/shop/1306, -0, assets/Resource/building/shop/1307, -0, assets/Resource/building/shop/1308, -0, assets/Resource/building/shop/1309, -0, assets/Resource/building/shop/1310, -0, assets/Resource/building/shop/1401, -0, assets/Resource/building/shop/1402, -0, assets/Resource/building/shop/1403, -0, assets/Resource/building/shop/1404, -0, assets/Resource/building/shop/1405, -0, assets/Resource/building/shop/1406, -0, assets/Resource/building/shop/1407, -0, assets/Resource/building/shop/1408, -0, assets/Resource/building/shop/1409, -0, assets/Resource/building/shop/1410, -0, assets/Resource/chunk/common, -0, assets/Resource/chunk/dreamisland/0_0, -0, assets/Resource/chunk/dreamisland/0_1, -0, assets/Resource/chunk/dreamisland/0_2, -0, assets/Resource/chunk/dreamisland/0_3, -0, assets/Resource/chunk/dreamisland/0_4, -0, assets/Resource/chunk/dreamisland/0_5, -0, assets/Resource/chunk/dreamisland/0_6, -0, assets/Resource/chunk/dreamisland/0_7, -0, assets/Resource/chunk/dreamisland/1_0, -0, assets/Resource/chunk/dreamisland/1_1, -0, assets/Resource/chunk/dreamisland/1_2, -0, assets/Resource/chunk/dreamisland/1_3, -0, assets/Resource/chunk/dreamisland/1_4, -0, assets/Resource/chunk/dreamisland/1_5, -0, assets/Resource/chunk/dreamisland/1_6, -0, assets/Resource/chunk/dreamisland/1_7, -0, assets/Resource/chunk/dreamisland/2_0, -0, assets/Resource/chunk/dreamisland/2_1, -0, assets/Resource/chunk/dreamisland/2_2, -0, assets/Resource/chunk/dreamisland/2_3, -0, assets/Resource/chunk/dreamisland/2_4, -0, assets/Resource/chunk/dreamisland/2_5, -0, assets/Resource/chunk/dreamisland/2_6, -0, assets/Resource/chunk/dreamisland/2_7, -0, assets/Resource/chunk/dreamisland/3_0, -0, assets/Resource/chunk/dreamisland/3_1, -0, assets/Resource/chunk/dreamisland/3_2, -0, assets/Resource/chunk/dreamisland/3_3, -0, assets/Resource/chunk/dreamisland/3_4, -0, assets/Resource/chunk/dreamisland/3_5, -0, assets/Resource/chunk/dreamisland/3_6, -0, assets/Resource/chunk/dreamisland/3_7, -0, assets/Resource/chunk/dreamisland/4_0, -0, assets/Resource/chunk/dreamisland/4_1, -0, assets/Resource/chunk/dreamisland/4_2, -0, assets/Resource/chunk/dreamisland/4_3, -0, assets/Resource/chunk/dreamisland/4_4, -0, assets/Resource/chunk/dreamisland/4_5, -0, assets/Resource/chunk/dreamisland/4_6, -0, assets/Resource/chunk/dreamisland/4_7, -0, assets/Resource/chunk/dreamisland/5_0, -0, assets/Resource/chunk/dreamisland/5_1, -0, assets/Resource/chunk/dreamisland/5_2, -0, assets/Resource/chunk/dreamisland/5_3, -0, assets/Resource/chunk/dreamisland/5_4, -0, assets/Resource/chunk/dreamisland/5_5, -0, assets/Resource/chunk/dreamisland/5_6, -0, assets/Resource/chunk/dreamisland/5_7, -0, assets/Resource/chunk/dreamisland/maptile, -0, assets/Resource/chunk/dreamisland/maptilecollider, -0, assets/Resource/chunk/dreamisland/mapwater, -0, assets/Resource/chunk/main/0_0, -0, assets/Resource/chunk/main/0_1, -0, assets/Resource/chunk/main/0_2, -0, assets/Resource/chunk/main/0_3, -0, assets/Resource/chunk/main/0_4, -0, assets/Resource/chunk/main/0_5, -0, assets/Resource/chunk/main/0_6, -0, assets/Resource/chunk/main/1_0, -0, assets/Resource/chunk/main/1_1, -0, assets/Resource/chunk/main/1_2, -0, assets/Resource/chunk/main/1_3, -0, assets/Resource/chunk/main/1_4, -0, assets/Resource/chunk/main/1_5, -0, assets/Resource/chunk/main/1_6, -0, assets/Resource/chunk/main/2_0, -0, assets/Resource/chunk/main/2_1, -0, assets/Resource/chunk/main/2_2, -0, assets/Resource/chunk/main/2_3, -0, assets/Resource/chunk/main/2_4, -0, assets/Resource/chunk/main/2_5, -0, assets/Resource/chunk/main/2_6, -0, assets/Resource/chunk/main/3_0, -0, assets/Resource/chunk/main/3_1, -0, assets/Resource/chunk/main/3_2, -0, assets/Resource/chunk/main/3_3, -0, assets/Resource/chunk/main/3_4, -0, assets/Resource/chunk/main/3_5, -0, assets/Resource/chunk/main/3_6, -0, assets/Resource/chunk/main/4_0, -0, assets/Resource/chunk/main/4_1, -0, assets/Resource/chunk/main/4_2, -0, assets/Resource/chunk/main/4_3, -0, assets/Resource/chunk/main/4_4, -0, assets/Resource/chunk/main/4_5, -0, assets/Resource/chunk/main/4_6, -0, assets/Resource/chunk/main/maptile, -0, assets/Resource/chunk/main/maptilecollider, -0, assets/Resource/chunk/main/mapwater, -0, assets/Resource/particle/scene/fenceani, -0, assets/Resource/particle/scene/landhighlight, -0, assets/Resource/particle/scene/npc3001, -0, assets/Resource/particle/scene/npc3002, -0, assets/Resource/particle/scene/npc3003, -0, assets/Resource/particle/scene/npc3004, -0, assets/Resource/particle/scene/npc3005, -0, assets/Resource/particle/scene/npc3006, -0, assets/Resource/particle/scene/npc3007, -0, assets/Resource/particle/scene/npc3008, -0, assets/Resource/particle/scene/npc3009, -0, assets/Resource/particle/scene/npc3010, -0, assets/Resource/particle/scene/npc3011, -0, assets/Resource/particle/scene/npc3012, -0, assets/Resource/particle/scene/parachute, -0, assets/Resource/particle/scene/public2001, -0, assets/Resource/particle/scene/public2002, -0, assets/Resource/particle/scene/public2003, -0, assets/Resource/particle/scene/public2004, -0, assets/Resource/particle/scene/public2005, -0, assets/Resource/particle/scene/public2006, -0, assets/Resource/particle/scene/public2007, -0, assets/Resource/particle/scene/public2008, -0, assets/Resource/particle/scene/public2009, -0, assets/Resource/particle/scene/public2010, -0, assets/Resource/particle/scene/public2011, -0, assets/Resource/particle/scene/public2012, -0, assets/Resource/particle/scene/public2013, -0, assets/Resource/particle/scene/public2014, -0, assets/Resource/particle/scene/public2015, -0, assets/Resource/particle/scene/public2016, -0, assets/Resource/particle/scene/public2017, -0, assets/Resource/particle/scene/public2018, -0, assets/Resource/particle/scene/public2019, -0, assets/Resource/particle/scene/public2020, -0, assets/Resource/particle/scene/public2021, -0, assets/Resource/particle/scene/public2022, -0, assets/Resource/particle/scene/public2023, -0, assets/Resource/particle/scene/public2024, -0, assets/Resource/particle/scene/public2025, -0, assets/Resource/particle/scene/public2026, -0, assets/Resource/particle/scene/public2027, -0, assets/Resource/particle/scene/public2028, -0, assets/Resource/particle/scene/public2029, -0, assets/Resource/particle/scene/public2030, -0, assets/Resource/particle/scene/public2031, -0, assets/Resource/particle/scene/public2032, -0, assets/Resource/particle/scene/public2033, -0, assets/Resource/particle/scene/public2034, -0, assets/Resource/particle/scene/ship, -0, assets/Resource/particle/scene/shopbuidingsmoke10x10, -0, assets/Resource/particle/scene/shopbuidingsmoke12x12, -0, assets/Resource/particle/scene/shopbuidingsmoke24x24, -0, assets/Resource/particle/scene/shopbuidingsmoke5x5, -0, assets/Resource/particle/scene/shopbuidingsmoke6x6, -0, assets/Resource/particle/scene/shopbuidingsmoke7x7, -0, assets/Resource/particle/scene/shopbuidingsmoke8x8, -0, assets/Resource/particle/scene/shopbuidingsmoke9x9, -0, assets/Resource/particle/scene/shopbuildcomplete, -0, assets/Resource/particle/scene/shopbuildinganchor, -0, assets/Resource/particle/scene/shopremovesmoke10x10, -0, assets/Resource/particle/scene/shopremovesmoke12x12, -0, assets/Resource/particle/scene/shopremovesmoke24x24, -0, assets/Resource/particle/scene/shopremovesmoke5x5, -0, assets/Resource/particle/scene/shopremovesmoke6x6, -0, assets/Resource/particle/scene/shopremovesmoke7x7, -0, assets/Resource/particle/scene/shopremovesmoke8x8, -0, assets/Resource/particle/scene/shopremovesmoke9x9, -0, assets/Resource/particle/scene/trailer, -0, assets/Resource/particle/scene/waterfall, -0, assets/Resource/particle/scene/waterfollwerfollwer, -0, assets/Resource/particle/scene/yacht, -0, assets/Resource/particle/ui3d/cashcollect, -0, assets/Resource/particle/ui3d/cashready, -0, assets/Resource/particle/ui/addcash, -0, assets/Resource/particle/ui/addgold, -0, assets/Resource/particle/ui/addsilver, -0, assets/Resource/particle/ui/cardidentificationbackparticles, -0, assets/Resource/particle/ui/cardidentificationfrontparticles, -0, assets/Resource/particle/ui/cardidentificationlightsweep, -0, assets/Resource/particle/ui/cardindentificationeffect, -0, assets/Resource/particle/ui/cardindentificationeffect02, -0, assets/Resource/particle/ui/chamberofcommercecircle, -0, assets/Resource/particle/ui/chamberofcommerceclearing, -0, assets/Resource/particle/ui/chamberofcommerceglow, -0, assets/Resource/particle/ui/chamberofcommercevs, -0, assets/Resource/particle/ui/chamberofcommercewin, -0, assets/Resource/particle/ui/chamberofgetfinish, -0, assets/Resource/particle/ui/clearancesuccess, -0, assets/Resource/particle/ui/companylevelupeffect, -0, assets/Resource/particle/ui/companylevelupeffect02, -0, assets/Resource/particle/ui/completionoftask, -0, assets/Resource/particle/ui/createfinish, -0, assets/Resource/particle/ui/createsuccess, -0, assets/Resource/particle/ui/cursor, -0, assets/Resource/particle/ui/departmentupgrade, -0, assets/Resource/particle/ui/employeestoupgradecontractionlight, -0, assets/Resource/particle/ui/employeestoupgradecontractionparticle, -0, assets/Resource/particle/ui/employeestoupgradeexplodeparticle, -0, assets/Resource/particle/ui/employeestoupgradewhitelight, -0, assets/Resource/particle/ui/employeesupgoldstarexplode, -0, assets/Resource/particle/ui/employeesupgoldstarfail, -0, assets/Resource/particle/ui/employeesupgoldstarmotion, -0, assets/Resource/particle/ui/employeesupgoldstarmotionexplode, -0, assets/Resource/particle/ui/employeesuplightexplode, -0, assets/Resource/particle/ui/employeesupphotosphere, -0, assets/Resource/particle/ui/employeesupsilverstarexplode, -0, assets/Resource/particle/ui/employeesupsilverstarfail, -0, assets/Resource/particle/ui/employeesupsilverstarmotion, -0, assets/Resource/particle/ui/employeesupstar, -0, assets/Resource/particle/ui/employeesupstarexplode, -0, assets/Resource/particle/ui/employeesupstarstar, -0, assets/Resource/particle/ui/employeesupstaryellow, -0, assets/Resource/particle/ui/employeesuptransform, -0, assets/Resource/particle/ui/environmentdowneffect, -0, assets/Resource/particle/ui/fireworksone, -0, assets/Resource/particle/ui/fireworkstwo, -0, assets/Resource/particle/ui/growthinadvance, -0, assets/Resource/particle/ui/learnskilleffect, -0, assets/Resource/particle/ui/promptparticle, -0, assets/Resource/particle/ui/public2001, -0, assets/Resource/particle/ui/public2002, -0, assets/Resource/particle/ui/public2003, -0, assets/Resource/particle/ui/public2004, -0, assets/Resource/particle/ui/public2005, -0, assets/Resource/particle/ui/public2006, -0, assets/Resource/particle/ui/public2007, -0, assets/Resource/particle/ui/public2008, -0, assets/Resource/particle/ui/public2009, -0, assets/Resource/particle/ui/public2010, -0, assets/Resource/particle/ui/public2011, -0, assets/Resource/particle/ui/public2012, -0, assets/Resource/particle/ui/public2013, -0, assets/Resource/particle/ui/public2014, -0, assets/Resource/particle/ui/public2015, -0, assets/Resource/particle/ui/public2016, -0, assets/Resource/particle/ui/public2017, -0, assets/Resource/particle/ui/public2018, -0, assets/Resource/particle/ui/public2019, -0, assets/Resource/particle/ui/public2020, -0, assets/Resource/particle/ui/public2021, -0, assets/Resource/particle/ui/public2022, -0, assets/Resource/particle/ui/public2023, -0, assets/Resource/particle/ui/public2024, -0, assets/Resource/particle/ui/public2025, -0, assets/Resource/particle/ui/public2026, -0, assets/Resource/particle/ui/public2027, -0, assets/Resource/particle/ui/public2028, -0, assets/Resource/particle/ui/public2029, -0, assets/Resource/particle/ui/public2030, -0, assets/Resource/particle/ui/public2031, -0, assets/Resource/particle/ui/public2032, -0, assets/Resource/particle/ui/public2033, -0, assets/Resource/particle/ui/shopdownsmoke10x10, -0, assets/Resource/particle/ui/shopdownsmoke12x12, -0, assets/Resource/particle/ui/shopdownsmoke24x24, -0, assets/Resource/particle/ui/shopdownsmoke5x5, -0, assets/Resource/particle/ui/shopdownsmoke6x6, -0, assets/Resource/particle/ui/shopdownsmoke7x7, -0, assets/Resource/particle/ui/shopdownsmoke8x8, -0, assets/Resource/particle/ui/shopdownsmoke9x9, -0, assets/Resource/particle/ui/skilllearningparticle, -0, assets/Resource/particle/ui/staffappraisal, -0, assets/Resource/particle/ui/stafftrain, -0, assets/Resource/particle/ui/staffupgrade, -0, assets/Resource/particle/ui/staffupgradfail, -0, assets/Resource/particle/ui/suipianhechengeffect01, -0, assets/Resource/particle/ui/suipianhechengeffect02, -0, assets/Resource/particle/ui/suipianresearcheffect01, -0, assets/Resource/particle/ui/suipianresearcheffect02, -0, assets/Resource/particle/ui/titleparticle, -0, assets/Resource/particle/ui/trailcommon, -0, assets/Resource/particle/ui/uiloadcloudeffect, -0, assets/Resource/particle/ui/upgradesuccess, -0, assets/Resource/particle/ui/vipparticle, -0, assets/Resource/particledepends/ani_003, -0, assets/Resource/particledepends/bulestar, -0, assets/Resource/particledepends/fashanguang, -0, assets/Resource/particledepends/littlemorelight, -0, assets/Resource/particledepends/lizi_00048, -0, assets/Resource/particledepends/matanim01, -0, assets/Resource/particledepends/matanim04, -0, assets/Resource/particledepends/matanim05, -0, assets/Resource/particledepends/matanim07, -0, assets/Resource/particledepends/matanim08, -0, assets/Resource/particledepends/matanim09, -0, assets/Resource/particledepends/matanim10, -0, assets/Resource/particledepends/matanim11, -0, assets/Resource/particledepends/matbiggoldenstar, -0, assets/Resource/particledepends/matbigsilverstar, -0, assets/Resource/particledepends/matcash, -0, assets/Resource/particledepends/matgold, -0, assets/Resource/particledepends/maticon01, -0, assets/Resource/particledepends/matlabeladvanceicon, -0, assets/Resource/particledepends/matlabelcash, -0, assets/Resource/particledepends/matlabelclearancesuccess, -0, assets/Resource/particledepends/matlabelcreatesuccess, -0, assets/Resource/particledepends/matlabeldetermine, -0, assets/Resource/particledepends/matlabelnumber, -0, assets/Resource/particledepends/matlabelquantityceiling, -0, assets/Resource/particledepends/matlabelupgradesuccess, -0, assets/Resource/particledepends/matlight01, -0, assets/Resource/particledepends/matlight010, -0, assets/Resource/particledepends/matlight011, -0, assets/Resource/particledepends/matlight015, -0, assets/Resource/particledepends/matlight015blend, -0, assets/Resource/particledepends/matlight016, -0, assets/Resource/particledepends/matlight017, -0, assets/Resource/particledepends/matlight018, -0, assets/Resource/particledepends/matlight019, -0, assets/Resource/particledepends/matlight02, -0, assets/Resource/particledepends/matlight023, -0, assets/Resource/particledepends/matlight024, -0, assets/Resource/particledepends/matlight025, -0, assets/Resource/particledepends/matlight026, -0, assets/Resource/particledepends/matlight027, -0, assets/Resource/particledepends/matlight028, -0, assets/Resource/particledepends/matlight029, -0, assets/Resource/particledepends/matlight03, -0, assets/Resource/particledepends/matlight032, -0, assets/Resource/particledepends/matlight033, -0, assets/Resource/particledepends/matlight034, -0, assets/Resource/particledepends/matlight036, -0, assets/Resource/particledepends/matlight037, -0, assets/Resource/particledepends/matlight038, -0, assets/Resource/particledepends/matlight04, -0, assets/Resource/particledepends/matlight05, -0, assets/Resource/particledepends/matlight06, -0, assets/Resource/particledepends/matlight07, -0, assets/Resource/particledepends/matlight08, -0, assets/Resource/particledepends/matlight09, -0, assets/Resource/particledepends/matlight351, -0, assets/Resource/particledepends/matnumber02, -0, assets/Resource/particledepends/matnumber04, -0, assets/Resource/particledepends/matnumber05, -0, assets/Resource/particledepends/matnumber06, -0, assets/Resource/particledepends/matnumber07, -0, assets/Resource/particledepends/matparachute, -0, assets/Resource/particledepends/matparticle01, -0, assets/Resource/particledepends/matparticle012, -0, assets/Resource/particledepends/matparticle013, -0, assets/Resource/particledepends/matparticle014, -0, assets/Resource/particledepends/matparticle016, -0, assets/Resource/particledepends/matparticle017, -0, assets/Resource/particledepends/matparticle018, -0, assets/Resource/particledepends/matparticle019, -0, assets/Resource/particledepends/matparticle02, -0, assets/Resource/particledepends/matparticle020, -0, assets/Resource/particledepends/matparticle021, -0, assets/Resource/particledepends/matparticle022, -0, assets/Resource/particledepends/matparticle023, -0, assets/Resource/particledepends/matparticle024, -0, assets/Resource/particledepends/matparticle025, -0, assets/Resource/particledepends/matparticle027, -0, assets/Resource/particledepends/matparticle028, -0, assets/Resource/particledepends/matparticle029, -0, assets/Resource/particledepends/matparticle030, -0, assets/Resource/particledepends/matparticle031, -0, assets/Resource/particledepends/matparticle036, -0, assets/Resource/particledepends/matparticle037, -0, assets/Resource/particledepends/matparticle038, -0, assets/Resource/particledepends/matparticle03802, -0, assets/Resource/particledepends/matparticle04, -0, assets/Resource/particledepends/matparticle047, -0, assets/Resource/particledepends/matparticle048, -0, assets/Resource/particledepends/matparticle049, -0, assets/Resource/particledepends/matparticle05, -0, assets/Resource/particledepends/matparticle050, -0, assets/Resource/particledepends/matparticle051, -0, assets/Resource/particledepends/matparticle052, -0, assets/Resource/particledepends/matparticle053, -0, assets/Resource/particledepends/matparticle054, -0, assets/Resource/particledepends/matparticle06, -0, assets/Resource/particledepends/matparticle07, -0, assets/Resource/particledepends/matparticle08, -0, assets/Resource/particledepends/matparticle09, -0, assets/Resource/particledepends/matparticle39, -0, assets/Resource/particledepends/matparticle40, -0, assets/Resource/particledepends/matparticle41, -0, assets/Resource/particledepends/matparticle42, -0, assets/Resource/particledepends/matparticle43, -0, assets/Resource/particledepends/matparticle44, -0, assets/Resource/particledepends/matperson, -0, assets/Resource/particledepends/matsilver, -0, assets/Resource/particledepends/matstaffupgradfail, -0, assets/Resource/particledepends/mattexanim02, -0, assets/Resource/particledepends/mattexanim05, -0, assets/Resource/particledepends/mattexcloud, -0, assets/Resource/particledepends/mattexlabelzi01, -0, assets/Resource/particledepends/mattexlabelzi02, -0, assets/Resource/particledepends/mattexlight027, -0, assets/Resource/particledepends/mattexlight0331, -0, assets/Resource/particledepends/mattexlight100, -0, assets/Resource/particledepends/mattexlightglow01, -0, assets/Resource/particledepends/mattexlingt4008, -0, assets/Resource/particledepends/mattexparticle03, -0, assets/Resource/particledepends/mattexparticle4007, -0, assets/Resource/particledepends/matupgradesuccess, -0, assets/Resource/particledepends/matwaterlang1, -0, assets/Resource/particledepends/matyacht, -0, assets/Resource/particledepends/modefountain01, -0, assets/Resource/particledepends/modefountain02, -0, assets/Resource/particledepends/modefountain03, -0, assets/Resource/particledepends/modefountain04, -0, assets/Resource/particledepends/modelbar, -0, assets/Resource/particledepends/modelgold, -0, assets/Resource/particledepends/modelnumber, -0, assets/Resource/particledepends/modelre, -0, assets/Resource/particledepends/modelrect01, -0, assets/Resource/particledepends/modelrect03, -0, assets/Resource/particledepends/modelrect04, -0, assets/Resource/particledepends/modelrect06, -0, assets/Resource/particledepends/modelrect07, -0, assets/Resource/particledepends/modelrect08, -0, assets/Resource/particledepends/modelrect09, -0, assets/Resource/particledepends/modelrect10, -0, assets/Resource/particledepends/modelrect11, -0, assets/Resource/particledepends/modelstar, -0, assets/Resource/particledepends/modeltorus, -0, assets/Resource/particledepends/modelwater, -0, assets/Resource/particledepends/modelwater01, -0, assets/Resource/particledepends/modelwater03, -0, assets/Resource/particledepends/modelwater04, -0, assets/Resource/particledepends/modelwater2, -0, assets/Resource/particledepends/modelwater3, -0, assets/Resource/particledepends/modelwaterflollwer, -0, assets/Resource/particledepends/modeperson, -0, assets/Resource/particledepends/modeplandlgetc, -0, assets/Resource/particledepends/modewatermark01, -0, assets/Resource/particledepends/modeyacht, -0, assets/Resource/particledepends/orangeball, -0, assets/Resource/particledepends/orangepoint, -0, assets/Resource/particledepends/point01, -0, assets/Resource/particledepends/purplestar, -0, assets/Resource/particledepends/redstar, -0, assets/Resource/particledepends/shanguang_00013, -0, assets/Resource/particledepends/suzi, -0, assets/Resource/particledepends/texanim01, -0, assets/Resource/particledepends/texanim02, -0, assets/Resource/particledepends/texanim04, -0, assets/Resource/particledepends/texanim05, -0, assets/Resource/particledepends/texanim06, -0, assets/Resource/particledepends/texanim07, -0, assets/Resource/particledepends/texanim08, -0, assets/Resource/particledepends/texanim09, -0, assets/Resource/particledepends/texanim10, -0, assets/Resource/particledepends/texanim11, -0, assets/Resource/particledepends/texbulding, -0, assets/Resource/particledepends/texcash, -0, assets/Resource/particledepends/texgold, -0, assets/Resource/particledepends/texlabelbigstar, -0, assets/Resource/particledepends/texlabelsillerstar, -0, assets/Resource/particledepends/texlabelzi01, -0, assets/Resource/particledepends/texlabelzi02, -0, assets/Resource/particledepends/texlight01, -0, assets/Resource/particledepends/texlight010, -0, assets/Resource/particledepends/texlight016, -0, assets/Resource/particledepends/texlight017, -0, assets/Resource/particledepends/texlight018, -0, assets/Resource/particledepends/texlight02, -0, assets/Resource/particledepends/texlight022, -0, assets/Resource/particledepends/texlight023, -0, assets/Resource/particledepends/texlight024, -0, assets/Resource/particledepends/texlight025, -0, assets/Resource/particledepends/texlight026, -0, assets/Resource/particledepends/texlight027, -0, assets/Resource/particledepends/texlight028, -0, assets/Resource/particledepends/texlight029, -0, assets/Resource/particledepends/texlight03, -0, assets/Resource/particledepends/texlight032, -0, assets/Resource/particledepends/texlight033, -0, assets/Resource/particledepends/texlight0331, -0, assets/Resource/particledepends/texlight034, -0, assets/Resource/particledepends/texlight0351, -0, assets/Resource/particledepends/texlight04, -0, assets/Resource/particledepends/texlight05, -0, assets/Resource/particledepends/texlight06, -0, assets/Resource/particledepends/texlight07, -0, assets/Resource/particledepends/texlight09, -0, assets/Resource/particledepends/texlight100, -0, assets/Resource/particledepends/texlightglow01, -0, assets/Resource/particledepends/texlightvisa, -0, assets/Resource/particledepends/texlingt4008, -0, assets/Resource/particledepends/texparachute, -0, assets/Resource/particledepends/texparticle01, -0, assets/Resource/particledepends/texparticle012, -0, assets/Resource/particledepends/texparticle013, -0, assets/Resource/particledepends/texparticle014, -0, assets/Resource/particledepends/texparticle016, -0, assets/Resource/particledepends/texparticle017, -0, assets/Resource/particledepends/texparticle018, -0, assets/Resource/particledepends/texparticle019, -0, assets/Resource/particledepends/texparticle02, -0, assets/Resource/particledepends/texparticle020, -0, assets/Resource/particledepends/texparticle021, -0, assets/Resource/particledepends/texparticle022, -0, assets/Resource/particledepends/texparticle023, -0, assets/Resource/particledepends/texparticle024, -0, assets/Resource/particledepends/texparticle025, -0, assets/Resource/particledepends/texparticle027, -0, assets/Resource/particledepends/texparticle028, -0, assets/Resource/particledepends/texparticle029, -0, assets/Resource/particledepends/texparticle03, -0, assets/Resource/particledepends/texparticle030, -0, assets/Resource/particledepends/texparticle031, -0, assets/Resource/particledepends/texparticle037, -0, assets/Resource/particledepends/texparticle038, -0, assets/Resource/particledepends/texparticle039, -0, assets/Resource/particledepends/texparticle04, -0, assets/Resource/particledepends/texparticle041, -0, assets/Resource/particledepends/texparticle042, -0, assets/Resource/particledepends/texparticle043, -0, assets/Resource/particledepends/texparticle044, -0, assets/Resource/particledepends/texparticle047, -0, assets/Resource/particledepends/texparticle048, -0, assets/Resource/particledepends/texparticle049, -0, assets/Resource/particledepends/texparticle05, -0, assets/Resource/particledepends/texparticle050, -0, assets/Resource/particledepends/texparticle052, -0, assets/Resource/particledepends/texparticle053, -0, assets/Resource/particledepends/texparticle054, -0, assets/Resource/particledepends/texparticle06, -0, assets/Resource/particledepends/texparticle07, -0, assets/Resource/particledepends/texparticle08, -0, assets/Resource/particledepends/texparticle09, -0, assets/Resource/particledepends/texparticle4007, -0, assets/Resource/particledepends/texperson, -0, assets/Resource/particledepends/texship1, -0, assets/Resource/particledepends/texship2, -0, assets/Resource/particledepends/texship3, -0, assets/Resource/particledepends/texsilver, -0, assets/Resource/particledepends/textlabelcash, -0, assets/Resource/particledepends/textlabelfinsh01, -0, assets/Resource/particledepends/textlabelfinsh02, -0, assets/Resource/particledepends/textlabelwin, -0, assets/Resource/particledepends/texwaterlang1, -0, assets/Resource/particledepends/texwhiteboard, -0, assets/Resource/particledepends/texyacht, -0, assets/Resource/particledepends/whitepoint, -0, assets/Resource/particledepends/yellowlightoutput, -0, assets/Resource/sound/effect/btnclick, -0, assets/Resource/sound/effect/buildingdrop, -0, assets/Resource/sound/effect/buildingmoving, -0, assets/Resource/sound/effect/buyblock, -0, assets/Resource/sound/effect/clanvslose, -0, assets/Resource/sound/effect/clanvswin, -0, assets/Resource/sound/effect/collectcash, -0, assets/Resource/sound/effect/combatcard, -0, assets/Resource/sound/effect/combatlose, -0, assets/Resource/sound/effect/combatvs, -0, assets/Resource/sound/effect/combatwin, -0, assets/Resource/sound/effect/commonfail, -0, assets/Resource/sound/effect/commonlevelup, -0, assets/Resource/sound/effect/commonmsgup, -0, assets/Resource/sound/effect/companylevelupbegin, -0, assets/Resource/sound/effect/companylevelupplayerrank, -0, assets/Resource/sound/effect/companyleveluprankbg, -0, assets/Resource/sound/effect/companylevelupreward, -0, assets/Resource/sound/effect/companyleveluptransform, -0, assets/Resource/sound/effect/createclan, -0, assets/Resource/sound/effect/developmentcomposite, -0, assets/Resource/sound/effect/developmentcompositehide, -0, assets/Resource/sound/effect/developmentresearchhide, -0, assets/Resource/sound/effect/developmentresearchshow, -0, assets/Resource/sound/effect/environmentdrop, -0, assets/Resource/sound/effect/gamestartbtnclk, -0, assets/Resource/sound/effect/moneyadd, -0, assets/Resource/sound/effect/moneysub, -0, assets/Resource/sound/effect/shopbuildingfinish, -0, assets/Resource/sound/effect/shopbuildingremove, -0, assets/Resource/sound/effect/shopbuildingstart, -0, assets/Resource/sound/effect/skillicontween, -0, assets/Resource/sound/effect/skillplan, -0, assets/Resource/sound/effect/skillplanend, -0, assets/Resource/sound/effect/staffidentifybegin, -0, assets/Resource/sound/effect/staffidentifycardshow, -0, assets/Resource/sound/effect/staffsetpositiondetail, -0, assets/Resource/sound/effect/staffsetpositionhead, -0, assets/Resource/sound/effect/staffsetpositionstart, -0, assets/Resource/sound/effect/staffupgradefailure, -0, assets/Resource/sound/effect/staffupgradelevel, -0, assets/Resource/sound/effect/staffupgradepop, -0, assets/Resource/sound/effect/staffupgradeskill, -0, assets/Resource/sound/effect/staffupgradestatus, -0, assets/Resource/sound/effect/staffupgradesuccess, -0, assets/Resource/sound/effect/staffupstar_success, -0, assets/Resource/sound/effect/staffupstarfailed, -0, assets/Resource/sound/effect/taskfinish, -0, assets/Resource/sound/effect/titleupgrade, -0, assets/Resource/sound/effect/vipupgrade, -0, assets/Resource/sound/effect/vscarnet, -0, assets/Resource/sound/effect/shopopen/shop1101, -0, assets/Resource/sound/effect/shopopen/shop1102, -0, assets/Resource/sound/effect/shopopen/shop1103, -0, assets/Resource/sound/effect/shopopen/shop1104, -0, assets/Resource/sound/effect/shopopen/shop1105, -0, assets/Resource/sound/effect/shopopen/shop1106, -0, assets/Resource/sound/effect/shopopen/shop1107, -0, assets/Resource/sound/effect/shopopen/shop1108, -0, assets/Resource/sound/effect/shopopen/shop1109, -0, assets/Resource/sound/effect/shopopen/shop1110, -0, assets/Resource/sound/effect/shopopen/shop1201, -0, assets/Resource/sound/effect/shopopen/shop1202, -0, assets/Resource/sound/effect/shopopen/shop1203, -0, assets/Resource/sound/effect/shopopen/shop1204, -0, assets/Resource/sound/effect/shopopen/shop1205, -0, assets/Resource/sound/effect/shopopen/shop1206, -0, assets/Resource/sound/effect/shopopen/shop1207, -0, assets/Resource/sound/effect/shopopen/shop1208, -0, assets/Resource/sound/effect/shopopen/shop1209, -0, assets/Resource/sound/effect/shopopen/shop1210, -0, assets/Resource/sound/effect/shopopen/shop1301, -0, assets/Resource/sound/effect/shopopen/shop1302, -0, assets/Resource/sound/effect/shopopen/shop1303, -0, assets/Resource/sound/effect/shopopen/shop1304, -0, assets/Resource/sound/effect/shopopen/shop1305, -0, assets/Resource/sound/effect/shopopen/shop1306, -0, assets/Resource/sound/effect/shopopen/shop1307, -0, assets/Resource/sound/effect/shopopen/shop1308, -0, assets/Resource/sound/effect/shopopen/shop1309, -0, assets/Resource/sound/effect/shopopen/shop1310, -0, assets/Resource/sound/effect/shopopen/shop1401, -0, assets/Resource/sound/effect/shopopen/shop1402, -0, assets/Resource/sound/effect/shopopen/shop1403, -0, assets/Resource/sound/effect/shopopen/shop1404, -0, assets/Resource/sound/effect/shopopen/shop1405, -0, assets/Resource/sound/effect/shopopen/shop1406, -0, assets/Resource/sound/effect/shopopen/shop1407, -0, assets/Resource/sound/effect/shopopen/shop1408, -0, assets/Resource/sound/effect/shopopen/shop1409, -0, assets/Resource/sound/effect/shopopen/shop1410, -0, assets/Resource/sound/music/bank, -0, assets/Resource/sound/music/clanvs, -0, assets/Resource/sound/music/music1, -0, assets/Resource/sound/music/musiccreaterole, -0, assets/Resource/sound/music/musiclogin, -0, assets/Resource/sound/music/official, -0, assets/Resource/sound/music/tradebackgroundmusic, -0, assets/Resource/ui/uifont, -0, assets/Resource/ui/uilaunch, -0, assets/Resource/ui/uistyle, -0, assets/Resource/ui/uiicon/auction, -0, assets/Resource/ui/uiicon/building, -0, assets/Resource/ui/uiicon/frametitle, -0, assets/Resource/ui/uiicon/playerhalf, -0, assets/Resource/ui/uiicon/staffhalf, -0, assets/Resource/ui/uilayout/athletice, -0, assets/Resource/ui/uilayout/auction, -0, assets/Resource/ui/uilayout/bag, -0, assets/Resource/ui/uilayout/bank, -0, assets/Resource/ui/uilayout/building, -0, assets/Resource/ui/uilayout/car, -0, assets/Resource/ui/uilayout/charitycenter, -0, assets/Resource/ui/uilayout/chat, -0, assets/Resource/ui/uilayout/clan, -0, assets/Resource/ui/uilayout/clancreat, -0, assets/Resource/ui/uilayout/clandonation, -0, assets/Resource/ui/uilayout/clanfunction, -0, assets/Resource/ui/uilayout/claninvest, -0, assets/Resource/ui/uilayout/clanlandmark, -0, assets/Resource/ui/uilayout/clanmember, -0, assets/Resource/ui/uilayout/common, -0, assets/Resource/ui/uilayout/commonupgrade, -0, assets/Resource/ui/uilayout/company, -0, assets/Resource/ui/uilayout/consortium, -0, assets/Resource/ui/uilayout/department, -0, assets/Resource/ui/uilayout/development, -0, assets/Resource/ui/uilayout/financecenter, -0, assets/Resource/ui/uilayout/headhuntingcenter, -0, assets/Resource/ui/uilayout/help, -0, assets/Resource/ui/uilayout/invest, -0, assets/Resource/ui/uilayout/login, -0, assets/Resource/ui/uilayout/mainrole, -0, assets/Resource/ui/uilayout/mainui, -0, assets/Resource/ui/uilayout/mall, -0, assets/Resource/ui/uilayout/map, -0, assets/Resource/ui/uilayout/official, -0, assets/Resource/ui/uilayout/onlinemessage, -0, assets/Resource/ui/uilayout/public, -0, assets/Resource/ui/uilayout/purchasecenter, -0, assets/Resource/ui/uilayout/purchasecommon, -0, assets/Resource/ui/uilayout/purchaselimit, -0, assets/Resource/ui/uilayout/purchasepower, -0, assets/Resource/ui/uilayout/rank, -0, assets/Resource/ui/uilayout/robbed, -0, assets/Resource/ui/uilayout/rolecard, -0, assets/Resource/ui/uilayout/sceneoper, -0, assets/Resource/ui/uilayout/secretary, -0, assets/Resource/ui/uilayout/setting, -0, assets/Resource/ui/uilayout/shop, -0, assets/Resource/ui/uilayout/social, -0, assets/Resource/ui/uilayout/socialfriends, -0, assets/Resource/ui/uilayout/socialinvest, -0, assets/Resource/ui/uilayout/square, -0, assets/Resource/ui/uilayout/staff, -0, assets/Resource/ui/uilayout/staffadjust, -0, assets/Resource/ui/uilayout/staffcenter, -0, assets/Resource/ui/uilayout/stafffire, -0, assets/Resource/ui/uilayout/staffhire, -0, assets/Resource/ui/uilayout/staffidentify, -0, assets/Resource/ui/uilayout/staffinfo, -0, assets/Resource/ui/uilayout/staffskill, -0, assets/Resource/ui/uilayout/stafftrain, -0, assets/Resource/ui/uilayout/staffupgrade, -0, assets/Resource/ui/uilayout/stock, -0, assets/Resource/ui/uilayout/task, -0, assets/Resource/ui/uilayout/taskguidance, -0, assets/Resource/ui/uilayout/trade, -0, assets/Resource/ui/uilayout/tradecenter, -0, assets/Resource/ui/uisprite/bag, -0, assets/Resource/ui/uisprite/fbagicon, -0, assets/Resource/ui/uisprite/fclan, -0, assets/Resource/ui/uisprite/fcommon, -0, assets/Resource/ui/uisprite/fcommonex1, -0, assets/Resource/ui/uisprite/fcompany, -0, assets/Resource/ui/uisprite/fmainrole, -0, assets/Resource/ui/uisprite/fmainui, -0, assets/Resource/ui/uisprite/fmap, -0, assets/Resource/ui/uisprite/fpublic, -0, assets/Resource/ui/uisprite/fsceneoper, -0, assets/Resource/ui/uisprite/fsetting, -0, assets/Resource/ui/uisprite/fshop, -0, assets/Resource/ui/uisprite/fstaff, -0, assets/Resource/ui/uisprite/fstaffskill, -0, assets/Resource/ui/uisprite/ftask, -0, assets/Resource/ui/uisprite/ftrade, -0, assets/Resource/ui/uisprite/logo, -0, assets/Resource/ui/uisprite/wauction, -0, assets/Resource/ui/uisprite/wbank, -0, assets/Resource/ui/uisprite/wcar, -0, assets/Resource/ui/uisprite/wcharitycenter, -0, assets/Resource/ui/uisprite/wchat, -0, assets/Resource/ui/uisprite/wclan, -0, assets/Resource/ui/uisprite/wclanhead, -0, assets/Resource/ui/uisprite/wcommon, -0, assets/Resource/ui/uisprite/wcommonex1, -0, assets/Resource/ui/uisprite/wcompany, -0, assets/Resource/ui/uisprite/wconsortium, -0, assets/Resource/ui/uisprite/wdepartment, -0, assets/Resource/ui/uisprite/wdevelopment, -0, assets/Resource/ui/uisprite/wguidance, -0, assets/Resource/ui/uisprite/wincreaseui, -0, assets/Resource/ui/uisprite/wlaunch, -0, assets/Resource/ui/uisprite/wlogin, -0, assets/Resource/ui/uisprite/wmainrole, -0, assets/Resource/ui/uisprite/wmainui, -0, assets/Resource/ui/uisprite/wmall, -0, assets/Resource/ui/uisprite/wmap, -0, assets/Resource/ui/uisprite/wofficial, -0, assets/Resource/ui/uisprite/wpurchase, -0, assets/Resource/ui/uisprite/wrank, -0, assets/Resource/ui/uisprite/wrolecard, -0, assets/Resource/ui/uisprite/wrolehead, -0, assets/Resource/ui/uisprite/wsceneoper, -0, assets/Resource/ui/uisprite/wsecretary, -0, assets/Resource/ui/uisprite/wsetting, -0, assets/Resource/ui/uisprite/wshop, -0, assets/Resource/ui/uisprite/wsocial, -0, assets/Resource/ui/uisprite/wsquare, -0, assets/Resource/ui/uisprite/wstaff, -0, assets/Resource/ui/uisprite/wstaffani, -0, assets/Resource/ui/uisprite/wstaffhead, -0, assets/Resource/ui/uisprite/wstaffskill, -0, assets/Resource/ui/uisprite/wstock, -0, assets/Resource/ui/uisprite/wstockicon, -0, assets/Resource/ui/uisprite/wtask, -0, assets/Resource/ui/uisprite/wtrade, -0, assets/Resource/ui/uisprite/wtradecenter, -0, assets/Resource/ui/uisprite/wtrademap, -0, assets/Resource/ui/uisprite/wvipanim, -0, arsc, -I, C:\Users\Zachary\apktool\framework\1.apk, -S, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\res, -M, E:\U8SDK\U8SDKTool-Win-P34\workspace\dfh3\oppo\decompile\AndroidManifest.xml]
at brut.util.OS.exec(OS.java:97)
at brut.androlib.res.AndrolibResources.aaptPackage(AndrolibResources.java:430)
... 6 more
Caused by: java.io.IOException: Cannot run program "C:\Users\Zachary\AppData\Local\Temp\brut_util_Jar_4106740525864047267.tmp": CreateProcess error=206, ??????ò)???
at java.lang.ProcessBuilder.start(Unknown Source)
at brut.util.OS.exec(OS.java:90)
... 7 more
Caused by: java.io.IOException: CreateProcess error=206, 文件名或扩展名太长(E: Filename or Extension is too long)
at java.lang.ProcessImpl.create(Native Method)
at java.lang.ProcessImpl.<init>(Unknown Source)
at java.lang.ProcessImpl.start(Unknown Source)
... 9 more
```
1、I used [apktool d] to decompile the apk with the latest version(2.1.1)
2、then change nothing, just to use [apktool b] to recompile it, but failed with the upper error.
3、the apk you can download from here:[test.apk](http://pan.baidu.com/s/1mhZAEG4)
Thanks!!!
| a84e3c56fdfccb1136ba6069357789baef7145c7 | ca25a2694408ab7989fd107db7f8ff300fa3f779 | https://github.com/ibotpeaches/apktool/compare/a84e3c56fdfccb1136ba6069357789baef7145c7...ca25a2694408ab7989fd107db7f8ff300fa3f779 | 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 cddc3631..ccf2cdb4 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
@@ -19,7 +19,6 @@ package brut.androlib;
import brut.androlib.meta.MetaInfo;
import brut.androlib.meta.UsesFramework;
import brut.androlib.res.AndrolibResources;
-import brut.androlib.res.data.ResConfigFlags;
import brut.androlib.res.data.ResPackage;
import brut.androlib.res.data.ResTable;
import brut.androlib.res.data.ResUnknownFiles;
@@ -41,8 +40,6 @@ import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringUtils;
/**
* @author Ryszard Wiśniewski <brut.alll@gmail.com>
@@ -161,28 +158,15 @@ public class Androlib {
}
}
- public void recordUncompressedFiles(ExtFile apkFile, Collection<String> uncompressedFilesOrExts) throws AndrolibException {
+ public void recordUncompressedFiles(ExtFile apkFile, Collection<String> uncompressedFiles) throws AndrolibException {
try {
Directory unk = apkFile.getDirectory();
Set<String> files = unk.getFiles(true);
- String ext;
for (String file : files) {
if (isAPKFileNames(file) && !NO_COMPRESS_PATTERN.matcher(file).find()) {
- if (unk.getCompressionLevel(file) == 0) {
-
- if (StringUtils.countMatches(file, ".") > 1) {
- ext = file;
- } else {
- ext = FilenameUtils.getExtension(file);
- if (ext.isEmpty()) {
- ext = file;
- }
- }
-
- if (! uncompressedFilesOrExts.contains(ext)) {
- uncompressedFilesOrExts.add(ext);
- }
+ if (unk.getCompressionLevel(file) == 0 && !uncompressedFiles.contains(file)) {
+ uncompressedFiles.add(file);
}
}
}
@@ -277,6 +261,7 @@ public class Androlib {
apkOptions.isFramework = meta.isFrameworkApk;
apkOptions.resourcesAreCompressed = meta.compressionType;
apkOptions.doNotCompress = meta.doNotCompress;
+ apkOptions.noCompressAssets = meta.noCompressAssets;
mAndRes.setSdkInfo(meta.sdkInfo);
mAndRes.setPackageId(meta.packageInfo);
@@ -308,8 +293,8 @@ public class Androlib {
buildApk(appDir, outFile);
// we must go after the Apk is built, and copy the files in via Zip
- // this is because Aapt won't add files it doesn't know (ex unknown files)
- buildUnknownFiles(appDir, outFile, meta);
+ // this is because Aapt won't add files it doesn't know (ex unknown files & uncompressed assets)
+ buildUnknownAndUncompressedAssets(appDir, outFile, meta);
// we copied the AndroidManifest.xml to AndroidManifest.xml.orig so we can edit it
// lets restore the unedited one, to not change the original
@@ -603,38 +588,46 @@ public class Androlib {
}
}
- public void buildUnknownFiles(File appDir, File outFile, MetaInfo meta)
+ public void buildUnknownAndUncompressedAssets(File appDir, File outFile, MetaInfo meta)
throws AndrolibException {
+ if (meta.unknownFiles == null && meta.noCompressAssets == null) {
+ return;
+ }
+
if (meta.unknownFiles != null) {
LOGGER.info("Copying unknown files/dir...");
+ }
- Map<String, String> files = meta.unknownFiles;
- File tempFile = new File(outFile.getParent(), outFile.getName() + ".apktool_temp");
- boolean renamed = outFile.renameTo(tempFile);
- if (!renamed) {
- throw new AndrolibException("Unable to rename temporary file");
- }
-
- try (
- ZipFile inputFile = new ZipFile(tempFile);
- ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile))
- ) {
- copyExistingFiles(inputFile, actualOutput);
- copyUnknownFiles(appDir, actualOutput, files);
- } catch (IOException | BrutException ex) {
- throw new AndrolibException(ex);
- }
+ File tempFile = new File(outFile.getParent(), outFile.getName() + ".apktool_temp");
+ boolean renamed = outFile.renameTo(tempFile);
+ if (!renamed) {
+ throw new AndrolibException("Unable to rename temporary file");
+ }
- // Remove our temporary file.
- tempFile.delete();
+ try (
+ ZipFile inputFile = new ZipFile(tempFile);
+ ZipOutputStream actualOutput = new ZipOutputStream(new FileOutputStream(outFile))
+ ) {
+ copyExistingFiles(inputFile, actualOutput, meta.noCompressAssets);
+ copyUncompressedAssetFiles(appDir, actualOutput, meta.noCompressAssets);
+ copyUnknownFiles(appDir, actualOutput, meta.unknownFiles);
+ } catch (IOException | BrutException ex) {
+ throw new AndrolibException(ex);
}
+
+ // Remove our temporary file.
+ tempFile.delete();
}
- private void copyExistingFiles(ZipFile inputFile, ZipOutputStream outputFile) throws IOException {
+ private void copyExistingFiles(ZipFile inputFile, ZipOutputStream outputFile, Collection<String> assets)
+ throws IOException {
// First, copy the contents from the existing outFile:
Enumeration<? extends ZipEntry> entries = inputFile.entries();
while (entries.hasMoreElements()) {
ZipEntry entry = new ZipEntry(entries.nextElement());
+ if (assets != null && assets.contains(entry.getName())) {
+ continue;
+ }
// We can't reuse the compressed size because it depends on compression sizes.
entry.setCompressedSize(-1);
@@ -651,25 +644,26 @@ public class Androlib {
private void copyUnknownFiles(File appDir, ZipOutputStream outputFile, Map<String, String> files)
throws BrutException, IOException {
+
File unknownFileDir = new File(appDir, UNK_DIRNAME);
+ if (files == null || files.isEmpty()) {
+ return;
+ }
// loop through unknown files
for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) {
- File inputFile = new File(unknownFileDir, BrutIO.sanitizeUnknownFile(unknownFileDir, unknownFileInfo.getKey()));
+ String normalizedPath = BrutIO.normalizePath(unknownFileInfo.getKey());
+ String cleanedPath = BrutIO.sanitizeUnknownFile(unknownFileDir, normalizedPath);
+ File inputFile = new File(unknownFileDir, cleanedPath);
if (inputFile.isDirectory()) {
continue;
}
- ZipEntry newEntry = new ZipEntry(unknownFileInfo.getKey());
+ ZipEntry newEntry = new ZipEntry(cleanedPath);
int method = Integer.parseInt(unknownFileInfo.getValue());
LOGGER.fine(String.format("Copying unknown file %s with method %d", unknownFileInfo.getKey(), method));
if (method == ZipEntry.STORED) {
- newEntry.setMethod(ZipEntry.STORED);
- newEntry.setSize(inputFile.length());
- newEntry.setCompressedSize(-1);
- BufferedInputStream unknownFile = new BufferedInputStream(new FileInputStream(inputFile));
- CRC32 crc = BrutIO.calculateCrc(unknownFile);
- newEntry.setCrc(crc.getValue());
+ newEntry = getStoredZipEntry(cleanedPath, inputFile);
} else {
newEntry.setMethod(ZipEntry.DEFLATED);
}
@@ -680,6 +674,46 @@ public class Androlib {
}
}
+ private void copyUncompressedAssetFiles(File appDir, ZipOutputStream outputFile, Collection<String> files)
+ throws BrutException, IOException {
+
+ if (files == null || files.isEmpty()) {
+ return;
+ }
+
+ File assetFileDir = new File(appDir, ASSET_DIRNAME);
+
+ for (String asset : files) {
+ String normalizedPath = BrutIO.normalizePath(asset);
+ String cleanedPath = BrutIO.sanitizeUnknownFile(assetFileDir, normalizedPath);
+
+ File inputFile = new File(appDir, cleanedPath);
+ if (inputFile.isDirectory()) {
+ continue;
+ }
+
+ LOGGER.fine(String.format("Copying uncompressed asset: %s", normalizedPath));
+ ZipEntry newEntry = getStoredZipEntry(normalizedPath, inputFile);
+ outputFile.putNextEntry(newEntry);
+ BrutIO.copy(inputFile, outputFile);
+ outputFile.closeEntry();
+ }
+ }
+
+ private ZipEntry getStoredZipEntry(String cleanedPath, File inputFile)
+ throws IOException {
+
+ ZipEntry newEntry = new ZipEntry(cleanedPath);
+ newEntry.setMethod(ZipEntry.STORED);
+ newEntry.setSize(inputFile.length());
+ newEntry.setCompressedSize(-1);
+ BufferedInputStream unknownFile = new BufferedInputStream(new FileInputStream(inputFile));
+ CRC32 crc = BrutIO.calculateCrc(unknownFile);
+ newEntry.setCrc(crc.getValue());
+
+ return newEntry;
+ }
+
public void buildApk(File appDir, File outApk) throws AndrolibException {
LOGGER.info("Building apk file...");
if (outApk.exists()) {
@@ -777,6 +811,7 @@ public class Androlib {
private final static String SMALI_DIRNAME = "smali";
private final static String APK_DIRNAME = "build/apk";
private final static String UNK_DIRNAME = "unknown";
+ private final static String ASSET_DIRNAME = "assets";
private final static String[] APK_RESOURCES_FILENAMES = new String[] {
"resources.arsc", "AndroidManifest.xml", "res" };
private final static String[] APK_RESOURCES_WITHOUT_RES_FILENAMES = new String[] {
@@ -791,6 +826,6 @@ public class Androlib {
// Taken from AOSP's frameworks/base/tools/aapt/Package.cpp
private final static Pattern NO_COMPRESS_PATTERN = Pattern.compile("\\.(" +
"jpg|jpeg|png|gif|wav|mp2|mp3|ogg|aac|mpg|mpeg|mid|midi|smf|jet|rtttl|imy|xmf|mp4|" +
- "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|mkv)$");
+ "m4a|m4v|3gp|3gpp|3g2|3gpp2|amr|awb|wma|wmv|webm|mkv|arsc)$");
}
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 4bf5b001..5188beb7 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
@@ -418,7 +418,7 @@ public class ApkDecoder {
private void putFileCompressionInfo(MetaInfo meta) throws AndrolibException {
if (mUncompressedFiles != null && !mUncompressedFiles.isEmpty()) {
- meta.doNotCompress = mUncompressedFiles;
+ meta.noCompressAssets = mUncompressedFiles;
}
}
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
index 0a81ef07..8eec9205 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java
@@ -28,7 +28,10 @@ public class ApkOptions {
public boolean isFramework = false;
public boolean resourcesAreCompressed = false;
public boolean useAapt2 = false;
+
+ @Deprecated
public Collection<String> doNotCompress;
+ public Collection<String> noCompressAssets;
public String frameworkFolderLocation = null;
public String frameworkTag = null;
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
index 7da11d4d..9921090e 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java
@@ -37,7 +37,10 @@ public class MetaInfo {
public boolean sharedLibrary;
public boolean sparseResources;
public Map<String, String> unknownFiles;
+
+ @Deprecated
public Collection<String> doNotCompress;
+ public Collection<String> noCompressAssets;
private static Yaml getYaml() {
DumperOptions options = new DumperOptions();
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
index 595c4343..a73362aa 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
@@ -16,6 +16,7 @@
*/
package brut.androlib.res.data;
+import brut.util.BrutIO;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -27,7 +28,7 @@ public class ResUnknownFiles {
private final Map<String, String> mUnknownFiles = new LinkedHashMap<>();
public void addUnknownFileInfo(String file, String value) {
- mUnknownFiles.put(file, value);
+ mUnknownFiles.put(BrutIO.normalizePath(file), value);
}
public Map<String, String> getUnknownFiles() {
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java
index d24bd9d6..5c9d7a8c 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
+import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
@@ -45,11 +46,11 @@ public class BaseTest {
Map<String, String> controlFiles = control.unknownFiles;
Map<String, String> testFiles = test.unknownFiles;
- assertTrue(controlFiles.size() == testFiles.size());
+ assertEquals(controlFiles.size(), testFiles.size());
// Make sure that the compression methods are still the same
for (Map.Entry<String, String> controlEntry : controlFiles.entrySet()) {
- assertTrue(controlEntry.getValue().equals(testFiles.get(controlEntry.getKey())));
+ assertEquals(controlEntry.getValue(), testFiles.get(controlEntry.getKey()));
}
}
diff --git a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java
index 9290b05b..a08d5f5b 100644
--- a/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java
+++ b/brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java
@@ -62,7 +62,7 @@ public class DoubleExtensionUnknownFileTest extends BaseTest {
apkDecoder.decode();
MetaInfo metaInfo = new Androlib().readMetaFile(decodedApk);
- for (String string : metaInfo.doNotCompress) {
+ for (String string : metaInfo.noCompressAssets) {
if (StringUtils.countMatches(string, ".") > 1) {
assertTrue(string.equalsIgnoreCase("assets/bin/Data/sharedassets1.assets.split0"));
} | ['brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java', 'brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DoubleExtensionUnknownFileTest.java', 'brut.apktool/apktool-lib/src/test/java/brut/androlib/BaseTest.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/MetaInfo.java'] | 7 | 7 | 0 | 0 | 7 | {'.java': 7} | "2018-03-29T19:45:17" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
123 | 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 | 1 | Regression: if frame-path does not exist | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2017-10-14T16:37:07" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
124 | 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 | 1 | APKTool 2.2.2 - ClassCastException ResColorValue -> ResAttr | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2017-08-27T13:24:12" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
126 | 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 | 1 | Error decompiling Hangouts v.20+ | fixes | ### 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2017-07-26T20:22:37" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
127 | 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 | 1 | ApkDecoder locks input file | fix | 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.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/ExtFile.java', 'brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java', 'brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java', 'brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java'] | 8 | 8 | 0 | 0 | 8 | {'.java': 8} | "2017-05-02T06:24:15" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
121 | 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 | 1 | Bugs during apktool.jar compieltion from sources | fixes | @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'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2018-04-05T20:47:01" | 16,931 | Java | {'Java': 703364, 'Kotlin': 10370, 'Shell': 4847, 'Smali': 3679, 'Batchfile': 1154} | Apache License 2.0 |
8,991 | 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 | 2 | Restart UIAutomator to find missing elements | fixes | 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'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2015-01-08T17:14:50" | 16,649 | 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 |
9,000 | 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 | 2 | Source is broken | fixes | ```
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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2013-06-04T14:56:30" | 16,649 | 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 |
8,994 | appium/appium/2562/2524 | appium | appium | https://github.com/appium/appium/issues/2524 | https://github.com/appium/appium/pull/2562 | https://github.com/appium/appium/pull/2562 | 1 | http://appium.io > examples > java needs to be updated | fixes | Hi,
For new users who wants to get started , goto https://github.com/appium/appium/tree/master/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium
But this code has old values from earlier builds.
can you please update as per latest capabilities changes . It will save lots of time of new comers.
Thanks,
Vikram
| ce311913d5b5b5b0fc4e8df856bbd40c1da9de3f | 02464c1c6835f1d5616d0050533776ff8e66b662 | https://github.com/appium/appium/compare/ce311913d5b5b5b0fc4e8df856bbd40c1da9de3f...02464c1c6835f1d5616d0050533776ff8e66b662 | diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
index 40fcc7007..63ad8674e 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java
@@ -23,9 +23,10 @@ public class AndroidContactsTest {
File appDir = new File(classpathRoot, "../../../apps/ContactManager");
File app = new File(appDir, "ContactManager.apk");
DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability("device","Android");
capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
- capabilities.setCapability(CapabilityType.VERSION, "4.4");
+ capabilities.setCapability("platformName", "Android");
+ capabilities.setCapability("deviceName","Android Emulator");
+ capabilities.setCapability("platformVersion", "4.4");
capabilities.setCapability("app", app.getAbsolutePath());
capabilities.setCapability("app-package", "com.example.android.contactmanager");
capabilities.setCapability("app-activity", ".ContactManager");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
index 13708158a..400fe1103 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java
@@ -25,9 +25,10 @@ public class AndroidTest {
File appDir = new File(classpathRoot, "../../../apps/ApiDemos/bin");
File app = new File(appDir, "ApiDemos-debug.apk");
DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability("device","Android");
capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
- capabilities.setCapability(CapabilityType.VERSION, "4.4");
+ capabilities.setCapability("deviceName","Android Emulator");
+ capabilities.setCapability("platformVersion", "4.4");
+ capabilities.setCapability("platformName","Android");
capabilities.setCapability("app", app.getAbsolutePath());
capabilities.setCapability("app-package", "com.example.android.apis");
capabilities.setCapability("app-activity", ".ApiDemos");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
index ba229db00..cf0f6149f 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java
@@ -22,8 +22,9 @@ public class AndroidWebViewTest {
File classpathRoot = new File(System.getProperty("user.dir"));
File app = new File(classpathRoot, "../../../apps/selendroid-test-app.apk");
DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability("automationName","selendroid");
- capabilities.setCapability(CapabilityType.PLATFORM, "android");
+ capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+ capabilities.setCapability("automationName","Selendroid");
+ capabilities.setCapability("platformName", "Android");
capabilities.setCapability("app", app.getAbsolutePath());
capabilities.setCapability("app-package", "io.selendroid.testapp");
capabilities.setCapability("app-activity", ".HomeScreenActivity");
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
index fa88aec3b..fe55b844e 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java
@@ -64,8 +64,9 @@ public class MobileFindJavaTest {
@Before
public void setUp() throws Exception {
final DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability("device", "android");
- capabilities.setCapability(CapabilityType.PLATFORM, "android");
+ capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+ capabilities.setCapability("deviceName", "Android Emulator");
+ capabilities.setCapability("platformName", "Android");
capabilities.setCapability("appPackage", "com.android.settings");
capabilities.setCapability("appActivity", ".Settings");
driver = new AppiumDriver(new URL(url), capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
index d8ba952ba..deb046ee3 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java
@@ -33,9 +33,9 @@ public class SafariTest {
@Before
public void setUp() throws Exception {
DesiredCapabilities capabilities = new DesiredCapabilities();
- capabilities.setCapability("device", "iPhone Simulator");
+ capabilities.setCapability("deviceName", "iPhone Simulator");
capabilities.setCapability("platformName", "iOS");
- capabilities.setCapability("version", "7.1");
+ capabilities.setCapability("platformVersion", "7.1");
capabilities.setCapability("browserName", "safari");
driver = new RemoteWebDriver(new URL("http://127.0.0.1:4723/wd/hub"),
capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
index 96a5a7398..bcd434a85 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java
@@ -70,10 +70,11 @@ public class SauceTest implements SauceOnDemandSessionIdProvider {
String sauceAccessKey = authentication.getAccessKey();
DesiredCapabilities capabilities = new DesiredCapabilities();
capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
- capabilities.setCapability(CapabilityType.VERSION, "6.0");
- capabilities.setCapability("device", "iPhone Simulator");
- capabilities.setCapability(CapabilityType.PLATFORM, "Mac 10.8");
- capabilities.setCapability("app", "http://appium.s3.amazonaws.com/TestApp6.0.app.zip");
+ capabilities.setCapability("platformVersion", "6.0");
+ capabilities.setCapability("deviceName", "iPhone Simulator");
+ capabilities.setCapability("platformName", "iOS");
+ capabilities.setCapability("appium-version", "1.0.0");
+ capabilities.setCapability("app", "http://appium.s3.amazonaws.com/TestApp6.0.app.zip");
driver = new AppiumDriver(new URL(MessageFormat.format("http://{0}:{1}@ondemand.saucelabs.com:80/wd/hub", sauceUserName, sauceAccessKey)),
capabilities);
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
index 9ae41bf47..eb5b72f7f 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java
@@ -48,9 +48,9 @@ public class SimpleTest {
File app = new File(appDir, "TestApp.app");
DesiredCapabilities capabilities = new DesiredCapabilities();
capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
- capabilities.setCapability(CapabilityType.VERSION, "7.1");
- capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
- capabilities.setCapability("device", "iPhone Simulator");
+ capabilities.setCapability("platformVersion", "7.1");
+ capabilities.setCapability("platformName", "iOS");
+ capabilities.setCapability("deviceName", "iPhone Simulator");
capabilities.setCapability("app", app.getAbsolutePath());
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
values = new ArrayList<Integer>();
diff --git a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
index 98254b520..95c064514 100644
--- a/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
+++ b/sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java
@@ -47,9 +47,9 @@ public class UICatalogTest {
File app = new File(appDir, "UICatalog.app");
DesiredCapabilities capabilities = new DesiredCapabilities();
capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
- capabilities.setCapability(CapabilityType.VERSION, "7.1");
- capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
- capabilities.setCapability("device", "iPhone Simulator");
+ capabilities.setCapability("platformVersion", "7.1");
+ capabilities.setCapability("platformName", "iOS");
+ capabilities.setCapability("deviceName", "iPhone Simulator");
capabilities.setCapability("app", app.getAbsolutePath());
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
} | ['sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SafariTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SimpleTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/SauceTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidContactsTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/MobileFindJavaTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/AndroidWebViewTest.java', 'sample-code/examples/java/junit/src/test/java/com/saucelabs/appium/UICatalogTest.java'] | 8 | 8 | 0 | 0 | 8 | {'.java': 8} | "2014-05-13T21:09:20" | 16,649 | 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 |
8,995 | 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 | 1 | Getting "unknown server-side error..." when real error is "Could not find an element…" | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2014-01-03T19:53:45" | 16,649 | 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 |
9,001 | 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 | 1 | finding android.webkit.WebView object fails | fixes | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2013-05-30T22:57:50" | 16,649 | 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 |
8,999 | 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 | 2 | Android button click returns false on success | fix | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2013-09-04T17:56:06" | 16,649 | 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 |
8,997 | 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 | 1 | catch NullPointerExceptions instead of crashing | fix | 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/Click.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Drag.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/SetText.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Clear.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetName.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Swipe.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/Flick.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetSize.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetText.java', 'android/bootstrap/src/io/appium/android/bootstrap/handler/GetAttribute.java'] | 11 | 11 | 0 | 0 | 11 | {'.java': 11} | "2013-09-11T16:34:27" | 16,649 | 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 |
1,388 | 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 | 1 | [TextInputLayout] DropdownMenuEndIconDelegate is leaking ContextThemeWrapper instance | resolves | **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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2022-05-25T20:32:39" | 15,271 | Java | {'Java': 6714445} | Apache License 2.0 |
1,031 | 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 | 1 | Cut polygon additional points | solved | 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'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2019-10-23T07:13:47" | 15,090 | Java | {'Java': 1436763, 'JavaScript': 9310, 'Kotlin': 2635, 'Python': 755} | MIT License |
205 | prestodb/presto/5517/5516 | prestodb | presto | https://github.com/prestodb/presto/issues/5516 | https://github.com/prestodb/presto/pull/5517 | https://github.com/prestodb/presto/pull/5517 | 1 | Division by zero error with empty interleaved block | fixes | This change 373c745b30b2db1e96eef844096b3620a11a84c7 added this bit to `InterleavedBlockEncoding.readBlock`:
``` java
byte isEmpty = sliceInput.readByte();
if (isEmpty == 1) {
return new InterleavedBlock(new Block[0]);
}
```
InterleavedBlock performs divisions using the length of that array (columns), which result in division by zero errors:
``` java
int positionInBlock = position / columns;
```
```
java.sql.SQLException: Query failed (#20160623_104612_01302_fsieu): / by zero
at com.facebook.presto.jdbc.PrestoResultSet.resultsException(PrestoResultSet.java:1799)
at com.facebook.presto.jdbc.PrestoResultSet$ResultsPageIterator.computeNext(PrestoResultSet.java:1787)
at com.facebook.presto.jdbc.PrestoResultSet$ResultsPageIterator.computeNext(PrestoResultSet.java:1756)
at com.facebook.presto.jdbc.internal.guava.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:143)
at com.facebook.presto.jdbc.internal.guava.collect.AbstractIterator.hasNext(AbstractIterator.java:138)
at com.facebook.presto.jdbc.internal.guava.collect.TransformedIterator.hasNext(TransformedIterator.java:43)
at com.facebook.presto.jdbc.internal.guava.collect.Iterators$5.hasNext(Iterators.java:547)
at com.facebook.presto.jdbc.PrestoResultSet.next(PrestoResultSet.java:149)
at com.facebook.presto.verifier.Validator.convertJdbcResultSet(Validator.java:520)
at com.facebook.presto.verifier.Validator.lambda$getResultSetConverter$4(Validator.java:494)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
at java.util.concurrent.FutureTask.report(FutureTask.java:122)
at java.util.concurrent.FutureTask.get(FutureTask.java:206)
at com.google.common.util.concurrent.SimpleTimeLimiter.callWithTimeout(SimpleTimeLimiter.java:130)
at com.facebook.presto.verifier.Validator.executeQuery(Validator.java:426)
at com.facebook.presto.verifier.Validator.executeQueryTest(Validator.java:304)
at com.facebook.presto.verifier.Validator.validate(Validator.java:218)
at com.facebook.presto.verifier.Validator.valid(Validator.java:190)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
Caused by: java.lang.ArithmeticException: / by zero
at com.facebook.presto.spi.block.AbstractInterleavedBlock.getRegion(AbstractInterleavedBlock.java:260)
at com.facebook.presto.spi.block.AbstractInterleavedBlock.copyRegion(AbstractInterleavedBlock.java:249)
at com.facebook.presto.spi.block.AbstractArrayBlock.getSingleValueBlock(AbstractArrayBlock.java:234)
at com.facebook.presto.operator.TopNOperator$TopNBuilder.getValues(TopNOperator.java:338)
at com.facebook.presto.operator.TopNOperator$TopNBuilder.addRow(TopNOperator.java:313)
at com.facebook.presto.operator.TopNOperator$TopNBuilder.mergeWithGlobalCandidates(TopNOperator.java:284)
at com.facebook.presto.operator.TopNOperator$TopNBuilder.processPage(TopNOperator.java:273)
at com.facebook.presto.operator.TopNOperator.addInput(TopNOperator.java:202)
at com.facebook.presto.operator.Driver.processInternal(Driver.java:384)
at com.facebook.presto.operator.Driver.processFor(Driver.java:301)
at com.facebook.presto.execution.SqlTaskExecution$DriverSplitRunner.processFor(SqlTaskExecution.java:618)
at com.facebook.presto.execution.TaskExecutor$PrioritizedSplitRunner.process(TaskExecutor.java:529)
at com.facebook.presto.execution.TaskExecutor$Runner.run(TaskExecutor.java:665)
... 3 more
```
This reproduces the issue:
``` java
InterleavedBlock block = new InterleavedBlock(new Block[0]);
block.copyRegion(0, 0);
```
(is that call to copyRegion even valid? If not, there might be another bug further up the stack, too)
Also, the test in `AbstractInterleavedBlock`'s constructor is a bit suspect. The condition checks for "non-negative", but the message says "positive". Moreover, given that methods use that value in division operations, it would seem that we should ensure the value is never 0.
``` java
if (columns < 0) {
throw new IllegalArgumentException("Number of blocks in InterleavedBlock must be positive");
}
```
| 0f96a7e18f1e8eb654a55bdf15da4b8a1638d746 | 5928074ed7986b81b2fc9cf381314d980dd80175 | https://github.com/prestodb/presto/compare/0f96a7e18f1e8eb654a55bdf15da4b8a1638d746...5928074ed7986b81b2fc9cf381314d980dd80175 | diff --git a/presto-main/src/test/java/com/facebook/presto/block/TestInterleavedBlock.java b/presto-main/src/test/java/com/facebook/presto/block/TestInterleavedBlock.java
index e3380eca5a..3bedad2d57 100644
--- a/presto-main/src/test/java/com/facebook/presto/block/TestInterleavedBlock.java
+++ b/presto-main/src/test/java/com/facebook/presto/block/TestInterleavedBlock.java
@@ -134,16 +134,17 @@ public class TestInterleavedBlock
Type type = TYPES.get(position % TYPES.size());
assertInterleavedPosition(ImmutableList.of(type), block.getSingleValueBlock(position), 0, expectedValue);
- assertInterleavedPosition(ImmutableList.of(type), block.getRegion(position, 1), 0, expectedValue);
- assertInterleavedPosition(TYPES, block.getRegion(0, position + 1), position, expectedValue);
- assertInterleavedPosition(ImmutableList.of(type), block.getRegion(position, block.getPositionCount() - position), 0, expectedValue);
+ int alignedPosition = position - position % COLUMN_COUNT;
- assertInterleavedPosition(ImmutableList.of(type), block.copyRegion(position, 1), 0, expectedValue);
- assertInterleavedPosition(TYPES, block.copyRegion(0, position + 1), position, expectedValue);
- assertInterleavedPosition(ImmutableList.of(type), block.copyRegion(position, block.getPositionCount() - position), 0, expectedValue);
+ assertInterleavedPosition(ImmutableList.of(type), block.getRegion(alignedPosition, COLUMN_COUNT), position - alignedPosition, expectedValue);
+ assertInterleavedPosition(TYPES, block.getRegion(0, alignedPosition + COLUMN_COUNT), position, expectedValue);
+ assertInterleavedPosition(ImmutableList.of(type), block.getRegion(alignedPosition, block.getPositionCount() - alignedPosition), position - alignedPosition, expectedValue);
- int positionFloored = position / COLUMN_COUNT * COLUMN_COUNT;
- assertInterleavedPosition(TYPES, block.copyPositions(IntStream.range(positionFloored, positionFloored + COLUMN_COUNT).boxed().collect(Collectors.toList())), position % COLUMN_COUNT, expectedValue);
+ assertInterleavedPosition(ImmutableList.of(type), block.copyRegion(alignedPosition, COLUMN_COUNT), position - alignedPosition, expectedValue);
+ assertInterleavedPosition(TYPES, block.copyRegion(0, alignedPosition + COLUMN_COUNT), position, expectedValue);
+ assertInterleavedPosition(ImmutableList.of(type), block.copyRegion(alignedPosition, block.getPositionCount() - alignedPosition), position - alignedPosition, expectedValue);
+
+ assertInterleavedPosition(TYPES, block.copyPositions(IntStream.range(alignedPosition, alignedPosition + COLUMN_COUNT).boxed().collect(Collectors.toList())), position % COLUMN_COUNT, expectedValue);
}
private <T> void assertInterleavedPosition(List<Type> types, Block block, int position, T expectedValue)
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
index 80dc9daef9..0fdc5cb081 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
@@ -32,7 +32,7 @@ public abstract class AbstractInterleavedBlock
protected AbstractInterleavedBlock(int columns)
{
- if (columns < 0) {
+ if (columns <= 0) {
throw new IllegalArgumentException("Number of blocks in InterleavedBlock must be positive");
}
this.columns = columns;
@@ -43,12 +43,14 @@ public abstract class AbstractInterleavedBlock
return columns;
}
- AbstractInterleavedBlock semiCompact()
+ Block[] computeSerializableSubBlocks()
{
- // the returned InterleavedBlock is guaranteed to have
- // * start equal to 0
- // * positionCount equal to the sum of positionCount of column blocks
- return getRegionAlwaysReturnInterleavedBlock(0, getPositionCount(), false);
+ InterleavedBlock interleavedBlock = (InterleavedBlock) sliceRange(0, getPositionCount(), false);
+ Block[] result = new Block[interleavedBlock.getBlockCount()];
+ for (int i = 0; i < result.length; i++) {
+ result[i] = interleavedBlock.getBlock(i);
+ }
+ return result;
}
/**
@@ -246,40 +248,30 @@ public abstract class AbstractInterleavedBlock
@Override
public Block copyRegion(int position, int length)
{
- return getRegion(position, length, true);
+ validateRange(position, length);
+ return sliceRange(position, length, true);
}
- protected Block getRegion(int position, int length, boolean compact)
+ protected void validateRange(int position, int length)
{
int positionCount = getPositionCount();
- if (position < 0 || length < 0 || position + length > positionCount) {
- throw new IndexOutOfBoundsException("Invalid position (" + position + "), length (" + length + ") in block with " + positionCount + " positions");
- }
- if (length <= 1) {
- position = computePosition(position);
- int positionInBlock = position / columns;
- if (compact) {
- return getBlock(position % columns).copyRegion(positionInBlock, length);
- }
- else {
- return getBlock(position % columns).getRegion(positionInBlock, length);
- }
+ if (position < 0 || length < 0 || position + length > positionCount || position % columns != 0 || length % columns != 0) {
+ throw new IndexOutOfBoundsException("Invalid position (" + position + "), length (" + length + ") in InterleavedBlock with " + positionCount + " positions and " + columns + " columns");
}
- return getRegionAlwaysReturnInterleavedBlock(position, length, compact);
}
- private InterleavedBlock getRegionAlwaysReturnInterleavedBlock(int position, int length, boolean compact)
+ protected Block sliceRange(int position, int length, boolean compact)
{
position = computePosition(position);
- Block[] resultBlocks = new Block[Math.min(columns, length)];
- for (int newBlockIndex = 0; newBlockIndex < resultBlocks.length; newBlockIndex++) {
- int positionInBlock = (position + newBlockIndex) / columns;
- int subBlockLength = (length + columns - 1 - newBlockIndex) / columns;
+ Block[] resultBlocks = new Block[columns];
+ int positionInBlock = position / columns;
+ int subBlockLength = length / columns;
+ for (int blockIndex = 0; blockIndex < columns; blockIndex++) {
if (compact) {
- resultBlocks[newBlockIndex] = getBlock((newBlockIndex + position) % columns).copyRegion(positionInBlock, subBlockLength);
+ resultBlocks[blockIndex] = getBlock((blockIndex + position) % columns).copyRegion(positionInBlock, subBlockLength);
}
else {
- resultBlocks[newBlockIndex] = getBlock((newBlockIndex + position) % columns).getRegion(positionInBlock, subBlockLength);
+ resultBlocks[blockIndex] = getBlock((blockIndex + position) % columns).getRegion(positionInBlock, subBlockLength);
}
}
return new InterleavedBlock(resultBlocks);
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlock.java
index d5a104133f..2d53a1c711 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlock.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlock.java
@@ -35,37 +35,17 @@ public class InterleavedBlock
super(blocks.length);
this.blocks = blocks;
- // Aside from calculating sizeInBytes, retainedSizeInBytes, and positionCount,
- // the loop below verifies that the position count of sub-blocks in the InterleavedBlock
- // * differs by at most one
- // * is non-ascending
int sizeInBytes = 0;
int retainedSizeInBytes = INSTANCE_SIZE;
int positionCount = 0;
- if (blocks.length != 0) {
- int firstSubBlockPositionCount = blocks[0].getPositionCount();
- boolean subBlockHasDifferentSize = false;
- for (int i = 0; i < getBlockCount(); i++) {
- sizeInBytes += blocks[i].getSizeInBytes();
- retainedSizeInBytes += blocks[i].getRetainedSizeInBytes();
- positionCount += blocks[i].getPositionCount();
-
- if (subBlockHasDifferentSize) {
- if (firstSubBlockPositionCount - 1 != blocks[i].getPositionCount()) {
- throw new IllegalArgumentException(
- "length of sub blocks differ by at least 2 or is not non-ascending: block 0: " + firstSubBlockPositionCount + ", block " + i + ": " + blocks[i].getPositionCount());
- }
- }
- else {
- if (firstSubBlockPositionCount != blocks[i].getPositionCount()) {
- if (firstSubBlockPositionCount - 1 == blocks[i].getPositionCount()) {
- subBlockHasDifferentSize = true;
- }
- else {
- throw new IllegalArgumentException("length of sub blocks differ by at least 2: block 0: " + firstSubBlockPositionCount + ", block " + i + ": " + blocks[i].getPositionCount());
- }
- }
- }
+ int firstSubBlockPositionCount = blocks[0].getPositionCount();
+ for (int i = 0; i < getBlockCount(); i++) {
+ sizeInBytes += blocks[i].getSizeInBytes();
+ retainedSizeInBytes += blocks[i].getRetainedSizeInBytes();
+ positionCount += blocks[i].getPositionCount();
+
+ if (firstSubBlockPositionCount != blocks[i].getPositionCount()) {
+ throw new IllegalArgumentException("length of sub blocks differ: block 0: " + firstSubBlockPositionCount + ", block " + i + ": " + blocks[i].getPositionCount());
}
}
@@ -90,9 +70,7 @@ public class InterleavedBlock
@Override
public Block getRegion(int position, int length)
{
- if (position < 0 || length < 0 || position + length > positionCount) {
- throw new IndexOutOfBoundsException("Invalid position (" + position + "), length (" + length + ") in block with " + positionCount + " positions");
- }
+ validateRange(position, length);
return new InterleavedBlock(blocks, computePosition(position), length, retainedSizeInBytes, blockEncoding);
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockBuilder.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockBuilder.java
index 2c30b96f5e..395ac8548a 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockBuilder.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockBuilder.java
@@ -238,7 +238,8 @@ public class InterleavedBlockBuilder
@Override
public Block getRegion(int position, int length)
{
- return getRegion(position, length, false);
+ validateRange(position, length);
+ return sliceRange(position, length, false);
}
@Override
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockEncoding.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockEncoding.java
index a62b514079..a595b8e92a 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockEncoding.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockEncoding.java
@@ -39,25 +39,16 @@ public class InterleavedBlockEncoding
@Override
public void writeBlock(SliceOutput sliceOutput, Block block)
{
- if (block.getPositionCount() == 0) {
- sliceOutput.appendByte(1);
- return;
- }
- else {
- sliceOutput.appendByte(0);
- }
-
AbstractInterleavedBlock interleavedBlock = (AbstractInterleavedBlock) block;
- interleavedBlock = interleavedBlock.semiCompact();
-
if (interleavedBlock.getBlockCount() != individualBlockEncodings.length) {
throw new IllegalArgumentException(
"argument block differs in length (" + interleavedBlock.getBlockCount() + ") with this encoding (" + individualBlockEncodings.length + ")");
}
- for (int i = 0; i < individualBlockEncodings.length; i++) {
- individualBlockEncodings[i].writeBlock(sliceOutput, interleavedBlock.getBlock(i));
+ Block[] subBlocks = interleavedBlock.computeSerializableSubBlocks();
+ for (int i = 0; i < subBlocks.length; i++) {
+ individualBlockEncodings[i].writeBlock(sliceOutput, subBlocks[i]);
}
}
@@ -71,11 +62,6 @@ public class InterleavedBlockEncoding
@Override
public Block readBlock(SliceInput sliceInput)
{
- byte isEmpty = sliceInput.readByte();
- if (isEmpty == 1) {
- return new InterleavedBlock(new Block[0]);
- }
-
Block[] individualBlocks = new Block[individualBlockEncodings.length];
for (int i = 0; i < individualBlockEncodings.length; i++) {
individualBlocks[i] = individualBlockEncodings[i].readBlock(sliceInput); | ['presto-main/src/test/java/com/facebook/presto/block/TestInterleavedBlock.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlock.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockEncoding.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/InterleavedBlockBuilder.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2016-06-23T19:30:52" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
206 | prestodb/presto/5504/5498 | prestodb | presto | https://github.com/prestodb/presto/issues/5498 | https://github.com/prestodb/presto/pull/5504 | https://github.com/prestodb/presto/pull/5504 | 1 | GROUPING SETS over UNION fails | fixes | The following query:
```
SELECT x, COUNT(DISTINCT x) AS c
FROM
(
SELECT *
FROM (values (1)) t(x)
UNION ALL
SELECT *
FROM (values (1)) t(x)
) t2
GROUP BY GROUPING SETS ((x), ())
```
fails with:
```
Query 20160622_013115_00003_u5amn failed: index (0) must be less than size (0)
java.lang.IndexOutOfBoundsException: index (0) must be less than size (0)
at com.google.common.base.Preconditions.checkElementIndex(Preconditions.java:310)
at com.google.common.base.Preconditions.checkElementIndex(Preconditions.java:292)
at com.google.common.collect.RegularImmutableList.get(RegularImmutableList.java:65)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitUnion(AddExchanges.java:1104)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitUnion(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.UnionNode.accept(UnionNode.java:139)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitPlan(AddExchanges.java:215)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitPlan(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.PlanVisitor.visitGroupId(PlanVisitor.java:150)
at com.facebook.presto.sql.planner.plan.GroupIdNode.accept(GroupIdNode.java:125)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitAggregation(AddExchanges.java:283)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitAggregation(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.AggregationNode.accept(AggregationNode.java:189)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitProject(AddExchanges.java:231)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitProject(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:76)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitAggregation(AddExchanges.java:283)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitAggregation(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.AggregationNode.accept(AggregationNode.java:189)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitProject(AddExchanges.java:231)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitProject(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:76)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1143)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitOutput(AddExchanges.java:237)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitOutput(AddExchanges.java:188)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.optimizations.AddExchanges.optimize(AddExchanges.java:150)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:100)
at com.facebook.presto.execution.SqlQueryExecution.doAnalyzeQuery(SqlQueryExecution.java:277)
at com.facebook.presto.execution.SqlQueryExecution.analyzeQuery(SqlQueryExecution.java:256)
at com.facebook.presto.execution.SqlQueryExecution.start(SqlQueryExecution.java:220)
at com.facebook.presto.execution.QueuedExecution.lambda$start$1(QueuedExecution.java:68)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| 11ee7671117eee90f3c9100bb0c95cab7dfc277b | fe434cb1468f6f71a526786869d35334c7e28bc4 | https://github.com/prestodb/presto/compare/11ee7671117eee90f3c9100bb0c95cab7dfc277b...fe434cb1468f6f71a526786869d35334c7e28bc4 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
index f9c62657d0..6f4837b207 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
@@ -45,6 +45,7 @@ import com.facebook.presto.sql.planner.plan.EnforceSingleRowNode;
import com.facebook.presto.sql.planner.plan.ExchangeNode;
import com.facebook.presto.sql.planner.plan.ExplainAnalyzeNode;
import com.facebook.presto.sql.planner.plan.FilterNode;
+import com.facebook.presto.sql.planner.plan.GroupIdNode;
import com.facebook.presto.sql.planner.plan.IndexJoinNode;
import com.facebook.presto.sql.planner.plan.IndexSourceNode;
import com.facebook.presto.sql.planner.plan.JoinNode;
@@ -383,6 +384,31 @@ public class AddExchanges
deriveProperties(source, partial.getProperties()));
}
+ @Override
+ public PlanWithProperties visitGroupId(GroupIdNode node, Context context)
+ {
+ PreferredProperties childPreference = context.getPreferredProperties().translate(translateGroupIdSymbols(node));
+ PlanWithProperties child = planChild(node, context.withPreferredProperties(childPreference));
+ return rebaseAndDeriveProperties(node, child);
+ }
+
+ private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
+ {
+ Map<Symbol, Symbol> invertedMappings = ImmutableBiMap.copyOf(node.getIdentityMappings()).inverse();
+ List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
+ return symbol -> {
+ if (invertedMappings.containsKey(symbol)) {
+ return Optional.of(invertedMappings.get(symbol));
+ }
+
+ if (commonGroupingColumns.contains(symbol)) {
+ return Optional.of(symbol);
+ }
+
+ return Optional.empty();
+ };
+ }
+
@Override
public PlanWithProperties visitMarkDistinct(MarkDistinctNode node, Context context)
{
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
index b586aea570..d9c01d0f7a 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
@@ -75,6 +75,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Function;
import static com.facebook.presto.SystemSessionProperties.planWithTableNodePartitioning;
import static com.facebook.presto.spi.predicate.TupleDomain.extractFixedValues;
@@ -213,7 +214,25 @@ class PropertyDerivations
@Override
public ActualProperties visitGroupId(GroupIdNode node, List<ActualProperties> inputProperties)
{
- return Iterables.getOnlyElement(inputProperties);
+ ActualProperties properties = Iterables.getOnlyElement(inputProperties);
+
+ return properties.translate(translateGroupIdSymbols(node));
+ }
+
+ private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
+ {
+ List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
+ return symbol -> {
+ if (node.getIdentityMappings().containsKey(symbol)) {
+ return Optional.of(node.getIdentityMappings().get(symbol));
+ }
+
+ if (commonGroupingColumns.contains(symbol)) {
+ return Optional.of(symbol);
+ }
+
+ return Optional.empty();
+ };
}
@Override
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index bda81a8b9f..f8225e2e2d 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1481,6 +1481,28 @@ public abstract class AbstractTestQueries
"SELECT NULL, NULL, COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem");
}
+ @Test
+ public void testGroupingSetsWithSingleDistinctAndUnion()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, COUNT(DISTINCT linenumber) FROM " +
+ "(SELECT * FROM lineitem WHERE linenumber%2 = 0 UNION ALL SELECT * FROM lineitem WHERE linenumber%2 = 1) " +
+ "GROUP BY GROUPING SETS ((linenumber), ())",
+ "SELECT DISTINCT linenumber, 1 FROM lineitem UNION ALL " +
+ "SELECT NULL, COUNT(DISTINCT linenumber) FROM lineitem");
+ }
+
+ @Test
+ public void testGroupingSetsWithMultipleDistinctAndUnion()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, COUNT(DISTINCT linenumber), SUM(DISTINCT suppkey) FROM " +
+ "(SELECT * FROM lineitem WHERE linenumber%2 = 0 UNION ALL SELECT * FROM lineitem WHERE linenumber%2 = 1) " +
+ "GROUP BY GROUPING SETS ((linenumber), ())",
+ "SELECT linenumber, 1, SUM(DISTINCT suppkey) FROM lineitem GROUP BY linenumber UNION ALL " +
+ "SELECT NULL, COUNT(DISTINCT linenumber), SUM(DISTINCT suppkey) FROM lineitem");
+ }
+
@Test
public void testRollup()
throws Exception | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2016-06-22T18:04:15" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
196 | prestodb/presto/6411/6407 | prestodb | presto | https://github.com/prestodb/presto/issues/6407 | https://github.com/prestodb/presto/pull/6411 | https://github.com/prestodb/presto/pull/6411 | 1 | Incorrect result when using MAP in IN expression | fix | In the latest master:
```
presto:tiny> select x from (values 2) t(x) where map(array[1], array[x]) in (values map(array[1],array[2]));
x
---
(0 rows)
```
| 0306af4a6f9e5238f8904ee97a16ffcc669a8dc9 | 2fd1fa2c6957d59b0f260e3d5a7802d271cd875e | https://github.com/prestodb/presto/compare/0306af4a6f9e5238f8904ee97a16ffcc669a8dc9...2fd1fa2c6957d59b0f260e3d5a7802d271cd875e | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayHashCodeOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayHashCodeOperator.java
index d10332cc90..a9f074a062 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayHashCodeOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayHashCodeOperator.java
@@ -45,11 +45,11 @@ public final class ArrayHashCodeOperator
@TypeParameter("T") Type type,
@SqlType("array(T)") Block block)
{
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < block.getPositionCount(); i++) {
checkElementNotNull(block.isNull(i), ARRAY_NULL_ELEMENT_MSG);
try {
- hash = (int) CombineHashFunction.getHash(hash, (long) hashFunction.invoke(readNativeValue(type, block, i)));
+ hash = CombineHashFunction.getHash(hash, (long) hashFunction.invoke(readNativeValue(type, block, i)));
}
catch (Throwable t) {
Throwables.propagateIfInstanceOf(t, Error.class);
@@ -69,11 +69,11 @@ public final class ArrayHashCodeOperator
@TypeParameter("T") Type type,
@SqlType("array(T)") Block block)
{
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < block.getPositionCount(); i++) {
checkElementNotNull(block.isNull(i), ARRAY_NULL_ELEMENT_MSG);
try {
- hash = (int) CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getLong(block, i)));
+ hash = CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getLong(block, i)));
}
catch (Throwable t) {
Throwables.propagateIfInstanceOf(t, Error.class);
@@ -93,11 +93,11 @@ public final class ArrayHashCodeOperator
@TypeParameter("T") Type type,
@SqlType("array(T)") Block block)
{
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < block.getPositionCount(); i++) {
checkElementNotNull(block.isNull(i), ARRAY_NULL_ELEMENT_MSG);
try {
- hash = (int) CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getBoolean(block, i)));
+ hash = CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getBoolean(block, i)));
}
catch (Throwable t) {
Throwables.propagateIfInstanceOf(t, Error.class);
@@ -117,11 +117,11 @@ public final class ArrayHashCodeOperator
@TypeParameter("T") Type type,
@SqlType("array(T)") Block block)
{
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < block.getPositionCount(); i++) {
checkElementNotNull(block.isNull(i), ARRAY_NULL_ELEMENT_MSG);
try {
- hash = (int) CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getSlice(block, i)));
+ hash = CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getSlice(block, i)));
}
catch (Throwable t) {
Throwables.propagateIfInstanceOf(t, Error.class);
@@ -141,11 +141,11 @@ public final class ArrayHashCodeOperator
@TypeParameter("T") Type type,
@SqlType("array(T)") Block block)
{
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < block.getPositionCount(); i++) {
checkElementNotNull(block.isNull(i), ARRAY_NULL_ELEMENT_MSG);
try {
- hash = (int) CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getDouble(block, i)));
+ hash = CombineHashFunction.getHash(hash, (long) hashFunction.invokeExact(type.getDouble(block, i)));
}
catch (Throwable t) {
Throwables.propagateIfInstanceOf(t, Error.class);
diff --git a/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java b/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java
index f6e8aca6ff..c9d5d4ad70 100644
--- a/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java
+++ b/presto-main/src/main/java/com/facebook/presto/type/ArrayType.java
@@ -89,10 +89,10 @@ public class ArrayType
public long hash(Block block, int position)
{
Block array = getObject(block, position);
- int hash = 0;
+ long hash = 0;
for (int i = 0; i < array.getPositionCount(); i++) {
checkElementNotNull(array.isNull(i), ARRAY_NULL_ELEMENT_MSG);
- hash = (int) CombineHashFunction.getHash(hash, elementType.hash(array, i));
+ hash = CombineHashFunction.getHash(hash, elementType.hash(array, i));
}
return hash;
}
diff --git a/presto-main/src/main/java/com/facebook/presto/type/MapType.java b/presto-main/src/main/java/com/facebook/presto/type/MapType.java
index 76fd439ca3..ab3baad727 100644
--- a/presto-main/src/main/java/com/facebook/presto/type/MapType.java
+++ b/presto-main/src/main/java/com/facebook/presto/type/MapType.java
@@ -89,7 +89,7 @@ public class MapType
public long hash(Block block, int position)
{
Block mapBlock = getObject(block, position);
- int result = 0;
+ long result = 0;
for (int i = 0; i < mapBlock.getPositionCount(); i += 2) {
result += hashPosition(keyType, mapBlock, i);
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/AbstractTestFunctions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/AbstractTestFunctions.java
index 7c2c9e1945..f9f2b300b9 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/AbstractTestFunctions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/AbstractTestFunctions.java
@@ -19,6 +19,7 @@ import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.metadata.SqlFunction;
import com.facebook.presto.spi.ErrorCodeSupplier;
import com.facebook.presto.spi.PrestoException;
+import com.facebook.presto.spi.function.OperatorType;
import com.facebook.presto.spi.type.DecimalParseResult;
import com.facebook.presto.spi.type.Decimals;
import com.facebook.presto.spi.type.SqlDecimal;
@@ -32,6 +33,7 @@ import java.math.BigInteger;
import java.util.List;
import static com.facebook.presto.SessionTestUtils.TEST_SESSION;
+import static com.facebook.presto.metadata.FunctionRegistry.mangleOperatorName;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static com.facebook.presto.spi.StandardErrorCode.NUMERIC_VALUE_OUT_OF_RANGE;
@@ -65,6 +67,11 @@ public abstract class AbstractTestFunctions
functionAssertions.assertFunction(projection, expectedType, expected);
}
+ protected void assertOperator(OperatorType operator, String value, Type expectedType, Object expected)
+ {
+ functionAssertions.assertFunction(format("\"%s\"(%s)", mangleOperatorName(operator), value), expectedType, expected);
+ }
+
protected void assertDecimalFunction(String statement, SqlDecimal expectedResult)
{
assertFunction(statement,
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java b/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java
index cd3c122c65..eb82bbc6ca 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java
@@ -17,8 +17,11 @@ import com.facebook.presto.operator.scalar.AbstractTestFunctions;
import com.facebook.presto.spi.ErrorCode;
import com.facebook.presto.spi.PrestoException;
import com.facebook.presto.spi.block.Block;
+import com.facebook.presto.spi.block.BlockBuilder;
import com.facebook.presto.spi.block.BlockBuilderStatus;
+import com.facebook.presto.spi.block.InterleavedBlockBuilder;
import com.facebook.presto.spi.type.SqlTimestamp;
+import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.analyzer.SemanticErrorCode;
import com.facebook.presto.sql.analyzer.SemanticException;
import com.google.common.collect.ImmutableList;
@@ -39,6 +42,7 @@ import static com.facebook.presto.block.BlockSerdeUtil.writeBlock;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
+import static com.facebook.presto.spi.function.OperatorType.HASH_CODE;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
import static com.facebook.presto.spi.type.DoubleType.DOUBLE;
@@ -50,6 +54,7 @@ import static com.facebook.presto.sql.analyzer.SemanticErrorCode.AMBIGUOUS_FUNCT
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.FUNCTION_NOT_FOUND;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.TYPE_MISMATCH;
import static com.facebook.presto.type.JsonType.JSON;
+import static com.facebook.presto.type.TypeJsonUtils.appendToBlockBuilder;
import static com.facebook.presto.type.UnknownType.UNKNOWN;
import static com.facebook.presto.util.StructuralTestUtil.arrayBlockOf;
import static java.lang.Double.NEGATIVE_INFINITY;
@@ -935,6 +940,20 @@ public class TestArrayOperators
assertFunction("flatten(ARRAY [NULL, ARRAY [MAP (ARRAY [3, 4], ARRAY [3, 4])]])", new ArrayType(new MapType(INTEGER, INTEGER)), ImmutableList.of(ImmutableMap.of(3, 3, 4, 4)));
}
+ @Test
+ public void testArrayHashOperator()
+ {
+ assertArrayHashOperator("ARRAY[1, 2]", INTEGER, ImmutableList.of(1, 2));
+ assertArrayHashOperator("ARRAY[true, false]", BOOLEAN, ImmutableList.of(true, false));
+
+ // test with ARRAY[ MAP( ARRAY[1], ARRAY[2] ) ]
+ MapType mapType = new MapType(INTEGER, INTEGER);
+ BlockBuilder mapBuilder = new InterleavedBlockBuilder(ImmutableList.of(INTEGER, INTEGER), new BlockBuilderStatus(), 2);
+ INTEGER.writeLong(mapBuilder, 1);
+ INTEGER.writeLong(mapBuilder, 2);
+ assertArrayHashOperator("ARRAY[MAP(ARRAY[1], ARRAY[2])]", mapType, ImmutableList.of(mapBuilder.build()));
+ }
+
public void assertInvalidFunction(String projection, ErrorCode errorCode)
{
try {
@@ -946,6 +965,19 @@ public class TestArrayOperators
}
}
+ private void assertArrayHashOperator(String inputArray, Type elementType, List<Object> elements)
+ {
+ ArrayType arrayType = new ArrayType(elementType);
+ BlockBuilder arrayArrayBuilder = arrayType.createBlockBuilder(new BlockBuilderStatus(), 1);
+ BlockBuilder arrayBuilder = elementType.createBlockBuilder(new BlockBuilderStatus(), elements.size());
+ for (Object element : elements) {
+ appendToBlockBuilder(elementType, element, arrayBuilder);
+ }
+ arrayType.writeObject(arrayArrayBuilder, arrayBuilder.build());
+
+ assertOperator(HASH_CODE, inputArray, BIGINT, arrayType.hash(arrayArrayBuilder.build(), 0));
+ }
+
private SqlTimestamp sqlTimestamp(long millisUtc)
{
return new SqlTimestamp(millisUtc, TEST_SESSION.getTimeZoneKey());
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestMapOperators.java b/presto-main/src/test/java/com/facebook/presto/type/TestMapOperators.java
index e7a7ce7b70..c93d93f4ad 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestMapOperators.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestMapOperators.java
@@ -15,6 +15,7 @@ package com.facebook.presto.type;
import com.facebook.presto.operator.scalar.AbstractTestFunctions;
import com.facebook.presto.spi.block.Block;
+import com.facebook.presto.spi.block.BlockBuilder;
import com.facebook.presto.spi.block.BlockBuilderStatus;
import com.facebook.presto.spi.block.InterleavedBlockBuilder;
import com.facebook.presto.spi.function.ScalarFunction;
@@ -31,10 +32,12 @@ import io.airlift.slice.Slice;
import org.testng.annotations.Test;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import static com.facebook.presto.SessionTestUtils.TEST_SESSION;
import static com.facebook.presto.block.BlockSerdeUtil.writeBlock;
+import static com.facebook.presto.spi.function.OperatorType.HASH_CODE;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
import static com.facebook.presto.spi.type.DoubleType.DOUBLE;
@@ -44,9 +47,12 @@ import static com.facebook.presto.spi.type.VarbinaryType.VARBINARY;
import static com.facebook.presto.spi.type.VarcharType.VARCHAR;
import static com.facebook.presto.spi.type.VarcharType.createVarcharType;
import static com.facebook.presto.type.JsonType.JSON;
+import static com.facebook.presto.type.TypeJsonUtils.appendToBlockBuilder;
import static com.facebook.presto.type.UnknownType.UNKNOWN;
import static com.facebook.presto.util.StructuralTestUtil.arrayBlockOf;
import static com.facebook.presto.util.StructuralTestUtil.mapBlockOf;
+import static com.google.common.base.Preconditions.checkArgument;
+import static io.airlift.slice.Slices.utf8Slice;
import static java.lang.Double.doubleToLongBits;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.testng.Assert.assertEquals;
@@ -449,4 +455,30 @@ public class TestMapOperators
assertInvalidCast("CAST(MAP(ARRAY[1, 2], ARRAY[6, 9]) AS MAP<boolean, bigint>)", "duplicate keys");
}
+
+ @Test
+ public void testMapHashOperator()
+ {
+ assertMapHashOperator("MAP(ARRAY[1], ARRAY[2])", INTEGER, INTEGER, ImmutableList.of(1, 2));
+ assertMapHashOperator("MAP(ARRAY[1, 2147483647], ARRAY[2147483647, 2])", INTEGER, INTEGER, ImmutableList.of(1, 2147483647, 2147483647, 2));
+ assertMapHashOperator("MAP(ARRAY[8589934592], ARRAY[2])", BIGINT, INTEGER, ImmutableList.of(8589934592L, 2));
+ assertMapHashOperator("MAP(ARRAY[true], ARRAY[false])", BOOLEAN, BOOLEAN, ImmutableList.of(true, false));
+ assertMapHashOperator("MAP(ARRAY['123'], ARRAY['456'])", VARCHAR, VARCHAR, ImmutableList.of(utf8Slice("123"), utf8Slice("456")));
+ }
+
+ private void assertMapHashOperator(String inputString, Type keyType, Type valueType, List<Object> elements)
+ {
+ checkArgument(elements.size() % 2 == 0, "the size of elements should be even number");
+ MapType mapType = new MapType(keyType, valueType);
+ BlockBuilder mapArrayBuilder = mapType.createBlockBuilder(new BlockBuilderStatus(), 1);
+ BlockBuilder mapBuilder = new InterleavedBlockBuilder(ImmutableList.of(keyType, valueType), new BlockBuilderStatus(), elements.size());
+ for (int i = 0; i < elements.size(); i += 2) {
+ appendToBlockBuilder(keyType, elements.get(i), mapBuilder);
+ appendToBlockBuilder(valueType, elements.get(i + 1), mapBuilder);
+ }
+ mapType.writeObject(mapArrayBuilder, mapBuilder.build());
+ long hashResult = mapType.hash(mapArrayBuilder.build(), 0);
+
+ assertOperator(HASH_CODE, inputString, BIGINT, hashResult);
+ }
}
diff --git a/presto-main/src/test/java/com/facebook/presto/type/TestRowOperators.java b/presto-main/src/test/java/com/facebook/presto/type/TestRowOperators.java
index 7dfc6a807a..5161d6ca40 100644
--- a/presto-main/src/test/java/com/facebook/presto/type/TestRowOperators.java
+++ b/presto-main/src/test/java/com/facebook/presto/type/TestRowOperators.java
@@ -16,6 +16,9 @@ package com.facebook.presto.type;
import com.facebook.presto.operator.scalar.AbstractTestFunctions;
import com.facebook.presto.spi.PrestoException;
import com.facebook.presto.spi.StandardErrorCode;
+import com.facebook.presto.spi.block.BlockBuilder;
+import com.facebook.presto.spi.block.BlockBuilderStatus;
+import com.facebook.presto.spi.block.InterleavedBlockBuilder;
import com.facebook.presto.spi.type.SqlTimestamp;
import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.analyzer.SemanticException;
@@ -24,8 +27,11 @@ import com.google.common.collect.ImmutableMap;
import org.testng.annotations.Test;
import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
import static com.facebook.presto.SessionTestUtils.TEST_SESSION;
+import static com.facebook.presto.spi.function.OperatorType.HASH_CODE;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
import static com.facebook.presto.spi.type.DoubleType.DOUBLE;
@@ -33,6 +39,8 @@ import static com.facebook.presto.spi.type.IntegerType.INTEGER;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
import static com.facebook.presto.spi.type.VarcharType.VARCHAR;
import static com.facebook.presto.type.JsonType.JSON;
+import static com.facebook.presto.type.TypeJsonUtils.appendToBlockBuilder;
+import static com.google.common.base.Preconditions.checkArgument;
import static java.lang.String.format;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
@@ -203,4 +211,25 @@ public class TestRowOperators
assertFunction("ROW(1, 2) = ROW(1, 2)", BOOLEAN, true);
assertFunction("ROW(2, 1) != ROW(1, 2)", BOOLEAN, true);
}
+
+ @Test
+ public void testRowHashOperator()
+ {
+ assertRowHashOperator("ROW(1, 2)", ImmutableList.of(INTEGER, INTEGER), ImmutableList.of(1, 2));
+ assertRowHashOperator("ROW(true, 2)", ImmutableList.of(BOOLEAN, INTEGER), ImmutableList.of(true, 2));
+ }
+
+ private void assertRowHashOperator(String inputString, List<Type> types, List<Object> elements)
+ {
+ checkArgument(types.size() == elements.size(), "types and elements must have the same size");
+ RowType rowType = new RowType(types, Optional.empty());
+ BlockBuilder rowArrayBuilder = rowType.createBlockBuilder(new BlockBuilderStatus(), 1);
+ BlockBuilder rowBuilder = new InterleavedBlockBuilder(types, new BlockBuilderStatus(), types.size());
+ for (int i = 0; i < types.size(); i++) {
+ appendToBlockBuilder(types.get(i), elements.get(i), rowBuilder);
+ }
+ rowType.writeObject(rowArrayBuilder, rowBuilder.build());
+
+ assertOperator(HASH_CODE, inputString, BIGINT, rowType.hash(rowArrayBuilder.build(), 0));
+ }
}
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index cb3d73e359..c2d21db432 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -2790,6 +2790,9 @@ public abstract class AbstractTestQueries
assertQuery(
"SELECT CASE WHEN false THEN 1 IN (VALUES 2) END",
"SELECT NULL");
+ assertQuery(
+ "SELECT x FROM (VALUES 2) t(x) where MAP(ARRAY[8589934592], ARRAY[x]) IN (VALUES MAP(ARRAY[8589934592],ARRAY[2]))",
+ "SELECT 2");
}
@Test | ['presto-main/src/main/java/com/facebook/presto/operator/scalar/ArrayHashCodeOperator.java', 'presto-main/src/main/java/com/facebook/presto/type/MapType.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/type/ArrayType.java', 'presto-main/src/test/java/com/facebook/presto/type/TestArrayOperators.java', 'presto-main/src/test/java/com/facebook/presto/operator/scalar/AbstractTestFunctions.java', 'presto-main/src/test/java/com/facebook/presto/type/TestRowOperators.java', 'presto-main/src/test/java/com/facebook/presto/type/TestMapOperators.java'] | 8 | 8 | 0 | 0 | 8 | {'.java': 8} | "2016-10-20T23:42:29" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
203 | prestodb/presto/6051/5980 | prestodb | presto | https://github.com/prestodb/presto/issues/5980 | https://github.com/prestodb/presto/pull/6051 | https://github.com/prestodb/presto/pull/6051 | 1 | Presto stats planning time is including queueing time | fixes | I noticed this when Presto was reporting super long planning times, but it looks like this was just because the queues are really full.
| e00be17eb45de151374fd2fe19476074e6bb9712 | c8945f4eb87d27f1b8ac5645973ed5ffd11d5266 | https://github.com/prestodb/presto/compare/e00be17eb45de151374fd2fe19476074e6bb9712...c8945f4eb87d27f1b8ac5645973ed5ffd11d5266 | diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
index 8751bd1139..f97902577c 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
@@ -25,6 +25,7 @@ import com.facebook.presto.sql.planner.PlanFragment;
import com.facebook.presto.sql.planner.plan.TableScanNode;
import com.facebook.presto.transaction.TransactionId;
import com.facebook.presto.transaction.TransactionManager;
+import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -61,7 +62,7 @@ import static com.facebook.presto.spi.StandardErrorCode.USER_CANCELED;
import static com.facebook.presto.util.Failures.toFailure;
import static com.google.common.base.Preconditions.checkArgument;
import static io.airlift.units.DataSize.succinctBytes;
-import static io.airlift.units.Duration.nanosSince;
+import static io.airlift.units.Duration.succinctNanos;
import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -71,7 +72,7 @@ public class QueryStateMachine
private static final Logger log = Logger.get(QueryStateMachine.class);
private final DateTime createTime = DateTime.now();
- private final long createNanos = System.nanoTime();
+ private final long createNanos;
private final AtomicLong endNanos = new AtomicLong();
private final QueryId queryId;
@@ -80,6 +81,7 @@ public class QueryStateMachine
private final URI self;
private final boolean autoCommit;
private final TransactionManager transactionManager;
+ private final Ticker ticker;
private final AtomicReference<VersionedMemoryPoolId> memoryPool = new AtomicReference<>(new VersionedMemoryPoolId(GENERAL_POOL, 0));
@@ -96,6 +98,7 @@ public class QueryStateMachine
private final AtomicReference<Long> finishingStartNanos = new AtomicReference<>();
private final AtomicReference<Duration> finishingTime = new AtomicReference<>();
+ private final AtomicReference<Long> totalPlanningStartNanos = new AtomicReference<>();
private final AtomicReference<Duration> totalPlanningTime = new AtomicReference<>();
private final StateMachine<QueryState> queryState;
@@ -119,7 +122,7 @@ public class QueryStateMachine
private final AtomicReference<Optional<Output>> output = new AtomicReference<>(Optional.empty());
private final StateMachine<Optional<QueryInfo>> finalQueryInfo;
- private QueryStateMachine(QueryId queryId, String query, Session session, URI self, boolean autoCommit, TransactionManager transactionManager, Executor executor)
+ private QueryStateMachine(QueryId queryId, String query, Session session, URI self, boolean autoCommit, TransactionManager transactionManager, Executor executor, Ticker ticker)
{
this.queryId = requireNonNull(queryId, "queryId is null");
this.query = requireNonNull(query, "query is null");
@@ -127,6 +130,8 @@ public class QueryStateMachine
this.self = requireNonNull(self, "self is null");
this.autoCommit = autoCommit;
this.transactionManager = requireNonNull(transactionManager, "transactionManager is null");
+ this.ticker = ticker;
+ this.createNanos = tickerNanos();
this.queryState = new StateMachine<>("query " + query, executor, QUEUED, TERMINAL_QUERY_STATES);
this.finalQueryInfo = new StateMachine<>("finalQueryInfo-" + queryId, executor, Optional.empty());
@@ -136,6 +141,19 @@ public class QueryStateMachine
* Created QueryStateMachines must be transitioned to terminal states to clean up resources.
*/
public static QueryStateMachine begin(QueryId queryId, String query, Session session, URI self, boolean transactionControl, TransactionManager transactionManager, Executor executor)
+ {
+ return beginWithTicker(queryId, query, session, self, transactionControl, transactionManager, executor, Ticker.systemTicker());
+ }
+
+ static QueryStateMachine beginWithTicker(
+ QueryId queryId,
+ String query,
+ Session session,
+ URI self,
+ boolean transactionControl,
+ TransactionManager transactionManager,
+ Executor executor,
+ Ticker ticker)
{
session.getTransactionId().ifPresent(transactionControl ? transactionManager::trySetActive : transactionManager::checkAndSetActive);
@@ -150,7 +168,7 @@ public class QueryStateMachine
querySession = session;
}
- QueryStateMachine queryStateMachine = new QueryStateMachine(queryId, query, querySession, self, autoCommit, transactionManager, executor);
+ QueryStateMachine queryStateMachine = new QueryStateMachine(queryId, query, querySession, self, autoCommit, transactionManager, executor, ticker);
queryStateMachine.addStateChangeListener(newState -> log.debug("Query %s is %s", queryId, newState));
queryStateMachine.addStateChangeListener(newState -> {
if (newState.isDone()) {
@@ -166,7 +184,20 @@ public class QueryStateMachine
*/
public static QueryStateMachine failed(QueryId queryId, String query, Session session, URI self, TransactionManager transactionManager, Executor executor, Throwable throwable)
{
- QueryStateMachine queryStateMachine = new QueryStateMachine(queryId, query, session, self, false, transactionManager, executor);
+ return failedWithTicker(queryId, query, session, self, transactionManager, executor, Ticker.systemTicker(), throwable);
+ }
+
+ static QueryStateMachine failedWithTicker(
+ QueryId queryId,
+ String query,
+ Session session,
+ URI self,
+ TransactionManager transactionManager,
+ Executor executor,
+ Ticker ticker,
+ Throwable throwable)
+ {
+ QueryStateMachine queryStateMachine = new QueryStateMachine(queryId, query, session, self, false, transactionManager, executor, ticker);
queryStateMachine.transitionToFailed(throwable);
return queryStateMachine;
}
@@ -472,14 +503,15 @@ public class QueryStateMachine
public boolean transitionToPlanning()
{
queuedTime.compareAndSet(null, nanosSince(createNanos).convertToMostSuccinctTimeUnit());
+ totalPlanningStartNanos.compareAndSet(null, tickerNanos());
return queryState.compareAndSet(QUEUED, PLANNING);
}
public boolean transitionToStarting()
{
- Duration durationSinceCreation = nanosSince(createNanos).convertToMostSuccinctTimeUnit();
- queuedTime.compareAndSet(null, durationSinceCreation);
- totalPlanningTime.compareAndSet(null, durationSinceCreation);
+ queuedTime.compareAndSet(null, nanosSince(createNanos).convertToMostSuccinctTimeUnit());
+ totalPlanningStartNanos.compareAndSet(null, tickerNanos());
+ totalPlanningTime.compareAndSet(null, nanosSince(totalPlanningStartNanos.get()));
return queryState.setIf(STARTING, currentState -> currentState == QUEUED || currentState == PLANNING);
}
@@ -488,7 +520,8 @@ public class QueryStateMachine
{
Duration durationSinceCreation = nanosSince(createNanos).convertToMostSuccinctTimeUnit();
queuedTime.compareAndSet(null, durationSinceCreation);
- totalPlanningTime.compareAndSet(null, durationSinceCreation);
+ totalPlanningStartNanos.compareAndSet(null, tickerNanos());
+ totalPlanningTime.compareAndSet(null, nanosSince(totalPlanningStartNanos.get()));
executionStartTime.compareAndSet(null, DateTime.now());
return queryState.setIf(RUNNING, currentState -> currentState != RUNNING && currentState != FINISHING && !currentState.isDone());
@@ -498,10 +531,11 @@ public class QueryStateMachine
{
Duration durationSinceCreation = nanosSince(createNanos).convertToMostSuccinctTimeUnit();
queuedTime.compareAndSet(null, durationSinceCreation);
- totalPlanningTime.compareAndSet(null, durationSinceCreation);
+ totalPlanningStartNanos.compareAndSet(null, tickerNanos());
+ totalPlanningTime.compareAndSet(null, nanosSince(totalPlanningStartNanos.get()));
DateTime now = DateTime.now();
executionStartTime.compareAndSet(null, now);
- finishingStartNanos.compareAndSet(null, System.nanoTime());
+ finishingStartNanos.compareAndSet(null, tickerNanos());
if (!queryState.setIf(FINISHING, currentState -> currentState != FINISHING && !currentState.isDone())) {
return false;
@@ -575,13 +609,14 @@ public class QueryStateMachine
{
Duration durationSinceCreation = nanosSince(createNanos).convertToMostSuccinctTimeUnit();
queuedTime.compareAndSet(null, durationSinceCreation);
- totalPlanningTime.compareAndSet(null, durationSinceCreation);
+ totalPlanningStartNanos.compareAndSet(null, tickerNanos());
+ totalPlanningTime.compareAndSet(null, nanosSince(totalPlanningStartNanos.get()));
DateTime now = DateTime.now();
executionStartTime.compareAndSet(null, now);
- finishingStartNanos.compareAndSet(null, System.nanoTime());
+ finishingStartNanos.compareAndSet(null, tickerNanos());
finishingTime.compareAndSet(null, nanosSince(finishingStartNanos.get()));
endTime.compareAndSet(null, now);
- endNanos.compareAndSet(0, System.nanoTime());
+ endNanos.compareAndSet(0, tickerNanos());
}
public void addStateChangeListener(StateChangeListener<QueryState> stateChangeListener)
@@ -693,4 +728,14 @@ public class QueryStateMachine
);
finalQueryInfo.compareAndSet(finalInfo, Optional.of(prunedQueryInfo));
}
+
+ private long tickerNanos()
+ {
+ return ticker.read();
+ }
+
+ private Duration nanosSince(long start)
+ {
+ return succinctNanos(tickerNanos() - start);
+ }
}
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java b/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
index 8dafa666ce..2417172563 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java
@@ -21,8 +21,10 @@ import com.facebook.presto.spi.PrestoException;
import com.facebook.presto.spi.QueryId;
import com.facebook.presto.spi.memory.MemoryPoolId;
import com.facebook.presto.transaction.TransactionManager;
+import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import io.airlift.testing.TestingTicker;
import io.airlift.units.Duration;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@@ -243,6 +245,36 @@ public class TestQueryStateMachine
assertFinalState(stateMachine, FAILED, new PrestoException(USER_CANCELED, "canceled"));
}
+ @Test
+ public void testPlanningTimeDuration()
+ throws InterruptedException
+ {
+ TestingTicker mockTicker = new TestingTicker();
+ QueryStateMachine stateMachine = createQueryStateMachineWithTicker(mockTicker);
+ assertState(stateMachine, QUEUED);
+
+ mockTicker.increment(100, TimeUnit.MILLISECONDS);
+ assertTrue(stateMachine.transitionToPlanning());
+ assertState(stateMachine, PLANNING);
+
+ mockTicker.increment(500, TimeUnit.MILLISECONDS);
+ assertTrue(stateMachine.transitionToStarting());
+ assertState(stateMachine, STARTING);
+
+ mockTicker.increment(300, TimeUnit.MILLISECONDS);
+ assertTrue(stateMachine.transitionToRunning());
+ assertState(stateMachine, RUNNING);
+
+ mockTicker.increment(200, TimeUnit.MILLISECONDS);
+ assertTrue(stateMachine.transitionToFinishing());
+ stateMachine.waitForStateChange(FINISHING, new Duration(2, TimeUnit.SECONDS));
+ assertState(stateMachine, FINISHED);
+
+ QueryStats queryStats = stateMachine.getQueryInfo(Optional.empty()).getQueryStats();
+ assertTrue(queryStats.getQueuedTime().toMillis() == 100);
+ assertTrue(queryStats.getTotalPlanningTime().toMillis() == 500);
+ }
+
private static void assertFinalState(QueryStateMachine stateMachine, QueryState expectedState)
{
assertFinalState(stateMachine, expectedState, null);
@@ -362,9 +394,14 @@ public class TestQueryStateMachine
}
private QueryStateMachine createQueryStateMachine()
+ {
+ return createQueryStateMachineWithTicker(Ticker.systemTicker());
+ }
+
+ private QueryStateMachine createQueryStateMachineWithTicker(Ticker ticker)
{
TransactionManager transactionManager = createTestTransactionManager();
- QueryStateMachine stateMachine = QueryStateMachine.begin(QUERY_ID, QUERY, TEST_SESSION, LOCATION, false, transactionManager, executor);
+ QueryStateMachine stateMachine = QueryStateMachine.beginWithTicker(QUERY_ID, QUERY, TEST_SESSION, LOCATION, false, transactionManager, executor, ticker);
stateMachine.setInputs(INPUTS);
stateMachine.setOutput(OUTPUT);
stateMachine.setOutputFieldNames(OUTPUT_FIELD_NAMES); | ['presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java', 'presto-main/src/test/java/com/facebook/presto/execution/TestQueryStateMachine.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-09-07T01:23:00" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
204 | prestodb/presto/5921/5797 | prestodb | presto | https://github.com/prestodb/presto/issues/5797 | https://github.com/prestodb/presto/pull/5921 | https://github.com/prestodb/presto/pull/5921 | 1 | Fix SHOW CREATE TABLE for Raptor | fixes | `RaptorMetadata.getTableMetadata()` does not include table properties, so`SHOW CREATE TABLE` does not include them.
We want to make as few database calls as possible. These are the properties we need:
- `ordering`: could be added to `TableColumn`
- `temporal_column`: could be added to `TableColumn`
- `bucket_count`: already in `RaptorTableHandle`
- `bucketed_on`: could be added to `TableColumn`
- `distribution_name`: could be added to `RaptorTableHandle` along with `distributionId` (seems ugly to put it in the handle, but the handle already has the schema/table name just for this metadata call)
| 7b47e32a25523c4a83e51ccf8edcfd29567c109e | b0ff6a9771963aabaf58062c74511ab38364cbd1 | https://github.com/prestodb/presto/compare/7b47e32a25523c4a83e51ccf8edcfd29567c109e...b0ff6a9771963aabaf58062c74511ab38364cbd1 | diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java
index dd0d772d46..073c7b61c3 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java
@@ -39,6 +39,7 @@ import com.facebook.presto.spi.Constraint;
import com.facebook.presto.spi.PrestoException;
import com.facebook.presto.spi.SchemaTableName;
import com.facebook.presto.spi.SchemaTablePrefix;
+import com.facebook.presto.spi.TableNotFoundException;
import com.facebook.presto.spi.ViewNotFoundException;
import com.facebook.presto.spi.connector.ConnectorMetadata;
import com.facebook.presto.spi.connector.ConnectorPartitioningHandle;
@@ -65,6 +66,8 @@ import java.util.Optional;
import java.util.OptionalInt;
import java.util.OptionalLong;
import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
@@ -83,6 +86,8 @@ import static com.facebook.presto.raptor.RaptorSessionProperties.getOneSplitPerB
import static com.facebook.presto.raptor.RaptorTableProperties.BUCKETED_ON_PROPERTY;
import static com.facebook.presto.raptor.RaptorTableProperties.BUCKET_COUNT_PROPERTY;
import static com.facebook.presto.raptor.RaptorTableProperties.DISTRIBUTION_NAME_PROPERTY;
+import static com.facebook.presto.raptor.RaptorTableProperties.ORDERING_PROPERTY;
+import static com.facebook.presto.raptor.RaptorTableProperties.TEMPORAL_COLUMN_PROPERTY;
import static com.facebook.presto.raptor.RaptorTableProperties.getBucketColumns;
import static com.facebook.presto.raptor.RaptorTableProperties.getBucketCount;
import static com.facebook.presto.raptor.RaptorTableProperties.getDistributionName;
@@ -175,6 +180,7 @@ public class RaptorMetadata
tableName.getTableName(),
table.getTableId(),
table.getDistributionId(),
+ table.getDistributionName(),
table.getBucketCount(),
OptionalLong.empty(),
Optional.ofNullable(sampleWeightColumnHandle),
@@ -186,17 +192,41 @@ public class RaptorMetadata
{
RaptorTableHandle handle = checkType(tableHandle, RaptorTableHandle.class, "tableHandle");
SchemaTableName tableName = new SchemaTableName(handle.getSchemaName(), handle.getTableName());
- List<ColumnMetadata> columns = dao.listTableColumns(handle.getTableId()).stream()
+ List<TableColumn> tableColumns = dao.listTableColumns(handle.getTableId());
+ if (tableColumns.isEmpty()) {
+ throw new TableNotFoundException(tableName);
+ }
+
+ ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
+ SortedMap<Integer, String> bucketing = new TreeMap<>();
+ SortedMap<Integer, String> ordering = new TreeMap<>();
+
+ for (TableColumn column : tableColumns) {
+ if (column.isTemporal()) {
+ properties.put(TEMPORAL_COLUMN_PROPERTY, column.getColumnName());
+ }
+ column.getBucketOrdinal().ifPresent(bucketOrdinal -> bucketing.put(bucketOrdinal, column.getColumnName()));
+ column.getSortOrdinal().ifPresent(sortOrdinal -> ordering.put(sortOrdinal, column.getColumnName()));
+ }
+
+ if (!bucketing.isEmpty()) {
+ properties.put(BUCKETED_ON_PROPERTY, ImmutableList.copyOf(bucketing.values()));
+ }
+ if (!ordering.isEmpty()) {
+ properties.put(ORDERING_PROPERTY, ImmutableList.copyOf(ordering.values()));
+ }
+
+ handle.getBucketCount().ifPresent(bucketCount -> properties.put(BUCKET_COUNT_PROPERTY, bucketCount));
+ handle.getDistributionName().ifPresent(distributionName -> properties.put(DISTRIBUTION_NAME_PROPERTY, distributionName));
+
+ List<ColumnMetadata> columns = tableColumns.stream()
.map(TableColumn::toColumnMetadata)
.filter(isSampleWeightColumn().negate())
.collect(toCollection(ArrayList::new));
- if (columns.isEmpty()) {
- throw new PrestoException(RAPTOR_ERROR, "Table does not have any columns: " + tableName);
- }
columns.add(hiddenColumn(SHARD_UUID_COLUMN_NAME, SHARD_UUID_COLUMN_TYPE));
columns.add(hiddenColumn(BUCKET_NUMBER_COLUMN_NAME, INTEGER));
- return new ConnectorTableMetadata(tableName, columns);
+ return new ConnectorTableMetadata(tableName, columns, properties.build());
}
@Override
@@ -694,6 +724,7 @@ public class RaptorMetadata
handle.getTableName(),
handle.getTableId(),
handle.getDistributionId(),
+ handle.getDistributionName(),
handle.getBucketCount(),
OptionalLong.of(transactionId),
handle.getSampleWeightColumnHandle(),
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorTableHandle.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorTableHandle.java
index eb07641671..14893812cc 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorTableHandle.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorTableHandle.java
@@ -35,6 +35,7 @@ public final class RaptorTableHandle
private final String tableName;
private final long tableId;
private final OptionalLong distributionId;
+ private final Optional<String> distributionName;
private final OptionalInt bucketCount;
private final OptionalLong transactionId;
private final Optional<RaptorColumnHandle> sampleWeightColumnHandle;
@@ -47,6 +48,7 @@ public final class RaptorTableHandle
@JsonProperty("tableName") String tableName,
@JsonProperty("tableId") long tableId,
@JsonProperty("distributionId") OptionalLong distributionId,
+ @JsonProperty("distributionName") Optional<String> distributionName,
@JsonProperty("bucketCount") OptionalInt bucketCount,
@JsonProperty("transactionId") OptionalLong transactionId,
@JsonProperty("sampleWeightColumnHandle") Optional<RaptorColumnHandle> sampleWeightColumnHandle,
@@ -60,6 +62,7 @@ public final class RaptorTableHandle
this.tableId = tableId;
this.sampleWeightColumnHandle = requireNonNull(sampleWeightColumnHandle, "sampleWeightColumnHandle is null");
+ this.distributionName = requireNonNull(distributionName, "distributionName is null");
this.distributionId = requireNonNull(distributionId, "distributionId is null");
this.bucketCount = requireNonNull(bucketCount, "bucketCount is null");
this.transactionId = requireNonNull(transactionId, "transactionId is null");
@@ -97,6 +100,12 @@ public final class RaptorTableHandle
return distributionId;
}
+ @JsonProperty
+ public Optional<String> getDistributionName()
+ {
+ return distributionName;
+ }
+
@JsonProperty
public OptionalInt getBucketCount()
{
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/MetadataDao.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/MetadataDao.java
index 03129a950e..46896a6584 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/MetadataDao.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/MetadataDao.java
@@ -27,7 +27,10 @@ import java.util.Set;
public interface MetadataDao
{
String TABLE_COLUMN_SELECT = "" +
- "SELECT t.schema_name, t.table_name, c.column_id, c.column_name, c.data_type\n" +
+ "SELECT t.schema_name, t.table_name,\n" +
+ " c.column_id, c.column_name, c.data_type,\n" +
+ " c.bucket_ordinal_position, c.sort_ordinal_position,\n" +
+ " t.temporal_column_id = c.column_id AS temporal\n" +
"FROM tables t\n" +
"JOIN columns c ON (t.table_id = c.table_id)\n";
@@ -38,7 +41,7 @@ public interface MetadataDao
@Mapper(TableMapper.class)
Table getTableInformation(@Bind("tableId") long tableId);
- @SqlQuery("SELECT t.table_id, t.distribution_id, d.bucket_count, t.temporal_column_id\n" +
+ @SqlQuery("SELECT t.table_id, t.distribution_id, d.distribution_name, d.bucket_count, t.temporal_column_id\n" +
"FROM tables t\n" +
"LEFT JOIN distributions d ON (t.distribution_id = d.distribution_id)\n" +
"WHERE t.schema_name = :schemaName\n" +
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/Table.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/Table.java
index 0bb855737f..26077c42af 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/Table.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/Table.java
@@ -18,6 +18,7 @@ import org.skife.jdbi.v2.tweak.ResultSetMapper;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.Optional;
import java.util.OptionalInt;
import java.util.OptionalLong;
@@ -30,13 +31,15 @@ public final class Table
{
private final long tableId;
private final OptionalLong distributionId;
+ private final Optional<String> distributionName;
private final OptionalInt bucketCount;
private final OptionalLong temporalColumnId;
- public Table(long tableId, OptionalLong distributionId, OptionalInt bucketCount, OptionalLong temporalColumnId)
+ public Table(long tableId, OptionalLong distributionId, Optional<String> distributionName, OptionalInt bucketCount, OptionalLong temporalColumnId)
{
this.tableId = tableId;
this.distributionId = requireNonNull(distributionId, "distributionId is null");
+ this.distributionName = requireNonNull(distributionName, "distributionName is null");
this.bucketCount = requireNonNull(bucketCount, "bucketCount is null");
this.temporalColumnId = requireNonNull(temporalColumnId, "temporalColumnId is null");
}
@@ -51,6 +54,11 @@ public final class Table
return distributionId;
}
+ public Optional<String> getDistributionName()
+ {
+ return distributionName;
+ }
+
public OptionalInt getBucketCount()
{
return bucketCount;
@@ -83,6 +91,7 @@ public final class Table
return new Table(
r.getLong("table_id"),
getOptionalLong(r, "distribution_id"),
+ Optional.ofNullable(r.getString("distribution_name")),
getOptionalInt(r, "bucket_count"),
getOptionalLong(r, "temporal_column_id"));
}
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/TableColumn.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/TableColumn.java
index 8da00a4e08..a53f575f37 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/TableColumn.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/TableColumn.java
@@ -24,7 +24,9 @@ import javax.inject.Inject;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.OptionalInt;
+import static com.facebook.presto.raptor.util.DatabaseUtil.getOptionalInt;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
@@ -36,13 +38,19 @@ public class TableColumn
private final String columnName;
private final Type dataType;
private final long columnId;
+ private final OptionalInt bucketOrdinal;
+ private final OptionalInt sortOrdinal;
+ private final boolean temporal;
- public TableColumn(SchemaTableName table, String columnName, Type dataType, long columnId)
+ public TableColumn(SchemaTableName table, String columnName, Type dataType, long columnId, OptionalInt bucketOrdinal, OptionalInt sortOrdinal, boolean temporal)
{
this.table = requireNonNull(table, "table is null");
this.columnName = requireNonNull(columnName, "columnName is null");
this.dataType = requireNonNull(dataType, "dataType is null");
this.columnId = columnId;
+ this.bucketOrdinal = requireNonNull(bucketOrdinal, "bucketOrdinal is null");
+ this.sortOrdinal = requireNonNull(sortOrdinal, "sortOrdinal is null");
+ this.temporal = temporal;
}
public SchemaTableName getTable()
@@ -65,6 +73,21 @@ public class TableColumn
return columnId;
}
+ public OptionalInt getBucketOrdinal()
+ {
+ return bucketOrdinal;
+ }
+
+ public OptionalInt getSortOrdinal()
+ {
+ return sortOrdinal;
+ }
+
+ public boolean isTemporal()
+ {
+ return temporal;
+ }
+
@Override
public String toString()
{
@@ -113,7 +136,10 @@ public class TableColumn
table,
r.getString("column_name"),
type,
- r.getLong("column_id"));
+ r.getLong("column_id"),
+ getOptionalInt(r, "bucket_ordinal_position"),
+ getOptionalInt(r, "sort_ordinal_position"),
+ r.getBoolean("temporal"));
}
}
}
diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/TestRaptorIntegrationSmokeTest.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/TestRaptorIntegrationSmokeTest.java
index 301b23ebe1..93c8362c45 100644
--- a/presto-raptor/src/test/java/com/facebook/presto/raptor/TestRaptorIntegrationSmokeTest.java
+++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/TestRaptorIntegrationSmokeTest.java
@@ -346,7 +346,15 @@ public class TestRaptorIntegrationSmokeTest
" c2 double,\n" +
" \"c 3\" varchar,\n" +
" \"c'4\" array(bigint),\n" +
- " c5 map(bigint, varchar)\n" +
+ " c5 map(bigint, varchar),\n" +
+ " c6 bigint,\n" +
+ " c7 timestamp\n" +
+ ")\n" +
+ "WITH (\n" +
+ " bucket_count = 32,\n" +
+ " bucketed_on = ARRAY['c1','c6'],\n" +
+ " ordering = ARRAY['c6','c1'],\n" +
+ " temporal_column = 'c7'\n" +
")",
getSession().getCatalog().get(), getSession().getSchema().get(), "test_show_create_table");
assertUpdate(createTableSql);
diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestRaptorMetadata.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestRaptorMetadata.java
index 7ece09444c..4ab99af548 100644
--- a/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestRaptorMetadata.java
+++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestRaptorMetadata.java
@@ -204,8 +204,8 @@ public class TestRaptorMetadata
// verify sort columns
List<TableColumn> sortColumns = metadataDao.listSortColumns(tableId);
assertTableColumnsEqual(sortColumns, ImmutableList.of(
- new TableColumn(DEFAULT_TEST_ORDERS, "orderdate", DATE, 4),
- new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2)));
+ new TableColumn(DEFAULT_TEST_ORDERS, "orderdate", DATE, 4, OptionalInt.empty(), OptionalInt.of(0), true),
+ new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2, OptionalInt.empty(), OptionalInt.of(1), false)));
// verify temporal column
assertEquals(metadataDao.getTemporalColumnId(tableId), Long.valueOf(4));
@@ -231,8 +231,8 @@ public class TestRaptorMetadata
MetadataDao metadataDao = dbi.onDemand(MetadataDao.class);
assertTableColumnsEqual(metadataDao.listBucketColumns(tableId), ImmutableList.of(
- new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2),
- new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1)));
+ new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2, OptionalInt.of(0), OptionalInt.empty(), false),
+ new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1, OptionalInt.of(1), OptionalInt.empty(), false)));
assertEquals(raptorTableHandle.getBucketCount(), OptionalInt.of(16));
@@ -274,8 +274,8 @@ public class TestRaptorMetadata
MetadataDao metadataDao = dbi.onDemand(MetadataDao.class);
assertTableColumnsEqual(metadataDao.listBucketColumns(tableId), ImmutableList.of(
- new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1),
- new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2)));
+ new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1, OptionalInt.of(0), OptionalInt.empty(), false),
+ new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2, OptionalInt.of(1), OptionalInt.empty(), false)));
assertEquals(raptorTableHandle.getBucketCount(), OptionalInt.of(32));
@@ -306,7 +306,7 @@ public class TestRaptorMetadata
assertEquals(raptorTableHandle.getTableId(), 1);
assertTableColumnsEqual(metadataDao.listBucketColumns(tableId), ImmutableList.of(
- new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1)));
+ new TableColumn(DEFAULT_TEST_ORDERS, "orderkey", BIGINT, 1, OptionalInt.of(0), OptionalInt.empty(), false)));
assertEquals(raptorTableHandle.getBucketCount(), OptionalInt.of(16));
@@ -329,7 +329,7 @@ public class TestRaptorMetadata
assertEquals(tableId, 2);
assertTableColumnsEqual(metadataDao.listBucketColumns(tableId), ImmutableList.of(
- new TableColumn(DEFAULT_TEST_LINEITEMS, "orderkey", BIGINT, 1)));
+ new TableColumn(DEFAULT_TEST_LINEITEMS, "orderkey", BIGINT, 1, OptionalInt.of(0), OptionalInt.empty(), false)));
assertEquals(raptorTableHandle.getBucketCount(), OptionalInt.of(16));
@@ -386,8 +386,8 @@ public class TestRaptorMetadata
// verify sort columns
List<TableColumn> sortColumns = metadataDao.listSortColumns(tableId);
assertTableColumnsEqual(sortColumns, ImmutableList.of(
- new TableColumn(DEFAULT_TEST_ORDERS, "orderdate", DATE, 4),
- new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2)));
+ new TableColumn(DEFAULT_TEST_ORDERS, "orderdate", DATE, 4, OptionalInt.empty(), OptionalInt.of(0), false),
+ new TableColumn(DEFAULT_TEST_ORDERS, "custkey", BIGINT, 2, OptionalInt.empty(), OptionalInt.of(1), false)));
// verify temporal column is not set
assertEquals(metadataDao.getTemporalColumnId(tableId), null);
@@ -723,6 +723,9 @@ public class TestRaptorMetadata
assertEquals(actual.getColumnId(), expected.getColumnId());
assertEquals(actual.getColumnName(), expected.getColumnName());
assertEquals(actual.getDataType(), expected.getDataType());
+ assertEquals(actual.getBucketOrdinal(), expected.getBucketOrdinal());
+ assertEquals(actual.getSortOrdinal(), expected.getSortOrdinal());
+ assertEquals(actual.isTemporal(), expected.isTemporal());
}
private static void assertTableColumnsEqual(List<TableColumn> actual, List<TableColumn> expected)
diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java
index 1c180a4f3f..b4e55569db 100644
--- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java
+++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java
@@ -39,10 +39,10 @@ public class TestCompactionSetCreator
{
private static final long MAX_SHARD_ROWS = 100;
private static final DataSize MAX_SHARD_SIZE = new DataSize(100, DataSize.Unit.BYTE);
- private static final Table tableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.empty(), OptionalLong.empty());
- private static final Table temporalTableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.empty(), OptionalLong.of(1));
- private static final Table bucketedTableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.of(3), OptionalLong.empty());
- private static final Table bucketedTemporalTableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.of(3), OptionalLong.of(1));
+ private static final Table tableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.empty(), OptionalLong.empty());
+ private static final Table temporalTableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.empty(), OptionalLong.of(1));
+ private static final Table bucketedTableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.of(3), OptionalLong.empty());
+ private static final Table bucketedTemporalTableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.of(3), OptionalLong.of(1));
private final CompactionSetCreator compactionSetCreator = new CompactionSetCreator(MAX_SHARD_SIZE, MAX_SHARD_ROWS);
diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizationManager.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizationManager.java
index 36dfdb031b..c3be167003 100644
--- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizationManager.java
+++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizationManager.java
@@ -56,8 +56,8 @@ public class TestShardOrganizationManager
private MetadataDao metadataDao;
private ShardOrganizerDao organizerDao;
- private static final Table tableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.empty(), OptionalLong.empty());
- private static final Table temporalTableInfo = new Table(1L, OptionalLong.empty(), OptionalInt.empty(), OptionalLong.of(1));
+ private static final Table tableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.empty(), OptionalLong.empty());
+ private static final Table temporalTableInfo = new Table(1L, OptionalLong.empty(), Optional.empty(), OptionalInt.empty(), OptionalLong.of(1));
private static final List<Type> types = ImmutableList.of(BIGINT, VARCHAR, DATE, TIMESTAMP);
| ['presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorMetadata.java', 'presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/Table.java', 'presto-raptor/src/main/java/com/facebook/presto/raptor/RaptorTableHandle.java', 'presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/TableColumn.java', 'presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestRaptorMetadata.java', 'presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestShardOrganizationManager.java', 'presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/MetadataDao.java', 'presto-raptor/src/test/java/com/facebook/presto/raptor/TestRaptorIntegrationSmokeTest.java', 'presto-raptor/src/test/java/com/facebook/presto/raptor/storage/organization/TestCompactionSetCreator.java'] | 9 | 9 | 0 | 0 | 9 | {'.java': 9} | "2016-08-22T22:39:27" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
209 | prestodb/presto/5334/5332 | prestodb | presto | https://github.com/prestodb/presto/issues/5332 | https://github.com/prestodb/presto/pull/5334 | https://github.com/prestodb/presto/pull/5334 | 1 | Cannot chain `AT TIME ZONE` | fix | Chaining `AT TIME ZONE` together results in the error `null`:
```
presto> SELECT TIMESTAMP '2012-10-31 01:00' AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC';
Query 20160520_185347_00028_kmihc failed: null
presto>
```
Can work around this with e.g.:
```
presto> WITH tz_la AS (SELECT TIMESTAMP '2012-10-31 01:00' AT TIME ZONE 'America/Los_Angeles' AS ts)
-> SELECT tz_la.ts, tz_la.ts AT TIME ZONE 'UTC' from tz_la;
ts | _col1
---------------------------------------------+-----------------------------
2012-10-31 01:00:00.000 America/Los_Angeles | 2012-10-31 08:00:00.000 UTC
(1 row)
Query 20160520_185900_00029_kmihc, FINISHED, 1 node
Splits: 1 total, 0 done (0.00%)
0:00 [0 rows, 0B] [0 rows/s, 0B/s]
presto>
```
This is on Presto 0.146. I believe this worked before but I could be mistaken and I haven't had time to bisect. I'll follow up if I find more info there.
| b3f323cbce5419826e1bd7fb4b553e9812bedce1 | 3a235edb8202374bad34bfa0d914e019aa5d0643 | https://github.com/prestodb/presto/compare/b3f323cbce5419826e1bd7fb4b553e9812bedce1...3a235edb8202374bad34bfa0d914e019aa5d0643 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/DesugaringRewriter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/DesugaringRewriter.java
index 593924b40a..ae1236a4a0 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/DesugaringRewriter.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/DesugaringRewriter.java
@@ -45,7 +45,7 @@ public class DesugaringRewriter
public Expression rewriteAtTimeZone(AtTimeZone node, Void context, ExpressionTreeRewriter<Void> treeRewriter)
{
Expression value = treeRewriter.rewrite(node.getValue(), context);
- Type type = expressionTypes.get(value);
+ Type type = expressionTypes.get(node.getValue());
if (type.equals(TIME)) {
value = new Cast(value, TIME_WITH_TIME_ZONE.getDisplayName());
}
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 046ae76db1..95174a774e 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -4401,6 +4401,13 @@ public abstract class AbstractTestQueries
"values TIMESTAMP '1969-12-31 16:01:00-08:00', TIMESTAMP '1970-01-01 00:01:00-08:00', TIMESTAMP '1969-12-31 08:01:00-08:00'");
assertQuery("SELECT min(x) AT TIME ZONE 'America/Los_Angeles' FROM (values TIMESTAMP '1970-01-01 00:01:00+00:00', TIMESTAMP '1970-01-01 08:01:00+08:00', TIMESTAMP '1969-12-31 16:01:00-08:00') t(x)",
"values TIMESTAMP '1969-12-31 16:01:00-08:00'");
+
+ // with chained AT TIME ZONE
+ assertQuery("SELECT TIMESTAMP '2012-10-31 01:00' AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC'", "SELECT TIMESTAMP '2012-10-30 18:00:00.000 America/Los_Angeles'");
+ assertQuery("SELECT TIMESTAMP '2012-10-31 01:00' AT TIME ZONE 'Asia/Tokyo' AT TIME ZONE 'America/Los_Angeles'", "SELECT TIMESTAMP '2012-10-30 18:00:00.000 America/Los_Angeles'");
+ assertQuery("SELECT TIMESTAMP '2012-10-31 01:00' AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'Asia/Shanghai'", "SELECT TIMESTAMP '2012-10-30 18:00:00.000 America/Los_Angeles'");
+ assertQuery("SELECT min(x) AT TIME ZONE 'America/Los_Angeles' AT TIME ZONE 'UTC' FROM (values TIMESTAMP '1970-01-01 00:01:00+00:00', TIMESTAMP '1970-01-01 08:01:00+08:00', TIMESTAMP '1969-12-31 16:01:00-08:00') t(x)",
+ "values TIMESTAMP '1969-12-31 16:01:00-08:00'");
}
@Test | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/DesugaringRewriter.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-05-20T21:38:12" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
202 | prestodb/presto/6064/6059 | prestodb | presto | https://github.com/prestodb/presto/issues/6059 | https://github.com/prestodb/presto/pull/6064 | https://github.com/prestodb/presto/pull/6064 | 1 | Incorrect results when cross joining against aggregation over partitioned table | fixes | This query:
``` sql
SELECT * FROM (VALUES 1, 2, 3) t CROSS JOIN (SELECT count(*) FROM table WHERE pk = 'non-existent') u
```
(`pk` is a partition key for `table`)
produces an incorrect plan:
```
- Output[_col0, _col1] => [field:bigint, count:bigint]
_col0 := field
_col1 := count
- InnerJoin[] => [field:bigint, count:bigint]
- Filter[false] => [field:bigint]
- Values => [field:bigint]
(1)
(2)
(3)
- Aggregate(FINAL) => [count:bigint]
count := "count"("count_235")
- Exchange[GATHER] => count_235:bigint
- Aggregate(PARTIAL) => [count_235:bigint]
count_235 := "count"(*)
- TableScan[...] => []
:: NONE
```
It seems to be pushing the "false" predicate (due to no matching partitions) up through the aggregation and pushing it down on the left side.
| b9bfdf045d2b5a6c1df0b25639e09987a66edeaf | dbb55b8e893f636c0ce7a2c422c2914c9ae68df1 | https://github.com/prestodb/presto/compare/b9bfdf045d2b5a6c1df0b25639e09987a66edeaf...dbb55b8e893f636c0ce7a2c422c2914c9ae68df1 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
index ac5ebf2d10..9f6ba10ef6 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
@@ -100,6 +100,15 @@ public class EffectivePredicateExtractor
@Override
public Expression visitAggregation(AggregationNode node, Void context)
{
+ // GROUP BY () always produces a group, regardless of whether there's any
+ // input (unlike the case where there are group by keys, which produce
+ // no output if there's no input).
+ // Therefore, we can't say anything about the effective predicate of the
+ // output of such an aggregation.
+ if (node.getGroupBy().isEmpty()) {
+ return TRUE_LITERAL;
+ }
+
Expression underlyingPredicate = node.getSource().accept(this, context);
return pullExpressionThroughSymbols(underlyingPredicate, node.getGroupBy());
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
index b0eb0b7cf8..5b2b25836c 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
@@ -72,6 +72,7 @@ import static com.facebook.presto.sql.ExpressionUtils.and;
import static com.facebook.presto.sql.ExpressionUtils.combineConjuncts;
import static com.facebook.presto.sql.ExpressionUtils.or;
import static com.facebook.presto.sql.tree.BooleanLiteral.FALSE_LITERAL;
+import static com.facebook.presto.sql.tree.BooleanLiteral.TRUE_LITERAL;
import static org.testng.Assert.assertEquals;
@Test(singleThreaded = true)
@@ -167,6 +168,28 @@ public class TestEffectivePredicateExtractor
equals(BE, CE)));
}
+ @Test
+ public void testGroupByEmpty()
+ throws Exception
+ {
+ PlanNode node = new AggregationNode(
+ newId(),
+ filter(baseTableScan, FALSE_LITERAL),
+ ImmutableList.of(),
+ ImmutableMap.of(),
+ ImmutableMap.of(),
+ ImmutableMap.of(),
+ ImmutableList.of(),
+ AggregationNode.Step.FINAL,
+ Optional.empty(),
+ 1.0,
+ Optional.empty());
+
+ Expression effectivePredicate = EffectivePredicateExtractor.extract(node, TYPES);
+
+ assertEquals(effectivePredicate, TRUE_LITERAL);
+ }
+
@Test
public void testFilter()
throws Exception | ['presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-09-07T19:40:43" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
201 | prestodb/presto/6126/6066 | prestodb | presto | https://github.com/prestodb/presto/issues/6066 | https://github.com/prestodb/presto/pull/6126 | https://github.com/prestodb/presto/pull/6126 | 1 | Incorrect results for GROUPING SETS with multiple () groups | fixes | This query:
``` sql
SELECT count(*)
FROM (VALUES 1, 2, 3) t(x)
WHERE false
GROUP BY GROUPING SETS ((), ())
```
incorrectly produces no rows. It should produce two rows with "0" in each cell.
| 17909908e00ed234f825171deae96798b3812cd6 | 555c3e9beec28f13c3ba7467a6198ca26815a0ed | https://github.com/prestodb/presto/compare/17909908e00ed234f825171deae96798b3812cd6...555c3e9beec28f13c3ba7467a6198ca26815a0ed | diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java
index 87349f07bd..e4573cfdff 100644
--- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java
+++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java
@@ -111,6 +111,7 @@ public class HandTpchQuery1
new PlanNodeId("test"),
ImmutableList.of(tpchQuery1Operator.getTypes().get(0), tpchQuery1Operator.getTypes().get(1)),
Ints.asList(0, 1),
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(
doubleSum.bind(ImmutableList.of(2), Optional.empty(), Optional.empty(), 1.0),
@@ -122,6 +123,7 @@ public class HandTpchQuery1
countFunction.bind(ImmutableList.of(2), Optional.empty(), Optional.empty(), 1.0)
),
Optional.empty(),
+ Optional.empty(),
10_000,
new DataSize(16, MEGABYTE));
diff --git a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java
index 31fa1d66ec..6353aa6aed 100644
--- a/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java
+++ b/presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java
@@ -55,9 +55,11 @@ public class HashAggregationBenchmark
new PlanNodeId("test"),
types,
Ints.asList(0),
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(doubleSum.bind(ImmutableList.of(1), Optional.empty(), Optional.empty(), 1.0)),
Optional.empty(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
return ImmutableList.of(tableScanOperator, aggregationOperator);
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java
index 0c32ddfa98..a94ccd9729 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java
@@ -13,6 +13,7 @@
*/
package com.facebook.presto.operator;
+import com.facebook.presto.operator.aggregation.Accumulator;
import com.facebook.presto.operator.aggregation.AccumulatorFactory;
import com.facebook.presto.operator.aggregation.GroupedAccumulator;
import com.facebook.presto.spi.Page;
@@ -21,6 +22,7 @@ import com.facebook.presto.spi.block.BlockBuilder;
import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.planner.plan.AggregationNode.Step;
import com.facebook.presto.sql.planner.plan.PlanNodeId;
+import com.facebook.presto.type.TypeUtils;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Ints;
@@ -31,6 +33,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
+import java.util.stream.Collectors;
import static com.facebook.presto.operator.GroupByHash.createGroupByHash;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
@@ -48,9 +51,11 @@ public class HashAggregationOperator
private final PlanNodeId planNodeId;
private final List<Type> groupByTypes;
private final List<Integer> groupByChannels;
+ private final List<Integer> globalAggregationGroupIds;
private final Step step;
private final List<AccumulatorFactory> accumulatorFactories;
private final Optional<Integer> hashChannel;
+ private final Optional<Integer> groupIdChannel;
private final int expectedGroups;
private final List<Type> types;
@@ -62,17 +67,21 @@ public class HashAggregationOperator
PlanNodeId planNodeId,
List<? extends Type> groupByTypes,
List<Integer> groupByChannels,
+ List<Integer> globalAggregationGroupIds,
Step step,
List<AccumulatorFactory> accumulatorFactories,
Optional<Integer> hashChannel,
+ Optional<Integer> groupIdChannel,
int expectedGroups,
DataSize maxPartialMemory)
{
this.operatorId = operatorId;
this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
this.hashChannel = requireNonNull(hashChannel, "hashChannel is null");
+ this.groupIdChannel = requireNonNull(groupIdChannel, "groupIdChannel is null");
this.groupByTypes = ImmutableList.copyOf(groupByTypes);
this.groupByChannels = ImmutableList.copyOf(groupByChannels);
+ this.globalAggregationGroupIds = ImmutableList.copyOf(globalAggregationGroupIds);
this.step = step;
this.accumulatorFactories = ImmutableList.copyOf(accumulatorFactories);
this.expectedGroups = expectedGroups;
@@ -103,9 +112,11 @@ public class HashAggregationOperator
operatorContext,
groupByTypes,
groupByChannels,
+ globalAggregationGroupIds,
step,
accumulatorFactories,
hashChannel,
+ groupIdChannel,
expectedGroups);
return hashAggregationOperator;
}
@@ -124,9 +135,11 @@ public class HashAggregationOperator
planNodeId,
groupByTypes,
groupByChannels,
+ globalAggregationGroupIds,
step,
accumulatorFactories,
hashChannel,
+ groupIdChannel,
expectedGroups,
new DataSize(maxPartialMemory, Unit.BYTE));
}
@@ -135,24 +148,30 @@ public class HashAggregationOperator
private final OperatorContext operatorContext;
private final List<Type> groupByTypes;
private final List<Integer> groupByChannels;
+ private final List<Integer> globalAggregationGroupIds;
private final Step step;
private final List<AccumulatorFactory> accumulatorFactories;
private final Optional<Integer> hashChannel;
+ private final Optional<Integer> groupIdChannel;
private final int expectedGroups;
private final List<Type> types;
private GroupByHashAggregationBuilder aggregationBuilder;
private Iterator<Page> outputIterator;
+ private boolean inputProcessed;
private boolean finishing;
+ private boolean finished;
public HashAggregationOperator(
OperatorContext operatorContext,
List<Type> groupByTypes,
List<Integer> groupByChannels,
+ List<Integer> globalAggregationGroupIds,
Step step,
List<AccumulatorFactory> accumulatorFactories,
Optional<Integer> hashChannel,
+ Optional<Integer> groupIdChannel,
int expectedGroups)
{
this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
@@ -162,8 +181,10 @@ public class HashAggregationOperator
this.groupByTypes = ImmutableList.copyOf(groupByTypes);
this.groupByChannels = ImmutableList.copyOf(groupByChannels);
+ this.globalAggregationGroupIds = ImmutableList.copyOf(globalAggregationGroupIds);
this.accumulatorFactories = ImmutableList.copyOf(accumulatorFactories);
this.hashChannel = requireNonNull(hashChannel, "hashChannel is null");
+ this.groupIdChannel = requireNonNull(groupIdChannel, "groupIdChannel is null");
this.step = step;
this.expectedGroups = expectedGroups;
this.types = toTypes(groupByTypes, step, accumulatorFactories, hashChannel);
@@ -190,7 +211,7 @@ public class HashAggregationOperator
@Override
public boolean isFinished()
{
- return finishing && aggregationBuilder == null && (outputIterator == null || !outputIterator.hasNext());
+ return finished;
}
@Override
@@ -204,6 +225,8 @@ public class HashAggregationOperator
{
checkState(!finishing, "Operator is already finishing");
requireNonNull(page, "page is null");
+ inputProcessed = true;
+
if (aggregationBuilder == null) {
aggregationBuilder = new GroupByHashAggregationBuilder(
accumulatorFactories,
@@ -225,17 +248,29 @@ public class HashAggregationOperator
@Override
public Page getOutput()
{
+ if (finished) {
+ return null;
+ }
+
if (outputIterator == null || !outputIterator.hasNext()) {
// current output iterator is done
outputIterator = null;
- // no data
- if (aggregationBuilder == null) {
- return null;
+ if (finishing) {
+ if (!inputProcessed && !step.isOutputPartial()) {
+ // global aggregations always generate an output row with the default aggregation output (e.g. 0 for COUNT, NULL for SUM)
+ finished = true;
+ return getGlobalAggregationOutput();
+ }
+
+ if (aggregationBuilder == null) {
+ finished = true;
+ return null;
+ }
}
// only flush if we are finishing or the aggregation builder is full
- if (!finishing && !aggregationBuilder.isFull()) {
+ if (!finishing && (aggregationBuilder == null || !aggregationBuilder.isFull())) {
return null;
}
@@ -252,6 +287,39 @@ public class HashAggregationOperator
return outputIterator.next();
}
+ private Page getGlobalAggregationOutput()
+ {
+ List<Accumulator> accumulators = accumulatorFactories.stream()
+ .map(AccumulatorFactory::createAccumulator)
+ .collect(Collectors.toList());
+
+ PageBuilder output = new PageBuilder(types);
+
+ for (int groupId : globalAggregationGroupIds) {
+ output.declarePosition();
+ int channel = 0;
+
+ for (; channel < groupByTypes.size(); channel++) {
+ if (channel == groupIdChannel.get()) {
+ output.getBlockBuilder(channel).writeLong(groupId);
+ }
+ else {
+ output.getBlockBuilder(channel).appendNull();
+ }
+ }
+
+ if (hashChannel.isPresent()) {
+ output.getBlockBuilder(channel++).writeLong(TypeUtils.NULL_HASH_CODE);
+ }
+
+ for (int j = 0; j < accumulators.size(); channel++, j++) {
+ accumulators.get(j).evaluateFinal(output.getBlockBuilder(channel));
+ }
+ }
+
+ return output.build();
+ }
+
private static List<Type> toTypes(List<? extends Type> groupByType, Step step, List<AccumulatorFactory> factories, Optional<Integer> hashChannel)
{
ImmutableList.Builder<Type> types = ImmutableList.builder();
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
index 9f6ba10ef6..e826035198 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
@@ -105,13 +105,13 @@ public class EffectivePredicateExtractor
// no output if there's no input).
// Therefore, we can't say anything about the effective predicate of the
// output of such an aggregation.
- if (node.getGroupBy().isEmpty()) {
+ if (node.getGroupingKeys().isEmpty()) {
return TRUE_LITERAL;
}
Expression underlyingPredicate = node.getSource().accept(this, context);
- return pullExpressionThroughSymbols(underlyingPredicate, node.getGroupBy());
+ return pullExpressionThroughSymbols(underlyingPredicate, node.getGroupingKeys());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
index 1f900d1050..3aad916f26 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -871,7 +871,7 @@ public class LocalExecutionPlanner
{
PhysicalOperation source = node.getSource().accept(this, context);
- if (node.getGroupBy().isEmpty()) {
+ if (node.getGroupingKeys().isEmpty()) {
return planGlobalAggregation(context.getNextOperatorId(), node, source);
}
@@ -1863,7 +1863,7 @@ public class LocalExecutionPlanner
private PhysicalOperation planGroupByAggregation(AggregationNode node, PhysicalOperation source, int operatorId)
{
- List<Symbol> groupBySymbols = node.getGroupBy();
+ List<Symbol> groupBySymbols = node.getGroupingKeys();
List<Symbol> aggregationOutputSymbols = new ArrayList<>();
List<AccumulatorFactory> accumulatorFactories = new ArrayList<>();
@@ -1880,6 +1880,13 @@ public class LocalExecutionPlanner
aggregationOutputSymbols.add(symbol);
}
+ ImmutableList.Builder<Integer> globalAggregationGroupIds = ImmutableList.builder();
+ for (int i = 0; i < node.getGroupingSets().size(); i++) {
+ if (node.getGroupingSets().get(i).isEmpty()) {
+ globalAggregationGroupIds.add(i);
+ }
+ }
+
ImmutableMap.Builder<Symbol, Integer> outputMappings = ImmutableMap.builder();
// add group-by key fields each in a separate channel
int channel = 0;
@@ -1906,18 +1913,21 @@ public class LocalExecutionPlanner
Optional<Integer> hashChannel = node.getHashSymbol().map(channelGetter(source));
+ Map<Symbol, Integer> mappings = outputMappings.build();
OperatorFactory operatorFactory = new HashAggregationOperatorFactory(
operatorId,
node.getId(),
groupByTypes,
groupByChannels,
+ globalAggregationGroupIds.build(),
node.getStep(),
accumulatorFactories,
hashChannel,
+ node.getGroupIdSymbol().map(mappings::get),
10_000,
maxPartialAggregationMemorySize);
- return new PhysicalOperation(operatorFactory, outputMappings.build(), source);
+ return new PhysicalOperation(operatorFactory, mappings, source);
}
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
index 4a1f425402..21cef55be4 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
@@ -493,8 +493,8 @@ public class PlanPrinter
type = format("(%s)", node.getStep().toString());
}
String key = "";
- if (!node.getGroupBy().isEmpty()) {
- key = node.getGroupBy().toString();
+ if (!node.getGroupingKeys().isEmpty()) {
+ key = node.getGroupingKeys().toString();
}
String sampleWeight = "";
if (node.getSampleWeight().isPresent()) {
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
index 871bdf268b..75598ffe34 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
@@ -67,6 +67,7 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static com.facebook.presto.spi.type.BooleanType.BOOLEAN;
@@ -398,7 +399,6 @@ class QueryPlanner
// 2.a. Rewrite group by expressions in terms of pre-projected inputs
TranslationMap translations = new TranslationMap(subPlan.getRelationPlan(), analysis);
ImmutableList.Builder<List<Symbol>> groupingSetsSymbolsBuilder = ImmutableList.builder();
- ImmutableSet.Builder<Symbol> distinctGroupingSymbolsBuilder = ImmutableSet.builder();
for (List<Expression> groupingSet : groupingSets) {
ImmutableList.Builder<Symbol> groupingColumns = ImmutableList.builder();
for (Expression expression : groupingSet) {
@@ -406,13 +406,13 @@ class QueryPlanner
translations.addIntermediateMapping(expression, rewritten);
Symbol symbol = subPlan.translate(rewritten);
groupingColumns.add(symbol);
- distinctGroupingSymbolsBuilder.add(symbol);
translations.put(rewritten, symbol);
}
groupingSetsSymbolsBuilder.add(groupingColumns.build());
}
// 2.b. Add a groupIdNode and groupIdSymbol if there are multiple grouping sets
+ Optional<Symbol> groupIdSymbol = Optional.empty();
List<List<Symbol>> groupingSetsSymbols = groupingSetsSymbolsBuilder.build();
if (groupingSets.size() > 1) {
ImmutableMap.Builder<Symbol, Symbol> identityMapping = ImmutableMap.builder();
@@ -424,10 +424,9 @@ class QueryPlanner
subPlan.getTranslations().put(argument, output);
}
- Symbol groupIdSymbol = symbolAllocator.newSymbol("groupId", BIGINT);
- GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), groupingSetsSymbols, identityMapping.build(), groupIdSymbol);
+ groupIdSymbol = Optional.of(symbolAllocator.newSymbol("groupId", BIGINT));
+ GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), groupingSetsSymbols, identityMapping.build(), groupIdSymbol.get());
subPlan = subPlan.withNewRoot(groupId);
- distinctGroupingSymbolsBuilder.add(groupIdSymbol);
}
// 2.c. Rewrite aggregates in terms of pre-projected inputs
@@ -474,10 +473,14 @@ class QueryPlanner
masks.put(aggregateSymbol, marker);
}
- List<Symbol> distinctGroupingSymbols = distinctGroupingSymbolsBuilder.build().asList();
for (Map.Entry<Set<Expression>, Symbol> entry : argumentMarkers.entrySet()) {
ImmutableList.Builder<Symbol> builder = ImmutableList.builder();
- builder.addAll(distinctGroupingSymbols);
+ builder.addAll(groupingSetsSymbols.stream()
+ .flatMap(Collection::stream)
+ .distinct()
+ .collect(Collectors.toList()));
+ groupIdSymbol.ifPresent(builder::add);
+
for (Expression expression : entry.getKey()) {
builder.add(subPlan.translate(expression));
}
@@ -495,7 +498,6 @@ class QueryPlanner
AggregationNode aggregationNode = new AggregationNode(
idAllocator.getNextId(),
subPlan.getRoot(),
- distinctGroupingSymbols,
aggregationAssignments.build(),
functions.build(),
masks,
@@ -503,7 +505,8 @@ class QueryPlanner
AggregationNode.Step.SINGLE,
subPlan.getSampleWeight(),
confidence,
- Optional.empty());
+ Optional.empty(),
+ groupIdSymbol);
subPlan = new PlanBuilder(translations, aggregationNode, Optional.empty(), analysis.getParameters());
@@ -653,7 +656,6 @@ class QueryPlanner
new AggregationNode(
idAllocator.getNextId(),
subPlan.getRoot(),
- subPlan.getRoot().getOutputSymbols(),
ImmutableMap.of(),
ImmutableMap.of(),
ImmutableMap.of(),
@@ -661,6 +663,7 @@ class QueryPlanner
AggregationNode.Step.SINGLE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty()));
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
index ca23c1c6df..003a35fb74 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
@@ -685,7 +685,6 @@ class RelationPlanner
{
return new AggregationNode(idAllocator.getNextId(),
node,
- node.getOutputSymbols(),
ImmutableMap.<Symbol, FunctionCall>of(),
ImmutableMap.<Symbol, Signature>of(),
ImmutableMap.<Symbol, Symbol>of(),
@@ -693,6 +692,7 @@ class RelationPlanner
AggregationNode.Step.SINGLE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/SubqueryPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/SubqueryPlanner.java
index c97c4056ed..34570db341 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/SubqueryPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/SubqueryPlanner.java
@@ -230,7 +230,6 @@ class SubqueryPlanner
subqueryPlan = new AggregationNode(
idAllocator.getNextId(),
subqueryPlan,
- ImmutableList.of(),
ImmutableMap.of(count, new FunctionCall(countFunction, ImmutableList.of())),
ImmutableMap.of(count, functionRegistry.resolveFunction(countFunction, ImmutableList.of(), false)),
ImmutableMap.of(),
@@ -238,6 +237,7 @@ class SubqueryPlanner
AggregationNode.Step.SINGLE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
Symbol exists = symbolAllocator.newSymbol("exists", BOOLEAN);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
index 40da89e4cc..5ff90b2d76 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
@@ -260,8 +260,8 @@ public class AddExchanges
}
PreferredProperties preferredProperties = PreferredProperties.any();
- if (!node.getGroupBy().isEmpty()) {
- preferredProperties = PreferredProperties.partitionedWithLocal(partitioningRequirement, grouped(node.getGroupBy()))
+ if (!node.getGroupingKeys().isEmpty()) {
+ preferredProperties = PreferredProperties.partitionedWithLocal(partitioningRequirement, grouped(node.getGroupingKeys()))
.mergeWithParent(context.getPreferredProperties());
}
@@ -272,14 +272,16 @@ public class AddExchanges
return rebaseAndDeriveProperties(node, child);
}
- if (node.getGroupBy().isEmpty()) {
+ // aggregations would benefit from the finals being hash partitioned on groupId, however, we need to gather because the final HashAggregationOperator
+ // needs to know whether input was received at the query level.
+ if (node.getGroupingSets().stream().anyMatch(List::isEmpty)) {
child = withDerivedProperties(
gatheringExchange(idAllocator.getNextId(), REMOTE, child.getNode()),
child.getProperties());
}
else if (!child.getProperties().isStreamPartitionedOn(partitioningRequirement) && !child.getProperties().isNodePartitionedOn(partitioningRequirement)) {
child = withDerivedProperties(
- partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), node.getGroupBy(), node.getHashSymbol()),
+ partitionedExchange(idAllocator.getNextId(), REMOTE, child.getNode(), node.getGroupingKeys(), node.getHashSymbol()),
child.getProperties());
}
return rebaseAndDeriveProperties(node, child);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java
index 4e75840412..8009290f0b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java
@@ -238,7 +238,13 @@ public class AddLocalExchanges
StreamPreferredProperties preferredChildProperties;
checkState(node.getStep() == AggregationNode.Step.SINGLE, "step of aggregation is expected to be SINGLE, but it is %s", node.getStep());
- // aggregation requires that all data be partitioned
+
+ // aggregations would benefit from the finals being hash partitioned on groupId, however, we need to gather because the final HashAggregationOperator
+ // needs to know whether input was received at the query level.
+ if (node.getGroupingSets().stream().anyMatch(List::isEmpty)) {
+ return planAndEnforceChildren(node, singleStream(), defaultParallelism(session));
+ }
+
HashSet<Symbol> partitioningRequirement = new HashSet<>(node.getGroupingSets().get(0));
for (int i = 1; i < node.getGroupingSets().size(); i++) {
partitioningRequirement.retainAll(node.getGroupingSets().get(i));
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/CountConstantOptimizer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/CountConstantOptimizer.java
index a72c0010ea..57dc9ac209 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/CountConstantOptimizer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/CountConstantOptimizer.java
@@ -80,7 +80,6 @@ public class CountConstantOptimizer
return new AggregationNode(
node.getId(),
source,
- node.getGroupBy(),
aggregations,
functions,
node.getMasks(),
@@ -88,7 +87,8 @@ public class CountConstantOptimizer
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
public static boolean isCountConstant(ProjectNode projectNode, FunctionCall functionCall, Signature signature)
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/HashGenerationOptimizer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/HashGenerationOptimizer.java
index 028ad61e2a..459d786400 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/HashGenerationOptimizer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/HashGenerationOptimizer.java
@@ -140,8 +140,8 @@ public class HashGenerationOptimizer
public PlanWithProperties visitAggregation(AggregationNode node, HashComputationSet parentPreference)
{
Optional<HashComputation> groupByHash = Optional.empty();
- if (!canSkipHashGeneration(node.getGroupBy())) {
- groupByHash = computeHash(node.getGroupBy());
+ if (!canSkipHashGeneration(node.getGroupingKeys())) {
+ groupByHash = computeHash(node.getGroupingKeys());
}
// aggregation does not pass through preferred hash symbols
@@ -154,7 +154,6 @@ public class HashGenerationOptimizer
new AggregationNode(
idAllocator.getNextId(),
child.getNode(),
- node.getGroupBy(),
node.getAggregations(),
node.getFunctions(),
node.getMasks(),
@@ -162,7 +161,8 @@ public class HashGenerationOptimizer
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- hashSymbol),
+ hashSymbol,
+ node.getGroupIdSymbol()),
hashSymbol.isPresent() ? ImmutableMap.of(groupByHash.get(), hashSymbol.get()) : ImmutableMap.of());
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/ImplementIntersectAndExceptAsUnion.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/ImplementIntersectAndExceptAsUnion.java
index 8e85382783..27781e5162 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/ImplementIntersectAndExceptAsUnion.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/ImplementIntersectAndExceptAsUnion.java
@@ -238,7 +238,6 @@ public class ImplementIntersectAndExceptAsUnion
return new AggregationNode(idAllocator.getNextId(),
sourceNode,
- originalColumns,
aggregations.build(),
signatures.build(),
ImmutableMap.of(),
@@ -246,6 +245,7 @@ public class ImplementIntersectAndExceptAsUnion
Step.SINGLE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/IndexJoinOptimizer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/IndexJoinOptimizer.java
index 4e2ba6bbad..cfc1d7fc55 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/IndexJoinOptimizer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/IndexJoinOptimizer.java
@@ -388,7 +388,7 @@ public class IndexJoinOptimizer
{
// Lookup symbols can only be passed through if they are part of the group by columns
Set<Symbol> groupByLookupSymbols = context.get().getLookupSymbols().stream()
- .filter(node.getGroupBy()::contains)
+ .filter(node.getGroupingKeys()::contains)
.collect(toImmutableSet());
if (groupByLookupSymbols.isEmpty()) {
@@ -505,7 +505,7 @@ public class IndexJoinOptimizer
public Map<Symbol, Symbol> visitAggregation(AggregationNode node, Set<Symbol> lookupSymbols)
{
Set<Symbol> groupByLookupSymbols = lookupSymbols.stream()
- .filter(node.getGroupBy()::contains)
+ .filter(node.getGroupingKeys()::contains)
.collect(toImmutableSet());
checkState(!groupByLookupSymbols.isEmpty(), "No lookup symbols were able to pass through the aggregation group by");
return node.getSource().accept(this, groupByLookupSymbols);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/LimitPushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/LimitPushDown.java
index 000f6c9a37..9d04a87b3f 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/LimitPushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/LimitPushDown.java
@@ -136,8 +136,8 @@ public class LimitPushDown
if (limit != null &&
node.getAggregations().isEmpty() &&
- node.getOutputSymbols().size() == node.getGroupBy().size() &&
- node.getOutputSymbols().containsAll(node.getGroupBy())) {
+ node.getOutputSymbols().size() == node.getGroupingKeys().size() &&
+ node.getOutputSymbols().containsAll(node.getGroupingKeys())) {
checkArgument(!node.getSampleWeight().isPresent(), "DISTINCT aggregation has sample weight symbol");
PlanNode rewrittenSource = context.rewrite(node.getSource());
return new DistinctLimitNode(idAllocator.getNextId(), rewrittenSource, limit.getCount(), false, Optional.empty());
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
index d48619a5c4..286e72d313 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
@@ -36,11 +36,9 @@ import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.FINAL;
import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.PARTIAL;
@@ -115,7 +113,6 @@ public class PartialAggregationPushDown
AggregationNode partial = new AggregationNode(
idAllocator.getNextId(),
node.getSource(),
- node.getGroupBy(),
intermediateCalls,
intermediateFunctions,
intermediateMask,
@@ -123,12 +120,12 @@ public class PartialAggregationPushDown
PARTIAL,
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
return new AggregationNode(
node.getId(),
context.rewrite(node.getSource(), partial),
- node.getGroupBy(),
finalCalls,
node.getFunctions(),
ImmutableMap.of(),
@@ -136,7 +133,8 @@ public class PartialAggregationPushDown
FINAL,
Optional.empty(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
@Override
@@ -222,6 +220,8 @@ public class PartialAggregationPushDown
// generate new partial aggregation for each exchange branch with renamed symbols
private AggregationWithLayout generateNewPartial(AggregationNode node, PlanNode source, Map<Symbol, Symbol> exchangeMap)
{
+ checkState(!node.getHashSymbol().isPresent(), "PartialAggregationPushDown optimizer must run before HashGenerationOptimizer");
+
// Store the symbol mapping from old aggregation output to new aggregation output
Map<Symbol, Symbol> layoutMap = new HashMap<>();
@@ -243,27 +243,19 @@ public class PartialAggregationPushDown
layoutMap.put(entry.getKey(), symbol);
}
- // translate group by keys, also remove the duplicate
- ImmutableList.Builder<Symbol> groupBy = ImmutableList.builder();
- Set<Symbol> groupBySet = new HashSet<>();
- for (Symbol groupBySymbol : node.getGroupBy()) {
+ // put group by keys in map
+ for (Symbol groupBySymbol : node.getGroupingKeys()) {
Symbol newGroupBySymbol = exchangeMap.get(groupBySymbol);
- if (groupBySet.add(newGroupBySymbol)) {
- groupBy.add(newGroupBySymbol);
- }
layoutMap.put(groupBySymbol, newGroupBySymbol);
}
- // translate grouping sets, also remove the duplicate
+ // translate grouping sets
ImmutableList.Builder<List<Symbol>> groupingSets = ImmutableList.builder();
for (List<Symbol> symbols : node.getGroupingSets()) {
- Set<Symbol> symbolSet = new HashSet<>();
ImmutableList.Builder<Symbol> symbolList = ImmutableList.builder();
for (Symbol symbol : symbols) {
Symbol translated = exchangeMap.get(symbol);
- if (symbolSet.add(translated)) {
- symbolList.add(translated);
- }
+ symbolList.add(translated);
}
groupingSets.add(symbolList.build());
}
@@ -271,7 +263,6 @@ public class PartialAggregationPushDown
AggregationNode partial = new AggregationNode(
idAllocator.getNextId(),
source,
- groupBy.build(),
functionCallMap,
signatureMap,
mask,
@@ -279,7 +270,8 @@ public class PartialAggregationPushDown
PARTIAL,
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol().map(exchangeMap::get));
// generate the output layout according to the order of pre-pushed aggregation's output
List<Symbol> layout = node.getOutputSymbols().stream()
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
index ed4bf4952d..39e0b8c8c8 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
@@ -843,7 +843,7 @@ public class PredicatePushDown
@Override
public PlanNode visitAggregation(AggregationNode node, RewriteContext<Expression> context)
{
- if (node.getGroupBy().isEmpty()) {
+ if (node.getGroupingKeys().isEmpty()) {
// cannot push predicates down through aggregations without any grouping columns
return visitPlan(node, context);
}
@@ -861,7 +861,7 @@ public class PredicatePushDown
// Sort non-equality predicates by those that can be pushed down and those that cannot
for (Expression conjunct : EqualityInference.nonInferrableConjuncts(inheritedPredicate)) {
- Expression rewrittenConjunct = equalityInference.rewriteExpression(conjunct, in(node.getGroupBy()));
+ Expression rewrittenConjunct = equalityInference.rewriteExpression(conjunct, in(node.getGroupingKeys()));
if (rewrittenConjunct != null) {
pushdownConjuncts.add(rewrittenConjunct);
}
@@ -871,7 +871,7 @@ public class PredicatePushDown
}
// Add the equality predicates back in
- EqualityInference.EqualityPartition equalityPartition = equalityInference.generateEqualitiesPartitionedBy(in(node.getGroupBy()));
+ EqualityInference.EqualityPartition equalityPartition = equalityInference.generateEqualitiesPartitionedBy(in(node.getGroupingKeys()));
pushdownConjuncts.addAll(equalityPartition.getScopeEqualities());
postAggregationConjuncts.addAll(equalityPartition.getScopeComplementEqualities());
postAggregationConjuncts.addAll(equalityPartition.getScopeStraddlingEqualities());
@@ -882,7 +882,6 @@ public class PredicatePushDown
if (rewrittenSource != node.getSource()) {
output = new AggregationNode(node.getId(),
rewrittenSource,
- node.getGroupBy(),
node.getAggregations(),
node.getFunctions(),
node.getMasks(),
@@ -890,7 +889,8 @@ public class PredicatePushDown
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
if (!postAggregationConjuncts.isEmpty()) {
output = new FilterNode(idAllocator.getNextId(), output, combineConjuncts(postAggregationConjuncts));
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
index 58a9d5265a..169e97f96f 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
@@ -241,10 +241,10 @@ class PropertyDerivations
{
ActualProperties properties = Iterables.getOnlyElement(inputProperties);
- ActualProperties translated = properties.translate(symbol -> node.getGroupBy().contains(symbol) ? Optional.of(symbol) : Optional.<Symbol>empty());
+ ActualProperties translated = properties.translate(symbol -> node.getGroupingKeys().contains(symbol) ? Optional.of(symbol) : Optional.<Symbol>empty());
return ActualProperties.builderFrom(translated)
- .local(LocalProperties.grouped(node.getGroupBy()))
+ .local(LocalProperties.grouped(node.getGroupingKeys()))
.build();
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
index 5ab467125f..a7dd77e5fa 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
@@ -280,7 +280,7 @@ public class PruneUnreferencedOutputs
public PlanNode visitAggregation(AggregationNode node, RewriteContext<Set<Symbol>> context)
{
ImmutableSet.Builder<Symbol> expectedInputs = ImmutableSet.<Symbol>builder()
- .addAll(node.getGroupBy());
+ .addAll(node.getGroupingKeys());
if (node.getHashSymbol().isPresent()) {
expectedInputs.add(node.getHashSymbol().get());
}
@@ -311,7 +311,6 @@ public class PruneUnreferencedOutputs
return new AggregationNode(node.getId(),
source,
- node.getGroupBy(),
functionCalls.build(),
functions.build(),
masks.build(),
@@ -319,7 +318,8 @@ public class PruneUnreferencedOutputs
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SetFlatteningOptimizer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SetFlatteningOptimizer.java
index f191205ba5..fb56390832 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SetFlatteningOptimizer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SetFlatteningOptimizer.java
@@ -129,7 +129,6 @@ public class SetFlatteningOptimizer
return new AggregationNode(
node.getId(),
rewrittenNode,
- node.getGroupBy(),
node.getAggregations(),
node.getFunctions(),
node.getMasks(),
@@ -137,7 +136,8 @@ public class SetFlatteningOptimizer
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
private static boolean isDistinctOperator(AggregationNode node)
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SingleDistinctOptimizer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SingleDistinctOptimizer.java
index 860840c394..fadeea5421 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SingleDistinctOptimizer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SingleDistinctOptimizer.java
@@ -87,7 +87,6 @@ public class SingleDistinctOptimizer
return new AggregationNode(idAllocator.getNextId(),
source,
- node.getGroupBy(),
aggregations,
node.getFunctions(),
Collections.emptyMap(),
@@ -95,7 +94,8 @@ public class SingleDistinctOptimizer
node.getStep(),
node.getSampleWeight(),
node.getConfidence(),
- node.getHashSymbol());
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
@Override
@@ -106,7 +106,6 @@ public class SingleDistinctOptimizer
// rewrite Distinct into GroupBy
AggregationNode aggregationNode = new AggregationNode(idAllocator.getNextId(),
context.rewrite(node.getSource(), Optional.empty()),
- node.getDistinctSymbols(),
Collections.emptyMap(),
Collections.emptyMap(),
Collections.emptyMap(),
@@ -114,7 +113,8 @@ public class SingleDistinctOptimizer
SINGLE,
Optional.empty(),
1.0,
- node.getHashSymbol());
+ node.getHashSymbol(),
+ Optional.empty());
ImmutableMap.Builder<Symbol, Expression> outputSymbols = ImmutableMap.builder();
for (Symbol symbol : aggregationNode.getOutputSymbols()) {
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
index cfc461d0fd..5e8222ccd9 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
@@ -296,7 +296,7 @@ final class StreamPropertyDerivations
StreamProperties properties = Iterables.getOnlyElement(inputProperties);
// Only grouped symbols projected symbols are passed through
- return properties.translate(symbol -> node.getGroupBy().contains(symbol) ? Optional.of(symbol) : Optional.<Symbol>empty());
+ return properties.translate(symbol -> node.getGroupingKeys().contains(symbol) ? Optional.of(symbol) : Optional.empty());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
index fc620bb510..eec1ac936d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
@@ -136,7 +136,6 @@ public class UnaliasSymbolReferences
masks.put(canonicalize(entry.getKey()), canonicalize(entry.getValue()));
}
- List<Symbol> groupByKeys = canonicalizeAndDistinct(node.getGroupBy());
List<List<Symbol>> groupingSets = node.getGroupingSets().stream()
.map(this::canonicalizeAndDistinct)
.collect(toImmutableList());
@@ -144,7 +143,6 @@ public class UnaliasSymbolReferences
return new AggregationNode(
node.getId(),
source,
- groupByKeys,
functionCalls.build(),
functionInfos.build(),
masks.build(),
@@ -152,7 +150,8 @@ public class UnaliasSymbolReferences
node.getStep(),
canonicalize(node.getSampleWeight()),
node.getConfidence(),
- canonicalize(node.getHashSymbol()));
+ canonicalize(node.getHashSymbol()),
+ canonicalize(node.getGroupIdSymbol()));
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/AggregationNode.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/AggregationNode.java
index b547f15b7c..794f0a2331 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/AggregationNode.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/AggregationNode.java
@@ -23,9 +23,12 @@ import com.google.common.collect.ImmutableMap;
import javax.annotation.concurrent.Immutable;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
@@ -35,7 +38,6 @@ public class AggregationNode
extends PlanNode
{
private final PlanNode source;
- private final List<Symbol> groupByKeys;
private final Map<Symbol, FunctionCall> aggregations;
// Map from function symbol, to the mask symbol
private final Map<Symbol, Symbol> masks;
@@ -45,6 +47,7 @@ public class AggregationNode
private final Optional<Symbol> sampleWeight;
private final double confidence;
private final Optional<Symbol> hashSymbol;
+ private final Optional<Symbol> groupIdSymbol;
public enum Step
{
@@ -76,7 +79,6 @@ public class AggregationNode
@JsonCreator
public AggregationNode(@JsonProperty("id") PlanNodeId id,
@JsonProperty("source") PlanNode source,
- @JsonProperty("groupBy") List<Symbol> groupByKeys,
@JsonProperty("aggregations") Map<Symbol, FunctionCall> aggregations,
@JsonProperty("functions") Map<Symbol, Signature> functions,
@JsonProperty("masks") Map<Symbol, Symbol> masks,
@@ -84,24 +86,27 @@ public class AggregationNode
@JsonProperty("step") Step step,
@JsonProperty("sampleWeight") Optional<Symbol> sampleWeight,
@JsonProperty("confidence") double confidence,
- @JsonProperty("hashSymbol") Optional<Symbol> hashSymbol)
+ @JsonProperty("hashSymbol") Optional<Symbol> hashSymbol,
+ @JsonProperty("groupIdSymbol") Optional<Symbol> groupIdSymbol)
{
super(id);
this.source = source;
- this.groupByKeys = ImmutableList.copyOf(requireNonNull(groupByKeys, "groupByKeys is null"));
this.aggregations = ImmutableMap.copyOf(requireNonNull(aggregations, "aggregations is null"));
this.functions = ImmutableMap.copyOf(requireNonNull(functions, "functions is null"));
this.masks = ImmutableMap.copyOf(requireNonNull(masks, "masks is null"));
for (Symbol mask : masks.keySet()) {
checkArgument(aggregations.containsKey(mask), "mask does not match any aggregations");
}
- this.groupingSets = ImmutableList.copyOf(requireNonNull(groupingSets, "groupingSets is null"));
+ requireNonNull(groupingSets, "groupingSets is null");
+ checkArgument(!groupingSets.isEmpty(), "grouping sets list cannot be empty");
+ this.groupingSets = ImmutableList.copyOf(groupingSets);
this.step = step;
this.sampleWeight = requireNonNull(sampleWeight, "sampleWeight is null");
checkArgument(confidence >= 0 && confidence <= 1, "confidence must be in [0, 1]");
this.confidence = confidence;
this.hashSymbol = hashSymbol;
+ this.groupIdSymbol = requireNonNull(groupIdSymbol);
}
@Override
@@ -114,12 +119,11 @@ public class AggregationNode
public List<Symbol> getOutputSymbols()
{
ImmutableList.Builder<Symbol> symbols = ImmutableList.builder();
- symbols.addAll(groupByKeys);
- // output hashSymbol if present
- if (hashSymbol.isPresent()) {
- symbols.add(hashSymbol.get());
- }
+
+ symbols.addAll(getGroupingKeys());
+ hashSymbol.ifPresent(symbols::add);
symbols.addAll(aggregations.keySet());
+
return symbols.build();
}
@@ -147,10 +151,15 @@ public class AggregationNode
return masks;
}
- @JsonProperty("groupBy")
- public List<Symbol> getGroupBy()
+ public List<Symbol> getGroupingKeys()
{
- return groupByKeys;
+ List<Symbol> symbols = new ArrayList<>(groupingSets.stream()
+ .flatMap(Collection::stream)
+ .distinct()
+ .collect(Collectors.toList()));
+
+ groupIdSymbol.ifPresent(symbols::add);
+ return symbols;
}
@JsonProperty("groupingSets")
@@ -183,6 +192,12 @@ public class AggregationNode
return hashSymbol;
}
+ @JsonProperty("groupIdSymbol")
+ public Optional<Symbol> getGroupIdSymbol()
+ {
+ return groupIdSymbol;
+ }
+
@Override
public <C, R> R accept(PlanVisitor<C, R> visitor, C context)
{
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
index 242d4803e0..fd17b51b92 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
@@ -154,7 +154,18 @@ public class ChildReplacer
@Override
public PlanNode visitAggregation(AggregationNode node, List<PlanNode> newChildren)
{
- return new AggregationNode(node.getId(), Iterables.getOnlyElement(newChildren), node.getGroupBy(), node.getAggregations(), node.getFunctions(), node.getMasks(), node.getGroupingSets(), node.getStep(), node.getSampleWeight(), node.getConfidence(), node.getHashSymbol());
+ return new AggregationNode(
+ node.getId(),
+ Iterables.getOnlyElement(newChildren),
+ node.getAggregations(),
+ node.getFunctions(),
+ node.getMasks(),
+ node.getGroupingSets(),
+ node.getStep(),
+ node.getSampleWeight(),
+ node.getConfidence(),
+ node.getHashSymbol(),
+ node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/sanity/ValidateDependenciesChecker.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/sanity/ValidateDependenciesChecker.java
index 3a6ab90f7b..6c1ec8e7e2 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/sanity/ValidateDependenciesChecker.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/sanity/ValidateDependenciesChecker.java
@@ -113,7 +113,7 @@ public final class ValidateDependenciesChecker
verifyUniqueId(node);
Set<Symbol> inputs = createInputs(source, boundSymbols);
- checkDependencies(inputs, node.getGroupBy(), "Invalid node. Group by symbols (%s) not in source plan output (%s)", node.getGroupBy(), node.getSource().getOutputSymbols());
+ checkDependencies(inputs, node.getGroupingKeys(), "Invalid node. Grouping key symbols (%s) not in source plan output (%s)", node.getGroupingKeys(), node.getSource().getOutputSymbols());
if (node.getSampleWeight().isPresent()) {
checkArgument(inputs.contains(node.getSampleWeight().get()), "Invalid node. Sample weight symbol (%s) is not in source plan output (%s)", node.getSampleWeight().get(), node.getSource().getOutputSymbols());
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java b/presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java
index 0e2f9f2847..e63c65329f 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java
@@ -130,6 +130,7 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(VARCHAR),
hashChannels,
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
LONG_SUM.bind(ImmutableList.of(3), Optional.empty(), Optional.empty(), 1.0),
@@ -138,6 +139,7 @@ public class TestHashAggregationOperator
countVarcharColumn.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
countBooleanColumn.bind(ImmutableList.of(4), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
@@ -159,6 +161,52 @@ public class TestHashAggregationOperator
assertOperatorEqualsIgnoreOrder(operator, input, expected, hashEnabled, Optional.of(hashChannels.size()));
}
+ @Test(dataProvider = "hashEnabledValues")
+ public void testHashAggregationWithGlobals(boolean hashEnabled)
+ throws Exception
+ {
+ MetadataManager metadata = MetadataManager.createTestMetadataManager();
+ InternalAggregationFunction countVarcharColumn = metadata.getFunctionRegistry().getAggregateFunctionImplementation(
+ new Signature("count", AGGREGATE, parseTypeSignature(StandardTypes.BIGINT), parseTypeSignature(StandardTypes.VARCHAR)));
+ InternalAggregationFunction countBooleanColumn = metadata.getFunctionRegistry().getAggregateFunctionImplementation(
+ new Signature("count", AGGREGATE, parseTypeSignature(StandardTypes.BIGINT), parseTypeSignature(StandardTypes.BOOLEAN)));
+ InternalAggregationFunction maxVarcharColumn = metadata.getFunctionRegistry().getAggregateFunctionImplementation(
+ new Signature("max", AGGREGATE, parseTypeSignature(StandardTypes.VARCHAR), parseTypeSignature(StandardTypes.VARCHAR)));
+
+ Optional<Integer> groupIdChannel = Optional.of(1);
+ List<Integer> groupByChannels = Ints.asList(1, 2);
+ List<Integer> globalAggregationGroupIds = Ints.asList(42, 49);
+ RowPagesBuilder rowPagesBuilder = rowPagesBuilder(hashEnabled, groupByChannels, VARCHAR, VARCHAR, VARCHAR, BIGINT, BIGINT, BOOLEAN);
+ List<Page> input = rowPagesBuilder.build();
+
+ HashAggregationOperatorFactory operatorFactory = new HashAggregationOperatorFactory(
+ 0,
+ new PlanNodeId("test"),
+ ImmutableList.of(VARCHAR, BIGINT),
+ groupByChannels,
+ globalAggregationGroupIds,
+ Step.SINGLE,
+ ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
+ LONG_SUM.bind(ImmutableList.of(4), Optional.empty(), Optional.empty(), 1.0),
+ LONG_AVERAGE.bind(ImmutableList.of(4), Optional.empty(), Optional.empty(), 1.0),
+ maxVarcharColumn.bind(ImmutableList.of(2), Optional.empty(), Optional.empty(), 1.0),
+ countVarcharColumn.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
+ countBooleanColumn.bind(ImmutableList.of(5), Optional.empty(), Optional.empty(), 1.0)),
+ rowPagesBuilder.getHashChannel(),
+ groupIdChannel,
+ 100_000,
+ new DataSize(16, MEGABYTE));
+
+ Operator operator = operatorFactory.createOperator(driverContext);
+
+ MaterializedResult expected = resultBuilder(driverContext.getSession(), VARCHAR, BIGINT, BIGINT, BIGINT, DOUBLE, VARCHAR, BIGINT, BIGINT)
+ .row(null, 42L, 0L, null, null, null, 0L, 0L)
+ .row(null, 49L, 0L, null, null, null, 0L, 0L)
+ .build();
+
+ assertOperatorEqualsIgnoreOrder(operator, input, expected, hashEnabled, Optional.of(groupByChannels.size()));
+ }
+
@Test(dataProvider = "hashEnabledValues", expectedExceptions = ExceededMemoryLimitException.class, expectedExceptionsMessageRegExp = "Query exceeded local memory limit of 10B")
public void testMemoryLimit(boolean hashEnabled)
{
@@ -183,12 +231,14 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(VARCHAR),
hashChannels,
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
LONG_SUM.bind(ImmutableList.of(3), Optional.empty(), Optional.empty(), 1.0),
LONG_AVERAGE.bind(ImmutableList.of(3), Optional.empty(), Optional.empty(), 1.0),
maxVarcharColumn.bind(ImmutableList.of(2), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
@@ -221,9 +271,11 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(VARCHAR),
hashChannels,
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
@@ -256,9 +308,11 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(VARCHAR),
hashChannels,
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
@@ -286,10 +340,12 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(BIGINT),
hashChannels,
+ ImmutableList.of(),
Step.SINGLE,
ImmutableList.of(COUNT.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0),
LONG_AVERAGE.bind(ImmutableList.of(1), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
@@ -316,9 +372,11 @@ public class TestHashAggregationOperator
new PlanNodeId("test"),
ImmutableList.of(BIGINT),
hashChannels,
+ ImmutableList.of(),
Step.PARTIAL,
ImmutableList.of(LONG_SUM.bind(ImmutableList.of(0), Optional.empty(), Optional.empty(), 1.0)),
rowPagesBuilder.getHashChannel(),
+ Optional.empty(),
100_000,
new DataSize(16, MEGABYTE));
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
index a6713c57ac..cd9b671d93 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java
@@ -148,7 +148,6 @@ public class TestEffectivePredicateExtractor
lessThan(CE, DE),
greaterThan(AE, bigintLiteral(2)),
equals(EE, FE))),
- ImmutableList.of(A, B, C),
ImmutableMap.of(C, fakeFunction("test"), D, fakeFunction("test")),
ImmutableMap.of(C, fakeFunctionHandle("test", AGGREGATE), D, fakeFunctionHandle("test", AGGREGATE)),
ImmutableMap.<Symbol, Symbol>of(),
@@ -156,6 +155,7 @@ public class TestEffectivePredicateExtractor
AggregationNode.Step.FINAL,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
Expression effectivePredicate = EffectivePredicateExtractor.extract(node, TYPES);
@@ -176,14 +176,14 @@ public class TestEffectivePredicateExtractor
PlanNode node = new AggregationNode(
newId(),
filter(baseTableScan, FALSE_LITERAL),
- ImmutableList.of(),
ImmutableMap.of(),
ImmutableMap.of(),
ImmutableMap.of(),
- ImmutableList.of(),
+ ImmutableList.of(ImmutableList.of()),
AggregationNode.Step.FINAL,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
Expression effectivePredicate = EffectivePredicateExtractor.extract(node, TYPES);
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestTypeValidator.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestTypeValidator.java
index f4e7b1317c..19bea5c620 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/TestTypeValidator.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/TestTypeValidator.java
@@ -194,7 +194,6 @@ public class TestTypeValidator
PlanNode node = new AggregationNode(
newId(),
baseTableScan,
- ImmutableList.of(columnA, columnB),
aggregations,
functions,
ImmutableMap.of(),
@@ -202,6 +201,7 @@ public class TestTypeValidator
SINGLE,
Optional.empty(),
0,
+ Optional.empty(),
Optional.empty());
assertTypesValid(node);
@@ -258,7 +258,6 @@ public class TestTypeValidator
PlanNode node = new AggregationNode(
newId(),
baseTableScan,
- ImmutableList.of(columnA, columnB),
aggregations,
functions,
ImmutableMap.of(),
@@ -266,6 +265,7 @@ public class TestTypeValidator
SINGLE,
Optional.empty(),
0,
+ Optional.empty(),
Optional.empty());
assertTypesValid(node);
@@ -290,7 +290,6 @@ public class TestTypeValidator
PlanNode node = new AggregationNode(
newId(),
baseTableScan,
- ImmutableList.of(columnA, columnB),
aggregations,
functions,
ImmutableMap.of(),
@@ -298,6 +297,7 @@ public class TestTypeValidator
SINGLE,
Optional.empty(),
0,
+ Optional.empty(),
Optional.empty());
assertTypesValid(node);
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestCountConstantOptimizer.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestCountConstantOptimizer.java
index 5196640666..2481d3991d 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestCountConstantOptimizer.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestCountConstantOptimizer.java
@@ -59,14 +59,14 @@ public class TestCountConstantOptimizer
planNodeIdAllocator.getNextId(),
valuesNode,
ImmutableMap.of(new Symbol("expr"), new LongLiteral("42"))),
- ImmutableList.of(),
aggregations,
functions,
ImmutableMap.of(),
- ImmutableList.of(),
+ ImmutableList.of(ImmutableList.of()),
AggregationNode.Step.INTERMEDIATE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
assertTrue(((AggregationNode) optimizer.optimize(eligiblePlan, TEST_SESSION, ImmutableMap.of(), new SymbolAllocator(), new PlanNodeIdAllocator()))
@@ -81,14 +81,14 @@ public class TestCountConstantOptimizer
planNodeIdAllocator.getNextId(),
valuesNode,
ImmutableMap.of(new Symbol("expr"), new FunctionCall(QualifiedName.of("function"), ImmutableList.of(new QualifiedNameReference(QualifiedName.of("x")))))),
- ImmutableList.of(),
aggregations,
functions,
ImmutableMap.of(),
- ImmutableList.of(),
+ ImmutableList.of(ImmutableList.of()),
AggregationNode.Step.INTERMEDIATE,
Optional.empty(),
1.0,
+ Optional.empty(),
Optional.empty());
assertFalse(((AggregationNode) optimizer.optimize(ineligiblePlan, TEST_SESSION, ImmutableMap.of(), new SymbolAllocator(), new PlanNodeIdAllocator()))
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 1f4d0b5f7a..99c98f28c5 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1333,6 +1333,50 @@ public abstract class AbstractTestQueries
"SELECT NULL, suppkey, SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY suppkey");
}
+ @Test
+ public void testGroupingSetsNoInput()
+ throws Exception
+ {
+ assertQuery(
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY GROUPING SETS ((linenumber, suppkey), (suppkey))",
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY linenumber, suppkey " +
+ "UNION " +
+ "SELECT NULL, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY suppkey");
+ }
+
+ @Test
+ public void testGroupingSetsWithGlobalAggregationNoInput()
+ throws Exception
+ {
+ assertQuery(
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY GROUPING SETS ((linenumber, suppkey), (suppkey), ())",
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY linenumber, suppkey " +
+ "UNION " +
+ "SELECT NULL, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY suppkey " +
+ "UNION " +
+ "SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0");
+ }
+
@Test
public void testGroupingSetsWithSingleDistinct()
throws Exception
@@ -1351,6 +1395,25 @@ public abstract class AbstractTestQueries
"SELECT NULL, suppkey, SUM(DISTINCT CAST(quantity AS BIGINT)), COUNT(DISTINCT linestatus) FROM lineitem GROUP BY suppkey");
}
+ @Test
+ public void testGroupingSetsWithMultipleDistinctNoInput()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, suppkey, SUM(DISTINCT CAST(quantity AS BIGINT)), COUNT(DISTINCT linestatus) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY GROUPING SETS ((linenumber, suppkey), (suppkey))",
+ "SELECT linenumber, suppkey, SUM(DISTINCT CAST(quantity AS BIGINT)), COUNT(DISTINCT linestatus) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY linenumber, suppkey " +
+ "UNION " +
+ "SELECT NULL, suppkey, SUM(DISTINCT CAST(quantity AS BIGINT)), COUNT(DISTINCT linestatus) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY suppkey");
+ }
+
@Test
public void testGroupingSetsGrandTotalSet()
throws Exception
@@ -1371,6 +1434,34 @@ public abstract class AbstractTestQueries
"SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem");
}
+ @Test
+ public void testGroupingSetsRepeatedSetsAllNoInput()
+ throws Exception
+ {
+ assertQuery(
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY GROUPING SETS ((), (linenumber, suppkey), (), (linenumber, suppkey))",
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY linenumber, suppkey " +
+ "UNION ALL " +
+ "SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "UNION ALL " +
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0 " +
+ "GROUP BY linenumber, suppkey " +
+ "UNION ALL " +
+ "SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) " +
+ "FROM lineitem " +
+ "WHERE quantity < 0");
+ }
+
@Test
public void testGroupingSetsRepeatedSetsDistinct()
throws Exception
@@ -1407,6 +1498,15 @@ public abstract class AbstractTestQueries
"SELECT SUM(CAST(quantity AS BIGINT)) FROM lineitem");
}
+ @Test
+ public void testGroupingSetsMultipleGrandTotalSetsNoInput()
+ throws Exception
+ {
+ assertQuery("SELECT SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 GROUP BY GROUPING SETS ((), ())",
+ "SELECT SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 UNION ALL " +
+ "SELECT SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0");
+ }
+
@Test
public void testGroupingSetMixedExpressionAndColumn()
throws Exception
@@ -1524,6 +1624,17 @@ public abstract class AbstractTestQueries
"SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem");
}
+ @Test
+ public void testCubeNoInput()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 GROUP BY CUBE (linenumber, suppkey)",
+ "SELECT linenumber, suppkey, SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 GROUP BY linenumber, suppkey UNION ALL " +
+ "SELECT linenumber, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 GROUP BY linenumber UNION ALL " +
+ "SELECT NULL, suppkey, SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0 GROUP BY suppkey UNION ALL " +
+ "SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0");
+ }
+
@Test
public void testGroupingCombinationsAll()
throws Exception
@@ -5243,6 +5354,29 @@ public abstract class AbstractTestQueries
" SELECT custkey,orderkey,orderkey+1 from orders where orderkey<>0) " +
" GROUP BY orderkey)"
);
+
+ assertQuery(
+ "SELECT count(orderkey), sum(sc) FROM (\n" +
+ " SELECT sum(custkey) sc, orderkey FROM (\n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey=0\n" +
+ " UNION ALL \n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey<>0) \n" +
+ " GROUP BY GROUPING SETS ((orderkey, orderstatus), (orderkey)))",
+ "SELECT count(orderkey), sum(sc) FROM (\n" +
+ " SELECT sum(custkey) sc, orderkey FROM (\n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey=0\n" +
+ " UNION ALL \n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey<>0) \n" +
+ " GROUP BY orderkey, orderstatus \n" +
+ " \n" +
+ " UNION ALL \n" +
+ " \n" +
+ " SELECT sum(custkey) sc, orderkey FROM (\n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey=0\n" +
+ " UNION ALL \n" +
+ " SELECT custkey, orderkey, orderkey+1, orderstatus from orders where orderkey<>0) \n" +
+ " GROUP BY orderkey)"
+ );
}
@Test | ['presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/HashGenerationOptimizer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/sanity/ValidateDependenciesChecker.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java', 'presto-benchmark/src/main/java/com/facebook/presto/benchmark/HashAggregationBenchmark.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java', 'presto-main/src/test/java/com/facebook/presto/sql/planner/TestEffectivePredicateExtractor.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/SubqueryPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SingleDistinctOptimizer.java', 'presto-main/src/test/java/com/facebook/presto/sql/planner/TestTypeValidator.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java', 'presto-main/src/test/java/com/facebook/presto/operator/TestHashAggregationOperator.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/LimitPushDown.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/AggregationNode.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SetFlatteningOptimizer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java', 'presto-benchmark/src/main/java/com/facebook/presto/benchmark/HandTpchQuery1.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/CountConstantOptimizer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/IndexJoinOptimizer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/ImplementIntersectAndExceptAsUnion.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddLocalExchanges.java', 'presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestCountConstantOptimizer.java'] | 32 | 32 | 0 | 0 | 32 | {'.java': 32} | "2016-09-15T21:14:47" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
200 | prestodb/presto/6195/6191 | prestodb | presto | https://github.com/prestodb/presto/issues/6191 | https://github.com/prestodb/presto/pull/6195 | https://github.com/prestodb/presto/pull/6195 | 1 | Distinct sum aggregation may produce incorrect results for empty grouping sets | fixes | `AbstractTestQueries::testGroupingSetsWithMultipleDistinctAndUnion` fails for some configurations with `task_concurrency` higher then 1:
```
SELECT linenumber, COUNT(DISTINCT linenumber), SUM(DISTINCT suppkey) FROM (SELECT * FROM lineitem WHERE linenumber%2 = 0 UNION ALL SELECT * FROM lineitem WHERE linenumber%2 = 1) GROUP BY GROUPING SETS ((linenumber), ())
not equal
Actual 8 rows:
[3, 1, 5050]
[null, 7, 30300]
[7, 1, 5050]
[1, 1, 5050]
[4, 1, 5050]
[6, 1, 5050]
[5, 1, 5050]
[2, 1, 5050]
Expected 8 rows:
[1, 1, 5050]
[2, 1, 5050]
[3, 1, 5050]
[4, 1, 5050]
[5, 1, 5050]
[6, 1, 5050]
[7, 1, 5050]
[null, 7, 5050]
```
Simplified query:
```
> set session task_concurrency=8;
> SELECT a, SUM(DISTINCT b) FROM (SELECT * FROM (VALUES (0,1), (0,2)) t(a,b) UNION ALL SELECT * FROM (VALUES (1,1), (1,2)) t(a,b)) GROUP BY GROUPING SETS ((a), ());
a | _col1
------+-------
0 | 3
NULL | 6
1 | 3
```
To reproduce this, number of workers must be greater then 1, task_concurrency must be greater then 1, query must contain an empty grouping set AND there must be union AND aggregation function must be sum distinct. It seems like multiple partial aggregations of empty grouping set are incorrectly combined in final aggregation, effectively multiplying result.
CC @kokosing
| 815f8796c7e8cef625fd16c44608116b9c66700b | d95e3496631a0467c27ccc93beed01415cf065b6 | https://github.com/prestodb/presto/compare/815f8796c7e8cef625fd16c44608116b9c66700b...d95e3496631a0467c27ccc93beed01415cf065b6 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
index 474dd52bbc..0d8aa9d9a5 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
@@ -222,9 +222,7 @@ class PropertyDerivations
@Override
public ActualProperties visitGroupId(GroupIdNode node, List<ActualProperties> inputProperties)
{
- ActualProperties properties = Iterables.getOnlyElement(inputProperties);
-
- return properties.translate(translateGroupIdSymbols(node));
+ return Iterables.getOnlyElement(inputProperties).translate(translateGroupIdSymbols(node));
}
private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
index 867ed6a2af..cdcc0f0231 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
@@ -291,6 +291,28 @@ final class StreamPropertyDerivations
return inputToOutput;
}
+ @Override
+ public StreamProperties visitGroupId(GroupIdNode node, List<StreamProperties> inputProperties)
+ {
+ return Iterables.getOnlyElement(inputProperties).translate(translateGroupIdSymbols(node));
+ }
+
+ private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
+ {
+ List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
+ return symbol -> {
+ if (node.getIdentityMappings().containsKey(symbol)) {
+ return Optional.of(node.getIdentityMappings().get(symbol));
+ }
+
+ if (commonGroupingColumns.contains(symbol)) {
+ return Optional.of(symbol);
+ }
+
+ return Optional.empty();
+ };
+ }
+
@Override
public StreamProperties visitAggregation(AggregationNode node, List<StreamProperties> inputProperties)
{
@@ -392,12 +414,6 @@ final class StreamPropertyDerivations
return Iterables.getOnlyElement(inputProperties);
}
- @Override
- public StreamProperties visitGroupId(GroupIdNode node, List<StreamProperties> inputProperties)
- {
- return Iterables.getOnlyElement(inputProperties);
- }
-
@Override
public StreamProperties visitWindow(WindowNode node, List<StreamProperties> inputProperties)
{
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 7fe4713525..afd7562503 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1590,6 +1590,17 @@ public abstract class AbstractTestQueries
@Test
public void testGroupingSetsWithSingleDistinctAndUnion()
throws Exception
+ {
+ assertQuery("SELECT suppkey, COUNT(DISTINCT linenumber) FROM " +
+ "(SELECT * FROM lineitem WHERE linenumber%2 = 0 UNION ALL SELECT * FROM lineitem WHERE linenumber%2 = 1) " +
+ "GROUP BY GROUPING SETS ((suppkey), ())",
+ "SELECT suppkey, COUNT(DISTINCT linenumber) FROM lineitem GROUP BY suppkey UNION ALL " +
+ "SELECT NULL, COUNT(DISTINCT linenumber) FROM lineitem");
+ }
+
+ @Test
+ public void testGroupingSetsWithSingleDistinctAndUnionGroupedArguments()
+ throws Exception
{
assertQuery("SELECT linenumber, COUNT(DISTINCT linenumber) FROM " +
"(SELECT * FROM lineitem WHERE linenumber%2 = 0 UNION ALL SELECT * FROM lineitem WHERE linenumber%2 = 1) " + | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2016-09-26T23:55:27" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
199 | prestodb/presto/6208/6196 | prestodb | presto | https://github.com/prestodb/presto/issues/6196 | https://github.com/prestodb/presto/pull/6208 | https://github.com/prestodb/presto/pull/6208 | 1 | Deadlock in task info fetching | fixes | Hit this one in production. Suddenly all queries get queued and all clients start timing out. [Here](https://gist.githubusercontent.com/nezihyigitbasi/108b844625d69de66bd8d74e427ea876/raw/c22dc663517fa991b87c162de2b387c0e8af0d69/presto-stack) is the full stack trace.
```
Found one Java-level deadlock:
=============================
"http-worker-2010473":
waiting to lock monitor 0x00007f8fed4a6fb8 (object 0x00007f9615a7e020, a com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup),
which is held by "ResourceGroupManager"
"ResourceGroupManager":
waiting to lock monitor 0x00007f91f0cc3598 (object 0x00007f9a9f000a48, a com.facebook.presto.execution.SqlStageExecution),
which is held by "HttpRemoteTask-20160926_222904_08073_w6q27.1.105-2010288"
"HttpRemoteTask-20160926_222904_08073_w6q27.1.105-2010288":
waiting to lock monitor 0x00007f90ed8c3ee8 (object 0x00007f9a9f000870, a com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher),
which is held by "ContinuousTaskStatusFetcher-20160926_222904_08073_w6q27.1.105-2009564"
"ContinuousTaskStatusFetcher-20160926_222904_08073_w6q27.1.105-2009564":
waiting to lock monitor 0x00007f910c0b5948 (object 0x00007f9a9f0008e0, a com.facebook.presto.server.remotetask.HttpRemoteTask),
which is held by "HttpRemoteTask-20160926_222904_08073_w6q27.1.105-2010288"
Java stack information for the threads listed above:
===================================================
"http-worker-2010473":
at com.facebook.presto.execution.resourceGroups.ResourceGroup.run(ResourceGroup.java:322)
- waiting to lock <0x00007f9615a7e020> (a com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup)
at com.facebook.presto.execution.resourceGroups.ResourceGroupManager.submit(ResourceGroupManager.java:89)
at com.facebook.presto.execution.SqlQueryManager.createQuery(SqlQueryManager.java:348)
at com.facebook.presto.server.StatementResource$Query.<init>(StatementResource.java:308)
at com.facebook.presto.server.StatementResource.createQuery(StatementResource.java:171)
at sun.reflect.GeneratedMethodAccessor1181.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory$1.invoke(ResourceMethodInvocationHandlerFactory.java:81)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher$1.run(AbstractJavaResourceMethodDispatcher.java:144)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.invoke(AbstractJavaResourceMethodDispatcher.java:161)
at org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$ResponseOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:160)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:99)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:389)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:347)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:102)
at org.glassfish.jersey.server.ServerRuntime$2.run(ServerRuntime.java:326)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
at org.glassfish.jersey.internal.Errors.process(Errors.java:315)
at org.glassfish.jersey.internal.Errors.process(Errors.java:297)
at org.glassfish.jersey.internal.Errors.process(Errors.java:267)
at org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:317)
at org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:305)
at org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1154)
at org.glassfish.jersey.servlet.WebComponent.serviceImpl(WebComponent.java:473)
at org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:427)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:388)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:341)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:228)
at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:845)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1689)
at io.airlift.http.server.TraceTokenFilter.doFilter(TraceTokenFilter.java:63)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at io.airlift.http.server.TimingFilter.doFilter(TimingFilter.java:52)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:581)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143)
at org.eclipse.jetty.server.handler.gzip.GzipHandler.handle(GzipHandler.java:396)
at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1176)
at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:511)
at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1106)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
at org.eclipse.jetty.server.handler.HandlerCollection.handle(HandlerCollection.java:119)
at org.eclipse.jetty.server.handler.StatisticsHandler.handle(StatisticsHandler.java:169)
at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)
at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:134)
at org.eclipse.jetty.server.Server.handle(Server.java:518)
at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:314)
at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:253)
at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:273)
at org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:95)
at org.eclipse.jetty.io.SelectChannelEndPoint$2.run(SelectChannelEndPoint.java:93)
at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:654)
at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:572)
at java.lang.Thread.run(Thread.java:745)
"ResourceGroupManager":
at com.facebook.presto.execution.SqlStageExecution.getMemoryReservation(SqlStageExecution.java:184)
- waiting to lock <0x00007f9a9f000a48> (a com.facebook.presto.execution.SqlStageExecution)
at com.facebook.presto.execution.scheduler.SqlQueryScheduler$$Lambda$792/605126606.applyAsLong(Unknown Source)
at java.util.stream.ReferencePipeline$5$1.accept(ReferencePipeline.java:227)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.LongPipeline.reduce(LongPipeline.java:438)
at java.util.stream.LongPipeline.sum(LongPipeline.java:396)
at com.facebook.presto.execution.scheduler.SqlQueryScheduler.getTotalMemoryReservation(SqlQueryScheduler.java:310)
at com.facebook.presto.execution.SqlQueryExecution.getTotalMemoryReservation(SqlQueryExecution.java:188)
at com.facebook.presto.execution.resourceGroups.ResourceGroup.internalRefreshStats(ResourceGroup.java:438)
- locked <0x00007f9615a7e020> (a com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup)
at com.facebook.presto.execution.resourceGroups.ResourceGroup.internalRefreshStats(ResourceGroup.java:445)
- locked <0x00007f9615a7e020> (a com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup)
at com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup.processQueuedQueries(ResourceGroup.java:580)
- locked <0x00007f9615a7e020> (a com.facebook.presto.execution.resourceGroups.ResourceGroup$RootResourceGroup)
at com.facebook.presto.execution.resourceGroups.ResourceGroupManager.refreshAndStartQueries(ResourceGroupManager.java:110)
at com.facebook.presto.execution.resourceGroups.ResourceGroupManager$$Lambda$140/724736957.run(Unknown Source)
at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
at java.util.concurrent.FutureTask.runAndReset(FutureTask.java:308)
at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(ScheduledThreadPoolExecutor.java:180)
at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:294)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
"HttpRemoteTask-20160926_222904_08073_w6q27.1.105-2010288":
at com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher.updateTaskStatus(ContinuousTaskStatusFetcher.java:214)
- waiting to lock <0x00007f9a9f000870> (a com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher)
at com.facebook.presto.server.remotetask.HttpRemoteTask.abort(HttpRemoteTask.java:560)
- locked <0x00007f9a9f0008e0> (a com.facebook.presto.server.remotetask.HttpRemoteTask)
at com.facebook.presto.server.remotetask.HttpRemoteTask.abort(HttpRemoteTask.java:552)
- locked <0x00007f9a9f0008e0> (a com.facebook.presto.server.remotetask.HttpRemoteTask)
at com.facebook.presto.execution.SqlStageExecution$$Lambda$1037/616866428.accept(Unknown Source)
at java.lang.Iterable.forEach(Iterable.java:75)
at com.facebook.presto.execution.SqlStageExecution.abort(SqlStageExecution.java:179)
- locked <0x00007f9a9f000a48> (a com.facebook.presto.execution.SqlStageExecution)
at com.facebook.presto.execution.scheduler.SqlQueryScheduler$$Lambda$1035/234080167.accept(Unknown Source)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.ReferencePipeline$Head.forEach(ReferencePipeline.java:580)
at com.facebook.presto.execution.scheduler.SqlQueryScheduler.abort(SqlQueryScheduler.java:412)
at com.facebook.presto.execution.SqlQueryExecution.lambda$new$0(SqlQueryExecution.java:154)
at com.facebook.presto.execution.SqlQueryExecution$$Lambda$440/1153217709.stateChanged(Unknown Source)
at com.facebook.presto.execution.StateMachine.lambda$fireStateChanged$0(StateMachine.java:225)
at com.facebook.presto.execution.StateMachine$$Lambda$413/743619379.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
"ContinuousTaskStatusFetcher-20160926_222904_08073_w6q27.1.105-2009564":
at com.facebook.presto.server.remotetask.HttpRemoteTask.abort(HttpRemoteTask.java:557)
- waiting to lock <0x00007f9a9f0008e0> (a com.facebook.presto.server.remotetask.HttpRemoteTask)
at com.facebook.presto.server.remotetask.HttpRemoteTask.failTask(HttpRemoteTask.java:621)
at com.facebook.presto.server.remotetask.HttpRemoteTask$$Lambda$817/1647878013.accept(Unknown Source)
at com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher.updateTaskStatus(ContinuousTaskStatusFetcher.java:234)
- locked <0x00007f9a9f000870> (a com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher)
at com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher.success(ContinuousTaskStatusFetcher.java:168)
at com.facebook.presto.server.remotetask.ContinuousTaskStatusFetcher.success(ContinuousTaskStatusFetcher.java:52)
at com.facebook.presto.server.remotetask.SimpleHttpResponseHandler.onSuccess(SimpleHttpResponseHandler.java:49)
at com.facebook.presto.server.remotetask.SimpleHttpResponseHandler.onSuccess(SimpleHttpResponseHandler.java:27)
at com.google.common.util.concurrent.Futures$6.run(Futures.java:1319)
at io.airlift.concurrent.BoundedExecutor.drainQueue(BoundedExecutor.java:77)
at io.airlift.concurrent.BoundedExecutor$$Lambda$437/311179219.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
Found 1 deadlock.
```
| e5dbe7ca1cb519f50a7b13fc1a775e5ba966ab89 | 72d65cdc4485c788e13647cf2fbca9ff867fd731 | https://github.com/prestodb/presto/compare/e5dbe7ca1cb519f50a7b13fc1a775e5ba966ab89...72d65cdc4485c788e13647cf2fbca9ff867fd731 | diff --git a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java
index 77d8dacfeb..12bedf066c 100644
--- a/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java
+++ b/presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java
@@ -208,7 +208,7 @@ class ContinuousTaskStatusFetcher
}
}
- synchronized void updateTaskStatus(TaskStatus newValue)
+ void updateTaskStatus(TaskStatus newValue)
{
// change to new value if old value is not changed and new value has a newer version
AtomicBoolean taskMismatch = new AtomicBoolean(); | ['presto-main/src/main/java/com/facebook/presto/server/remotetask/ContinuousTaskStatusFetcher.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2016-09-27T21:57:38" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
198 | prestodb/presto/6279/6278 | prestodb | presto | https://github.com/prestodb/presto/issues/6278 | https://github.com/prestodb/presto/pull/6279 | https://github.com/prestodb/presto/pull/6279 | 1 | Planning Class cast exception | fixes | This query now throws an error:
```
SELECT
(MAX(x.a) OVER () - x.a) * 100.0 / MAX(x.a) OVER ()
FROM (
SELECT 1 as a
) x
```
```
Query 20161005_231326_03851_gb7jd failed: com.facebook.presto.sql.tree.SymbolReference cannot be cast to com.facebook.presto.sql.tree.FunctionCall
java.lang.ClassCastException: com.facebook.presto.sql.tree.SymbolReference cannot be cast to com.facebook.presto.sql.tree.FunctionCall
at com.facebook.presto.sql.planner.QueryPlanner.window(QueryPlanner.java:617)
at com.facebook.presto.sql.planner.QueryPlanner.plan(QueryPlanner.java:140)
at com.facebook.presto.sql.planner.RelationPlanner.visitQuerySpecification(RelationPlanner.java:443)
at com.facebook.presto.sql.planner.RelationPlanner.visitQuerySpecification(RelationPlanner.java:94)
at com.facebook.presto.sql.tree.QuerySpecification.accept(QuerySpecification.java:125)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)
at com.facebook.presto.sql.planner.QueryPlanner.planQueryBody(QueryPlanner.java:220)
at com.facebook.presto.sql.planner.QueryPlanner.plan(QueryPlanner.java:113)
at com.facebook.presto.sql.planner.RelationPlanner.visitQuery(RelationPlanner.java:436)
at com.facebook.presto.sql.planner.RelationPlanner.visitQuery(RelationPlanner.java:94)
at com.facebook.presto.sql.tree.Query.accept(Query.java:103)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)
at com.facebook.presto.sql.planner.LogicalPlanner.createRelationPlan(LogicalPlanner.java:358)
at com.facebook.presto.sql.planner.LogicalPlanner.planStatement(LogicalPlanner.java:150)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:112)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:107)
at com.facebook.presto.execution.SqlQueryExecution.doAnalyzeQuery(SqlQueryExecution.java:291)
at com.facebook.presto.execution.SqlQueryExecution.analyzeQuery(SqlQueryExecution.java:270)
at com.facebook.presto.execution.SqlQueryExecution.start(SqlQueryExecution.java:228)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| 8428d4d1b0c9a2639f75ac5799b2e97526ef1890 | 5b4e6ec8e03cf6d07db74bce0c4466c41e04c30c | https://github.com/prestodb/presto/compare/8428d4d1b0c9a2639f75ac5799b2e97526ef1890...5b4e6ec8e03cf6d07db74bce0c4466c41e04c30c | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
index 9c25114f99..71f2b7c62b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
@@ -600,18 +600,22 @@ class QueryPlanner
outputTranslations.addIntermediateMapping(windowFunction, parametersReplaced);
Expression rewritten = subPlan.rewrite(parametersReplaced);
+ boolean needCoercion = rewritten instanceof Cast;
+ // Strip out the cast and add it back as a post-projection
+ if (rewritten instanceof Cast) {
+ rewritten = ((Cast) rewritten).getExpression();
+ }
+
// If refers to existing symbol, don't create another PlanNode
if (rewritten instanceof SymbolReference) {
+ if (needCoercion) {
+ subPlan = explicitCoercionSymbols(subPlan, subPlan.getRoot().getOutputSymbols(), ImmutableList.of(windowFunction));
+ }
+
continue;
}
Symbol newSymbol = symbolAllocator.newSymbol(rewritten, analysis.getType(windowFunction));
-
- boolean needCoercion = rewritten instanceof Cast;
- // Strip out the cast and add it back as a post-projection
- if (rewritten instanceof Cast) {
- rewritten = ((Cast) rewritten).getExpression();
- }
outputTranslations.put(parametersReplaced, newSymbol);
WindowNode.Function function = new WindowNode.Function(
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 30393eb08b..45a1af2979 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -3797,6 +3797,19 @@ public abstract class AbstractTestQueries
.build();
assertEquals(actual, expected);
+
+ actual = computeActual("" +
+ "SELECT (MAX(x.a) OVER () - x.a) * 100.0 / MAX(x.a) OVER ()\n" +
+ "FROM (VALUES 1, 2, 3, 4) x(a)");
+
+ expected = resultBuilder(getSession(), DOUBLE)
+ .row(75.0)
+ .row(50.0)
+ .row(25.0)
+ .row(0.0)
+ .build();
+
+ assertEquals(actual, expected);
}
@Test | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-10-06T03:44:07" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
197 | prestodb/presto/6350/6330 | prestodb | presto | https://github.com/prestodb/presto/issues/6330 | https://github.com/prestodb/presto/pull/6350 | https://github.com/prestodb/presto/pull/6350 | 1 | Planning bug when creating bucketed table | fixes | This query:
``` sql
CREATE TABLE t
WITH (
bucketed_by=array['k'],
bucket_count=64)
AS (SELECT '' a, '' b, 0 k)
```
fails with:
```
java.lang.IllegalArgumentException: Input symbols do not match output symbols
at com.google.common.base.Preconditions.checkArgument(Preconditions.java:122)
at com.facebook.presto.sql.planner.plan.ExchangeNode.<init>(ExchangeNode.java:82)
at com.facebook.presto.sql.planner.plan.ExchangeNode.partitionedExchange(ExchangeNode.java:130)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitTableWriter(AddExchanges.java:636)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitTableWriter(AddExchanges.java:187)
at com.facebook.presto.sql.planner.plan.TableWriterNode.accept(TableWriterNode.java:128)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1231)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitTableFinish(AddExchanges.java:791)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitTableFinish(AddExchanges.java:187)
at com.facebook.presto.sql.planner.plan.TableFinishNode.accept(TableFinishNode.java:80)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.planChild(AddExchanges.java:1231)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitOutput(AddExchanges.java:236)
at com.facebook.presto.sql.planner.optimizations.AddExchanges$Rewriter.visitOutput(AddExchanges.java:187)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.optimizations.AddExchanges.optimize(AddExchanges.java:149)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:105)
at com.facebook.presto.execution.SqlQueryExecution.doAnalyzeQuery(SqlQueryExecution.java:281)
at com.facebook.presto.execution.SqlQueryExecution.analyzeQuery(SqlQueryExecution.java:260)
at com.facebook.presto.execution.SqlQueryExecution.start(SqlQueryExecution.java:224)
at com.facebook.presto.execution.QueuedExecution.lambda$start$1(QueuedExecution.java:62)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| 5b9ff8c6970fd8a5f79285262992356f56a1749e | d6ce487e2ea9b540cd16381351ed81a9fb8b4da7 | https://github.com/prestodb/presto/compare/5b9ff8c6970fd8a5f79285262992356f56a1749e...d6ce487e2ea9b540cd16381351ed81a9fb8b4da7 | diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
index 11e80aeab0..ad08eb1289 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
@@ -550,6 +550,7 @@ public class TestHiveIntegrationSmokeTest
public void testCreatePartitionedBucketedTableAsFewRows()
throws Exception
{
+ // go through all storage formats to make sure the empty buckets are correctly created
for (TestingHiveStorageFormat storageFormat : getAllTestingHiveStorageFormat()) {
testCreatePartitionedBucketedTableAsFewRows(storageFormat.getSession(), storageFormat.getFormat());
}
@@ -614,11 +615,11 @@ public class TestHiveIntegrationSmokeTest
"WITH (" +
"format = '" + storageFormat + "', " +
"partitioned_by = ARRAY[ 'orderstatus' ], " +
- "bucketed_by = ARRAY[ 'custkey' ], " +
+ "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
"bucket_count = 11 " +
") " +
"AS " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders";
assertUpdate(
@@ -650,15 +651,15 @@ public class TestHiveIntegrationSmokeTest
"WITH (" +
"format = '" + storageFormat + "', " +
"partitioned_by = ARRAY[ 'orderstatus' ], " +
- "bucketed_by = ARRAY[ 'custkey' ], " +
+ "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
"bucket_count = 11 " +
") " +
"AS " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders " +
"WHERE length(comment) % 2 = 0 " +
"UNION ALL " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders " +
"WHERE length(comment) % 2 = 1";
@@ -687,22 +688,22 @@ public class TestHiveIntegrationSmokeTest
assertEquals(columnMetadata.getComment(), annotateColumnComment(Optional.empty(), partitionKey));
}
- assertEquals(tableMetadata.getMetadata().getProperties().get(BUCKETED_BY_PROPERTY), ImmutableList.of("custkey"));
+ assertEquals(tableMetadata.getMetadata().getProperties().get(BUCKETED_BY_PROPERTY), ImmutableList.of("custkey", "custkey2"));
assertEquals(tableMetadata.getMetadata().getProperties().get(BUCKET_COUNT_PROPERTY), 11);
List<?> partitions = getPartitions(tableName);
assertEquals(partitions.size(), 3);
- assertQuery("SELECT * from " + tableName, "SELECT custkey, comment, orderstatus FROM orders");
+ assertQuery("SELECT * from " + tableName, "SELECT custkey, custkey, comment, orderstatus FROM orders");
for (int i = 1; i <= 30; i++) {
assertQuery(
- format("SELECT * from " + tableName + " where custkey = %d", i),
- format("SELECT custkey, comment, orderstatus FROM orders where custkey = %d", i));
+ format("SELECT * from " + tableName + " where custkey = %d and custkey2 = %d", i, i),
+ format("SELECT custkey, custkey, comment, orderstatus FROM orders where custkey = %d", i));
}
try {
- assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'comment', 'O')", 1);
+ assertUpdate("INSERT INTO " + tableName + " VALUES (1, 1, 'comment', 'O')", 1);
fail("expected failure");
}
catch (Exception e) {
@@ -714,6 +715,7 @@ public class TestHiveIntegrationSmokeTest
public void testInsertPartitionedBucketedTableFewRows()
throws Exception
{
+ // go through all storage formats to make sure the empty buckets are correctly created
for (TestingHiveStorageFormat storageFormat : getAllTestingHiveStorageFormat()) {
testInsertPartitionedBucketedTableFewRows(storageFormat.getSession(), storageFormat.getFormat());
}
@@ -801,12 +803,13 @@ public class TestHiveIntegrationSmokeTest
assertUpdate("" +
"CREATE TABLE " + tableName + " (" +
" custkey bigint," +
+ " custkey2 bigint," +
" comment varchar," +
" orderstatus varchar)" +
"WITH (" +
"format = '" + storageFormat + "', " +
"partitioned_by = ARRAY[ 'orderstatus' ], " +
- "bucketed_by = ARRAY[ 'custkey' ], " +
+ "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
"bucket_count = 11)");
ImmutableList<String> orderStatusList = ImmutableList.of("F", "O", "P");
@@ -817,7 +820,7 @@ public class TestHiveIntegrationSmokeTest
getSession().withSystemProperty("task_writer_count", "4"),
format(
"INSERT INTO " + tableName + " " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders " +
"WHERE orderstatus = '%s'",
orderStatus),
@@ -845,12 +848,13 @@ public class TestHiveIntegrationSmokeTest
assertUpdate("" +
"CREATE TABLE " + tableName + " (" +
" custkey bigint," +
+ " custkey2 bigint," +
" comment varchar," +
" orderstatus varchar)" +
"WITH (" +
"format = '" + storageFormat + "', " +
"partitioned_by = ARRAY[ 'orderstatus' ], " +
- "bucketed_by = ARRAY[ 'custkey' ], " +
+ "bucketed_by = ARRAY[ 'custkey', 'custkey2' ], " +
"bucket_count = 11)");
ImmutableList<String> orderStatusList = ImmutableList.of("F", "O", "P");
@@ -861,11 +865,11 @@ public class TestHiveIntegrationSmokeTest
getSession().withSystemProperty("task_writer_count", "4"),
format(
"INSERT INTO " + tableName + " " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders " +
"WHERE orderstatus = '%s' and length(comment) %% 2 = 0 " +
"UNION ALL " +
- "SELECT custkey, comment, orderstatus " +
+ "SELECT custkey, custkey AS custkey2, comment, orderstatus " +
"FROM tpch.tiny.orders " +
"WHERE orderstatus = '%s' and length(comment) %% 2 = 1",
orderStatus, orderStatus),
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
index 8142dbaf18..5111377733 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
@@ -544,7 +544,7 @@ public class UnaliasSymbolReferences
node.getColumnNames(),
node.getOutputSymbols(),
canonicalize(node.getSampleWeightSymbol()),
- node.getPartitioningScheme().map(this::canonicalizePartitionFunctionBinding));
+ node.getPartitioningScheme().map(partitioningScheme -> canonicalizePartitionFunctionBinding(partitioningScheme, source)));
}
@Override
@@ -658,11 +658,20 @@ public class UnaliasSymbolReferences
return builder.build();
}
- private PartitioningScheme canonicalizePartitionFunctionBinding(PartitioningScheme scheme)
+ private PartitioningScheme canonicalizePartitionFunctionBinding(PartitioningScheme scheme, PlanNode source)
{
+ Set<Symbol> addedOutputs = new HashSet<>();
+ ImmutableList.Builder<Symbol> outputs = ImmutableList.builder();
+ for (Symbol symbol : source.getOutputSymbols()) {
+ Symbol canonicalOutput = canonicalize(symbol);
+ if (addedOutputs.add(canonicalOutput)) {
+ outputs.add(canonicalOutput);
+ }
+ }
+
return new PartitioningScheme(
scheme.getPartitioning().translate(this::canonicalize),
- canonicalize(scheme.getOutputLayout()),
+ outputs.build(),
canonicalize(scheme.getHashColumn()),
scheme.isReplicateNulls(),
scheme.getBucketToPartition()); | ['presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-10-13T22:02:19" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
195 | prestodb/presto/6427/6379 | prestodb | presto | https://github.com/prestodb/presto/issues/6379 | https://github.com/prestodb/presto/pull/6427 | https://github.com/prestodb/presto/pull/6427 | 1 | Incorrect results when GROUPING SETS refer to columns derived from same column | fixes | This query:
``` sql
WITH
t (v) AS (VALUES 1, 2),
u (v1, v2) AS (SELECT v v1, v v2 FROM t)
SELECT v1, v2
FROM u
GROUP BY GROUPING SETS ((v1), (v2))
```
incorrectly produces:
```
v1 | v2
----+----
1 | 1
2 | 2
1 | 1
2 | 2
(4 rows)
```
The expected result is:
```
v1 | v2
------+------
1 | NULL
2 | NULL
NULL | 1
NULL | 2
(4 rows)
```
| fa726a95f9f279df415275ae66b90ad8252dae07 | 8548ba813f2d426911062e59efa079ed296d44a6 | https://github.com/prestodb/presto/compare/fa726a95f9f279df415275ae66b90ad8252dae07...8548ba813f2d426911062e59efa079ed296d44a6 | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
index 18653de108..30588fe289 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
@@ -22,14 +22,11 @@ import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.planner.plan.PlanNodeId;
import com.google.common.collect.ImmutableList;
-import java.util.BitSet;
-import java.util.Collection;
+import java.util.Arrays;
import java.util.List;
-import java.util.Set;
+import java.util.Map;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
-import static com.facebook.presto.util.ImmutableCollectors.toImmutableSet;
-import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
@@ -42,9 +39,7 @@ public class GroupIdOperator
private final int operatorId;
private final PlanNodeId planNodeId;
private final List<Type> outputTypes;
- private final List<List<Integer>> groupingSetChannels;
- private final List<Integer> groupingChannels;
- private final List<Integer> copyChannels;
+ private final List<Map<Integer, Integer>> groupingSetMappings;
private boolean closed;
@@ -52,16 +47,12 @@ public class GroupIdOperator
int operatorId,
PlanNodeId planNodeId,
List<? extends Type> outputTypes,
- List<List<Integer>> groupingSetChannels,
- List<Integer> groupingChannels,
- List<Integer> copyChannels)
+ List<Map<Integer, Integer>> groupingSetMappings)
{
this.operatorId = operatorId;
this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
this.outputTypes = ImmutableList.copyOf(requireNonNull(outputTypes));
- this.groupingSetChannels = ImmutableList.copyOf(requireNonNull(groupingSetChannels));
- this.groupingChannels = ImmutableList.copyOf(requireNonNull(groupingChannels));
- this.copyChannels = ImmutableList.copyOf(requireNonNull(copyChannels));
+ this.groupingSetMappings = ImmutableList.copyOf(requireNonNull(groupingSetMappings));
}
@Override
@@ -76,48 +67,35 @@ public class GroupIdOperator
checkState(!closed, "Factory is already closed");
OperatorContext operatorContext = driverContext.addOperatorContext(operatorId, planNodeId, GroupIdOperator.class.getSimpleName());
- Set<Integer> allGroupingColumns = groupingSetChannels.stream()
- .flatMap(Collection::stream)
- .collect(toImmutableSet());
-
- // create an array of bitset for fast lookup of which columns are part of a given grouping set
- // will have a 'true' for every channel that should be set to null for each grouping set
- BitSet[] groupingSetNullChannels = new BitSet[groupingSetChannels.size()];
- for (int i = 0; i < groupingSetChannels.size(); i++) {
- groupingSetNullChannels[i] = new BitSet(groupingChannels.size() + copyChannels.size());
- // first set all grouping columns to true
- for (int groupingColumn : allGroupingColumns) {
- groupingSetNullChannels[i].set(groupingColumn, true);
- }
- // then set all the columns in this grouping set to false
- for (int nonNullGroupingColumn : groupingSetChannels.get(i)) {
- groupingSetNullChannels[i].set(nonNullGroupingColumn, false);
+ // create an int array for fast lookup of input columns for every grouping set
+ int[][] groupingSetInputs = new int[groupingSetMappings.size()][outputTypes.size() - 1];
+ for (int i = 0; i < groupingSetMappings.size(); i++) {
+ // -1 means the output column is null
+ Arrays.fill(groupingSetInputs[i], -1);
+
+ // anything else is an input column to copy
+ for (int outputChannel : groupingSetMappings.get(i).keySet()) {
+ groupingSetInputs[i][outputChannel] = groupingSetMappings.get(i).get(outputChannel);
}
}
- // create null blocks for every grouping channel
- Block[] nullBlocks = new Block[groupingChannels.size()];
- for (int i = 0; i < groupingChannels.size(); i++) {
+ // it's easier to create null blocks for every output column even though we only null out some grouping column outputs
+ Block[] nullBlocks = new Block[outputTypes.size()];
+ for (int i = 0; i < outputTypes.size(); i++) {
nullBlocks[i] = outputTypes.get(i).createBlockBuilder(new BlockBuilderStatus(), 1)
.appendNull()
.build();
}
// create groupid blocks for every group
- Block[] groupIdBlocks = new Block[groupingSetNullChannels.length];
- for (int i = 0; i < groupingSetNullChannels.length; i++) {
+ Block[] groupIdBlocks = new Block[groupingSetMappings.size()];
+ for (int i = 0; i < groupingSetMappings.size(); i++) {
BlockBuilder builder = BIGINT.createBlockBuilder(new BlockBuilderStatus(), 1);
BIGINT.writeLong(builder, i);
groupIdBlocks[i] = builder.build();
}
- // create array of input channels for every grouping channel
- int[] groupInputs = groupingChannels.stream().mapToInt(Integer::intValue).toArray();
-
- // create array of input channels for every copy channel
- int[] copyInputs = copyChannels.stream().mapToInt(Integer::intValue).toArray();
-
- return new GroupIdOperator(operatorContext, outputTypes, groupingSetNullChannels, nullBlocks, groupIdBlocks, groupInputs, copyInputs);
+ return new GroupIdOperator(operatorContext, outputTypes, groupingSetInputs, nullBlocks, groupIdBlocks);
}
@Override
@@ -129,17 +107,15 @@ public class GroupIdOperator
@Override
public OperatorFactory duplicate()
{
- return new GroupIdOperatorFactory(operatorId, planNodeId, outputTypes, groupingSetChannels, groupingChannels, copyChannels);
+ return new GroupIdOperatorFactory(operatorId, planNodeId, outputTypes, groupingSetMappings);
}
}
private final OperatorContext operatorContext;
private final List<Type> types;
- private final BitSet[] groupingSetNullChannels;
+ private final int[][] groupingSetInputs;
private final Block[] nullBlocks;
private final Block[] groupIdBlocks;
- private final int[] groupInputs;
- private final int[] copyInputs;
private Page currentPage = null;
private int currentGroupingSet = 0;
@@ -148,20 +124,15 @@ public class GroupIdOperator
public GroupIdOperator(
OperatorContext operatorContext,
List<Type> types,
- BitSet[] groupingSetNullChannels,
+ int[][] groupingSetInputs,
Block[] nullBlocks,
- Block[] groupIdBlocks,
- int[] groupInputs,
- int[] copyInputs)
+ Block[] groupIdBlocks)
{
this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
- this.types = requireNonNull(types, "types is null");
- this.groupingSetNullChannels = requireNonNull(groupingSetNullChannels, "groupingSetNullChannels is null");
- this.nullBlocks = requireNonNull(nullBlocks);
- this.groupIdBlocks = requireNonNull(groupIdBlocks);
- checkArgument(groupIdBlocks.length == groupingSetNullChannels.length, "groupIdBlocks and groupingSetNullChannels must have the same length");
- this.groupInputs = requireNonNull(groupInputs);
- this.copyInputs = requireNonNull(copyInputs);
+ this.types = ImmutableList.copyOf(requireNonNull(types, "types is null"));
+ this.groupingSetInputs = requireNonNull(groupingSetInputs, "groupingSetInputs is null");
+ this.nullBlocks = requireNonNull(nullBlocks, "nullBlocks is null");
+ this.groupIdBlocks = requireNonNull(groupIdBlocks, "groupIdBlocks is null");
}
@Override
@@ -218,21 +189,17 @@ public class GroupIdOperator
// generate 'n' pages for every input page, where n is the number of grouping sets
Block[] outputBlocks = new Block[types.size()];
- for (int i = 0; i < groupInputs.length; i++) {
- if (groupingSetNullChannels[currentGroupingSet].get(groupInputs[i])) {
+ for (int i = 0; i < groupingSetInputs[currentGroupingSet].length; i++) {
+ if (groupingSetInputs[currentGroupingSet][i] == -1) {
outputBlocks[i] = new RunLengthEncodedBlock(nullBlocks[i], currentPage.getPositionCount());
}
else {
- outputBlocks[i] = currentPage.getBlock(groupInputs[i]);
+ outputBlocks[i] = currentPage.getBlock(groupingSetInputs[currentGroupingSet][i]);
}
}
- for (int i = 0; i < copyInputs.length; i++) {
- outputBlocks[groupInputs.length + i] = currentPage.getBlock(copyInputs[i]);
- }
-
outputBlocks[outputBlocks.length - 1] = new RunLengthEncodedBlock(groupIdBlocks[currentGroupingSet], currentPage.getPositionCount());
- currentGroupingSet = (currentGroupingSet + 1) % groupingSetNullChannels.length;
+ currentGroupingSet = (currentGroupingSet + 1) % groupingSetInputs.length;
Page outputPage = new Page(currentPage.getPositionCount(), outputBlocks);
if (currentGroupingSet == 0) {
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
index 24acf28fe5..b3a4d5344a 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -832,42 +832,50 @@ public class LocalExecutionPlanner
public PhysicalOperation visitGroupId(GroupIdNode node, LocalExecutionPlanContext context)
{
PhysicalOperation source = node.getSource().accept(this, context);
- ImmutableMap.Builder<Symbol, Integer> newLayout = ImmutableMap.builder();
+ Map<Symbol, Integer> newLayout = new HashMap<>();
ImmutableList.Builder<Type> outputTypes = ImmutableList.builder();
int outputChannel = 0;
- ImmutableList.Builder<Integer> groupingChannels = ImmutableList.builder();
- for (Symbol inputSymbol : node.getDistinctGroupingColumns()) {
- int inputChannel = source.getLayout().get(inputSymbol);
- newLayout.put(inputSymbol, outputChannel++);
- outputTypes.add(source.getTypes().get(inputChannel));
- groupingChannels.add(inputChannel);
+ for (Symbol output : node.getGroupingSets().stream().flatMap(Collection::stream).collect(Collectors.toSet())) {
+ newLayout.put(output, outputChannel++);
+ outputTypes.add(source.getTypes().get(source.getLayout().get(node.getGroupingSetMappings().get(output))));
}
- ImmutableList.Builder<Integer> copyChannels = ImmutableList.builder();
- for (Symbol inputSymbol : node.getIdentityMappings().keySet()) {
- int inputChannel = source.getLayout().get(inputSymbol);
- newLayout.put(node.getIdentityMappings().get(inputSymbol), outputChannel++);
+ Map<Symbol, Integer> argumentMappings = new HashMap<>();
+ for (Symbol output : node.getArgumentMappings().keySet()) {
+ int inputChannel = source.getLayout().get(node.getArgumentMappings().get(output));
+
+ newLayout.put(output, outputChannel++);
outputTypes.add(source.getTypes().get(inputChannel));
- copyChannels.add(inputChannel);
+ argumentMappings.put(output, inputChannel);
+ }
+
+ // for every grouping set, create a mapping of all output to input channels (including arguments)
+ ImmutableList.Builder<Map<Integer, Integer>> mappings = ImmutableList.builder();
+ for (List<Symbol> groupingSet : node.getGroupingSets()) {
+ ImmutableMap.Builder<Integer, Integer> setMapping = ImmutableMap.builder();
+
+ for (Symbol output : groupingSet) {
+ setMapping.put(newLayout.get(output), source.getLayout().get(node.getGroupingSetMappings().get(output)));
+ }
+
+ for (Symbol output : argumentMappings.keySet()) {
+ setMapping.put(newLayout.get(output), argumentMappings.get(output));
+ }
+
+ mappings.add(setMapping.build());
}
newLayout.put(node.getGroupIdSymbol(), outputChannel);
outputTypes.add(BIGINT);
- List<List<Integer>> groupingSetChannels = node.getGroupingSets().stream()
- .map(groupingSet -> getChannelsForSymbols(groupingSet, source.getLayout()))
- .collect(toImmutableList());
-
OperatorFactory groupIdOperatorFactory = new GroupIdOperator.GroupIdOperatorFactory(context.getNextOperatorId(),
node.getId(),
outputTypes.build(),
- groupingSetChannels,
- groupingChannels.build(),
- copyChannels.build());
+ mappings.build());
- return new PhysicalOperation(groupIdOperatorFactory, newLayout.build(), source);
+ return new PhysicalOperation(groupIdOperatorFactory, newLayout, source);
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
index b22f3d5665..84092bcff7 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java
@@ -523,7 +523,23 @@ public class PlanPrinter
@Override
public Void visitGroupId(GroupIdNode node, Integer indent)
{
- print(indent, "- GroupId%s => [%s]", node.getGroupingSets(), formatOutputs(node.getOutputSymbols()));
+ // grouping sets are easier to understand in terms of inputs
+ List<List<Symbol>> inputGroupingSetSymbols = node.getGroupingSets().stream()
+ .map(set -> set.stream()
+ .map(symbol -> node.getGroupingSetMappings().get(symbol))
+ .collect(Collectors.toList()))
+ .collect(Collectors.toList());
+
+ print(indent, "- GroupId%s => [%s]", inputGroupingSetSymbols, formatOutputs(node.getOutputSymbols()));
+ printStats(indent + 2, node.getId());
+
+ for (Map.Entry<Symbol, Symbol> mapping : node.getGroupingSetMappings().entrySet()) {
+ print(indent + 2, "%s := %s", mapping.getKey(), mapping.getValue());
+ }
+ for (Map.Entry<Symbol, Symbol> argument : node.getArgumentMappings().entrySet()) {
+ print(indent + 2, "%s := %s", argument.getKey(), argument.getValue());
+ }
+
return processChildren(node, indent + 1);
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
index 3c5978bedf..323048bc9f 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
@@ -60,6 +60,7 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -383,47 +384,81 @@ class QueryPlanner
// 2. Aggregate
- // 2.a. Rewrite group by expressions in terms of pre-projected inputs
- TranslationMap translations = new TranslationMap(subPlan.getRelationPlan(), analysis);
- ImmutableList.Builder<List<Symbol>> groupingSetsSymbolsBuilder = ImmutableList.builder();
+ // 2.a. Rewrite aggregate arguments
+ TranslationMap argumentTranslations = new TranslationMap(subPlan.getRelationPlan(), analysis);
+ ImmutableMap.Builder<Symbol, Symbol> argumentMappingBuilder = ImmutableMap.builder();
+ for (Expression argument : arguments) {
+ Expression parametersReplaced = ExpressionTreeRewriter.rewriteWith(new ParameterRewriter(analysis.getParameters(), analysis), argument);
+ argumentTranslations.addIntermediateMapping(argument, parametersReplaced);
+ Symbol input = subPlan.translate(parametersReplaced);
+
+ if (!argumentTranslations.containsSymbol(parametersReplaced)) {
+ Symbol output = symbolAllocator.newSymbol(parametersReplaced, analysis.getTypeWithCoercions(parametersReplaced), "arg");
+ argumentMappingBuilder.put(output, input);
+ argumentTranslations.put(parametersReplaced, output);
+ }
+ }
+ Map<Symbol, Symbol> argumentMappings = argumentMappingBuilder.build();
+
+ // 2.b. Rewrite grouping columns
+ TranslationMap groupingTranslations = new TranslationMap(subPlan.getRelationPlan(), analysis);
+ Map<Symbol, Symbol> groupingSetMappings = new HashMap<>();
+ List<List<Symbol>> groupingSymbols = new ArrayList<>();
+
for (List<Expression> groupingSet : groupingSets) {
- ImmutableList.Builder<Symbol> groupingColumns = ImmutableList.builder();
+ ImmutableList.Builder<Symbol> symbols = ImmutableList.builder();
for (Expression expression : groupingSet) {
- Expression rewritten = ExpressionTreeRewriter.rewriteWith(new ParameterRewriter(analysis.getParameters(), analysis), expression);
- translations.addIntermediateMapping(expression, rewritten);
- Symbol symbol = subPlan.translate(rewritten);
- groupingColumns.add(symbol);
- translations.put(rewritten, symbol);
+ Expression parametersReplaced = ExpressionTreeRewriter.rewriteWith(new ParameterRewriter(analysis.getParameters(), analysis), expression);
+ groupingTranslations.addIntermediateMapping(expression, parametersReplaced);
+ Symbol input = subPlan.translate(expression);
+
+ Symbol output;
+ if (!groupingTranslations.containsSymbol(parametersReplaced)) {
+ output = symbolAllocator.newSymbol(parametersReplaced, analysis.getTypeWithCoercions(expression), "gid");
+ groupingTranslations.put(parametersReplaced, output);
+ }
+ else {
+ output = groupingTranslations.get(parametersReplaced);
+ }
+
+ groupingSetMappings.put(output, input);
+ symbols.add(output);
}
- groupingSetsSymbolsBuilder.add(groupingColumns.build());
+ groupingSymbols.add(symbols.build());
}
- // 2.b. Add a groupIdNode and groupIdSymbol if there are multiple grouping sets
+ // 2.c. Generate GroupIdNode (multiple grouping sets) or ProjectNode (single grouping set)
Optional<Symbol> groupIdSymbol = Optional.empty();
- List<List<Symbol>> groupingSetsSymbols = groupingSetsSymbolsBuilder.build();
if (groupingSets.size() > 1) {
- ImmutableMap.Builder<Symbol, Symbol> identityMapping = ImmutableMap.builder();
- for (Expression argument : ImmutableSet.copyOf(arguments)) {
- Symbol output = symbolAllocator.newSymbol(argument, analysis.getTypeWithCoercions(argument), "id");
- identityMapping.put(subPlan.translate(argument), output);
+ groupIdSymbol = Optional.of(symbolAllocator.newSymbol("groupId", BIGINT));
+ GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), groupingSymbols, groupingSetMappings, argumentMappings, groupIdSymbol.get());
+ subPlan = new PlanBuilder(groupingTranslations, groupId, analysis.getParameters());
+ }
+ else {
+ Map<Symbol, Expression> projections = new HashMap<>();
+ for (Symbol output : argumentMappings.keySet()) {
+ projections.putIfAbsent(output, argumentMappings.get(output).toSymbolReference());
+ }
- // relies on the fact that group by expressions have already been re-written, and will not be affected by this mapping change
- subPlan.getTranslations().put(argument, output);
+ for (Symbol output : groupingSetMappings.keySet()) {
+ projections.putIfAbsent(output, groupingSetMappings.get(output).toSymbolReference());
}
- groupIdSymbol = Optional.of(symbolAllocator.newSymbol("groupId", BIGINT));
- GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), groupingSetsSymbols, identityMapping.build(), groupIdSymbol.get());
- subPlan = subPlan.withNewRoot(groupId);
+ ProjectNode project = new ProjectNode(idAllocator.getNextId(), subPlan.getRoot(), projections);
+ subPlan = new PlanBuilder(groupingTranslations, project, analysis.getParameters());
}
- // 2.c. Rewrite aggregates in terms of pre-projected inputs
+ TranslationMap aggregationTranslations = new TranslationMap(subPlan.getRelationPlan(), analysis);
+ aggregationTranslations.copyMappingsFrom(groupingTranslations);
+
+ // 2.d. Rewrite aggregates
ImmutableMap.Builder<Symbol, FunctionCall> aggregationAssignments = ImmutableMap.builder();
ImmutableMap.Builder<Symbol, Signature> functions = ImmutableMap.builder();
boolean needPostProjectionCoercion = false;
for (FunctionCall aggregate : analysis.getAggregates(node)) {
Expression parametersReplaced = ExpressionTreeRewriter.rewriteWith(new ParameterRewriter(analysis.getParameters(), analysis), aggregate);
- translations.addIntermediateMapping(aggregate, parametersReplaced);
- Expression rewritten = subPlan.rewrite(parametersReplaced);
+ aggregationTranslations.addIntermediateMapping(aggregate, parametersReplaced);
+ Expression rewritten = argumentTranslations.rewrite(parametersReplaced);
Symbol newSymbol = symbolAllocator.newSymbol(rewritten, analysis.getType(aggregate));
// TODO: this is a hack, because we apply coercions to the output of expressions, rather than the arguments to expressions.
@@ -433,12 +468,12 @@ class QueryPlanner
needPostProjectionCoercion = true;
}
aggregationAssignments.put(newSymbol, (FunctionCall) rewritten);
- translations.put(parametersReplaced, newSymbol);
+ aggregationTranslations.put(parametersReplaced, newSymbol);
functions.put(newSymbol, analysis.getFunctionSignature(aggregate));
}
- // 2.d. Mark distinct rows for each aggregate that has DISTINCT
+ // 2.e. Mark distinct rows for each aggregate that has DISTINCT
// Map from aggregate function arguments to marker symbols, so that we can reuse the markers, if two aggregates have the same argument
Map<Set<Expression>, Symbol> argumentMarkers = new HashMap<>();
// Map from aggregate functions to marker symbols
@@ -446,7 +481,7 @@ class QueryPlanner
for (FunctionCall aggregate : Iterables.filter(analysis.getAggregates(node), FunctionCall::isDistinct)) {
Set<Expression> args = ImmutableSet.copyOf(aggregate.getArguments());
Symbol marker = argumentMarkers.get(args);
- Symbol aggregateSymbol = translations.get(aggregate);
+ Symbol aggregateSymbol = aggregationTranslations.get(aggregate);
if (marker == null) {
if (args.size() == 1) {
marker = symbolAllocator.newSymbol(getOnlyElement(args), BOOLEAN, "distinct");
@@ -462,14 +497,14 @@ class QueryPlanner
for (Map.Entry<Set<Expression>, Symbol> entry : argumentMarkers.entrySet()) {
ImmutableList.Builder<Symbol> builder = ImmutableList.builder();
- builder.addAll(groupingSetsSymbols.stream()
+ builder.addAll(groupingSymbols.stream()
.flatMap(Collection::stream)
.distinct()
.collect(Collectors.toList()));
groupIdSymbol.ifPresent(builder::add);
for (Expression expression : entry.getKey()) {
- builder.add(subPlan.translate(expression));
+ builder.add(argumentTranslations.get(expression));
}
subPlan = subPlan.withNewRoot(
new MarkDistinctNode(
@@ -486,12 +521,12 @@ class QueryPlanner
aggregationAssignments.build(),
functions.build(),
masks,
- groupingSetsSymbols,
+ groupingSymbols,
AggregationNode.Step.SINGLE,
Optional.empty(),
groupIdSymbol);
- subPlan = new PlanBuilder(translations, aggregationNode, analysis.getParameters());
+ subPlan = new PlanBuilder(aggregationTranslations, aggregationNode, analysis.getParameters());
// 3. Post-projection
// Add back the implicit casts that we removed in 2.a
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
index 61c18e2263..129fee725e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
@@ -113,7 +113,8 @@ public final class SymbolExtractor
node.getSource().accept(this, context);
builder.add(node.getGroupIdSymbol());
- builder.addAll(node.getIdentityMappings().values());
+ builder.addAll(node.getGroupingSetMappings().keySet());
+ builder.addAll(node.getArgumentMappings().keySet());
return null;
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
index a444ff1d20..86bac59425 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
@@ -312,15 +312,13 @@ public class AddExchanges
private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
{
- Map<Symbol, Symbol> invertedMappings = ImmutableBiMap.copyOf(node.getIdentityMappings()).inverse();
- List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
return symbol -> {
- if (invertedMappings.containsKey(symbol)) {
- return Optional.of(invertedMappings.get(symbol));
+ if (node.getArgumentMappings().containsKey(symbol)) {
+ return Optional.of(node.getArgumentMappings().get(symbol));
}
- if (commonGroupingColumns.contains(symbol)) {
- return Optional.of(symbol);
+ if (node.getCommonGroupingColumns().contains(symbol)) {
+ return Optional.of(node.getGroupingSetMappings().get(symbol));
}
return Optional.empty();
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
index 2753a999b2..3495784790 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java
@@ -30,7 +30,6 @@ import com.facebook.presto.sql.planner.Symbol;
import com.facebook.presto.sql.planner.SymbolAllocator;
import com.facebook.presto.sql.planner.plan.AggregationNode;
import com.facebook.presto.sql.planner.plan.AssignUniqueId;
-import com.facebook.presto.sql.planner.plan.ChildReplacer;
import com.facebook.presto.sql.planner.plan.ExchangeNode;
import com.facebook.presto.sql.planner.plan.FilterNode;
import com.facebook.presto.sql.planner.plan.GroupIdNode;
@@ -221,26 +220,25 @@ public class PredicatePushDown
{
checkState(!DependencyExtractor.extractUnique(context.get()).contains(node.getGroupIdSymbol()), "groupId symbol cannot be referenced in predicate");
- List<Symbol> commonGroupingSymbols = node.getCommonGroupingColumns();
+ Map<Symbol, SymbolReference> commonGroupingSymbolMapping = node.getGroupingSetMappings().entrySet().stream()
+ .filter(entry -> node.getCommonGroupingColumns().contains(entry.getKey()))
+ .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().toSymbolReference()));
+
Predicate<Expression> pushdownEligiblePredicate = conjunct -> DependencyExtractor.extractUnique(conjunct).stream()
- .allMatch(commonGroupingSymbols::contains);
+ .allMatch(commonGroupingSymbolMapping.keySet()::contains);
Map<Boolean, List<Expression>> conjuncts = extractConjuncts(context.get()).stream().collect(Collectors.partitioningBy(pushdownEligiblePredicate));
- // Push down conjuncts from the inherited predicate that apply to the common grouping columns, or don't apply to any grouping columns
- PlanNode rewrittenSource = context.rewrite(node.getSource(), combineConjuncts(conjuncts.get(true)));
-
- PlanNode output = node;
- if (rewrittenSource != node.getSource()) {
- output = ChildReplacer.replaceChildren(node, ImmutableList.of(rewrittenSource));
- }
+ // Push down conjuncts from the inherited predicate that apply to common grouping symbols
+ PlanNode rewrittenNode = context.defaultRewrite(node,
+ ExpressionTreeRewriter.rewriteWith(new ExpressionSymbolInliner(commonGroupingSymbolMapping), combineConjuncts(conjuncts.get(true))));
// All other conjuncts, if any, will be in the filter node.
if (!conjuncts.get(false).isEmpty()) {
- output = new FilterNode(idAllocator.getNextId(), output, combineConjuncts(conjuncts.get(false)));
+ rewrittenNode = new FilterNode(idAllocator.getNextId(), rewrittenNode, combineConjuncts(conjuncts.get(false)));
}
- return output;
+ return rewrittenNode;
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
index 0d8aa9d9a5..8c8f3537df 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java
@@ -76,7 +76,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.function.Function;
import static com.facebook.presto.SystemSessionProperties.planWithTableNodePartitioning;
import static com.facebook.presto.spi.predicate.TupleDomain.extractFixedValues;
@@ -222,23 +221,22 @@ class PropertyDerivations
@Override
public ActualProperties visitGroupId(GroupIdNode node, List<ActualProperties> inputProperties)
{
- return Iterables.getOnlyElement(inputProperties).translate(translateGroupIdSymbols(node));
- }
-
- private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
- {
- List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
- return symbol -> {
- if (node.getIdentityMappings().containsKey(symbol)) {
- return Optional.of(node.getIdentityMappings().get(symbol));
+ Map<Symbol, Symbol> inputToOutputMappings = new HashMap<>();
+ for (Map.Entry<Symbol, Symbol> setMapping : node.getGroupingSetMappings().entrySet()) {
+ if (node.getCommonGroupingColumns().contains(setMapping.getKey())) {
+ // TODO: Add support for translating a property on a single column to multiple columns
+ // when GroupIdNode is copying a single input grouping column into multiple output grouping columns (i.e. aliases), this is basically picking one arbitrarily
+ inputToOutputMappings.putIfAbsent(setMapping.getValue(), setMapping.getKey());
}
+ }
- if (commonGroupingColumns.contains(symbol)) {
- return Optional.of(symbol);
- }
+ // TODO: Add support for translating a property on a single column to multiple columns
+ // this is deliberately placed after the grouping columns, because preserving properties has a bigger perf impact
+ for (Map.Entry<Symbol, Symbol> argumentMapping : node.getArgumentMappings().entrySet()) {
+ inputToOutputMappings.putIfAbsent(argumentMapping.getValue(), argumentMapping.getKey());
+ }
- return Optional.empty();
- };
+ return Iterables.getOnlyElement(inputProperties).translate(column -> Optional.ofNullable(inputToOutputMappings.get(column)));
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
index 9658c59f7f..41eb36742b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
@@ -68,15 +68,16 @@ import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
import static com.facebook.presto.util.ImmutableCollectors.toImmutableList;
import static com.facebook.presto.util.ImmutableCollectors.toImmutableSet;
-import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Predicates.in;
import static com.google.common.collect.Iterables.concat;
import static java.util.Objects.requireNonNull;
@@ -408,23 +409,31 @@ public class PruneUnreferencedOutputs
@Override
public PlanNode visitGroupId(GroupIdNode node, RewriteContext<Set<Symbol>> context)
{
- checkState(node.getDistinctGroupingColumns().stream().allMatch(column -> context.get().contains(column)));
+ ImmutableSet.Builder<Symbol> expectedInputs = ImmutableSet.builder();
- ImmutableMap.Builder<Symbol, Symbol> identityMappingBuilder = ImmutableMap.builder();
- for (Map.Entry<Symbol, Symbol> entry : node.getIdentityMappings().entrySet()) {
- if (context.get().contains(entry.getValue())) {
- identityMappingBuilder.put(entry);
- }
- }
+ Map<Symbol, Symbol> newArgumentMappings = node.getArgumentMappings().entrySet().stream()
+ .filter(entry -> context.get().contains(entry.getKey()))
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ expectedInputs.addAll(newArgumentMappings.values());
+
+ ImmutableList.Builder<List<Symbol>> newGroupingSets = ImmutableList.builder();
+ Map<Symbol, Symbol> newGroupingMapping = new HashMap<>();
- Map<Symbol, Symbol> identityMapping = identityMappingBuilder.build();
+ for (List<Symbol> groupingSet : node.getGroupingSets()) {
+ ImmutableList.Builder<Symbol> newGroupingSet = ImmutableList.builder();
- PlanNode source = context.rewrite(node.getSource(), ImmutableSet.<Symbol>builder()
- .addAll(identityMapping.keySet())
- .addAll(node.getDistinctGroupingColumns())
- .build());
+ for (Symbol output : groupingSet) {
+ if (context.get().contains(output)) {
+ newGroupingSet.add(output);
+ newGroupingMapping.putIfAbsent(output, node.getGroupingSetMappings().get(output));
+ expectedInputs.add(node.getGroupingSetMappings().get(output));
+ }
+ }
+ newGroupingSets.add(newGroupingSet.build());
+ }
- return new GroupIdNode(node.getId(), source, node.getGroupingSets(), identityMapping, node.getGroupIdSymbol());
+ PlanNode source = context.rewrite(node.getSource(), expectedInputs.build());
+ return new GroupIdNode(node.getId(), source, newGroupingSets.build(), newGroupingMapping, newArgumentMappings, node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
index 62c639e66f..c0977978f1 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java
@@ -307,23 +307,22 @@ final class StreamPropertyDerivations
@Override
public StreamProperties visitGroupId(GroupIdNode node, List<StreamProperties> inputProperties)
{
- return Iterables.getOnlyElement(inputProperties).translate(translateGroupIdSymbols(node));
- }
-
- private Function<Symbol, Optional<Symbol>> translateGroupIdSymbols(GroupIdNode node)
- {
- List<Symbol> commonGroupingColumns = node.getCommonGroupingColumns();
- return symbol -> {
- if (node.getIdentityMappings().containsKey(symbol)) {
- return Optional.of(node.getIdentityMappings().get(symbol));
+ Map<Symbol, Symbol> inputToOutputMappings = new HashMap<>();
+ for (Map.Entry<Symbol, Symbol> setMapping : node.getGroupingSetMappings().entrySet()) {
+ if (node.getCommonGroupingColumns().contains(setMapping.getKey())) {
+ // TODO: Add support for translating a property on a single column to multiple columns
+ // when GroupIdNode is copying a single input grouping column into multiple output grouping columns (i.e. aliases), this is basically picking one arbitrarily
+ inputToOutputMappings.putIfAbsent(setMapping.getValue(), setMapping.getKey());
}
+ }
- if (commonGroupingColumns.contains(symbol)) {
- return Optional.of(symbol);
- }
+ // TODO: Add support for translating a property on a single column to multiple columns
+ // this is deliberately placed after the grouping columns, because preserving properties has a bigger perf impact
+ for (Map.Entry<Symbol, Symbol> argumentMapping : node.getArgumentMappings().entrySet()) {
+ inputToOutputMappings.putIfAbsent(argumentMapping.getValue(), argumentMapping.getKey());
+ }
- return Optional.empty();
- };
+ return Iterables.getOnlyElement(inputProperties).translate(column -> Optional.ofNullable(inputToOutputMappings.get(column)));
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
index 3761439cae..153bd13229 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
@@ -81,7 +81,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.stream.Collectors;
import static com.facebook.presto.util.ImmutableCollectors.toImmutableList;
import static com.facebook.presto.util.ImmutableCollectors.toImmutableSet;
@@ -157,16 +156,31 @@ public class UnaliasSymbolReferences
public PlanNode visitGroupId(GroupIdNode node, RewriteContext<Void> context)
{
PlanNode source = context.rewrite(node.getSource());
- List<List<Symbol>> groupingSetsSymbols = node.getGroupingSets().stream()
- .map(this::canonicalize)
- .collect(Collectors.toList());
- ImmutableMap.Builder<Symbol, Symbol> newPassthroughMap = ImmutableMap.builder();
- for (Symbol inputSymbol : node.getIdentityMappings().keySet()) {
- newPassthroughMap.put(canonicalize(inputSymbol), canonicalize(node.getIdentityMappings().get(inputSymbol)));
+ Map<Symbol, Symbol> newGroupingMappings = new HashMap<>();
+ ImmutableList.Builder<List<Symbol>> newGroupingSets = ImmutableList.builder();
+
+ for (List<Symbol> groupingSet : node.getGroupingSets()) {
+ ImmutableList.Builder<Symbol> newGroupingSet = ImmutableList.builder();
+ for (Symbol output : groupingSet) {
+ newGroupingMappings.putIfAbsent(canonicalize(output), canonicalize(node.getGroupingSetMappings().get(output)));
+ newGroupingSet.add(canonicalize(output));
+ }
+ newGroupingSets.add(newGroupingSet.build());
+ }
+
+ Map<Symbol, Symbol> newArgumentMappings = new HashMap<>();
+ for (Symbol output : node.getArgumentMappings().keySet()) {
+ Symbol canonicalOutput = canonicalize(output);
+ if (newArgumentMappings.containsKey(canonicalOutput)) {
+ map(output, canonicalOutput);
+ }
+ else {
+ newArgumentMappings.put(canonicalOutput, canonicalize(node.getArgumentMappings().get(output)));
+ }
}
- return new GroupIdNode(node.getId(), source, groupingSetsSymbols, newPassthroughMap.build(), canonicalize(node.getGroupIdSymbol()));
+ return new GroupIdNode(node.getId(), source, newGroupingSets.build(), newGroupingMappings, newArgumentMappings, canonicalize(node.getGroupIdSymbol()));
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
index 41f8c140f5..a760186471 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
@@ -169,7 +169,7 @@ public class ChildReplacer
@Override
public PlanNode visitGroupId(GroupIdNode node, List<PlanNode> newChildren)
{
- return new GroupIdNode(node.getId(), Iterables.getOnlyElement(newChildren), node.getGroupingSets(), node.getIdentityMappings(), node.getGroupIdSymbol());
+ return new GroupIdNode(node.getId(), Iterables.getOnlyElement(newChildren), node.getGroupingSets(), node.getGroupingSetMappings(), node.getArgumentMappings(), node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
index daf3560ced..1dc5bb48d4 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
import javax.annotation.concurrent.Immutable;
@@ -27,39 +28,53 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
@Immutable
public class GroupIdNode
extends PlanNode
{
private final PlanNode source;
+
+ // in terms of output symbols
private final List<List<Symbol>> groupingSets;
- private final Map<Symbol, Symbol> identityMappings;
+
+ // from output to input symbols
+ private final Map<Symbol, Symbol> groupingSetMappings;
+ private final Map<Symbol, Symbol> argumentMappings;
+
private final Symbol groupIdSymbol;
@JsonCreator
public GroupIdNode(@JsonProperty("id") PlanNodeId id,
@JsonProperty("source") PlanNode source,
@JsonProperty("groupingSets") List<List<Symbol>> groupingSets,
- @JsonProperty("identityMappings") Map<Symbol, Symbol> identityMappings,
+ @JsonProperty("groupingSetMappings") Map<Symbol, Symbol> groupingSetMappings,
+ @JsonProperty("argumentMappings") Map<Symbol, Symbol> argumentMappings,
@JsonProperty("groupIdSymbol") Symbol groupIdSymbol)
{
super(id);
this.source = requireNonNull(source);
this.groupingSets = ImmutableList.copyOf(requireNonNull(groupingSets));
- this.identityMappings = ImmutableMap.copyOf(requireNonNull(identityMappings));
+ this.groupingSetMappings = ImmutableMap.copyOf(requireNonNull(groupingSetMappings));
+ this.argumentMappings = ImmutableMap.copyOf(requireNonNull(argumentMappings));
this.groupIdSymbol = requireNonNull(groupIdSymbol);
+
+ checkArgument(Sets.intersection(groupingSetMappings.keySet(), argumentMappings.keySet()).isEmpty(), "argument outputs and grouping outputs must be a disjoint set");
}
@Override
public List<Symbol> getOutputSymbols()
{
return ImmutableList.<Symbol>builder()
- .addAll(getDistinctGroupingColumns())
- .addAll(identityMappings.values())
+ .addAll(groupingSets.stream()
+ .flatMap(Collection::stream)
+ .collect(toSet()))
+ .addAll(argumentMappings.keySet())
.add(groupIdSymbol)
.build();
}
@@ -76,14 +91,6 @@ public class GroupIdNode
return source;
}
- public Set<Symbol> getInputSymbols()
- {
- return ImmutableSet.<Symbol>builder()
- .addAll(identityMappings.keySet())
- .addAll(getDistinctGroupingColumns())
- .build();
- }
-
@JsonProperty
public List<List<Symbol>> getGroupingSets()
{
@@ -91,26 +98,15 @@ public class GroupIdNode
}
@JsonProperty
- public Map<Symbol, Symbol> getIdentityMappings()
+ public Map<Symbol, Symbol> getGroupingSetMappings()
{
- return identityMappings;
+ return groupingSetMappings;
}
- public List<Symbol> getDistinctGroupingColumns()
+ @JsonProperty
+ public Map<Symbol, Symbol> getArgumentMappings()
{
- return groupingSets.stream()
- .flatMap(Collection::stream)
- .distinct()
- .collect(toList());
- }
-
- public List<Symbol> getCommonGroupingColumns()
- {
- Set<Symbol> intersection = new HashSet<>(groupingSets.get(0));
- for (int i = 1; i < getGroupingSets().size(); i++) {
- intersection.retainAll(groupingSets.get(i));
- }
- return ImmutableList.copyOf(intersection);
+ return argumentMappings;
}
@JsonProperty
@@ -124,4 +120,26 @@ public class GroupIdNode
{
return visitor.visitGroupId(this, context);
}
+
+ public Set<Symbol> getInputSymbols()
+ {
+ return ImmutableSet.<Symbol>builder()
+ .addAll(argumentMappings.values())
+ .addAll(groupingSets.stream()
+ .map(set -> set.stream()
+ .map(groupingSetMappings::get).collect(Collectors.toList()))
+ .flatMap(Collection::stream)
+ .collect(toSet()))
+ .build();
+ }
+
+ // returns the common grouping columns in terms of output symbols
+ public Set<Symbol> getCommonGroupingColumns()
+ {
+ Set<Symbol> intersection = new HashSet<>(groupingSets.get(0));
+ for (int i = 1; i < groupingSets.size(); i++) {
+ intersection.retainAll(groupingSets.get(i));
+ }
+ return ImmutableSet.copyOf(intersection);
+ }
}
diff --git a/presto-main/src/main/java/com/facebook/presto/util/GraphvizPrinter.java b/presto-main/src/main/java/com/facebook/presto/util/GraphvizPrinter.java
index eb7703171e..c5b7677248 100644
--- a/presto-main/src/main/java/com/facebook/presto/util/GraphvizPrinter.java
+++ b/presto-main/src/main/java/com/facebook/presto/util/GraphvizPrinter.java
@@ -332,11 +332,14 @@ public final class GraphvizPrinter
@Override
public Void visitGroupId(GroupIdNode node, Void context)
{
- List<String> groupingSets = node.getGroupingSets().stream()
- .map(groupingSet -> "(" + Joiner.on(", ").join(groupingSet) + ")")
+ // grouping sets are easier to understand in terms of inputs
+ List<String> inputGroupingSetSymbols = node.getGroupingSets().stream()
+ .map(set -> "(" + Joiner.on(", ").join(set.stream()
+ .map(symbol -> node.getGroupingSetMappings().get(symbol))
+ .collect(Collectors.toList())) + ")")
.collect(Collectors.toList());
- printNode(node, "GroupId", Joiner.on(", ").join(groupingSets), NODE_COLORS.get(NodeType.AGGREGATE));
+ printNode(node, "GroupId", Joiner.on(", ").join(inputGroupingSetSymbols), NODE_COLORS.get(NodeType.AGGREGATE));
return node.getSource().accept(this, context);
}
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java b/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
index e366afa8bc..53efa7593c 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
@@ -19,6 +19,7 @@ import com.facebook.presto.spi.Page;
import com.facebook.presto.sql.planner.plan.PlanNodeId;
import com.facebook.presto.testing.MaterializedResult;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -72,9 +73,7 @@ public class TestGroupIdOperator
new GroupIdOperatorFactory(0,
new PlanNodeId("test"),
ImmutableList.of(VARCHAR, BOOLEAN, BIGINT, BIGINT, BIGINT),
- ImmutableList.of(ImmutableList.of(1, 2), ImmutableList.of(3)),
- ImmutableList.of(1, 2, 3),
- ImmutableList.of(0));
+ ImmutableList.of(ImmutableMap.of(0, 1, 1, 2, 3, 0), ImmutableMap.of(2, 3, 3, 0)));
MaterializedResult expected = resultBuilder(driverContext.getSession(), VARCHAR, BOOLEAN, BIGINT, BIGINT, BIGINT)
.row("400", true, null, 100L, 0L)
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index bfbd609fb5..adbff45529 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1516,6 +1516,19 @@ public abstract class AbstractTestQueries
"SELECT SUM(CAST(quantity AS BIGINT)) FROM lineitem WHERE quantity < 0");
}
+ @Test
+ public void testGroupingSetsAliasedGroupingColumns()
+ throws Exception
+ {
+ assertQuery("SELECT lna, lnb, SUM(quantity) " +
+ "FROM (SELECT linenumber lna, linenumber lnb, CAST(quantity AS BIGINT) quantity FROM lineitem) " +
+ "GROUP BY GROUPING SETS ((lna, lnb), (lna), (lnb), ())",
+ "SELECT linenumber, linenumber, SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY linenumber UNION ALL " +
+ "SELECT linenumber, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY linenumber UNION ALL " +
+ "SELECT NULL, linenumber, SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY linenumber UNION ALL " +
+ "SELECT NULL, NULL, SUM(CAST(quantity AS BIGINT)) FROM lineitem");
+ }
+
@Test
public void testGroupingSetMixedExpressionAndColumn()
throws Exception | ['presto-main/src/main/java/com/facebook/presto/sql/planner/PlanPrinter.java', 'presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PropertyDerivations.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PredicatePushDown.java', 'presto-main/src/main/java/com/facebook/presto/util/GraphvizPrinter.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/StreamPropertyDerivations.java', 'presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java'] | 16 | 16 | 0 | 0 | 16 | {'.java': 16} | "2016-10-24T16:11:10" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
208 | prestodb/presto/5430/5429 | prestodb | presto | https://github.com/prestodb/presto/issues/5429 | https://github.com/prestodb/presto/pull/5430 | https://github.com/prestodb/presto/pull/5430 | 1 | round(nan(), 2) returns 0.0 | fixes | `SELECT round(nan(), 2)` results in `0.0`, but should be `NaN`. This is a regression since 0.144.5.
| 2c3751dfbf7bc3af05bbd47970989580ad3742d5 | ea771947c017fefa785e0e017fb533adaae83a2f | https://github.com/prestodb/presto/compare/2c3751dfbf7bc3af05bbd47970989580ad3742d5...ea771947c017fefa785e0e017fb533adaae83a2f | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/scalar/MathFunctions.java b/presto-main/src/main/java/com/facebook/presto/operator/scalar/MathFunctions.java
index c7a1031919..de0796209f 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/scalar/MathFunctions.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/scalar/MathFunctions.java
@@ -465,6 +465,10 @@ public final class MathFunctions
@SqlType(StandardTypes.DOUBLE)
public static double round(@SqlType(StandardTypes.DOUBLE) double num, @SqlType(StandardTypes.BIGINT) long decimals)
{
+ if (Double.isNaN(num)) {
+ return num;
+ }
+
double factor = Math.pow(10, decimals);
return Math.round(num * factor) / factor;
}
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestMathFunctions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestMathFunctions.java
index 4a937b84e4..8b05ad68ac 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestMathFunctions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestMathFunctions.java
@@ -485,6 +485,8 @@ public class TestMathFunctions
assertFunction("round(CAST(NULL as DOUBLE), CAST(NULL as BIGINT))", DOUBLE, null);
assertFunction("round(-3.0, CAST(NULL as BIGINT))", DOUBLE, null);
assertFunction("round(CAST(NULL as DOUBLE), 1)", DOUBLE, null);
+
+ assertFunction("round(nan(), 2)", DOUBLE, Double.NaN);
}
@Test | ['presto-main/src/test/java/com/facebook/presto/operator/scalar/TestMathFunctions.java', 'presto-main/src/main/java/com/facebook/presto/operator/scalar/MathFunctions.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-06-10T03:21:03" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
221 | prestodb/presto/3775/3646 | prestodb | presto | https://github.com/prestodb/presto/issues/3646 | https://github.com/prestodb/presto/pull/3775 | https://github.com/prestodb/presto/pull/3775 | 1 | Duplicate DistinctLimitNode in query plan | fixes | When explain distinct limit query, the plan looks like below
There are duplicate DistinctLimit in the plan.
```
presto:orc> explain select distinct l_orderkey from lineitem limit 10;
Query Plan
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- Output[l_orderkey] => [l_orderkey:bigint]
- DistinctLimit[10] => [l_orderkey:bigint, $hashvalue:bigint]
- Exchange[GATHER] => l_orderkey:bigint, $hashvalue:bigint
- DistinctLimit[10] => [l_orderkey:bigint, $hashvalue:bigint]
- DistinctLimit[10] => [l_orderkey:bigint, $hashvalue:bigint]
- Project => [l_orderkey:bigint, $hashvalue:bigint]
$hashvalue := "combine_hash"(0, COALESCE("$operator$hash_code"("l_orderkey"), 0))
- TableScan[hive:hive:orc:lineitem, originalConstraint = true] => [l_orderkey:bigint]
LAYOUT: hive
l_orderkey := HiveColumnHandle{clientId=hive, name=l_orderkey, ordinalPosition=0, hiveType=bigint, hiveColumnIndex=0, partitionKey=false}
```
| db5ea9183412656f9cbf2e8a9302666ac323143d | 7bdf3ff5faf3e0dce34b82271050a718cd9e157d | https://github.com/prestodb/presto/compare/db5ea9183412656f9cbf2e8a9302666ac323143d...7bdf3ff5faf3e0dce34b82271050a718cd9e157d | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
index 90beffb26c..ae565e188e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java
@@ -545,10 +545,6 @@ public class AddExchanges
PlanWithProperties child = planChild(node, context.withPreferredProperties(PreferredProperties.any()));
if (child.getProperties().isDistributed()) {
- child = withDerivedProperties(
- new DistinctLimitNode(idAllocator.getNextId(), child.getNode(), node.getLimit(), node.getHashSymbol()),
- child.getProperties());
-
child = withDerivedProperties(
gatheringExchange(
idAllocator.getNextId(), | ['presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/AddExchanges.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2015-10-16T16:51:04" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
210 | prestodb/presto/5308/5267 | prestodb | presto | https://github.com/prestodb/presto/issues/5267 | https://github.com/prestodb/presto/pull/5308 | https://github.com/prestodb/presto/pull/5308 | 1 | Presto doesn't correctly deal with complex aggregations when arguments are also group by columns | fixes | Hi,
I might found a bug related to ROLLUP function.
Could you look into this issue?
### Problem
ROLLUP function return 0 as total count if `COUNT(column)` is used.
If `COUNT(*)` is used, Presto returns a correct result.
#### PostgreSQL 9.5.2
```
$ psql
psql (9.5.2)
Type "help" for help.
postgres=# WITH test_data AS (SELECT * FROM (
postgres(# VALUES
postgres(# ('a', 1),
postgres(# ('b', 2),
postgres(# ('a', 3)
postgres(# ) as t(id, cnt)
postgres(# )
postgres-# SELECT id, COUNT(*) as s_cnt
postgres-# FROM test_data
postgres-# GROUP BY ROLLUP(id)
postgres-# ;
id | s_cnt
----+-------
a | 2
b | 1
| 3
(3 rows)
```
```
postgres=# WITH test_data AS (SELECT * FROM (
postgres(# VALUES
postgres(# ('a', 1),
postgres(# ('b', 2),
postgres(# ('a', 3)
postgres(# ) as t(id, cnt)
postgres(# )
postgres-# SELECT id, COUNT(id) as s_cnt
postgres-# FROM test_data
postgres-# GROUP BY ROLLUP(id);
id | s_cnt
----+-------
a | 2
b | 1
| 3
(3 rows)
```
### Presto 0.146
```
> WITH test_data AS (SELECT * FROM (
> VALUES
> ('a', 1),
> ('b', 2),
> ('a', 3)
> ) as t(id, cnt)
> )
> SELECT id, COUNT(*) as s_cnt
> FROM test_data
> GROUP BY ROLLUP(id);
>
+------+-------+
| id | s_cnt |
+------+-------+
| null | 3 |
| a | 2 |
| b | 1 |
+------+-------+
3 rows in set
```
_The following SQL show this problem_.
`null` returns `0`
```
> WITH test_data AS (SELECT * FROM (
> VALUES
> ('a', 1),
> ('b', 2),
> ('a', 3)
> ) as t(id, cnt)
> )
> SELECT id, COUNT(id) as s_cnt
> FROM test_data
> GROUP BY ROLLUP(id);
+------+-------+
| id | s_cnt |
+------+-------+
| null | 0 |
| a | 2 |
| b | 1 |
+------+-------+
3 rows in set
```
| 688a8ff0128169d8e0c4b28094ab29457bd1269b | 30340ae10cda4efb91ff57ff58583f78759b4b3d | https://github.com/prestodb/presto/compare/688a8ff0128169d8e0c4b28094ab29457bd1269b...30340ae10cda4efb91ff57ff58583f78759b4b3d | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
index d4266a86b1..18653de108 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java
@@ -41,25 +41,27 @@ public class GroupIdOperator
{
private final int operatorId;
private final PlanNodeId planNodeId;
- private final List<Type> inputTypes;
private final List<Type> outputTypes;
private final List<List<Integer>> groupingSetChannels;
+ private final List<Integer> groupingChannels;
+ private final List<Integer> copyChannels;
private boolean closed;
public GroupIdOperatorFactory(
int operatorId,
PlanNodeId planNodeId,
- List<? extends Type> inputTypes,
- List<List<Integer>> groupingSetChannels)
+ List<? extends Type> outputTypes,
+ List<List<Integer>> groupingSetChannels,
+ List<Integer> groupingChannels,
+ List<Integer> copyChannels)
{
this.operatorId = operatorId;
this.planNodeId = requireNonNull(planNodeId, "planNodeId is null");
+ this.outputTypes = ImmutableList.copyOf(requireNonNull(outputTypes));
this.groupingSetChannels = ImmutableList.copyOf(requireNonNull(groupingSetChannels));
- this.inputTypes = ImmutableList.copyOf(requireNonNull(inputTypes));
-
- // add the groupId channel to the output types
- this.outputTypes = ImmutableList.<Type>builder().addAll(inputTypes).add(BIGINT).build();
+ this.groupingChannels = ImmutableList.copyOf(requireNonNull(groupingChannels));
+ this.copyChannels = ImmutableList.copyOf(requireNonNull(copyChannels));
}
@Override
@@ -78,10 +80,11 @@ public class GroupIdOperator
.flatMap(Collection::stream)
.collect(toImmutableSet());
+ // create an array of bitset for fast lookup of which columns are part of a given grouping set
// will have a 'true' for every channel that should be set to null for each grouping set
BitSet[] groupingSetNullChannels = new BitSet[groupingSetChannels.size()];
for (int i = 0; i < groupingSetChannels.size(); i++) {
- groupingSetNullChannels[i] = new BitSet(inputTypes.size());
+ groupingSetNullChannels[i] = new BitSet(groupingChannels.size() + copyChannels.size());
// first set all grouping columns to true
for (int groupingColumn : allGroupingColumns) {
groupingSetNullChannels[i].set(groupingColumn, true);
@@ -92,13 +95,15 @@ public class GroupIdOperator
}
}
- Block[] nullBlocks = new Block[inputTypes.size()];
- for (int i = 0; i < nullBlocks.length; i++) {
- nullBlocks[i] = inputTypes.get(i).createBlockBuilder(new BlockBuilderStatus(), 1)
+ // create null blocks for every grouping channel
+ Block[] nullBlocks = new Block[groupingChannels.size()];
+ for (int i = 0; i < groupingChannels.size(); i++) {
+ nullBlocks[i] = outputTypes.get(i).createBlockBuilder(new BlockBuilderStatus(), 1)
.appendNull()
.build();
}
+ // create groupid blocks for every group
Block[] groupIdBlocks = new Block[groupingSetNullChannels.length];
for (int i = 0; i < groupingSetNullChannels.length; i++) {
BlockBuilder builder = BIGINT.createBlockBuilder(new BlockBuilderStatus(), 1);
@@ -106,7 +111,13 @@ public class GroupIdOperator
groupIdBlocks[i] = builder.build();
}
- return new GroupIdOperator(operatorContext, outputTypes, groupingSetNullChannels, nullBlocks, groupIdBlocks);
+ // create array of input channels for every grouping channel
+ int[] groupInputs = groupingChannels.stream().mapToInt(Integer::intValue).toArray();
+
+ // create array of input channels for every copy channel
+ int[] copyInputs = copyChannels.stream().mapToInt(Integer::intValue).toArray();
+
+ return new GroupIdOperator(operatorContext, outputTypes, groupingSetNullChannels, nullBlocks, groupIdBlocks, groupInputs, copyInputs);
}
@Override
@@ -118,7 +129,7 @@ public class GroupIdOperator
@Override
public OperatorFactory duplicate()
{
- return new GroupIdOperatorFactory(operatorId, planNodeId, inputTypes, groupingSetChannels);
+ return new GroupIdOperatorFactory(operatorId, planNodeId, outputTypes, groupingSetChannels, groupingChannels, copyChannels);
}
}
@@ -127,6 +138,8 @@ public class GroupIdOperator
private final BitSet[] groupingSetNullChannels;
private final Block[] nullBlocks;
private final Block[] groupIdBlocks;
+ private final int[] groupInputs;
+ private final int[] copyInputs;
private Page currentPage = null;
private int currentGroupingSet = 0;
@@ -137,15 +150,18 @@ public class GroupIdOperator
List<Type> types,
BitSet[] groupingSetNullChannels,
Block[] nullBlocks,
- Block[] groupIdBlocks)
+ Block[] groupIdBlocks,
+ int[] groupInputs,
+ int[] copyInputs)
{
this.operatorContext = requireNonNull(operatorContext, "operatorContext is null");
- this.types = requireNonNull(types, "inputTypes is null");
+ this.types = requireNonNull(types, "types is null");
this.groupingSetNullChannels = requireNonNull(groupingSetNullChannels, "groupingSetNullChannels is null");
this.nullBlocks = requireNonNull(nullBlocks);
- checkArgument(nullBlocks.length == (types.size() - 1), "length of nullBlocks must be one plus length of types");
this.groupIdBlocks = requireNonNull(groupIdBlocks);
checkArgument(groupIdBlocks.length == groupingSetNullChannels.length, "groupIdBlocks and groupingSetNullChannels must have the same length");
+ this.groupInputs = requireNonNull(groupInputs);
+ this.copyInputs = requireNonNull(copyInputs);
}
@Override
@@ -200,17 +216,21 @@ public class GroupIdOperator
private Page generateNextPage()
{
// generate 'n' pages for every input page, where n is the number of grouping sets
- Block[] outputBlocks = new Block[currentPage.getChannelCount() + 1];
+ Block[] outputBlocks = new Block[types.size()];
- for (int channel = 0; channel < currentPage.getChannelCount(); channel++) {
- if (groupingSetNullChannels[currentGroupingSet].get(channel)) {
- outputBlocks[channel] = new RunLengthEncodedBlock(nullBlocks[channel], currentPage.getPositionCount());
+ for (int i = 0; i < groupInputs.length; i++) {
+ if (groupingSetNullChannels[currentGroupingSet].get(groupInputs[i])) {
+ outputBlocks[i] = new RunLengthEncodedBlock(nullBlocks[i], currentPage.getPositionCount());
}
else {
- outputBlocks[channel] = currentPage.getBlock(channel);
+ outputBlocks[i] = currentPage.getBlock(groupInputs[i]);
}
}
+ for (int i = 0; i < copyInputs.length; i++) {
+ outputBlocks[groupInputs.length + i] = currentPage.getBlock(copyInputs[i]);
+ }
+
outputBlocks[outputBlocks.length - 1] = new RunLengthEncodedBlock(groupIdBlocks[currentGroupingSet], currentPage.getPositionCount());
currentGroupingSet = (currentGroupingSet + 1) % groupingSetNullChannels.length;
Page outputPage = new Page(currentPage.getPositionCount(), outputBlocks);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
index 7689c44064..4b29a1e346 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -818,24 +818,42 @@ public class LocalExecutionPlanner
public PhysicalOperation visitGroupId(GroupIdNode node, LocalExecutionPlanContext context)
{
PhysicalOperation source = node.getSource().accept(this, context);
+ ImmutableMap.Builder<Symbol, Integer> newLayout = ImmutableMap.builder();
+ ImmutableList.Builder<Type> outputTypes = ImmutableList.builder();
- // add groupId to the layout
- int groupIdChannel = source.getLayout().values().stream()
- .mapToInt(Integer::intValue)
- .max()
- .orElse(-1) + 1;
+ int outputChannel = 0;
- Map<Symbol, Integer> newLayout = ImmutableMap.<Symbol, Integer>builder()
- .putAll(source.getLayout())
- .put(node.getGroupIdSymbol(), groupIdChannel)
- .build();
+ ImmutableList.Builder<Integer> groupingChannels = ImmutableList.builder();
+ for (Symbol inputSymbol : node.getDistinctGroupingColumns()) {
+ int inputChannel = source.getLayout().get(inputSymbol);
+ newLayout.put(inputSymbol, outputChannel++);
+ outputTypes.add(source.getTypes().get(inputChannel));
+ groupingChannels.add(inputChannel);
+ }
+
+ ImmutableList.Builder<Integer> copyChannels = ImmutableList.builder();
+ for (Symbol inputSymbol : node.getIdentityMappings().keySet()) {
+ int inputChannel = source.getLayout().get(inputSymbol);
+ newLayout.put(node.getIdentityMappings().get(inputSymbol), outputChannel++);
+ outputTypes.add(source.getTypes().get(inputChannel));
+ copyChannels.add(inputChannel);
+ }
+
+ newLayout.put(node.getGroupIdSymbol(), outputChannel);
+ outputTypes.add(BIGINT);
List<List<Integer>> groupingSetChannels = node.getGroupingSets().stream()
.map(groupingSet -> getChannelsForSymbols(groupingSet, source.getLayout()))
.collect(toImmutableList());
- OperatorFactory groupIdOperatorFactory = new GroupIdOperator.GroupIdOperatorFactory(context.getNextOperatorId(), node.getId(), source.getTypes(), groupingSetChannels);
- return new PhysicalOperation(groupIdOperatorFactory, newLayout, source);
+ OperatorFactory groupIdOperatorFactory = new GroupIdOperator.GroupIdOperatorFactory(context.getNextOperatorId(),
+ node.getId(),
+ outputTypes.build(),
+ groupingSetChannels,
+ groupingChannels.build(),
+ copyChannels.build());
+
+ return new PhysicalOperation(groupIdOperatorFactory, newLayout.build(), source);
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
index c6e0f073e4..02264cd077 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java
@@ -60,6 +60,7 @@ import com.google.common.collect.Iterables;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -369,29 +370,9 @@ class QueryPlanner
}
// 2. Aggregate
- ImmutableMap.Builder<Symbol, FunctionCall> aggregationAssignments = ImmutableMap.builder();
- ImmutableMap.Builder<Symbol, Signature> functions = ImmutableMap.builder();
- // 2.a. Rewrite aggregates in terms of pre-projected inputs
+ // 2.a. Rewrite group by expressions in terms of pre-projected inputs
TranslationMap translations = new TranslationMap(subPlan.getRelationPlan(), analysis);
- boolean needPostProjectionCoercion = false;
- for (FunctionCall aggregate : analysis.getAggregates(node)) {
- Expression rewritten = subPlan.rewrite(aggregate);
- Symbol newSymbol = symbolAllocator.newSymbol(rewritten, analysis.getType(aggregate));
-
- // TODO: this is a hack, because we apply coercions to the output of expressions, rather than the arguments to expressions.
- // Therefore we can end up with this implicit cast, and have to move it into a post-projection
- if (rewritten instanceof Cast) {
- rewritten = ((Cast) rewritten).getExpression();
- needPostProjectionCoercion = true;
- }
- aggregationAssignments.put(newSymbol, (FunctionCall) rewritten);
- translations.put(aggregate, newSymbol);
-
- functions.put(newSymbol, analysis.getFunctionSignature(aggregate));
- }
-
- // 2.b. Rewrite group by expressions in terms of pre-projected inputs
ImmutableList.Builder<List<Symbol>> groupingSetsSymbolsBuilder = ImmutableList.builder();
ImmutableSet.Builder<Symbol> distinctGroupingSymbolsBuilder = ImmutableSet.builder();
for (List<Expression> groupingSet : groupingSets) {
@@ -405,15 +386,49 @@ class QueryPlanner
groupingSetsSymbolsBuilder.add(groupingColumns.build());
}
+ // 2.b. Add a groupIdNode and groupIdSymbol if there are multiple grouping sets
List<List<Symbol>> groupingSetsSymbols = groupingSetsSymbolsBuilder.build();
- // 2.c. Add a groupIdNode and groupIdSymbol if there are multiple grouping sets
if (groupingSets.size() > 1) {
+ Set<Symbol> groupIdInputs = new HashSet<>();
+ distinctGroupingColumns.stream()
+ .map(subPlan::translate)
+ .forEach(groupIdInputs::add);
+
+ ImmutableMap.Builder<Symbol, Symbol> identityMapping = ImmutableMap.builder();
+ for (Expression argument : arguments) {
+ Symbol output = symbolAllocator.newSymbol(argument, analysis.getTypeWithCoercions(argument), "id");
+ identityMapping.put(subPlan.translate(argument), output);
+ groupIdInputs.add(subPlan.translate(argument));
+
+ // relies on the fact that group by expressions have already been re-written, and will not be affected by this mapping change
+ subPlan.getTranslations().put(argument, output);
+ }
+
Symbol groupIdSymbol = symbolAllocator.newSymbol("groupId", BIGINT);
- GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), subPlan.getRoot().getOutputSymbols(), groupingSetsSymbols, groupIdSymbol);
+ GroupIdNode groupId = new GroupIdNode(idAllocator.getNextId(), subPlan.getRoot(), groupingSetsSymbols, identityMapping.build(), groupIdSymbol);
subPlan = subPlan.withNewRoot(groupId);
distinctGroupingSymbolsBuilder.add(groupIdSymbol);
}
- List<Symbol> distinctGroupingSymbols = distinctGroupingSymbolsBuilder.build().asList();
+
+ // 2.c. Rewrite aggregates in terms of pre-projected inputs
+ ImmutableMap.Builder<Symbol, FunctionCall> aggregationAssignments = ImmutableMap.builder();
+ ImmutableMap.Builder<Symbol, Signature> functions = ImmutableMap.builder();
+ boolean needPostProjectionCoercion = false;
+ for (FunctionCall aggregate : analysis.getAggregates(node)) {
+ Expression rewritten = subPlan.rewrite(aggregate);
+ Symbol newSymbol = symbolAllocator.newSymbol(rewritten, analysis.getType(aggregate));
+
+ // TODO: this is a hack, because we apply coercions to the output of expressions, rather than the arguments to expressions.
+ // Therefore we can end up with this implicit cast, and have to move it into a post-projection
+ if (rewritten instanceof Cast) {
+ rewritten = ((Cast) rewritten).getExpression();
+ needPostProjectionCoercion = true;
+ }
+ aggregationAssignments.put(newSymbol, (FunctionCall) rewritten);
+ translations.put(aggregate, newSymbol);
+
+ functions.put(newSymbol, analysis.getFunctionSignature(aggregate));
+ }
// 2.d. Mark distinct rows for each aggregate that has DISTINCT
// Map from aggregate function arguments to marker symbols, so that we can reuse the markers, if two aggregates have the same argument
@@ -437,6 +452,7 @@ class QueryPlanner
masks.put(aggregateSymbol, marker);
}
+ List<Symbol> distinctGroupingSymbols = distinctGroupingSymbolsBuilder.build().asList();
for (Map.Entry<Set<Expression>, Symbol> entry : argumentMarkers.entrySet()) {
ImmutableList.Builder<Symbol> builder = ImmutableList.builder();
builder.addAll(distinctGroupingSymbols);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
index d93456e715..367d4deb5c 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java
@@ -113,6 +113,7 @@ public final class SymbolExtractor
node.getSource().accept(this, context);
builder.add(node.getGroupIdSymbol());
+ builder.addAll(node.getIdentityMappings().values());
return null;
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
index f1fb28c362..dcf584f27e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java
@@ -405,12 +405,21 @@ public class PruneUnreferencedOutputs
{
checkState(node.getDistinctGroupingColumns().stream().allMatch(column -> context.get().contains(column)));
- PlanNode source = context.rewrite(node.getSource(), ImmutableSet.copyOf(context.get()));
- List<Symbol> requiredSymbols = context.get().stream()
- .filter(symbol -> !symbol.equals(node.getGroupIdSymbol()))
- .collect(toImmutableList());
+ ImmutableMap.Builder<Symbol, Symbol> identityMappingBuilder = ImmutableMap.builder();
+ for (Map.Entry<Symbol, Symbol> entry : node.getIdentityMappings().entrySet()) {
+ if (context.get().contains(entry.getValue())) {
+ identityMappingBuilder.put(entry);
+ }
+ }
+
+ Map<Symbol, Symbol> identityMapping = identityMappingBuilder.build();
+
+ PlanNode source = context.rewrite(node.getSource(), ImmutableSet.<Symbol>builder()
+ .addAll(identityMapping.keySet())
+ .addAll(node.getDistinctGroupingColumns())
+ .build());
- return new GroupIdNode(node.getId(), source, requiredSymbols, node.getGroupingSets(), node.getGroupIdSymbol());
+ return new GroupIdNode(node.getId(), source, node.getGroupingSets(), identityMapping, node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
index b61ef06f94..bde6ac893d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java
@@ -162,7 +162,12 @@ public class UnaliasSymbolReferences
.map(this::canonicalize)
.collect(Collectors.toList());
- return new GroupIdNode(node.getId(), source, canonicalize(node.getInputSymbols()), groupingSetsSymbols, canonicalize(node.getGroupIdSymbol()));
+ ImmutableMap.Builder<Symbol, Symbol> newPassthroughMap = ImmutableMap.builder();
+ for (Symbol inputSymbol : node.getIdentityMappings().keySet()) {
+ newPassthroughMap.put(canonicalize(inputSymbol), canonicalize(node.getIdentityMappings().get(inputSymbol)));
+ }
+
+ return new GroupIdNode(node.getId(), source, groupingSetsSymbols, newPassthroughMap.build(), canonicalize(node.getGroupIdSymbol()));
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
index 40c98bebf0..960396df1b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java
@@ -174,7 +174,7 @@ public class ChildReplacer
@Override
public PlanNode visitGroupId(GroupIdNode node, List<PlanNode> newChildren)
{
- return new GroupIdNode(node.getId(), Iterables.getOnlyElement(newChildren), node.getInputSymbols(), node.getGroupingSets(), node.getGroupIdSymbol());
+ return new GroupIdNode(node.getId(), Iterables.getOnlyElement(newChildren), node.getGroupingSets(), node.getIdentityMappings(), node.getGroupIdSymbol());
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
index 2b3c7b7616..daf3560ced 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java
@@ -17,12 +17,15 @@ import com.facebook.presto.sql.planner.Symbol;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import javax.annotation.concurrent.Immutable;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static java.util.Objects.requireNonNull;
@@ -33,21 +36,21 @@ public class GroupIdNode
extends PlanNode
{
private final PlanNode source;
- private final List<Symbol> inputSymbols;
private final List<List<Symbol>> groupingSets;
+ private final Map<Symbol, Symbol> identityMappings;
private final Symbol groupIdSymbol;
@JsonCreator
public GroupIdNode(@JsonProperty("id") PlanNodeId id,
@JsonProperty("source") PlanNode source,
- @JsonProperty("inputSymbols") List<Symbol> inputSymbols,
@JsonProperty("groupingSets") List<List<Symbol>> groupingSets,
+ @JsonProperty("identityMappings") Map<Symbol, Symbol> identityMappings,
@JsonProperty("groupIdSymbol") Symbol groupIdSymbol)
{
super(id);
this.source = requireNonNull(source);
- this.inputSymbols = ImmutableList.copyOf(requireNonNull(inputSymbols));
this.groupingSets = ImmutableList.copyOf(requireNonNull(groupingSets));
+ this.identityMappings = ImmutableMap.copyOf(requireNonNull(identityMappings));
this.groupIdSymbol = requireNonNull(groupIdSymbol);
}
@@ -55,7 +58,8 @@ public class GroupIdNode
public List<Symbol> getOutputSymbols()
{
return ImmutableList.<Symbol>builder()
- .addAll(source.getOutputSymbols())
+ .addAll(getDistinctGroupingColumns())
+ .addAll(identityMappings.values())
.add(groupIdSymbol)
.build();
}
@@ -72,10 +76,12 @@ public class GroupIdNode
return source;
}
- @JsonProperty
- public List<Symbol> getInputSymbols()
+ public Set<Symbol> getInputSymbols()
{
- return inputSymbols;
+ return ImmutableSet.<Symbol>builder()
+ .addAll(identityMappings.keySet())
+ .addAll(getDistinctGroupingColumns())
+ .build();
}
@JsonProperty
@@ -84,6 +90,12 @@ public class GroupIdNode
return groupingSets;
}
+ @JsonProperty
+ public Map<Symbol, Symbol> getIdentityMappings()
+ {
+ return identityMappings;
+ }
+
public List<Symbol> getDistinctGroupingColumns()
{
return groupingSets.stream()
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java b/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
index 125bb02472..738a825da6 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java
@@ -71,23 +71,28 @@ public class TestGroupIdOperator
.build();
GroupIdOperatorFactory operatorFactory =
- new GroupIdOperatorFactory(0, new PlanNodeId("test"), ImmutableList.of(BIGINT, VARCHAR, BOOLEAN, BIGINT), ImmutableList.of(ImmutableList.of(1, 2), ImmutableList.of(3)));
+ new GroupIdOperatorFactory(0,
+ new PlanNodeId("test"),
+ ImmutableList.of(VARCHAR, BOOLEAN, BIGINT, BIGINT, BIGINT),
+ ImmutableList.of(ImmutableList.of(1, 2), ImmutableList.of(3)),
+ ImmutableList.of(1, 2, 3),
+ ImmutableList.of(0));
Operator operator = operatorFactory.createOperator(driverContext);
- MaterializedResult expected = resultBuilder(driverContext.getSession(), BIGINT, VARCHAR, BOOLEAN, BIGINT, BIGINT)
- .row(100L, "400", true, null, 0L)
- .row(101L, "401", false, null, 0L)
- .row(102L, "402", true, null, 0L)
- .row(200L, "500", true, null, 0L)
- .row(201L, "501", false, null, 0L)
- .row(202L, "502", true, null, 0L)
- .row(100L, null, null, 1000L, 1L)
- .row(101L, null, null, 1001L, 1L)
- .row(102L, null, null, 1002L, 1L)
- .row(200L, null, null, 1100L, 1L)
- .row(201L, null, null, 1101L, 1L)
- .row(202L, null, null, 1102L, 1L)
+ MaterializedResult expected = resultBuilder(driverContext.getSession(), VARCHAR, BOOLEAN, BIGINT, BIGINT, BIGINT)
+ .row("400", true, null, 100L, 0L)
+ .row("401", false, null, 101L, 0L)
+ .row("402", true, null, 102L, 0L)
+ .row("500", true, null, 200L, 0L)
+ .row("501", false, null, 201L, 0L)
+ .row("502", true, null, 202L, 0L)
+ .row(null, null, 1000L, 100L, 1L)
+ .row(null, null, 1001L, 101L, 1L)
+ .row(null, null, 1002L, 102L, 1L)
+ .row(null, null, 1100L, 200L, 1L)
+ .row(null, null, 1101L, 201L, 1L)
+ .row(null, null, 1102L, 202L, 1L)
.build();
List<Page> pages = toPages(operator, input.iterator());
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 1d43de6a41..bbad900d5d 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1420,6 +1420,33 @@ public abstract class AbstractTestQueries
"SELECT orderpriority, -1 FROM orders GROUP BY orderpriority");
}
+ @Test
+ public void testGroupingSetsAggregateOnGroupedColumn()
+ throws Exception
+ {
+ assertQuery("SELECT orderpriority, COUNT(orderpriority) FROM orders GROUP BY ROLLUP (orderpriority)",
+ "SELECT orderpriority, COUNT(orderpriority) FROM orders GROUP BY orderpriority UNION " +
+ "SELECT NULL, COUNT(orderpriority) FROM orders");
+ }
+
+ @Test
+ public void testGroupingSetsMultipleAggregatesOnGroupedColumn()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, suppkey, SUM(suppkey), COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY GROUPING SETS ((linenumber, suppkey), ())",
+ "SELECT linenumber, suppkey, SUM(suppkey), COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY linenumber, suppkey UNION " +
+ "SELECT NULL, NULL, SUM(suppkey), COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem");
+ }
+
+ @Test
+ public void testGroupingSetsMultipleAggregatesWithGroupedColumns()
+ throws Exception
+ {
+ assertQuery("SELECT linenumber, suppkey, COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY GROUPING SETS ((linenumber, suppkey), ())",
+ "SELECT linenumber, suppkey, COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem GROUP BY linenumber, suppkey UNION " +
+ "SELECT NULL, NULL, COUNT(linenumber), SUM(CAST(quantity AS BIGINT)) FROM lineitem");
+ }
+
@Test
public void testRollup()
throws Exception | ['presto-main/src/test/java/com/facebook/presto/operator/TestGroupIdOperator.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PruneUnreferencedOutputs.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/SymbolExtractor.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/QueryPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/GroupIdNode.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/UnaliasSymbolReferences.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/plan/ChildReplacer.java', 'presto-main/src/main/java/com/facebook/presto/operator/GroupIdOperator.java'] | 10 | 10 | 0 | 0 | 10 | {'.java': 10} | "2016-05-18T20:43:26" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
211 | prestodb/presto/5123/5110 | prestodb | presto | https://github.com/prestodb/presto/issues/5110 | https://github.com/prestodb/presto/pull/5123 | https://github.com/prestodb/presto/pull/5123 | 1 | Race condition in array_concat | fix | A query like:
``` sql
select count(x) from (
select concat(a, b) x
from t
)
```
where `a` and `b` are of type `array(map(string, double))`, fails non-deterministically with various exceptions (Presto version 0.144.2):
```
java.lang.IllegalStateException: closeEntry called before anything is written
at com.facebook.presto.spi.block.InterleavedBlockBuilder.closeEntry(InterleavedBlockBuilder.java:212)
at com.facebook.presto.spi.block.ArrayElementBlockWriter.closeEntry(ArrayElementBlockWriter.java:127)
at com.facebook.presto.spi.block.AbstractArrayBlock.writePositionTo(AbstractArrayBlock.java:155)
at com.facebook.presto.type.MapType.appendTo(MapType.java:192)
at com.facebook.presto.operator.scalar.ArrayConcatFunction.concat(ArrayConcatFunction.java:53)
at com_facebook_presto_$gen_CursorProcessor_37019.project_0(Unknown Source)
at com_facebook_presto_$gen_CursorProcessor_37019.process(Unknown Source)
at com.facebook.presto.operator.ScanFilterAndProjectOperator.getOutput(ScanFilterAndProjectOperator.java:215)
at com.facebook.presto.operator.Driver.processInternal(Driver.java:380)
at com.facebook.presto.operator.Driver.processFor(Driver.java:303)
at com.facebook.presto.execution.SqlTaskExecution$DriverSplitRunner.processFor(SqlTaskExecution.java:577)
at com.facebook.presto.execution.TaskExecutor$PrioritizedSplitRunner.process(TaskExecutor.java:529)
at com.facebook.presto.execution.TaskExecutor$Runner.run(TaskExecutor.java:665)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
```
Query 20160425_183530_20138_n949w failed: Expected current entry size to be exactly 0 but was 0
java.lang.IllegalStateException: Expected current entry size to be exactly 0 but was 0
at com.facebook.presto.spi.block.ArrayBlockBuilder.beginBlockEntry(ArrayBlockBuilder.java:193)
at com.facebook.presto.spi.block.ArrayBlockBuilder.beginBlockEntry(ArrayBlockBuilder.java:24)
at com.facebook.presto.spi.block.AbstractArrayBlock.writePositionTo(AbstractArrayBlock.java:146)
at com.facebook.presto.type.MapType.appendTo(MapType.java:192)
at com.facebook.presto.operator.scalar.ArrayConcatFunction.concat(ArrayConcatFunction.java:53)
at com_facebook_presto_$gen_CursorProcessor_36742.project_0(Unknown Source)
at com_facebook_presto_$gen_CursorProcessor_36742.process(Unknown Source)
at com.facebook.presto.operator.ScanFilterAndProjectOperator.getOutput(ScanFilterAndProjectOperator.java:215)
at com.facebook.presto.operator.Driver.processInternal(Driver.java:380)
at com.facebook.presto.operator.Driver.processFor(Driver.java:303)
at com.facebook.presto.execution.SqlTaskExecution$DriverSplitRunner.processFor(SqlTaskExecution.java:577)
at com.facebook.presto.execution.TaskExecutor$PrioritizedSplitRunner.process(TaskExecutor.java:529)
at com.facebook.presto.execution.TaskExecutor$Runner.run(TaskExecutor.java:665)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
```
Query 20160425_183539_20170_n949w failed: Expected current entry size to be exactly 0 but was 1
java.lang.IllegalStateException: Expected current entry size to be exactly 0 but was 1
at com.facebook.presto.spi.block.ArrayBlockBuilder.beginBlockEntry(ArrayBlockBuilder.java:193)
at com.facebook.presto.spi.block.ArrayBlockBuilder.beginBlockEntry(ArrayBlockBuilder.java:24)
at com.facebook.presto.spi.block.AbstractArrayBlock.writePositionTo(AbstractArrayBlock.java:146)
at com.facebook.presto.type.MapType.appendTo(MapType.java:192)
at com.facebook.presto.operator.scalar.ArrayConcatFunction.concat(ArrayConcatFunction.java:53)
at com_facebook_presto_$gen_CursorProcessor_37840.project_0(Unknown Source)
at com_facebook_presto_$gen_CursorProcessor_37840.process(Unknown Source)
at com.facebook.presto.operator.ScanFilterAndProjectOperator.getOutput(ScanFilterAndProjectOperator.java:215)
at com.facebook.presto.operator.Driver.processInternal(Driver.java:380)
at com.facebook.presto.operator.Driver.processFor(Driver.java:303)
at com.facebook.presto.execution.SqlTaskExecution$DriverSplitRunner.processFor(SqlTaskExecution.java:577)
at com.facebook.presto.execution.TaskExecutor$PrioritizedSplitRunner.process(TaskExecutor.java:529)
at com.facebook.presto.execution.TaskExecutor$Runner.run(TaskExecutor.java:665)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| 7beadecb0d85efc5e33bd0f7505d8c8347dd81dd | 73ccbf177d312daaff7c8c585f5d230ef468c722 | https://github.com/prestodb/presto/compare/7beadecb0d85efc5e33bd0f7505d8c8347dd81dd...73ccbf177d312daaff7c8c585f5d230ef468c722 | diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcPageSourceMemoryTracking.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcPageSourceMemoryTracking.java
index 05aad9aeca..db5ca3f689 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcPageSourceMemoryTracking.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestOrcPageSourceMemoryTracking.java
@@ -419,7 +419,7 @@ public class TestOrcPageSourceMemoryTracking
new PlanNodeId("test"),
new PlanNodeId("0"),
(session, split, columnHandles) -> pageSource,
- new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, projections),
+ () -> new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, projections),
() -> new GenericPageProcessor(FilterFunctions.TRUE_FUNCTION, projections),
columns.stream().map(columnHandle -> (ColumnHandle) columnHandle).collect(toList()),
types
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java
index 0518c3e982..4492c1d74c 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java
@@ -299,7 +299,7 @@ public class ScanFilterAndProjectOperator
{
private final int operatorId;
private final PlanNodeId planNodeId;
- private final CursorProcessor cursorProcessor;
+ private final Supplier<CursorProcessor> cursorProcessor;
private final Supplier<PageProcessor> pageProcessor;
private final PlanNodeId sourceId;
private final PageSourceProvider pageSourceProvider;
@@ -312,7 +312,7 @@ public class ScanFilterAndProjectOperator
PlanNodeId planNodeId,
PlanNodeId sourceId,
PageSourceProvider pageSourceProvider,
- CursorProcessor cursorProcessor,
+ Supplier<CursorProcessor> cursorProcessor,
Supplier<PageProcessor> pageProcessor,
Iterable<ColumnHandle> columns,
List<Type> types)
@@ -348,7 +348,7 @@ public class ScanFilterAndProjectOperator
operatorContext,
sourceId,
pageSourceProvider,
- cursorProcessor,
+ cursorProcessor.get(),
pageProcessor.get(),
columns,
types);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java
index aad8240bb1..ec012e2b2e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java
@@ -81,15 +81,17 @@ public class ExpressionCompiler
return pageProcessors.size();
}
- public CursorProcessor compileCursorProcessor(RowExpression filter, List<RowExpression> projections, Object uniqueKey)
+ public Supplier<CursorProcessor> compileCursorProcessor(RowExpression filter, List<RowExpression> projections, Object uniqueKey)
{
- try {
- return cursorProcessors.getUnchecked(new CacheKey(filter, projections, uniqueKey))
- .newInstance();
- }
- catch (ReflectiveOperationException e) {
- throw Throwables.propagate(e);
- }
+ Class<? extends CursorProcessor> cursorProcessor = cursorProcessors.getUnchecked(new CacheKey(filter, projections, uniqueKey));
+ return () -> {
+ try {
+ return cursorProcessor.newInstance();
+ }
+ catch (ReflectiveOperationException e) {
+ throw Throwables.propagate(e);
+ }
+ };
}
public Supplier<PageProcessor> compilePageProcessor(RowExpression filter, List<RowExpression> projections)
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
index f98890a7e4..f4e8e6e6eb 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -978,7 +978,7 @@ public class LocalExecutionPlanner
try {
if (columns != null) {
- CursorProcessor cursorProcessor = compiler.compileCursorProcessor(translatedFilter, translatedProjections, sourceNode.getId());
+ Supplier<CursorProcessor> cursorProcessor = compiler.compileCursorProcessor(translatedFilter, translatedProjections, sourceNode.getId());
Supplier<PageProcessor> pageProcessor = compiler.compilePageProcessor(translatedFilter, translatedProjections);
SourceOperatorFactory operatorFactory = new ScanFilterAndProjectOperator.ScanFilterAndProjectOperatorFactory(
@@ -1050,7 +1050,7 @@ public class LocalExecutionPlanner
planNodeId,
sourceNode.getId(),
pageSourceProvider,
- new GenericCursorProcessor(filterFunction, projectionFunctions),
+ () -> new GenericCursorProcessor(filterFunction, projectionFunctions),
() -> new GenericPageProcessor(filterFunction, projectionFunctions),
columns,
toTypes(projectionFunctions));
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java b/presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java
index 1ed44ce165..d9ccc89e6f 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java
@@ -71,7 +71,7 @@ public class TestScanFilterAndProjectOperator
return new FixedPageSource(ImmutableList.of(input));
}
},
- new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
+ () -> new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
() -> new GenericPageProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
ImmutableList.<ColumnHandle>of(),
ImmutableList.<Type>of(VARCHAR));
@@ -105,7 +105,7 @@ public class TestScanFilterAndProjectOperator
return new RecordPageSource(new PageRecordSet(ImmutableList.<Type>of(VARCHAR), input));
}
},
- new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
+ () -> new GenericCursorProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
() -> new GenericPageProcessor(FilterFunctions.TRUE_FUNCTION, ImmutableList.of(singleColumn(VARCHAR, 0))),
ImmutableList.<ColumnHandle>of(),
ImmutableList.<Type>of(VARCHAR));
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
index 0c394c94df..b478b32aa8 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
@@ -608,7 +608,7 @@ public final class FunctionAssertions
SQL_PARSER, INPUT_TYPES, ImmutableList.of(filter, projection));
try {
- CursorProcessor cursorProcessor = compiler.compileCursorProcessor(
+ Supplier<CursorProcessor> cursorProcessor = compiler.compileCursorProcessor(
toRowExpression(filter, expressionTypes),
ImmutableList.of(toRowExpression(projection, expressionTypes)),
SOURCE_ID); | ['presto-main/src/main/java/com/facebook/presto/sql/gen/ExpressionCompiler.java', 'presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java', 'presto-hive/src/test/java/com/facebook/presto/hive/TestOrcPageSourceMemoryTracking.java', 'presto-main/src/test/java/com/facebook/presto/operator/TestScanFilterAndProjectOperator.java', 'presto-main/src/main/java/com/facebook/presto/operator/ScanFilterAndProjectOperator.java'] | 6 | 6 | 0 | 0 | 6 | {'.java': 6} | "2016-04-26T20:21:06" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
225 | prestodb/presto/1869/1864 | prestodb | presto | https://github.com/prestodb/presto/issues/1864 | https://github.com/prestodb/presto/pull/1869 | https://github.com/prestodb/presto/pull/1869 | 1 | Null partition keys break Hive partition pruning | fixes | If the table has a partition key like `key=__HIVE_DEFAULT_PARTITION__`, the following query:
```
SELECT
key
, count(*)
from TABLE
GROUP BY 1
```
returns results like:
```
key | _col1
---------+--------
windows | 1
NULL | 2
ios | 3
android | 4
(4 rows)
```
But the following query return no rows:
```
SELECT
key
, count(*)
from TABLE
WHERE key is null
GROUP BY 1
```
| 477d90d9ba6a9fa75c9eecffd63564a31411b551 | 9c0145af61020fda5fd2042e1388eb29bdea4d90 | https://github.com/prestodb/presto/compare/477d90d9ba6a9fa75c9eecffd63564a31411b551...9c0145af61020fda5fd2042e1388eb29bdea4d90 | diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
index 5291b65c4c..a53f35414e 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
@@ -62,6 +62,7 @@ import java.util.concurrent.Callable;
import static com.facebook.presto.hive.HiveColumnHandle.hiveColumnIndexGetter;
import static com.facebook.presto.hive.HiveColumnHandle.isPartitionKeyPredicate;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_CANNOT_OPEN_SPLIT;
+import static com.facebook.presto.hive.HivePartitionKey.HIVE_DEFAULT_DYNAMIC_PARTITION;
import static com.facebook.presto.hive.HiveType.HIVE_BOOLEAN;
import static com.facebook.presto.hive.HiveType.HIVE_BYTE;
import static com.facebook.presto.hive.HiveType.HIVE_DATE;
@@ -321,7 +322,7 @@ public final class HiveUtil
public static SerializableNativeValue parsePartitionValue(String partitionName, String value, HiveType hiveType, DateTimeZone timeZone)
{
- boolean isNull = isHiveNull(value.getBytes(UTF_8));
+ boolean isNull = HIVE_DEFAULT_DYNAMIC_PARTITION.equals(value);
if (HIVE_BOOLEAN.equals(hiveType)) {
if (isNull) { | ['presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2014-10-28T00:40:32" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
224 | prestodb/presto/1992/1991 | prestodb | presto | https://github.com/prestodb/presto/issues/1991 | https://github.com/prestodb/presto/pull/1992 | https://github.com/prestodb/presto/pull/1992 | 1 | Query input rows/size stats not tracked properly for JOIN queries | fixes | The query-level stats only include the row/size from the leaf stage. The should include the inputs for all stages that perform table scans.
For example:
```
1:20 [ 130M rows, 14.1GB] [1.64M rows/s, 182MB/s] [ <=> ]
STAGES ROWS ROWS/s BYTES BYTES/s QUEUED RUN DONE
0.........R 0 0 0B 0B 0 1 0
1.......R 0 0 0B 0B 0 20 0
2.....S 13B 163M 1.82T 23.4G 1478 8870 27560
3...F 43.1M 0 2.38G 0B 0 0 20
4.F 130M 0 14.1G 0B 0 0 2363
```
The bug is possibly due to the following check in `QueryStateMachine.getQueryInfo()`, line 193:
``` java
if (stageInfo.getSubStages().isEmpty()) {
```
| 70ff6bac3ae6b4f2c91555c0e52121021eb313d9 | 8dd30570a1d8e40f0a267fcb6b02230dd58eb185 | https://github.com/prestodb/presto/compare/70ff6bac3ae6b4f2c91555c0e52121021eb313d9...8dd30570a1d8e40f0a267fcb6b02230dd58eb185 | diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
index b909d8c410..67578efa87 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java
@@ -19,12 +19,14 @@ import com.facebook.presto.client.FailureInfo;
import com.facebook.presto.execution.StateMachine.StateChangeListener;
import com.facebook.presto.spi.ErrorCode;
import com.facebook.presto.spi.PrestoException;
+import com.facebook.presto.sql.planner.plan.TableScanNode;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import io.airlift.log.Logger;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
@@ -190,7 +192,7 @@ public class QueryStateMachine
totalUserTime += stageStats.getTotalUserTime().roundTo(NANOSECONDS);
totalBlockedTime += stageStats.getTotalBlockedTime().roundTo(NANOSECONDS);
- if (stageInfo.getSubStages().isEmpty()) {
+ if (Iterables.any(stageInfo.getPlan().getSources(), Predicates.instanceOf(TableScanNode.class))) {
rawInputDataSize += stageStats.getRawInputDataSize().toBytes();
rawInputPositions += stageStats.getRawInputPositions();
| ['presto-main/src/main/java/com/facebook/presto/execution/QueryStateMachine.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2014-11-19T08:31:40" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
223 | prestodb/presto/2271/1696 | prestodb | presto | https://github.com/prestodb/presto/issues/1696 | https://github.com/prestodb/presto/pull/2271 | https://github.com/prestodb/presto/pull/2271 | 1 | Compilation for try_cast is broken | fixes | The exception handling is completely broken because exceptions clear the stack. It needs to be in a separate method. This query reproduces it:
```
select concat('foo', try_cast(x as varchar)) from (values (1)) a (x);
```
Exception:
```
java.lang.VerifyError: Instruction type does not match stack map
```
| 6ce854ea9f07006ff509ec9db6eca11f3212c45c | 90348e394c04387e3c68c0b94d401fbbf99d5952 | https://github.com/prestodb/presto/compare/6ce854ea9f07006ff509ec9db6eca11f3212c45c...90348e394c04387e3c68c0b94d401fbbf99d5952 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/ByteCodeUtils.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/ByteCodeUtils.java
index 468704ffe1..2cb18b820d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/ByteCodeUtils.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/ByteCodeUtils.java
@@ -152,7 +152,8 @@ public final class ByteCodeUtils
MethodType methodType = binding.getType();
Signature signature = function.getSignature();
- Class<?> unboxedReturnType = Primitives.unwrap(methodType.returnType());
+ Class<?> returnType = methodType.returnType();
+ Class<?> unboxedReturnType = Primitives.unwrap(returnType);
LabelNode end = new LabelNode("end");
Block block = new Block(context)
@@ -181,23 +182,35 @@ public final class ByteCodeUtils
block.append(invoke(context, binding, function.getSignature()));
if (function.isNullable()) {
- if (unboxedReturnType.isPrimitive() && unboxedReturnType != void.class) {
- LabelNode notNull = new LabelNode("notNull");
- block.dup(methodType.returnType())
- .ifNotNullGoto(notNull)
- .putVariable("wasNull", true)
- .comment("swap boxed null with unboxed default")
- .pop(methodType.returnType())
- .pushJavaDefault(unboxedReturnType)
- .gotoLabel(end)
- .visitLabel(notNull)
- .append(unboxPrimitive(context, unboxedReturnType));
- }
- else {
- block.dup(methodType.returnType())
- .ifNotNullGoto(end)
- .putVariable("wasNull", true);
- }
+ block.append(unboxPrimitiveIfNecessary(context, returnType));
+ }
+ block.visitLabel(end);
+
+ return block;
+ }
+
+ public static Block unboxPrimitiveIfNecessary(CompilerContext context, Class<?> boxedType)
+ {
+ Block block = new Block(context);
+ LabelNode end = new LabelNode("end");
+ Class<?> unboxedType = Primitives.unwrap(boxedType);
+
+ if (unboxedType.isPrimitive() && unboxedType != void.class) {
+ LabelNode notNull = new LabelNode("notNull");
+ block.dup(boxedType)
+ .ifNotNullGoto(notNull)
+ .putVariable("wasNull", true)
+ .comment("swap boxed null with unboxed default")
+ .pop(boxedType)
+ .pushJavaDefault(unboxedType)
+ .gotoLabel(end)
+ .visitLabel(notNull)
+ .append(unboxPrimitive(context, unboxedType));
+ }
+ else {
+ block.dup(boxedType)
+ .ifNotNullGoto(end)
+ .putVariable("wasNull", true);
}
block.visitLabel(end);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java
index c0d534724b..0f91ebca5f 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java
@@ -59,14 +59,6 @@ public final class CompilerOperations
return left > right;
}
- public static void propagateInterruptedException(Throwable throwable)
- {
- if (throwable instanceof InterruptedException) {
- Thread.currentThread().interrupt();
- throw new RuntimeException(throwable);
- }
- }
-
public static boolean in(Object value, Set<?> set)
{
return set.contains(value);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCastCodeGenerator.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCastCodeGenerator.java
index 8c74c604c5..b09c3a3f8d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCastCodeGenerator.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCastCodeGenerator.java
@@ -16,14 +16,23 @@ package com.facebook.presto.sql.gen;
import com.facebook.presto.byteCode.Block;
import com.facebook.presto.byteCode.ByteCodeNode;
import com.facebook.presto.byteCode.CompilerContext;
-import com.facebook.presto.byteCode.control.TryCatch;
+import com.facebook.presto.byteCode.instruction.LabelNode;
import com.facebook.presto.metadata.Signature;
import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.relational.RowExpression;
+import com.google.common.primitives.Primitives;
+import java.lang.invoke.MethodHandle;
import java.util.List;
-import static com.facebook.presto.byteCode.ParameterizedType.type;
+import static com.facebook.presto.sql.gen.ByteCodeUtils.ifWasNullPopAndGoto;
+import static com.facebook.presto.sql.gen.ByteCodeUtils.invoke;
+import static com.facebook.presto.sql.gen.ByteCodeUtils.unboxPrimitiveIfNecessary;
+import static com.facebook.presto.type.UnknownType.UNKNOWN;
+import static java.lang.invoke.MethodHandles.catchException;
+import static java.lang.invoke.MethodHandles.constant;
+import static java.lang.invoke.MethodHandles.dropArguments;
+import static java.lang.invoke.MethodType.methodType;
public class TryCastCodeGenerator
implements ByteCodeGenerator
@@ -31,19 +40,43 @@ public class TryCastCodeGenerator
@Override
public ByteCodeNode generateExpression(Signature signature, ByteCodeGeneratorContext generatorContext, Type returnType, List<RowExpression> arguments)
{
- ByteCodeNode castByteCode = new CastCodeGenerator().generateExpression(signature, generatorContext, returnType, arguments);
-
CompilerContext context = generatorContext.getContext();
- Block catchBlock = new Block(context)
- .comment("propagate InterruptedException")
- .invokeStatic(CompilerOperations.class, "propagateInterruptedException", void.class, Throwable.class)
- .comment("wasNull = true;")
- .putVariable("wasNull", true)
- .comment("restore stack after exception")
- .getVariable("output") // TODO: this is quite a strong assumption to make. This code should not be sensitive to whether "output" was on the stack before the call
- .comment("return dummy value for null")
- .pushJavaDefault(returnType.getJavaType());
-
- return new TryCatch(context, "TRY_CAST", castByteCode, catchBlock, type(Exception.class));
+ RowExpression argument = arguments.get(0);
+
+ Class<?> argumentType = argument.getType().getJavaType();
+ Class<?> unboxedReturnType = returnType.getJavaType();
+ Class<?> boxedReturnType = Primitives.wrap(unboxedReturnType);
+
+ if (argument.getType().equals(UNKNOWN)) {
+ return new Block(context)
+ .putVariable("wasNull", true)
+ .pushJavaDefault(unboxedReturnType);
+ }
+
+ MethodHandle function = generatorContext
+ .getRegistry()
+ .getCoercion(argument.getType(), returnType)
+ .getMethodHandle()
+ .asType(methodType(boxedReturnType, argumentType));
+
+ MethodHandle tryCast = exceptionToNull(function, boxedReturnType, RuntimeException.class);
+
+ Binding tryCastBinding = generatorContext.getCallSiteBinder().bind(tryCast);
+
+ LabelNode end = new LabelNode("end");
+
+ return new Block(context)
+ .comment("call tryCast method")
+ .append(generatorContext.generate(argument))
+ .append(ifWasNullPopAndGoto(context, end, unboxedReturnType, argumentType))
+ .append(invoke(generatorContext.getContext(), tryCastBinding, "tryCast"))
+ .append(unboxPrimitiveIfNecessary(context, boxedReturnType))
+ .visitLabel(end);
+ }
+
+ private static MethodHandle exceptionToNull(MethodHandle target, Class<?> type, Class<? extends Throwable> throwable)
+ {
+ MethodHandle toNull = dropArguments(constant(type, null), 0, throwable);
+ return catchException(target, throwable, toNull);
}
}
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java b/presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java
index 094181a730..3aed863516 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java
@@ -543,8 +543,13 @@ public class TestExpressionCompiler
assertExecute("try_cast('foo' as varchar)", "foo");
assertExecute("try_cast('foo' as bigint)", null);
assertExecute("try_cast(bound_string as bigint)", null);
+ assertExecute("try_cast(cast(null as varchar) as bigint)", null);
+ assertExecute("try_cast(bound_long / 13 as bigint)", 94);
assertExecute("coalesce(try_cast('123' as bigint), 456)", 123L);
assertExecute("coalesce(try_cast('foo' as bigint), 456)", 456L);
+ assertExecute("concat('foo', cast('bar' as varchar))", "foobar");
+ assertExecute("try_cast(try_cast(123 as varchar) as bigint)", 123L);
+ assertExecute("try_cast('foo' as varchar) || try_cast('bar' as varchar)", "foobar");
Futures.allAsList(futures).get();
}
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index a65a5e4b5c..015fedab8b 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -2248,6 +2248,9 @@ public abstract class AbstractTestQueries
assertQuery("SELECT try_cast('foo' AS BIGINT) FROM orders", "SELECT CAST(null AS BIGINT) FROM orders");
assertQuery("SELECT try_cast(clerk AS BIGINT) FROM orders", "SELECT CAST(null AS BIGINT) FROM orders");
+ assertQuery("SELECT try_cast(orderkey * orderkey AS VARCHAR) FROM orders", "SELECT CAST(orderkey * orderkey AS VARCHAR) FROM orders");
+ assertQuery("SELECT try_cast(try_cast(orderkey AS VARCHAR) AS BIGINT) FROM orders", "SELECT orderkey FROM orders");
+ assertQuery("SELECT try_cast(clerk AS VARCHAR) || try_cast(clerk AS VARCHAR) FROM orders", "SELECT clerk || clerk FROM orders");
assertQuery("SELECT coalesce(try_cast('foo' AS BIGINT), 456) FROM orders", "SELECT 456 FROM orders");
assertQuery("SELECT coalesce(try_cast(clerk AS BIGINT), 456) FROM orders", "SELECT 456 FROM orders"); | ['presto-main/src/main/java/com/facebook/presto/sql/gen/TryCastCodeGenerator.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/ByteCodeUtils.java', 'presto-main/src/test/java/com/facebook/presto/sql/gen/TestExpressionCompiler.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/CompilerOperations.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2015-01-26T06:31:48" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
222 | prestodb/presto/2364/2330 | prestodb | presto | https://github.com/prestodb/presto/issues/2330 | https://github.com/prestodb/presto/pull/2364 | https://github.com/prestodb/presto/pull/2364 | 1 | Detect quick worker restarts and fail queries immediately | fixes | When a worker restart, the engine may not notice the change and wait for work that will never complete. An easy fix for this is to add the node instance id to task info and then the `HttpRemoteTask` would see the change and fail the task.
This issue is identified by having a task stuck in the RUNNING state with 0 splits assigned. If there are multiple queries, they will all be stuck on the same node or nodes that rebooted.
| 4260ab3d315025f6a450bc7188f21cdd38c22c76 | 39202d3ffeb50897c0d7d8a30c29c13a01773dd3 | https://github.com/prestodb/presto/compare/4260ab3d315025f6a450bc7188f21cdd38c22c76...39202d3ffeb50897c0d7d8a30c29c13a01773dd3 | diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlTask.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlTask.java
index 1ee5413c8d..12d7dfb1ef 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/SqlTask.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlTask.java
@@ -35,6 +35,7 @@ import javax.annotation.Nullable;
import java.net.URI;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicLong;
@@ -49,6 +50,7 @@ public class SqlTask
private static final Logger log = Logger.get(SqlTask.class);
private final TaskId taskId;
+ private final String nodeInstanceId;
private final URI location;
private final TaskStateMachine taskStateMachine;
private final SharedBuffer sharedBuffer;
@@ -62,6 +64,7 @@ public class SqlTask
public SqlTask(
TaskId taskId,
+ String nodeInstanceId,
URI location,
SqlTaskExecutionFactory sqlTaskExecutionFactory,
ExecutorService taskNotificationExecutor,
@@ -69,6 +72,7 @@ public class SqlTask
DataSize maxBufferSize)
{
this.taskId = checkNotNull(taskId, "taskId is null");
+ this.nodeInstanceId = checkNotNull(nodeInstanceId, "nodeInstanceId is null");
this.location = checkNotNull(location, "location is null");
this.sqlTaskExecutionFactory = checkNotNull(sqlTaskExecutionFactory, "sqlTaskExecutionFactory is null");
checkNotNull(taskNotificationExecutor, "taskNotificationExecutor is null");
@@ -174,6 +178,7 @@ public class SqlTask
return new TaskInfo(
taskStateMachine.getTaskId(),
+ Optional.of(nodeInstanceId),
versionNumber,
state,
location,
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java
index 480d0a9f8e..1727c91682 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java
@@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.ListenableFuture;
import io.airlift.concurrent.ThreadPoolExecutorMBean;
import io.airlift.log.Logger;
+import io.airlift.node.NodeInfo;
import io.airlift.units.DataSize;
import io.airlift.units.Duration;
import org.joda.time.DateTime;
@@ -78,8 +79,10 @@ public class SqlTaskManager
final LocationFactory locationFactory,
TaskExecutor taskExecutor,
QueryMonitor queryMonitor,
+ NodeInfo nodeInfo,
TaskManagerConfig config)
{
+ checkNotNull(nodeInfo, "nodeInfo is null");
checkNotNull(config, "config is null");
infoCacheTime = config.getInfoMaxAge();
clientTimeout = config.getClientTimeout();
@@ -102,6 +105,7 @@ public class SqlTaskManager
{
return new SqlTask(
taskId,
+ nodeInfo.getInstanceId(),
locationFactory.createLocalTaskLocation(taskId),
sqlTaskExecutionFactory,
taskNotificationExecutor,
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/TaskInfo.java b/presto-main/src/main/java/com/facebook/presto/execution/TaskInfo.java
index d68b08c45e..f20dad9dd4 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/TaskInfo.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/TaskInfo.java
@@ -24,6 +24,7 @@ import javax.annotation.concurrent.Immutable;
import java.net.URI;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -50,6 +51,7 @@ public class TaskInfo
public static final long MAX_VERSION = Long.MAX_VALUE;
private final TaskId taskId;
+ private final Optional<String> nodeInstanceId;
private final long version;
private final TaskState state;
private final URI self;
@@ -61,6 +63,7 @@ public class TaskInfo
@JsonCreator
public TaskInfo(@JsonProperty("taskId") TaskId taskId,
+ @JsonProperty("nodeInstanceId") Optional<String> nodeInstanceId,
@JsonProperty("version") long version,
@JsonProperty("state") TaskState state,
@JsonProperty("self") URI self,
@@ -71,6 +74,7 @@ public class TaskInfo
@JsonProperty("failures") List<ExecutionFailureInfo> failures)
{
this.taskId = checkNotNull(taskId, "taskId is null");
+ this.nodeInstanceId = checkNotNull(nodeInstanceId, "nodeInstanceId is null");
this.version = checkNotNull(version, "version is null");
this.state = checkNotNull(state, "state is null");
this.self = checkNotNull(self, "self is null");
@@ -93,6 +97,12 @@ public class TaskInfo
return taskId;
}
+ @JsonProperty
+ public Optional<String> getNodeInstanceId()
+ {
+ return nodeInstanceId;
+ }
+
@JsonProperty
public long getVersion()
{
@@ -143,7 +153,7 @@ public class TaskInfo
public TaskInfo summarize()
{
- return new TaskInfo(taskId, version, state, self, lastHeartbeat, outputBuffers, noMoreSplits, stats.summarize(), failures);
+ return new TaskInfo(taskId, nodeInstanceId, version, state, self, lastHeartbeat, outputBuffers, noMoreSplits, stats.summarize(), failures);
}
@Override
diff --git a/presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTask.java b/presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTask.java
index 473996c505..40e59dab43 100644
--- a/presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTask.java
+++ b/presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTask.java
@@ -67,6 +67,7 @@ import java.net.URI;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.CancellationException;
@@ -82,7 +83,9 @@ import java.util.concurrent.atomic.AtomicReference;
import static com.facebook.presto.spi.StandardErrorCode.REMOTE_TASK_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.TOO_MANY_REQUESTS_FAILED;
+import static com.facebook.presto.spi.StandardErrorCode.WORKER_RESTARTED;
import static com.facebook.presto.util.Failures.WORKER_NODE_ERROR;
+import static com.facebook.presto.util.Failures.WORKER_RESTARTED_ERROR;
import static com.facebook.presto.util.Failures.toFailure;
import static com.facebook.presto.util.ImmutableCollectors.toImmutableList;
import static com.google.common.base.MoreObjects.toStringHelper;
@@ -188,6 +191,7 @@ public class HttpRemoteTask
taskInfo = new StateMachine<>("task " + taskId, executor, new TaskInfo(
taskId,
+ Optional.empty(),
TaskInfo.MIN_VERSION,
TaskState.PLANNED,
location,
@@ -322,7 +326,14 @@ public class HttpRemoteTask
}
// change to new value if old value is not changed and new value has a newer version
+ AtomicBoolean workerRestarted = new AtomicBoolean();
taskInfo.setIf(newValue, oldValue -> {
+ // did the worker restart
+ if (oldValue.getNodeInstanceId().isPresent() && !oldValue.getNodeInstanceId().equals(newValue.getNodeInstanceId())) {
+ workerRestarted.set(true);
+ return false;
+ }
+
if (oldValue.getState().isDone()) {
// never update if the task has reached a terminal state
return false;
@@ -334,6 +345,12 @@ public class HttpRemoteTask
return true;
});
+ if (workerRestarted.get()) {
+ PrestoException exception = new PrestoException(WORKER_RESTARTED, format("%s (%s)", WORKER_RESTARTED_ERROR, newValue.getSelf()));
+ failTask(exception);
+ abort();
+ }
+
// remove acknowledged splits, which frees memory
for (TaskSource source : sources) {
PlanNodeId planNodeId = source.getPlanNodeId();
@@ -465,6 +482,7 @@ public class HttpRemoteTask
TaskInfo taskInfo = getTaskInfo();
URI uri = taskInfo.getSelf();
updateTaskInfo(new TaskInfo(taskInfo.getTaskId(),
+ taskInfo.getNodeInstanceId(),
TaskInfo.MAX_VERSION,
TaskState.ABORTED,
uri,
@@ -521,6 +539,7 @@ public class HttpRemoteTask
log.debug(cause, "Remote task failed: %s", taskInfo.getSelf());
}
updateTaskInfo(new TaskInfo(taskInfo.getTaskId(),
+ taskInfo.getNodeInstanceId(),
TaskInfo.MAX_VERSION,
TaskState.FAILED,
taskInfo.getSelf(),
diff --git a/presto-main/src/main/java/com/facebook/presto/util/Failures.java b/presto-main/src/main/java/com/facebook/presto/util/Failures.java
index d84d0d8af8..e9b52ae132 100644
--- a/presto-main/src/main/java/com/facebook/presto/util/Failures.java
+++ b/presto-main/src/main/java/com/facebook/presto/util/Failures.java
@@ -34,11 +34,13 @@ import static java.util.Arrays.asList;
public final class Failures
{
- public static final String WORKER_NODE_ERROR = "" +
- "Encountered too many errors talking to a worker node. " +
- "The node may have crashed or be under too much load. " +
+ private static final String NODE_CRASHED_ERROR = "The node may have crashed or be under too much load. " +
"This is probably a transient issue, so please retry your query in a few minutes.";
+ public static final String WORKER_NODE_ERROR = "Encountered too many errors talking to a worker node. " + NODE_CRASHED_ERROR;
+
+ public static final String WORKER_RESTARTED_ERROR = "A worker node running your query has restarted. " + NODE_CRASHED_ERROR;
+
private Failures() {}
public static ExecutionFailureInfo toFailure(Throwable failure)
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java b/presto-main/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java
index d31eccc264..fb79a6abc8 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java
@@ -162,6 +162,7 @@ public class MockRemoteTaskFactory
return new TaskInfo(
taskStateMachine.getTaskId(),
+ Optional.empty(),
nextTaskInfoVersion.getAndIncrement(),
state,
location,
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java
index dc34df9d98..b0d045974c 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java
@@ -442,6 +442,7 @@ public class TestSqlStageExecution
return new TaskInfo(
taskStateMachine.getTaskId(),
+ Optional.empty(),
nextTaskInfoVersion.getAndIncrement(),
state,
location,
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java
index 04d77f8b58..b363827a20 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java
@@ -278,6 +278,7 @@ public class TestSqlTask
return new SqlTask(
taskId,
+ "test",
location,
sqlTaskExecutionFactory,
taskNotificationExecutor,
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java
index 701501ca26..22b7f83597 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java
@@ -245,6 +245,7 @@ public class TestSqlTaskManager
new MockLocationFactory(),
taskExecutor,
new QueryMonitor(new ObjectMapperProvider().get(), new NullEventClient(), new NodeInfo("test"), new NodeVersion("testVersion")),
+ new NodeInfo("test"),
config);
}
diff --git a/presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java b/presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java
index b3870629ad..113221fb3b 100644
--- a/presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java
+++ b/presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java
@@ -44,6 +44,7 @@ import java.net.URI;
import java.util.Collections;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
@@ -271,6 +272,7 @@ public class MockTaskManager
return new TaskInfo(
taskStateMachine.getTaskId(),
+ Optional.empty(),
nextTaskInfoVersion.getAndIncrement(),
state,
location,
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/StandardErrorCode.java b/presto-spi/src/main/java/com/facebook/presto/spi/StandardErrorCode.java
index 9ed35f16c4..e54d5e3e8a 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/StandardErrorCode.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/StandardErrorCode.java
@@ -42,6 +42,7 @@ public enum StandardErrorCode
NO_NODES_AVAILABLE(0x0001_0005),
REMOTE_TASK_ERROR(0x0001_0006),
COMPILER_ERROR(0x0001_0007),
+ WORKER_RESTARTED(0x0001_0008),
INSUFFICIENT_RESOURCES(0x0002_0000),
EXCEEDED_MEMORY_LIMIT(0x0002_0001), | ['presto-main/src/test/java/com/facebook/presto/execution/MockRemoteTaskFactory.java', 'presto-main/src/main/java/com/facebook/presto/execution/TaskInfo.java', 'presto-main/src/main/java/com/facebook/presto/util/Failures.java', 'presto-main/src/main/java/com/facebook/presto/server/HttpRemoteTask.java', 'presto-main/src/test/java/com/facebook/presto/execution/TestSqlStageExecution.java', 'presto-main/src/test/java/com/facebook/presto/execution/TestSqlTask.java', 'presto-main/src/test/java/com/facebook/presto/execution/TestSqlTaskManager.java', 'presto-main/src/test/java/com/facebook/presto/server/MockTaskManager.java', 'presto-spi/src/main/java/com/facebook/presto/spi/StandardErrorCode.java', 'presto-main/src/main/java/com/facebook/presto/execution/SqlTask.java', 'presto-main/src/main/java/com/facebook/presto/execution/SqlTaskManager.java'] | 11 | 11 | 0 | 0 | 11 | {'.java': 11} | "2015-02-13T22:41:47" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
193 | prestodb/presto/6571/6554 | prestodb | presto | https://github.com/prestodb/presto/issues/6554 | https://github.com/prestodb/presto/pull/6571 | https://github.com/prestodb/presto/pull/6571 | 1 | Invalid plan for query involving an aggregation subquery joined to a partitioned table | fixes | Given this hive table:
```sql
CREATE TABLE t (a bigint, ds varchar) WITH (partitioned_by = array['ds'])
```
The following query fails with an exception during planning:
```sql
SELECT *
FROM (
SELECT count(*)
FROM tpch.tiny.orders
HAVING count(DISTINCT custkey) > 1
)
CROSS JOIN t
```
```
java.lang.IllegalArgumentException: Output layout ([count_20]) don't include all partition columns ([custkey])
at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)
at com.facebook.presto.sql.planner.PartitioningScheme.<init>(PartitioningScheme.java:70)
at com.facebook.presto.sql.planner.PartitioningScheme.<init>(PartitioningScheme.java:50)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:165)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:69)
at com.facebook.presto.sql.planner.plan.ExchangeNode.accept(ExchangeNode.java:208)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:155)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:69)
at com.facebook.presto.sql.planner.plan.ExchangeNode.accept(ExchangeNode.java:208)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitAggregation(PartialAggregationPushDown.java:126)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitAggregation(PartialAggregationPushDown.java:69)
at com.facebook.presto.sql.planner.plan.AggregationNode.accept(AggregationNode.java:185)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.lambda$defaultRewrite$0(SimplePlanRewriter.java:74)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:75)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:64)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:141)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown$Rewriter.visitExchange(PartialAggregationPushDown.java:69)
at com.facebook.presto.sql.planner.plan.ExchangeNode.accept(ExchangeNode.java:208)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.lambda$defaultRewrite$0(SimplePlanRewriter.java:74)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:75)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:39)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:23)
at com.facebook.presto.sql.planner.plan.PlanVisitor.visitFilter(PlanVisitor.java:35)
at com.facebook.presto.sql.planner.plan.FilterNode.accept(FilterNode.java:71)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.lambda$defaultRewrite$0(SimplePlanRewriter.java:74)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:75)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:39)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:23)
at com.facebook.presto.sql.planner.plan.PlanVisitor.visitJoin(PlanVisitor.java:90)
at com.facebook.presto.sql.planner.plan.JoinNode.accept(JoinNode.java:170)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.lambda$defaultRewrite$0(SimplePlanRewriter.java:74)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:75)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:39)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:23)
at com.facebook.presto.sql.planner.plan.PlanVisitor.visitOutput(PlanVisitor.java:50)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.rewriteWith(SimplePlanRewriter.java:33)
at com.facebook.presto.sql.planner.optimizations.PartialAggregationPushDown.optimize(PartialAggregationPushDown.java:66)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:118)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:109)
at com.facebook.presto.execution.SqlQueryExecution.doAnalyzeQuery(SqlQueryExecution.java:288)
at com.facebook.presto.execution.SqlQueryExecution.analyzeQuery(SqlQueryExecution.java:267)
at com.facebook.presto.execution.SqlQueryExecution.start(SqlQueryExecution.java:225)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
``` | 3e33358e1348b5c9ccd9b2ff26a01762072f7bfb | 468a314ae91bd255de04a5e80e81e66670afb355 | https://github.com/prestodb/presto/compare/3e33358e1348b5c9ccd9b2ff26a01762072f7bfb...468a314ae91bd255de04a5e80e81e66670afb355 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java
index 4f2d90fae8..38a9ee4633 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java
@@ -132,7 +132,8 @@ public class PlanOptimizers
// Optimizers above this do not need to care about aggregations with the type other than SINGLE
// This optimizer must be run after all exchange-related optimizers
- builder.add(new PartialAggregationPushDown(metadata));
+ builder.add(new PartialAggregationPushDown(metadata.getFunctionRegistry()));
+ builder.add(new PruneIdentityProjections());
// DO NOT add optimizers that change the plan shape (computations) after this point
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
index 582843ce79..740a83e69e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java
@@ -15,10 +15,10 @@ package com.facebook.presto.sql.planner.optimizations;
import com.facebook.presto.Session;
import com.facebook.presto.metadata.FunctionRegistry;
-import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.metadata.Signature;
import com.facebook.presto.operator.aggregation.InternalAggregationFunction;
import com.facebook.presto.spi.type.Type;
+import com.facebook.presto.sql.planner.Partitioning;
import com.facebook.presto.sql.planner.PartitioningScheme;
import com.facebook.presto.sql.planner.PlanNodeIdAllocator;
import com.facebook.presto.sql.planner.Symbol;
@@ -26,38 +26,38 @@ import com.facebook.presto.sql.planner.SymbolAllocator;
import com.facebook.presto.sql.planner.plan.AggregationNode;
import com.facebook.presto.sql.planner.plan.ExchangeNode;
import com.facebook.presto.sql.planner.plan.PlanNode;
+import com.facebook.presto.sql.planner.plan.ProjectNode;
import com.facebook.presto.sql.planner.plan.SimplePlanRewriter;
import com.facebook.presto.sql.tree.Expression;
import com.facebook.presto.sql.tree.FunctionCall;
import com.facebook.presto.sql.tree.QualifiedName;
-import com.facebook.presto.sql.tree.SymbolReference;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
+import java.util.stream.Collectors;
import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.FINAL;
import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.PARTIAL;
-import static com.facebook.presto.sql.planner.plan.AggregationNode.Step.SINGLE;
-import static com.facebook.presto.sql.planner.plan.ExchangeNode.Type.REPLICATE;
-import static com.google.common.base.Preconditions.checkState;
+import static com.facebook.presto.sql.planner.plan.ExchangeNode.Type.GATHER;
+import static com.facebook.presto.sql.planner.plan.ExchangeNode.Type.REPARTITION;
+import static com.google.common.base.Verify.verify;
import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
public class PartialAggregationPushDown
implements PlanOptimizer
{
private final FunctionRegistry functionRegistry;
- public PartialAggregationPushDown(Metadata metadata)
+ public PartialAggregationPushDown(FunctionRegistry registry)
{
- requireNonNull(metadata, "metadata is null");
+ requireNonNull(registry, "registry is null");
- this.functionRegistry = metadata.getFunctionRegistry();
+ this.functionRegistry = registry;
}
@Override
@@ -67,7 +67,7 @@ public class PartialAggregationPushDown
}
private class Rewriter
- extends SimplePlanRewriter<AggregationNode>
+ extends SimplePlanRewriter<Void>
{
private final SymbolAllocator allocator;
private final PlanNodeIdAllocator idAllocator;
@@ -79,17 +79,125 @@ public class PartialAggregationPushDown
}
@Override
- public PlanNode visitAggregation(AggregationNode node, RewriteContext<AggregationNode> context)
+ public PlanNode visitAggregation(AggregationNode node, RewriteContext<Void> context)
{
+ PlanNode child = node.getSource();
+
+ if (!(child instanceof ExchangeNode)) {
+ return context.defaultRewrite(node);
+ }
+
+ // partial aggregation can only be pushed through exchange that doesn't change
+ // the cardinality of the stream (i.e., gather or repartition)
+ ExchangeNode exchange = (ExchangeNode) child;
+ if ((exchange.getType() != GATHER && exchange.getType() != REPARTITION) ||
+ exchange.getPartitioningScheme().isReplicateNulls()) {
+ return context.defaultRewrite(node);
+ }
+
+ if (exchange.getType() == REPARTITION) {
+ // if partitioning columns are not a subset of grouping keys,
+ // we can't push this through
+ List<Symbol> partitioningColumns = exchange.getPartitioningScheme()
+ .getPartitioning()
+ .getArguments()
+ .stream()
+ .filter(Partitioning.ArgumentBinding::isVariable)
+ .map(Partitioning.ArgumentBinding::getColumn)
+ .collect(Collectors.toList());
+
+ if (!node.getGroupingKeys().containsAll(partitioningColumns)) {
+ return context.defaultRewrite(node);
+ }
+ }
+
+ // currently, we only support plans that don't use pre-computed hash functions
+ if (node.getHashSymbol().isPresent() || exchange.getPartitioningScheme().getHashColumn().isPresent()) {
+ return context.defaultRewrite(node);
+ }
+
boolean decomposable = node.getFunctions().values().stream()
.map(functionRegistry::getAggregateFunctionImplementation)
.allMatch(InternalAggregationFunction::isDecomposable);
- checkState(node.getStep() == SINGLE, "aggregation should be SINGLE, but it is %s", node.getStep());
- checkState(context.get() == null, "context is not null: %s", context);
- if (!decomposable || !allowPushThrough(node.getSource())) {
+
+ if (!decomposable) {
return context.defaultRewrite(node);
}
+ switch (node.getStep()) {
+ case SINGLE:
+ // Split it into a FINAL on top of a PARTIAL and
+ // reprocess the resulting plan to push the partial
+ // below the exchange (see case below).
+ return context.rewrite(split(node));
+ case PARTIAL:
+ // Push it underneath each branch of the exchange
+ // and reprocess in case it can be pushed further down
+ // (e.g., if there are local/remote exchanges stacked)
+ return context.rewrite(pushPartial(node, exchange));
+ default:
+ return context.defaultRewrite(node);
+ }
+ }
+
+ private PlanNode pushPartial(AggregationNode partial, ExchangeNode exchange)
+ {
+ List<PlanNode> partials = new ArrayList<>();
+ for (int i = 0; i < exchange.getSources().size(); i++) {
+ PlanNode source = exchange.getSources().get(i);
+
+ if (!exchange.getOutputSymbols().equals(exchange.getInputs().get(i))) {
+ // Add an identity projection to preserve the inputs to the aggregation, if necessary.
+ // This allows us to avoid having to rewrite the symbols in the aggregation node below.
+ ImmutableMap.Builder<Symbol, Expression> assignments = ImmutableMap.builder();
+ for (int outputIndex = 0; outputIndex < exchange.getOutputSymbols().size(); outputIndex++) {
+ Symbol output = exchange.getOutputSymbols().get(outputIndex);
+ Symbol input = exchange.getInputs().get(i).get(outputIndex);
+ assignments.put(output, input.toSymbolReference());
+ }
+
+ source = new ProjectNode(idAllocator.getNextId(), source, assignments.build());
+ }
+
+ // Since this exchange source is now guaranteed to have the same symbols as the inputs to the the partial
+ // aggregation, we can build a new AggregationNode without any further symbol rewrites
+ partials.add(new AggregationNode(
+ idAllocator.getNextId(),
+ source,
+ partial.getAggregations(),
+ partial.getFunctions(),
+ partial.getMasks(),
+ partial.getGroupingSets(),
+ partial.getStep(),
+ partial.getHashSymbol(),
+ partial.getGroupIdSymbol()));
+ }
+
+ for (PlanNode node : partials) {
+ verify(partial.getOutputSymbols().equals(node.getOutputSymbols()));
+ }
+
+ // Since this exchange source is now guaranteed to have the same symbols as the inputs to the the partial
+ // aggregation, we don't need to rewrite symbols in the partitioning function
+ PartitioningScheme partitioning = new PartitioningScheme(
+ exchange.getPartitioningScheme().getPartitioning(),
+ partial.getOutputSymbols(),
+ exchange.getPartitioningScheme().getHashColumn(),
+ exchange.getPartitioningScheme().isReplicateNulls(),
+ exchange.getPartitioningScheme().getBucketToPartition());
+
+ return new ExchangeNode(
+ idAllocator.getNextId(),
+ exchange.getType(),
+ exchange.getScope(),
+ partitioning,
+ partials,
+ ImmutableList.copyOf(Collections.nCopies(partials.size(), partial.getOutputSymbols())));
+ }
+
+ private PlanNode split(AggregationNode node)
+ {
+ // otherwise, add a partial and final with an exchange in between
Map<Symbol, Symbol> masks = node.getMasks();
Map<Symbol, FunctionCall> finalCalls = new HashMap<>();
@@ -98,8 +206,9 @@ public class PartialAggregationPushDown
Map<Symbol, Symbol> intermediateMask = new HashMap<>();
for (Map.Entry<Symbol, FunctionCall> entry : node.getAggregations().entrySet()) {
Signature signature = node.getFunctions().get(entry.getKey());
+ InternalAggregationFunction function = functionRegistry.getAggregateFunctionImplementation(signature);
- Symbol intermediateSymbol = generateIntermediateSymbol(signature);
+ Symbol intermediateSymbol = allocator.newSymbol(signature.getName(), function.getIntermediateType());
intermediateCalls.put(intermediateSymbol, entry.getValue());
intermediateFunctions.put(intermediateSymbol, signature);
if (masks.containsKey(entry.getKey())) {
@@ -110,7 +219,7 @@ public class PartialAggregationPushDown
finalCalls.put(entry.getKey(), new FunctionCall(QualifiedName.of(signature.getName()), ImmutableList.of(intermediateSymbol.toSymbolReference())));
}
- AggregationNode partial = new AggregationNode(
+ PlanNode partial = new AggregationNode(
idAllocator.getNextId(),
node.getSource(),
intermediateCalls,
@@ -123,7 +232,7 @@ public class PartialAggregationPushDown
return new AggregationNode(
node.getId(),
- context.rewrite(node.getSource(), partial),
+ partial,
finalCalls,
node.getFunctions(),
ImmutableMap.of(),
@@ -132,181 +241,5 @@ public class PartialAggregationPushDown
node.getHashSymbol(),
node.getGroupIdSymbol());
}
-
- @Override
- public PlanNode visitExchange(ExchangeNode node, RewriteContext<AggregationNode> context)
- {
- AggregationNode partial = context.get();
- if (partial == null) {
- return context.defaultRewrite(node);
- }
-
- List<PlanNode> newChildren = new ArrayList<>();
- List<List<Symbol>> inputs = new ArrayList<>();
-
- boolean allowPushThroughChildren = node.getSources().stream().allMatch(this::allowPushThrough);
- for (int i = 0; i < node.getSources().size(); i++) {
- PlanNode currentSource = node.getSources().get(i);
- Map<Symbol, Symbol> exchangeMap = buildExchangeMap(node.getOutputSymbols(), node.getInputs().get(i));
- AggregationWithLayout childPartial = generateNewPartial(partial, currentSource, exchangeMap);
- inputs.add(childPartial.getLayout());
- PlanNode child;
- if (allowPushThroughChildren) {
- child = context.rewrite(currentSource, childPartial.getAggregationNode());
- }
- else {
- child = context.defaultRewrite(childPartial.getAggregationNode());
- }
- newChildren.add(child);
- }
- PartitioningScheme partitioningScheme = new PartitioningScheme(
- node.getPartitioningScheme().getPartitioning(),
- partial.getOutputSymbols(),
- partial.getHashSymbol());
- return new ExchangeNode(
- node.getId(),
- node.getType(),
- node.getScope(),
- partitioningScheme,
- newChildren,
- inputs);
- }
-
- private boolean allowPushThrough(PlanNode node)
- {
- if (node instanceof ExchangeNode) {
- ExchangeNode exchangeNode = (ExchangeNode) node;
- return exchangeNode.getType() != REPLICATE && !exchangeNode.getPartitioningScheme().isReplicateNulls();
- }
- return false;
- }
-
- private Symbol generateIntermediateSymbol(Signature signature)
- {
- InternalAggregationFunction function = functionRegistry.getAggregateFunctionImplementation(signature);
- return allocator.newSymbol(signature.getName(), function.getIntermediateType());
- }
-
- private Map<Symbol, Symbol> buildExchangeMap(List<Symbol> exchangeOutput, List<Symbol> sourceOutput)
- {
- checkState(exchangeOutput.size() == sourceOutput.size(), "exchange output length doesn't match source output length");
- Map<Symbol, Symbol> assignments = new HashMap<>();
- for (int i = 0; i < exchangeOutput.size(); i++) {
- Symbol output = exchangeOutput.get(i);
- Symbol input = sourceOutput.get(i);
- if (!assignments.containsKey(output)) {
- assignments.put(output, input);
- }
- else {
- checkState(assignments.get(output).equals(input),
- "Different input symbols (%s vs %s) for same output symbol (%s)",
- input,
- assignments.get(output),
- output);
- }
- }
-
- return ImmutableMap.copyOf(assignments);
- }
-
- private List<Expression> replaceArguments(List<Expression> arguments, Map<Symbol, Symbol> exchangeMap)
- {
- Map<SymbolReference, SymbolReference> symbolReferenceSymbolMap = new HashMap<>();
- for (Map.Entry<Symbol, Symbol> entry : exchangeMap.entrySet()) {
- symbolReferenceSymbolMap.put(entry.getKey().toSymbolReference(), entry.getValue().toSymbolReference());
- }
- return arguments.stream()
- .map(expression -> {
- if (symbolReferenceSymbolMap.containsKey(expression)) {
- return symbolReferenceSymbolMap.get(expression);
- }
- return expression;
- })
- .collect(toList());
- }
-
- // generate new partial aggregation for each exchange branch with renamed symbols
- private AggregationWithLayout generateNewPartial(AggregationNode node, PlanNode source, Map<Symbol, Symbol> exchangeMap)
- {
- checkState(!node.getHashSymbol().isPresent(), "PartialAggregationPushDown optimizer must run before HashGenerationOptimizer");
-
- // Store the symbol mapping from old aggregation output to new aggregation output
- Map<Symbol, Symbol> layoutMap = new HashMap<>();
-
- Map<Symbol, FunctionCall> functionCallMap = new HashMap<>();
- Map<Symbol, Signature> signatureMap = new HashMap<>();
- Map<Symbol, Symbol> mask = new HashMap<>();
- for (Map.Entry<Symbol, FunctionCall> entry : node.getAggregations().entrySet()) {
- Signature signature = node.getFunctions().get(entry.getKey());
- Symbol symbol = generateIntermediateSymbol(signature);
-
- signatureMap.put(symbol, node.getFunctions().get(entry.getKey()));
-
- List<Expression> arguments = replaceArguments(entry.getValue().getArguments(), exchangeMap);
- functionCallMap.put(symbol, new FunctionCall(entry.getValue().getName(), Optional.empty(), entry.getValue().getFilter(), false, arguments));
- if (node.getMasks().containsKey(entry.getKey())) {
- mask.put(symbol, exchangeMap.get(node.getMasks().get(entry.getKey())));
- }
-
- layoutMap.put(entry.getKey(), symbol);
- }
-
- // put group by keys in map
- for (Symbol groupBySymbol : node.getGroupingKeys()) {
- Symbol newGroupBySymbol = exchangeMap.get(groupBySymbol);
- layoutMap.put(groupBySymbol, newGroupBySymbol);
- }
-
- // translate grouping sets
- ImmutableList.Builder<List<Symbol>> groupingSets = ImmutableList.builder();
- for (List<Symbol> symbols : node.getGroupingSets()) {
- ImmutableList.Builder<Symbol> symbolList = ImmutableList.builder();
- for (Symbol symbol : symbols) {
- Symbol translated = exchangeMap.get(symbol);
- symbolList.add(translated);
- }
- groupingSets.add(symbolList.build());
- }
-
- AggregationNode partial = new AggregationNode(
- idAllocator.getNextId(),
- source,
- functionCallMap,
- signatureMap,
- mask,
- groupingSets.build(),
- PARTIAL,
- node.getHashSymbol(),
- node.getGroupIdSymbol().map(exchangeMap::get));
-
- // generate the output layout according to the order of pre-pushed aggregation's output
- List<Symbol> layout = node.getOutputSymbols().stream()
- .map(layoutMap::get)
- .collect(toList());
-
- return new AggregationWithLayout(partial, layout);
- }
- }
-
- private static class AggregationWithLayout
- {
- private final AggregationNode aggregationNode;
- private final List<Symbol> layout;
-
- public AggregationWithLayout(AggregationNode aggregationNode, List<Symbol> layout)
- {
- this.aggregationNode = requireNonNull(aggregationNode, "aggregationNode is null");
- this.layout = ImmutableList.copyOf(requireNonNull(layout, "layout is null"));
- }
-
- public AggregationNode getAggregationNode()
- {
- return aggregationNode;
- }
-
- public List<Symbol> getLayout()
- {
- return layout;
- }
}
} | ['presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/PartialAggregationPushDown.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/PlanOptimizers.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-11-09T02:20:12" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
220 | prestodb/presto/4012/4008 | prestodb | presto | https://github.com/prestodb/presto/issues/4008 | https://github.com/prestodb/presto/pull/4012 | https://github.com/prestodb/presto/pull/4012 | 1 | Array constructor with too many values causes ClassFormatError | fixes | Queries that contain very large array constructors cause bytecode to be generated that contains too many method arguments.
```
SELECT ARRAY['1','1','1','2','1','1','-1','1','1','1','1','1','-1','1','1','1','1','1','1','1','1','1','-1','1','-1','1','1','1','1','1','1','1','-1','-1','-1','1','-1','1','-1','3','-1','1','1','1','1','-1','-1','1','1','-1','-1','1','1','1','1','1','-1','1','1','1','1','1','-1','-1','1','-1','1','-1','1','1','1','-1','1','1','-1','1','1','-1','1','-1','-1','-1','1','1','-1','1','1','1','1','1','-1','1','-1','1','-1','1','1','1','1','-1','-1','-1','1','-1','-1','-1','1','1','1','-1','1','-1','-1','-1','-1','1','-1','-1','-1','1','-1','1','1','3','1','-1','-1','1','-1','-1','1','-1','-1','1','1','1','-1','-1','-1','1','1','1','-1','1','1','1','1','-1','-1','-1','1','-1','1','-1','3','-1','-1','1','-1','1','1','-1','-1','3','-1','1','-1','-1','-1','1','-1','-1','1','1','1','1','1','-1','1','1','-1','-1','-1','1','1','1','-1','1','-1','1','1','1','-1','-1','1','1','-1','-1','-1','-1','1','-1','-1','1','-1','1','1','-1','1','-1','-1','1','1','-1','-1','-1','-1','1','1','1','-1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','-1','-1','-1','-1','1','-1','1','-1','-1','1','3','-1','-1','1','1','3','1','1','1','1','1','1','1','1','-1','1','1','3','3','1','1','1','-1','-1','1','1','1','3','1','1','1','1','1','1','1','1','1','1','1','1','1','1','-1','1','1','1','1','1','1','1','3','1','1','1','1','1','1','1','1','1','1','1','1','-1','1','1','1','1','1','-1','1','3','1','1','1','1','1','3','1','3','1','1','1','1','3','-1','-1','-1','1','1','1','-1','-1','-1','-1','-1','1','-1','1','1','3','1','1','1','1','-1','-1','3','1','1','3','-1','1','1','1','-1','-1','1','1','1','-1','1','1','1','-1','1','3','1','1','1','1','3','3','-1','1','1','-1','3','3','1','1','3','-1','-1','1','1','-1','-1','1','1','3','1','-1','3','3','1','1','3','1','1','1','3','3','1','1','3','3','3','1','1','1','1','-1','-1','1','1','3','1','1','3','3','1','1','3','3','1','-1','1','1','1','1','-1','1','1','1','1','1','3','3','-1','-1','-1','1','-1','1','1','3','1','3','1','1','1','1','1','3','1','1','-1','1','3','3','3','1','1','3','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','1','3','1','3','3','1','1','1','1','1','1','1','1','1','1','1','1','1','3','3','1','1'];
```
fails with
```
com.google.common.util.concurrent.ExecutionError: java.lang.ClassFormatError: Too many arguments in method signature i
n class file com_facebook_presto_$gen_SliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSlice
SliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSli
ceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceS
liceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSlic
eSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSl
iceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSlice
SliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSli
ceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceSliceS
liceSliceSliceSliceSliceSliceSliceSlice
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2201)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
at com.facebook.presto.metadata.FunctionRegistry.getScalarFunctionImplementation(FunctionRegistry.java:586)
at com.facebook.presto.sql.planner.ExpressionInterpreter$Visitor.visitFunctionCall(ExpressionInterpreter.java:
798)
at com.facebook.presto.sql.planner.ExpressionInterpreter$Visitor.visitArrayConstructor(ExpressionInterpreter.j
ava:940)
at com.facebook.presto.sql.tree.ArrayConstructor.accept(ArrayConstructor.java:54)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)
at com.facebook.presto.sql.planner.ExpressionInterpreter.optimize(ExpressionInterpreter.java:251)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.simplifyExpression(SimplifyExpre
ssions.java:133)
at com.google.common.collect.Maps$7.transformEntry(Maps.java:1812)
at com.google.common.collect.Maps$10.getValue(Maps.java:1857)
at com.google.common.collect.ImmutableMap.copyOf(ImmutableMap.java:292)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.visitProject(SimplifyExpressions
.java:92)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.visitProject(SimplifyExpressions
.java:70)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:86)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:97)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.visitProject(SimplifyExpressions
.java:91)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.visitProject(SimplifyExpressions
.java:70)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:86)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:97)
at com.facebook.presto.sql.planner.optimizations.SimplifyExpressions$Rewriter.visitProject(SimplifyExpressions
.java:91)
...
```
| 72917dec52feac0df81fbdc3fa86fdfa3ccb5396 | cca5a7c1c89bc9b7a47dd16956bb408c753ab5bc | https://github.com/prestodb/presto/compare/72917dec52feac0df81fbdc3fa86fdfa3ccb5396...cca5a7c1c89bc9b7a47dd16956bb408c753ab5bc | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java
index 3b49320335..4bdf002a0b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java
@@ -25,6 +25,8 @@ import com.facebook.presto.spi.ConnectorSession;
import com.facebook.presto.spi.PrestoException;
import com.facebook.presto.spi.RecordCursor;
import com.facebook.presto.spi.block.Block;
+import com.facebook.presto.spi.block.BlockBuilder;
+import com.facebook.presto.spi.block.BlockBuilderStatus;
import com.facebook.presto.spi.type.StandardTypes;
import com.facebook.presto.spi.type.Type;
import com.facebook.presto.sql.analyzer.AnalysisContext;
@@ -68,6 +70,7 @@ import com.facebook.presto.sql.tree.SimpleCaseExpression;
import com.facebook.presto.sql.tree.StringLiteral;
import com.facebook.presto.sql.tree.SubscriptExpression;
import com.facebook.presto.sql.tree.WhenClause;
+import com.facebook.presto.type.ArrayType;
import com.facebook.presto.type.LikeFunctions;
import com.facebook.presto.util.Failures;
import com.facebook.presto.util.FastutilSetHelper;
@@ -93,6 +96,7 @@ import java.util.stream.Stream;
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
+import static com.facebook.presto.spi.type.TypeUtils.writeNativeValue;
import static com.facebook.presto.sql.analyzer.ExpressionAnalyzer.createConstantAnalyzer;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.EXPRESSION_NOT_CONSTANT;
import static com.facebook.presto.sql.planner.LiteralInterpreter.toExpression;
@@ -936,7 +940,18 @@ public class ExpressionInterpreter
@Override
protected Object visitArrayConstructor(ArrayConstructor node, Object context)
{
- return visitFunctionCall(new FunctionCall(QualifiedName.of(ArrayConstructor.ARRAY_CONSTRUCTOR), node.getValues()), context);
+ Type elementType = ((ArrayType) expressionTypes.get(node)).getElementType();
+ BlockBuilder arrayBlockBuilder = elementType.createBlockBuilder(new BlockBuilderStatus(), node.getValues().size());
+
+ for (Expression expression : node.getValues()) {
+ Object value = process(expression, context);
+ if (value instanceof Expression) {
+ return visitFunctionCall(new FunctionCall(QualifiedName.of(ArrayConstructor.ARRAY_CONSTRUCTOR), node.getValues()), context);
+ }
+ writeNativeValue(elementType, arrayBlockBuilder, value);
+ }
+
+ return arrayBlockBuilder.build();
}
@Override
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java b/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
index 70d3b8c032..41f09f57d5 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java
@@ -33,6 +33,7 @@ import com.facebook.presto.sql.tree.LikePredicate;
import com.facebook.presto.sql.tree.QualifiedName;
import com.facebook.presto.sql.tree.QualifiedNameReference;
import com.facebook.presto.sql.tree.StringLiteral;
+import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.airlift.slice.Slice;
@@ -48,6 +49,7 @@ import org.testng.annotations.Test;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
import static com.facebook.presto.SessionTestUtils.TEST_SESSION;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
@@ -64,6 +66,7 @@ import static com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionT
import static com.facebook.presto.sql.planner.ExpressionInterpreter.expressionInterpreter;
import static com.facebook.presto.sql.planner.ExpressionInterpreter.expressionOptimizer;
import static io.airlift.slice.Slices.utf8Slice;
+import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static org.testng.Assert.assertEquals;
@@ -929,6 +932,26 @@ public class TestExpressionInterpreter
optimize("0 / 0");
}
+ @Test
+ public void testMassiveArrayConstructor()
+ {
+ optimize(format("ARRAY [%s]", Joiner.on(", ").join(IntStream.range(0, 10_000).mapToObj(i -> "(bound_long + " + i + ")").iterator())));
+ optimize(format("ARRAY [%s]", Joiner.on(", ").join(IntStream.range(0, 10_000).mapToObj(i -> "'" + i + "'").iterator())));
+ optimize(format("ARRAY [%s]", Joiner.on(", ").join(IntStream.range(0, 10_000).mapToObj(i -> "ARRAY['" + i + "']").iterator())));
+ }
+
+ @Test
+ public void testArrayConstructor()
+ {
+ optimize("ARRAY []");
+ assertOptimizedEquals("ARRAY [(unbound_long + 0), (unbound_long + 1), (unbound_long + 2)]",
+ "array_constructor((unbound_long + 0), (unbound_long + 1), (unbound_long + 2))");
+ assertOptimizedEquals("ARRAY [(bound_long + 0), (unbound_long + 1), (bound_long + 2)]",
+ "array_constructor((bound_long + 0), (unbound_long + 1), (bound_long + 2))");
+ assertOptimizedEquals("ARRAY [(bound_long + 0), (unbound_long + 1), NULL]",
+ "array_constructor((bound_long + 0), (unbound_long + 1), NULL)");
+ }
+
@Test(expectedExceptions = PrestoException.class)
public void testArraySubscriptConstantNegativeIndex()
{ | ['presto-main/src/main/java/com/facebook/presto/sql/planner/ExpressionInterpreter.java', 'presto-main/src/test/java/com/facebook/presto/sql/TestExpressionInterpreter.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2015-11-21T01:22:49" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
219 | prestodb/presto/4045/4043 | prestodb | presto | https://github.com/prestodb/presto/issues/4043 | https://github.com/prestodb/presto/pull/4045 | https://github.com/prestodb/presto/pull/4045 | 1 | The node_id column in deleted_shard_nodes should not be nullable | fixes | The table tracks shards for a node, so it should be `NOT NULL`. Being nullable is probably a leftover from when the same table was used for local and global shards (during development of the feature).
| 607cfd4aab6eb5c6f9d6a3f4e5a5dfb1a014205c | f4263193b0eb7ef43931ed8beb87d3ea8d75b7fa | https://github.com/prestodb/presto/compare/607cfd4aab6eb5c6f9d6a3f4e5a5dfb1a014205c...f4263193b0eb7ef43931ed8beb87d3ea8d75b7fa | diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/SchemaDao.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/SchemaDao.java
index ab13aa5c8d..59efccbe72 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/SchemaDao.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/SchemaDao.java
@@ -94,7 +94,7 @@ public interface SchemaDao
@SqlUpdate("CREATE TABLE IF NOT EXISTS created_shards (\n" +
" shard_uuid BINARY(16) NOT NULL,\n" +
- " transaction_id bigint NOT NULL,\n" +
+ " transaction_id BIGINT NOT NULL,\n" +
" PRIMARY KEY (shard_uuid),\n" +
" FOREIGN KEY (transaction_id) REFERENCES transactions (transaction_id)\n" +
")")
@@ -103,7 +103,7 @@ public interface SchemaDao
@SqlUpdate("CREATE TABLE IF NOT EXISTS created_shard_nodes (\n" +
" shard_uuid BINARY(16) NOT NULL,\n" +
" node_id INT NOT NULL,\n" +
- " transaction_id bigint NOT NULL,\n" +
+ " transaction_id BIGINT NOT NULL,\n" +
" PRIMARY KEY (shard_uuid, node_id),\n" +
" FOREIGN KEY (node_id) REFERENCES nodes (node_id),\n" +
" FOREIGN KEY (transaction_id) REFERENCES transactions (transaction_id)\n" +
@@ -120,7 +120,7 @@ public interface SchemaDao
@SqlUpdate("CREATE TABLE IF NOT EXISTS deleted_shard_nodes (\n" +
" shard_uuid BINARY(16) NOT NULL,\n" +
- " node_id INT,\n" +
+ " node_id INT NOT NULL,\n" +
" delete_time DATETIME NOT NULL,\n" +
" clean_time DATETIME,\n" +
" purge_time DATETIME,\n" + | ['presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/SchemaDao.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2015-11-27T10:02:09" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
218 | prestodb/presto/4046/4042 | prestodb | presto | https://github.com/prestodb/presto/issues/4042 | https://github.com/prestodb/presto/pull/4046 | https://github.com/prestodb/presto/pull/4046 | 1 | Raptor local shard cleanup should only mark shards for current node | fixes | The calls in `ShardCleaner` to `updateCleanedShardNodes()` and `updatePurgedShardNodes()` should take the current node ID. It is updating the shard for all nodes rather than just the local node.
| 62411b7b148754932980e4ae48caf1413777c61a | acfc0609c0b5bccb92f3d17e4b9cfa87f7a79f5c | https://github.com/prestodb/presto/compare/62411b7b148754932980e4ae48caf1413777c61a...acfc0609c0b5bccb92f3d17e4b9cfa87f7a79f5c | diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardCleaner.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardCleaner.java
index b7ef3d1d4c..7138fa225e 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardCleaner.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardCleaner.java
@@ -16,6 +16,7 @@ package com.facebook.presto.raptor.metadata;
import com.facebook.presto.raptor.backup.BackupStore;
import com.facebook.presto.raptor.storage.StorageService;
import com.facebook.presto.spi.NodeManager;
+import com.facebook.presto.spi.PrestoException;
import com.google.common.annotations.VisibleForTesting;
import io.airlift.log.Logger;
import io.airlift.units.Duration;
@@ -41,6 +42,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
+import static com.facebook.presto.raptor.RaptorErrorCode.RAPTOR_ERROR;
import static com.facebook.presto.raptor.util.DatabaseUtil.onDemandDao;
import static io.airlift.concurrent.Threads.daemonThreadsNamed;
import static java.util.Objects.requireNonNull;
@@ -239,7 +241,7 @@ public class ShardCleaner
for (UUID uuid : uuids) {
deleteFile(storageService.getStorageFile(uuid));
}
- dao.updateCleanedShardNodes(uuids);
+ dao.updateCleanedShardNodes(uuids, getCurrentNodeId());
}
}
@@ -255,7 +257,7 @@ public class ShardCleaner
for (UUID uuid : uuids) {
deleteFile(storageService.getStorageFile(uuid));
}
- dao.updatePurgedShardNodes(uuids);
+ dao.updatePurgedShardNodes(uuids, getCurrentNodeId());
}
}
@@ -327,6 +329,15 @@ public class ShardCleaner
}
}
+ private int getCurrentNodeId()
+ {
+ Integer nodeId = dao.getNodeId(currentNode);
+ if (nodeId == null) {
+ throw new PrestoException(RAPTOR_ERROR, "Node does not exist: " + currentNode);
+ }
+ return nodeId;
+ }
+
private static Timestamp maxTimestamp(Duration duration)
{
return new Timestamp(System.currentTimeMillis() - duration.toMillis());
diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardManagerDao.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardManagerDao.java
index 98e3ee0b0c..e6ebdbf69c 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardManagerDao.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardManagerDao.java
@@ -279,11 +279,17 @@ public interface ShardManagerDao
@SqlBatch("UPDATE deleted_shard_nodes SET clean_time = CURRENT_TIMESTAMP\n" +
"WHERE shard_uuid = :shardUuid\n" +
+ " AND node_id = :nodeId\n" +
" AND clean_time IS NULL\n")
- void updateCleanedShardNodes(@Bind("shardUuid") Iterable<UUID> shardUuids);
+ void updateCleanedShardNodes(
+ @Bind("shardUuid") Iterable<UUID> shardUuids,
+ @Bind("nodeId") int nodeId);
@SqlBatch("UPDATE deleted_shard_nodes SET purge_time = CURRENT_TIMESTAMP\n" +
"WHERE shard_uuid = :shardUuid\n" +
+ " AND node_id = :nodeId\n" +
" AND purge_time IS NULL\n")
- void updatePurgedShardNodes(@Bind("shardUuid") Iterable<UUID> shardUuids);
+ void updatePurgedShardNodes(
+ @Bind("shardUuid") Iterable<UUID> shardUuids,
+ @Bind("nodeId") int nodeId);
}
diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestShardManagerDao.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestShardManagerDao.java
index eb56cdc0ef..2335e5ad09 100644
--- a/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestShardManagerDao.java
+++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestShardManagerDao.java
@@ -24,12 +24,14 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import static com.facebook.presto.raptor.metadata.SchemaDaoUtil.createTablesWithRetry;
import static io.airlift.testing.Assertions.assertInstanceOf;
+import static java.util.concurrent.TimeUnit.DAYS;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -276,6 +278,50 @@ public class TestShardManagerDao
assertContainsShardNode(shardNodes, nodeName2, shardUuid4);
}
+ @Test
+ public void testDeletedShardNodes()
+ {
+ String nodeName1 = UUID.randomUUID().toString();
+ int nodeId1 = dao.insertNode(nodeName1);
+
+ String nodeName2 = UUID.randomUUID().toString();
+ int nodeId2 = dao.insertNode(nodeName2);
+
+ ImmutableList<UUID> shards = ImmutableList.of(UUID.randomUUID());
+
+ // insert shard on both nodes
+ dao.insertDeletedShardNodes(shards, ImmutableList.of(nodeId1));
+ dao.insertDeletedShardNodes(shards, ImmutableList.of(nodeId2));
+
+ // verify we should clean from both
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName1, future()), shards);
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName2, future()), shards);
+
+ // clean on first node
+ dao.updateCleanedShardNodes(shards, nodeId1);
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName1, future()), ImmutableList.of());
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName2, future()), shards);
+
+ // clean on second node
+ dao.updateCleanedShardNodes(shards, nodeId2);
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName1, future()), ImmutableList.of());
+ assertEquals(dao.getCleanableShardNodesBatch(nodeName2, future()), ImmutableList.of());
+
+ // verify we should purge from both
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName1, future()), shards);
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName2, future()), shards);
+
+ // purge on first node
+ dao.updatePurgedShardNodes(shards, nodeId1);
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName1, future()), ImmutableList.of());
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName2, future()), shards);
+
+ // purge on second node
+ dao.updatePurgedShardNodes(shards, nodeId2);
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName1, future()), ImmutableList.of());
+ assertEquals(dao.getPurgableShardNodesBatch(nodeName2, future()), ImmutableList.of());
+ }
+
private long createTable(String name)
{
return dbi.onDemand(MetadataDao.class).insertTable("test", name, false);
@@ -285,4 +331,9 @@ public class TestShardManagerDao
{
assertTrue(nodes.contains(new ShardNode(shardUuid, nodeName)));
}
+
+ private static Timestamp future()
+ {
+ return new Timestamp(System.currentTimeMillis() + DAYS.toMillis(1));
+ }
} | ['presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardCleaner.java', 'presto-raptor/src/test/java/com/facebook/presto/raptor/metadata/TestShardManagerDao.java', 'presto-raptor/src/main/java/com/facebook/presto/raptor/metadata/ShardManagerDao.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2015-11-27T13:11:22" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
217 | prestodb/presto/4469/4421 | prestodb | presto | https://github.com/prestodb/presto/issues/4421 | https://github.com/prestodb/presto/pull/4469 | https://github.com/prestodb/presto/pull/4469 | 1 | Validate column order when creating Hive tables | closes | Partition columns for Hive tables are always at the end because Hive works that way. When creating a table, the creation should fail if the columns are not in the final order (having `CREATE TABLE` silently rearrange columns is quite unexpected).
We should use a new error code for this: `HIVE_COLUMN_ORDER_MISMATCH`
This should fail because the partition column is listed first, but will be at the end in the final table:
```
CREATE TABLE test (
ds varchar,
x bigint)
WITH (partitioned_by = ARRAY['ds']);
```
This should fail because the partition columns are listed in a different order than in the partition specification:
```
CREATE TABLE test (
x bigint,
type varchar,
ds varchar)
WITH (partitioned_by = ARRAY['ds', 'type']);
```
| b3f052c34ac4832b6f65d6a95b2f49add2fa29dd | ff642bd931cf1d5a5e6e3a0bea465f8fcb9fbd37 | https://github.com/prestodb/presto/compare/b3f052c34ac4832b6f65d6a95b2f49add2fa29dd...ff642bd931cf1d5a5e6e3a0bea465f8fcb9fbd37 | diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveErrorCode.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveErrorCode.java
index c902673fab..5da341a3cd 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveErrorCode.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveErrorCode.java
@@ -42,7 +42,8 @@ public enum HiveErrorCode
HIVE_UNSUPPORTED_FORMAT(0x0100_0013),
HIVE_PARTITION_READ_ONLY(0x0100_00014),
HIVE_TOO_MANY_OPEN_PARTITIONS(0x0000_0015),
- HIVE_CONCURRENT_MODIFICATION_DETECTED(0x0000_0016);
+ HIVE_CONCURRENT_MODIFICATION_DETECTED(0x0000_0016),
+ HIVE_COLUMN_ORDER_MISMATCH(0x0000_0017);
private final ErrorCode errorCode;
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java
index 05bd0aee5a..f4ab85d629 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java
@@ -82,6 +82,7 @@ import java.util.function.Predicate;
import static com.facebook.presto.hive.HiveColumnHandle.SAMPLE_WEIGHT_COLUMN_NAME;
import static com.facebook.presto.hive.HiveColumnHandle.updateRowIdHandle;
+import static com.facebook.presto.hive.HiveErrorCode.HIVE_COLUMN_ORDER_MISMATCH;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_CONCURRENT_MODIFICATION_DETECTED;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_FILESYSTEM_ERROR;
import static com.facebook.presto.hive.HiveErrorCode.HIVE_INVALID_METADATA;
@@ -1304,8 +1305,23 @@ public class HiveMetadata
throw new PrestoException(HIVE_UNSUPPORTED_FORMAT, format("Output format %s with SerDe %s is not supported", outputFormat, serializationLib));
}
+ private static void validateColumnOrdering(ConnectorTableMetadata tableMetadata)
+ {
+ List<String> partitionedBy = getPartitionedBy(tableMetadata.getProperties());
+
+ List<String> allColumns = tableMetadata.getColumns().stream()
+ .map(ColumnMetadata::getName)
+ .collect(toList());
+
+ if (!allColumns.subList(allColumns.size() - partitionedBy.size(), allColumns.size()).equals(partitionedBy)) {
+ throw new PrestoException(HIVE_COLUMN_ORDER_MISMATCH, "Partition keys must be the last columns in the table and in the same order as the table properties: " + partitionedBy);
+ }
+ }
+
private static List<HiveColumnHandle> getColumnHandles(String connectorId, ConnectorTableMetadata tableMetadata, Set<String> partitionColumnNames)
{
+ validateColumnOrdering(tableMetadata);
+
ImmutableList.Builder<HiveColumnHandle> columnHandles = ImmutableList.builder();
Set<String> foundPartitionColumns = new HashSet<>();
int ordinal = 0;
diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
index 7dcb48d386..ff6017a4c4 100644
--- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
+++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
@@ -144,13 +144,13 @@ public class TestHiveIntegrationSmokeTest
{
@Language("SQL") String createTable = "" +
"CREATE TABLE test_partitioned_table (" +
- " _partition_varchar VARCHAR" +
- ", _partition_bigint BIGINT" +
- ", _varchar VARCHAR" +
+ " _varchar VARCHAR" +
", _varbinary VARBINARY" +
", _bigint BIGINT" +
", _double DOUBLE" +
", _boolean BOOLEAN" +
+ ", _partition_varchar VARCHAR" +
+ ", _partition_bigint BIGINT" +
") " +
"WITH (" +
"format = '" + storageFormat + "', " +
@@ -244,7 +244,6 @@ public class TestHiveIntegrationSmokeTest
List<HivePartition> partitions = getPartitions("test_create_partitioned_table_as");
assertEquals(partitions.size(), 3);
- // Hive will reorder the partition keys to the end
assertQuery("SELECT * from test_create_partitioned_table_as", "SELECT orderkey, shippriority, orderstatus FROM orders");
assertUpdate("DROP TABLE test_create_partitioned_table_as");
@@ -252,6 +251,27 @@ public class TestHiveIntegrationSmokeTest
assertFalse(queryRunner.tableExists(getSession(), "test_create_partitioned_table_as"));
}
+ @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Partition keys must be the last columns in the table and in the same order as the table properties.*")
+ public void testCreatePartitionedTableInvalidColumnOrdering()
+ {
+ assertUpdate("" +
+ "CREATE TABLE test_show_columns_partition_key\n" +
+ "(grape bigint, apple varchar, orange bigint, pear varchar)\n" +
+ "WITH (partitioned_by = ARRAY['apple'])");
+ }
+
+ @Test(expectedExceptions = RuntimeException.class, expectedExceptionsMessageRegExp = "Partition keys must be the last columns in the table and in the same order as the table properties.*")
+ public void testCreatePartitionedTableAsInvalidColumnOrdering()
+ throws Exception
+ {
+ assertUpdate("" +
+ "CREATE TABLE test_create_partitioned_table_as " +
+ "WITH (partitioned_by = ARRAY['SHIP_PRIORITY', 'ORDER_STATUS']) " +
+ "AS " +
+ "SELECT shippriority AS ship_priority, orderkey AS order_key, orderstatus AS order_status " +
+ "FROM tpch.tiny.orders");
+ }
+
@Test
public void insertTable()
throws Exception
@@ -317,9 +337,9 @@ public class TestHiveIntegrationSmokeTest
@Language("SQL") String createTable = "" +
"CREATE TABLE test_insert_partitioned_table " +
"(" +
- " ORDER_STATUS VARCHAR," +
+ " ORDER_KEY BIGINT," +
" SHIP_PRIORITY BIGINT," +
- " ORDER_KEY BIGINT" +
+ " ORDER_STATUS VARCHAR" +
") " +
"WITH (" +
"format = '" + storageFormat + "', " +
@@ -380,9 +400,9 @@ public class TestHiveIntegrationSmokeTest
@Language("SQL") String createTable = "" +
"CREATE TABLE test_metadata_delete " +
"(" +
- " LINE_STATUS VARCHAR," +
+ " ORDER_KEY BIGINT," +
" LINE_NUMBER BIGINT," +
- " ORDER_KEY BIGINT" +
+ " LINE_STATUS VARCHAR" +
") " +
"WITH (" +
STORAGE_FORMAT_PROPERTY + " = '" + storageFormat + "', " +
@@ -391,7 +411,6 @@ public class TestHiveIntegrationSmokeTest
assertUpdate(createTable);
- // Hive will reorder the partition keys, so we must insert into the table assuming the partition keys have been moved to the end
assertUpdate("" +
"INSERT INTO test_metadata_delete " +
"SELECT orderkey, linenumber, linestatus " +
@@ -459,10 +478,9 @@ public class TestHiveIntegrationSmokeTest
{
assertUpdate("" +
"CREATE TABLE test_show_columns_partition_key\n" +
- "(grape bigint, apple varchar, orange bigint, pear varchar)\n" +
+ "(grape bigint, orange bigint, pear varchar, apple varchar)\n" +
"WITH (partitioned_by = ARRAY['apple'])");
- // partition keys go last and have a special comment
MaterializedResult actual = computeActual("SHOW COLUMNS FROM test_show_columns_partition_key");
MaterializedResult expected = resultBuilder(getSession(), VARCHAR, VARCHAR, VARCHAR)
.row("grape", "bigint", "") | ['presto-hive/src/main/java/com/facebook/presto/hive/HiveErrorCode.java', 'presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java', 'presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2016-02-03T18:55:48" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
216 | prestodb/presto/4537/4532 | prestodb | presto | https://github.com/prestodb/presto/issues/4532 | https://github.com/prestodb/presto/pull/4537 | https://github.com/prestodb/presto/pull/4537 | 1 | Unbounded varchar should not be serialized with length | fixes | The fact that `varchar` is internally represented as `varchar(MAX_INT)` is an implementation detail that should not leak out and be permanently stored in external systems. It also breaks backwards compatibility with older clients, causes issues in clients that try to allocate a buffer of that size, etc.
| 09d7a2e16a4e901bfee19836a079dd6c19405d37 | 918ecbefe2e1c3381457a21ad3dd26ecb49be061 | https://github.com/prestodb/presto/compare/09d7a2e16a4e901bfee19836a079dd6c19405d37...918ecbefe2e1c3381457a21ad3dd26ecb49be061 | diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java
index 6378252088..24959ed22c 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java
@@ -272,9 +272,16 @@ public class TypeSignature
@JsonValue
public String toString()
{
+ // TODO: remove these hacks
if (base.equalsIgnoreCase(StandardTypes.ROW)) {
return rowToString();
}
+ else if (base.equalsIgnoreCase(StandardTypes.VARCHAR) &&
+ (parameters.size() == 1) &&
+ parameters.get(0).isLongLiteral() &&
+ parameters.get(0).getLongLiteral() == VarcharType.MAX_LENGTH) {
+ return base;
+ }
else {
StringBuilder typeName = new StringBuilder(base);
if (!parameters.isEmpty()) {
diff --git a/presto-spi/src/test/java/com/facebook/presto/spi/type/TestTypeSignature.java b/presto-spi/src/test/java/com/facebook/presto/spi/type/TestTypeSignature.java
index aa16aebabf..720d5dc840 100644
--- a/presto-spi/src/test/java/com/facebook/presto/spi/type/TestTypeSignature.java
+++ b/presto-spi/src/test/java/com/facebook/presto/spi/type/TestTypeSignature.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Map;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
+import static com.facebook.presto.spi.type.VarcharType.VARCHAR;
+import static com.facebook.presto.spi.type.VarcharType.createVarcharType;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
@@ -144,6 +146,14 @@ public class TestTypeSignature
assertSignature("varchar(10)", "varchar", ImmutableList.<String>of("10"));
}
+ @Test
+ public void testVarchar()
+ throws Exception
+ {
+ assertEquals(VARCHAR.getTypeSignature().toString(), "varchar");
+ assertEquals(createVarcharType(42).getTypeSignature().toString(), "varchar(42)");
+ }
+
private static void assertRowSignature(
String typeName,
String base, | ['presto-spi/src/main/java/com/facebook/presto/spi/type/TypeSignature.java', 'presto-spi/src/test/java/com/facebook/presto/spi/type/TestTypeSignature.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-02-11T19:11:32" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
215 | prestodb/presto/4627/4585 | prestodb | presto | https://github.com/prestodb/presto/issues/4585 | https://github.com/prestodb/presto/pull/4627 | https://github.com/prestodb/presto/pull/4627 | 1 | Uncategorized error for Raptor system table | fixes | The catch block needs to be `catch (SQLException | DBIException e)`
```
org.skife.jdbi.v2.exceptions.UnableToObtainConnectionException: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: ...
at org.skife.jdbi.v2.DBI.open(DBI.java:230)
at com.facebook.presto.raptor.systemtables.ShardMetadataRecordCursor.getTableIds(ShardMetadataRecordCursor.java:321)
at com.facebook.presto.raptor.systemtables.ShardMetadataRecordCursor.<init>(ShardMetadataRecordCursor.java:103)
at com.facebook.presto.raptor.systemtables.ShardMetadataSystemTable.cursor(ShardMetadataSystemTable.java:57)
at com.facebook.presto.connector.system.SystemRecordSetProvider$1.cursor(SystemRecordSetProvider.java:118)
at com.facebook.presto.split.MappedRecordSet.cursor(MappedRecordSet.java:53)
at com.facebook.presto.spi.RecordPageSource.<init>(RecordPageSource.java:37)
at com.facebook.presto.split.RecordPageSourceProvider.createPageSource(RecordPageSourceProvider.java:42)
at com.facebook.presto.split.PageSourceManager.createPageSource(PageSourceManager.java:48)
at com.facebook.presto.operator.ScanFilterAndProjectOperator.createSourceIfNecessary(ScanFilterAndProjectOperator.java:287)
at com.facebook.presto.operator.ScanFilterAndProjectOperator.isFinished(ScanFilterAndProjectOperator.java:180)
at com.facebook.presto.operator.Driver.processInternal(Driver.java:377)
at com.facebook.presto.operator.Driver.processFor(Driver.java:303)
at com.facebook.presto.execution.SqlTaskExecution$DriverSplitRunner.processFor(SqlTaskExecution.java:575)
at com.facebook.presto.execution.TaskExecutor$PrioritizedSplitRunner.process(TaskExecutor.java:505)
at com.facebook.presto.execution.TaskExecutor$Runner.run(TaskExecutor.java:640)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| 5fb01fdf4a0d963ffc2227f4b2f32d2a82451450 | e741f6bbb42e4779b7fa12c77941301a963deec3 | https://github.com/prestodb/presto/compare/5fb01fdf4a0d963ffc2227f4b2f32d2a82451450...e741f6bbb42e4779b7fa12c77941301a963deec3 | diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/systemtables/ShardMetadataRecordCursor.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/systemtables/ShardMetadataRecordCursor.java
index 7011abd113..68fa9ca885 100644
--- a/presto-raptor/src/main/java/com/facebook/presto/raptor/systemtables/ShardMetadataRecordCursor.java
+++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/systemtables/ShardMetadataRecordCursor.java
@@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import io.airlift.slice.Slice;
import org.skife.jdbi.v2.IDBI;
+import org.skife.jdbi.v2.exceptions.DBIException;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -181,7 +182,7 @@ public class ShardMetadataRecordCursor
completedBytes += resultSetValues.extractValues(resultSet, ImmutableSet.of(getColumnIndex(SHARD_METADATA, SHARD_UUID)));
return true;
}
- catch (SQLException e) {
+ catch (SQLException | DBIException e) {
throw metadataError(e);
}
}
@@ -275,7 +276,7 @@ public class ShardMetadataRecordCursor
tupleDomain);
return statement.executeQuery();
}
- catch (SQLException e) {
+ catch (SQLException | DBIException e) {
close();
throw metadataError(e);
}
@@ -328,7 +329,7 @@ public class ShardMetadataRecordCursor
tableIds.add(resultSet.getLong("table_id"));
}
}
- catch (SQLException e) {
+ catch (SQLException | DBIException e) {
throw metadataError(e);
}
return tableIds.build().iterator(); | ['presto-raptor/src/main/java/com/facebook/presto/raptor/systemtables/ShardMetadataRecordCursor.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2016-02-23T18:49:29" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
214 | prestodb/presto/4871/4869 | prestodb | presto | https://github.com/prestodb/presto/issues/4869 | https://github.com/prestodb/presto/pull/4871 | https://github.com/prestodb/presto/pull/4871 | 1 | Potential deadlock when using phased scheduler with broadcast joins | fixes | ``` sql
SELECT * FROM orders CROSS JOIN (VALUES 1);
```
```
Fragment 0 [SINGLE]
Output layout: [orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment, field]
Output partitioning: SINGLE []
- Output[orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment, _col9] => [orderkey:bigint, custkey:bigint, orderstatus:varchar, totalprice:double, orderdate:date, orderpriority:
_col9 := field
- RemoteSource[1] => [orderkey:bigint, custkey:bigint, orderstatus:varchar, totalprice:double, orderdate:date, orderpriority:varchar, clerk:varchar, shippriority:bigint, comment:varchar, field:bigint]
Fragment 1 [SOURCE]
Output layout: [orderkey, custkey, orderstatus, totalprice, orderdate, orderpriority, clerk, shippriority, comment, field]
Output partitioning: SINGLE []
- InnerJoin[] => [orderkey:bigint, custkey:bigint, orderstatus:varchar, totalprice:double, orderdate:date, orderpriority:varchar, clerk:varchar, shippriority:bigint, comment:varchar, field:bigint]
- TableScan[tpch:tpch:orders:sf1.0, originalConstraint = true] => [orderkey:bigint, custkey:bigint, orderstatus:varchar, totalprice:double, orderdate:date, orderpriority:varchar, clerk:varchar, shippriority:bigint, comm
orderkey := tpch:orderkey
custkey := tpch:custkey
orderstatus := tpch:orderstatus
totalprice := tpch:totalprice
orderdate := tpch:orderdate
orderpriority := tpch:orderpriority
clerk := tpch:clerk
shippriority := tpch:shippriority
comment := tpch:comment
- RemoteSource[2] => [field:bigint]
Fragment 2 [SINGLE]
Output layout: [field]
Output partitioning: BROADCAST []
- Values => [field:bigint]
(1)
```
The scheduling dependency graph is missing an edge (2->1), which can cause the join stage to be scheduled independently (and before) the build stage.
| b4d90f151c1a649c276f332e2116339e7e844f9e | be0cc2ac232c6467b730f8256e58673f766fade1 | https://github.com/prestodb/presto/compare/b4d90f151c1a649c276f332e2116339e7e844f9e...be0cc2ac232c6467b730f8256e58673f766fade1 | diff --git a/presto-main/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java b/presto-main/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java
index 29c622be83..1c3f4c1df4 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java
@@ -153,7 +153,12 @@ public class PhasedExecutionSchedule
for (DefaultEdge edge : graph.edgeSet()) {
PlanFragmentId source = graph.getEdgeSource(edge);
PlanFragmentId target = graph.getEdgeTarget(edge);
- componentGraph.addEdge(componentMembership.get(source), componentMembership.get(target));
+
+ Set<PlanFragmentId> from = componentMembership.get(source);
+ Set<PlanFragmentId> to = componentMembership.get(target);
+ if (!from.equals(to)) { // the topological order iterator below doesn't include vertices that have self-edges, so don't add them
+ componentGraph.addEdge(from, to);
+ }
}
List<Set<PlanFragmentId>> schedulePhases = ImmutableList.copyOf(new TopologicalOrderIterator<>(componentGraph));
@@ -274,7 +279,7 @@ public class PhasedExecutionSchedule
{
List<PlanNode> sources = node.getSources();
if (sources.isEmpty()) {
- return ImmutableSet.of();
+ return ImmutableSet.of(currentFragmentId);
}
if (sources.size() == 1) {
return sources.get(0).accept(this, currentFragmentId);
diff --git a/presto-main/src/test/java/com/facebook/presto/execution/scheduler/TestPhasedExecutionSchedule.java b/presto-main/src/test/java/com/facebook/presto/execution/scheduler/TestPhasedExecutionSchedule.java
index 45ec18c8ba..97ab602569 100644
--- a/presto-main/src/test/java/com/facebook/presto/execution/scheduler/TestPhasedExecutionSchedule.java
+++ b/presto-main/src/test/java/com/facebook/presto/execution/scheduler/TestPhasedExecutionSchedule.java
@@ -94,6 +94,17 @@ public class TestPhasedExecutionSchedule
assertEquals(phases, ImmutableList.of(ImmutableSet.of(joinFragment.getId()), ImmutableSet.of(buildFragment.getId()), ImmutableSet.of(probeFragment.getId())));
}
+ @Test
+ public void testBroadcastJoin()
+ throws Exception
+ {
+ PlanFragment buildFragment = createTableScanPlanFragment("build");
+ PlanFragment joinFragment = createBroadcastJoinPlanFragment("join", buildFragment);
+
+ List<Set<PlanFragmentId>> phases = PhasedExecutionSchedule.extractPhases(ImmutableList.of(joinFragment, buildFragment));
+ assertEquals(phases, ImmutableList.of(ImmutableSet.of(joinFragment.getId(), buildFragment.getId())));
+ }
+
@Test
public void testJoinWithDeepSources()
throws Exception
@@ -150,6 +161,30 @@ public class TestPhasedExecutionSchedule
return createFragment(planNode);
}
+ private static PlanFragment createBroadcastJoinPlanFragment(String name, PlanFragment buildFragment)
+ {
+ Symbol symbol = new Symbol("column");
+ PlanNode tableScan = new TableScanNode(
+ new PlanNodeId(name),
+ new TableHandle("test", new TestingTableHandle()),
+ ImmutableList.of(symbol),
+ ImmutableMap.of(symbol, new TestingColumnHandle("column")),
+ Optional.empty(),
+ TupleDomain.all(),
+ null);
+
+ PlanNode join = new JoinNode(
+ new PlanNodeId(name + "_id"),
+ INNER,
+ tableScan,
+ new RemoteSourceNode(new PlanNodeId("build_id"), buildFragment.getId(), ImmutableList.of()),
+ ImmutableList.of(),
+ Optional.<Symbol>empty(),
+ Optional.<Symbol>empty());
+
+ return createFragment(join);
+ }
+
private static PlanFragment createJoinPlanFragment(String name, PlanFragment buildFragment, PlanFragment probeFragment)
{
PlanNode planNode = new JoinNode( | ['presto-main/src/main/java/com/facebook/presto/execution/scheduler/PhasedExecutionSchedule.java', 'presto-main/src/test/java/com/facebook/presto/execution/scheduler/TestPhasedExecutionSchedule.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-03-24T19:59:08" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
213 | prestodb/presto/5055/4901 | prestodb | presto | https://github.com/prestodb/presto/issues/4901 | https://github.com/prestodb/presto/pull/5055 | https://github.com/prestodb/presto/pull/5055 | 1 | try(cast(...)) fails with multiple predicates in a where clause | fixes | When I run the following query:
``` sql
with example as (
select
id,
other_id
from (
values
(1, '23452'),
(3, '2354')
) as t (id, other_id)
)
select
try(cast(other_id as bigint)) as other_id
from example
where id = 1
and try(cast(other_id as bigint)) is not null
```
It produces the error message: `Compiler failed and interpreter is disabled`
When I remove the `id = 1` in the final query, the query works as expected.
| 747603c9539bf8d20b625e597d392bc1538a983c | c9d6b954fbd7d240c6c096ba1e36fdf92bb786b6 | https://github.com/prestodb/presto/compare/747603c9539bf8d20b625e597d392bc1538a983c...c9d6b954fbd7d240c6c096ba1e36fdf92bb786b6 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/BytecodeExpressionVisitor.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/BytecodeExpressionVisitor.java
index 4bc29acfa3..fae3a4ea5d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/BytecodeExpressionVisitor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/BytecodeExpressionVisitor.java
@@ -17,14 +17,12 @@ import com.facebook.presto.bytecode.BytecodeBlock;
import com.facebook.presto.bytecode.BytecodeNode;
import com.facebook.presto.bytecode.MethodDefinition;
import com.facebook.presto.bytecode.Scope;
-import com.facebook.presto.bytecode.Variable;
import com.facebook.presto.metadata.FunctionRegistry;
import com.facebook.presto.sql.relational.CallExpression;
import com.facebook.presto.sql.relational.ConstantExpression;
import com.facebook.presto.sql.relational.InputReferenceExpression;
import com.facebook.presto.sql.relational.RowExpressionVisitor;
-import java.util.List;
import java.util.Map;
import static com.facebook.presto.bytecode.expression.BytecodeExpressions.constantTrue;
@@ -51,7 +49,6 @@ public class BytecodeExpressionVisitor
private final CachedInstanceBinder cachedInstanceBinder;
private final RowExpressionVisitor<Scope, BytecodeNode> fieldReferenceCompiler;
private final FunctionRegistry registry;
- private final List<? extends Variable> expressionInputs;
private final Map<CallExpression, MethodDefinition> tryExpressionsMap;
public BytecodeExpressionVisitor(
@@ -59,14 +56,12 @@ public class BytecodeExpressionVisitor
CachedInstanceBinder cachedInstanceBinder,
RowExpressionVisitor<Scope, BytecodeNode> fieldReferenceCompiler,
FunctionRegistry registry,
- List<? extends Variable> expressionInputs,
Map<CallExpression, MethodDefinition> tryExpressionsMap)
{
this.callSiteBinder = callSiteBinder;
this.cachedInstanceBinder = cachedInstanceBinder;
this.fieldReferenceCompiler = fieldReferenceCompiler;
this.registry = registry;
- this.expressionInputs = expressionInputs;
this.tryExpressionsMap = tryExpressionsMap;
}
@@ -92,7 +87,7 @@ public class BytecodeExpressionVisitor
generator = new SwitchCodeGenerator();
break;
case TRY:
- generator = new TryCodeGenerator(tryExpressionsMap, expressionInputs);
+ generator = new TryCodeGenerator(tryExpressionsMap);
break;
// functions that take null as input
case IS_NULL:
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
index 93996bc763..656a41901a 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
@@ -204,7 +204,6 @@ public class CursorProcessorCompiler
cachedInstanceBinder,
fieldReferenceCompiler(cursor, wasNull),
metadata.getFunctionRegistry(),
- inputParameters,
tryMethodMap.build());
MethodDefinition tryMethod = defineTryMethod(
@@ -241,7 +240,6 @@ public class CursorProcessorCompiler
cachedInstanceBinder,
fieldReferenceCompiler(cursor, wasNullVariable),
metadata.getFunctionRegistry(),
- ImmutableList.of(session, cursor, wasNullVariable),
tryMethodMap);
LabelNode end = new LabelNode("end");
@@ -282,7 +280,6 @@ public class CursorProcessorCompiler
cachedInstanceBinder,
fieldReferenceCompiler(cursor, wasNullVariable),
metadata.getFunctionRegistry(),
- ImmutableList.of(session, cursor, wasNullVariable),
tryMethodMap);
body.getVariable(output)
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
index 53f3e408d4..4269cef01d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
@@ -750,21 +750,20 @@ public class PageProcessorCompiler
Parameter position = arg("position", int.class);
Parameter wasNullVariable = arg("wasNull", boolean.class);
- List<Parameter> inputParameters = ImmutableList.<Parameter>builder()
- .add(session)
- .addAll(blocks)
- .add(position)
- .add(wasNullVariable)
- .build();
-
BytecodeExpressionVisitor innerExpressionVisitor = new BytecodeExpressionVisitor(
callSiteBinder,
cachedInstanceBinder,
fieldReferenceCompiler(callSiteBinder, position, wasNullVariable),
metadata.getFunctionRegistry(),
- inputParameters,
tryMethodMap.build());
+ List<Parameter> inputParameters = ImmutableList.<Parameter>builder()
+ .add(session)
+ .addAll(blocks)
+ .add(position)
+ .add(wasNullVariable)
+ .build();
+
MethodDefinition tryMethod = defineTryMethod(
innerExpressionVisitor,
containerClassDefinition,
@@ -789,17 +788,15 @@ public class PageProcessorCompiler
List<Parameter> blocks = toBlockParameters(getInputChannels(filter));
Parameter position = arg("position", int.class);
- List<Parameter> expressionInputs = ImmutableList.<Parameter>builder()
- .add(session)
- .addAll(blocks)
- .add(position)
- .build();
-
MethodDefinition method = classDefinition.declareMethod(
a(PUBLIC),
"filter",
type(boolean.class),
- expressionInputs);
+ ImmutableList.<Parameter>builder()
+ .add(session)
+ .addAll(blocks)
+ .add(position)
+ .build());
method.comment("Filter: %s", filter.toString());
BytecodeBlock body = method.getBody();
@@ -812,10 +809,6 @@ public class PageProcessorCompiler
cachedInstanceBinder,
fieldReferenceCompiler(callSiteBinder, position, wasNullVariable),
metadata.getFunctionRegistry(),
- ImmutableList.<Variable>builder()
- .addAll(expressionInputs)
- .add(wasNullVariable)
- .build(),
tryMethodMap);
BytecodeNode visitorBody = filter.accept(visitor, scope);
@@ -838,18 +831,14 @@ public class PageProcessorCompiler
Parameter position = arg("position", int.class);
Parameter output = arg("output", BlockBuilder.class);
- List<Parameter> expressionInputs = ImmutableList.<Parameter>builder()
- .add(session)
- .addAll(blocks)
- .add(position)
- .build();
-
MethodDefinition method = classDefinition.declareMethod(
a(PUBLIC),
methodName,
type(void.class),
ImmutableList.<Parameter>builder()
- .addAll(expressionInputs)
+ .add(session)
+ .addAll(blocks)
+ .add(position)
.add(output)
.build());
@@ -864,10 +853,6 @@ public class PageProcessorCompiler
cachedInstanceBinder,
fieldReferenceCompiler(callSiteBinder, position, wasNullVariable),
metadata.getFunctionRegistry(),
- ImmutableList.<Variable>builder()
- .addAll(expressionInputs)
- .add(wasNullVariable)
- .build(),
tryMethodMap
);
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCodeGenerator.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCodeGenerator.java
index 25e23d17d7..f3cfb733c1 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCodeGenerator.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/TryCodeGenerator.java
@@ -20,7 +20,6 @@ import com.facebook.presto.bytecode.MethodDefinition;
import com.facebook.presto.bytecode.Parameter;
import com.facebook.presto.bytecode.ParameterizedType;
import com.facebook.presto.bytecode.Scope;
-import com.facebook.presto.bytecode.Variable;
import com.facebook.presto.bytecode.control.TryCatch;
import com.facebook.presto.metadata.Signature;
import com.facebook.presto.spi.PrestoException;
@@ -56,12 +55,10 @@ public class TryCodeGenerator
private static final String EXCEPTION_HANDLER_NAME = "tryExpressionExceptionHandler";
private final Map<CallExpression, MethodDefinition> tryMethodsMap;
- private final List<? extends Variable> inputParameters;
- public TryCodeGenerator(Map<CallExpression, MethodDefinition> tryMethodsMap, List<? extends Variable> inputParameters)
+ public TryCodeGenerator(Map<CallExpression, MethodDefinition> tryMethodsMap)
{
this.tryMethodsMap = tryMethodsMap;
- this.inputParameters = inputParameters;
}
@Override
@@ -77,11 +74,14 @@ public class TryCodeGenerator
.comment("load required variables")
.getVariable(context.getScope().getVariable("this"));
- inputParameters.stream()
+ MethodDefinition definition = tryMethodsMap.get(innerCallExpression);
+
+ definition.getParameters().stream()
+ .map(parameter -> context.getScope().getVariable(parameter.getName()))
.forEach(bytecodeBlock::getVariable);
- bytecodeBlock.comment("call dynamic try method: " + tryMethodsMap.get(innerCallExpression).getName())
- .invokeVirtual(tryMethodsMap.get(innerCallExpression))
+ bytecodeBlock.comment("call dynamic try method: " + definition.getName())
+ .invokeVirtual(definition)
.append(unboxPrimitiveIfNecessary(context.getScope(), Primitives.wrap(innerCallExpression.getType().getJavaType())));
return bytecodeBlock;
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index eae6e30275..70819db65c 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -4306,6 +4306,11 @@ public abstract class AbstractTestQueries
assertQuery(
"SELECT COUNT(TRY(to_base(100, CAST(round(totalprice/100) AS BIGINT)))) FROM orders",
"SELECT SUM(CASE WHEN CAST(round(totalprice/100) AS BIGINT) BETWEEN 2 AND 36 THEN 1 ELSE 0 END) FROM orders");
+
+ // as part of a complex expression
+ assertQuery(
+ "SELECT COUNT(CAST(orderkey AS VARCHAR) || TRY(to_base(100, CAST(round(totalprice/100) AS BIGINT)))) FROM orders",
+ "SELECT SUM(CASE WHEN CAST(round(totalprice/100) AS BIGINT) BETWEEN 2 AND 36 THEN 1 ELSE 0 END) FROM orders");
}
@Test | ['presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/TryCodeGenerator.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/BytecodeExpressionVisitor.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2016-04-19T04:56:54" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
212 | prestodb/presto/5073/5057 | prestodb | presto | https://github.com/prestodb/presto/issues/5057 | https://github.com/prestodb/presto/pull/5073 | https://github.com/prestodb/presto/pull/5073 | 2 | Date constructor should handle year 0 correctly | fix | Year zero is converted to January 2nd of 1 AD:
```
presto> select date '0000-12-31';
_col0
------------
0001-01-02
(1 row)
```
It should be rejected, similar to other invalid dates:
```
presto> select date '2015-02-29';
Query ... failed: Value cannot be cast to date: 2015-02-29
presto> select date '2016-12-32';
Query ... failed: Value cannot be cast to date: 2016-12-32
```
| 7b0d0e02536bcb485b6e0c9a3c6959fa8cb67491 | d06fe75c1551639f5bc96e86b22038b15f596843 | https://github.com/prestodb/presto/compare/7b0d0e02536bcb485b6e0c9a3c6959fa8cb67491...d06fe75c1551639f5bc96e86b22038b15f596843 | diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
index b478b32aa8..0cc40f4a94 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java
@@ -232,6 +232,17 @@ public final class FunctionAssertions
}
}
+ public void assertFunctionString(String projection, Type expectedType, String expected)
+ {
+ Object actual = selectSingleValue(projection, expectedType, compiler);
+ try {
+ assertEquals(actual.toString(), expected);
+ }
+ catch (Throwable e) {
+ throw e;
+ }
+ }
+
public void tryEvaluate(String expression, Type expectedType)
{
tryEvaluate(expression, expectedType, session);
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
index 35d2801a5e..8c57fef0ce 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java
@@ -820,11 +820,51 @@ public class TestDateTimeFunctions
toTimestampWithTimeZone(new DateTime(2013, 5, 17, 0, 35, 10, 0, DATE_TIME_ZONE)));
}
+ @Test
+ public void testDateTimeOutputString()
+ {
+ // SqlDate
+ assertFunctionString("date '2012-12-31'", DateType.DATE, "2012-12-31");
+ assertFunctionString("date '0000-12-31'", DateType.DATE, "0000-12-31");
+ assertFunctionString("date '0000-09-23'", DateType.DATE, "0000-09-23");
+ assertFunctionString("date '0001-10-25'", DateType.DATE, "0001-10-25");
+ assertFunctionString("date '1560-04-29'", DateType.DATE, "1560-04-29");
+
+ // SqlTime
+ assertFunctionString("time '00:00:00'", TimeType.TIME, "00:00:00.000");
+ assertFunctionString("time '01:02:03'", TimeType.TIME, "01:02:03.000");
+ assertFunctionString("time '23:23:23.233'", TimeType.TIME, "23:23:23.233");
+ assertFunctionString("time '23:59:59.999'", TimeType.TIME, "23:59:59.999");
+
+ // SqlTimeWithTimeZone
+ assertFunctionString("time '00:00:00 UTC'", TIME_WITH_TIME_ZONE, "00:00:00.000 UTC");
+ assertFunctionString("time '01:02:03 Asia/Shanghai'", TIME_WITH_TIME_ZONE, "01:02:03.000 Asia/Shanghai");
+ assertFunctionString("time '23:23:23.233 America/Los_Angeles'", TIME_WITH_TIME_ZONE, "23:23:23.233 America/Los_Angeles");
+ assertFunctionString(WEIRD_TIME_LITERAL, TIME_WITH_TIME_ZONE, "03:04:05.321 +07:09");
+
+ // SqlTimestamp
+ assertFunctionString("timestamp '0000-01-02 01:02:03'", TimestampType.TIMESTAMP, "0000-01-02 01:02:03.000");
+ assertFunctionString("timestamp '2012-12-31 00:00:00'", TimestampType.TIMESTAMP, "2012-12-31 00:00:00.000");
+ assertFunctionString("timestamp '1234-05-06 23:23:23.233'", TimestampType.TIMESTAMP, "1234-05-06 23:23:23.233");
+ assertFunctionString("timestamp '2333-02-23 23:59:59.999'", TimestampType.TIMESTAMP, "2333-02-23 23:59:59.999");
+
+ // SqlTimestampWithTimeZone
+ assertFunctionString("timestamp '2012-12-31 00:00:00 UTC'", TIMESTAMP_WITH_TIME_ZONE, "2012-12-31 00:00:00.000 UTC");
+ assertFunctionString("timestamp '0000-01-02 01:02:03 Asia/Shanghai'", TIMESTAMP_WITH_TIME_ZONE, "0000-01-02 01:02:03.000 Asia/Shanghai");
+ assertFunctionString("timestamp '1234-05-06 23:23:23.233 America/Los_Angeles'", TIMESTAMP_WITH_TIME_ZONE, "1234-05-06 23:23:23.233 America/Los_Angeles");
+ assertFunctionString("timestamp '2333-02-23 23:59:59.999 Asia/Tokyo'", TIMESTAMP_WITH_TIME_ZONE, "2333-02-23 23:59:59.999 Asia/Tokyo");
+ }
+
private void assertFunction(String projection, Type expectedType, Object expected)
{
functionAssertions.assertFunction(projection, expectedType, expected);
}
+ private void assertFunctionString(String projection, Type expectedType, String expected)
+ {
+ functionAssertions.assertFunctionString(projection, expectedType, expected);
+ }
+
private SqlDate toDate(DateTime dateDate)
{
long millis = dateDate.getMillis();
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlDate.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlDate.java
index 4171f4a56b..6a13509b44 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlDate.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlDate.java
@@ -15,13 +15,8 @@ package com.facebook.presto.spi.type;
import com.fasterxml.jackson.annotation.JsonValue;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static com.facebook.presto.spi.type.TimeZoneIndex.getTimeZoneForKey;
-import static com.facebook.presto.spi.type.TimeZoneKey.UTC_KEY;
public final class SqlDate
{
@@ -60,8 +55,6 @@ public final class SqlDate
@Override
public String toString()
{
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- format.setTimeZone(getTimeZoneForKey(UTC_KEY));
- return format.format(new Date(TimeUnit.DAYS.toMillis(days)));
+ return LocalDate.ofEpochDay(days).toString();
}
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTime.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTime.java
index 8858ef09d2..3a883c7aa0 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTime.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTime.java
@@ -15,14 +15,15 @@ package com.facebook.presto.spi.type;
import com.fasterxml.jackson.annotation.JsonValue;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.Objects;
-import static com.facebook.presto.spi.type.TimeZoneIndex.getTimeZoneForKey;
-
public final class SqlTime
{
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS");
+
private final long millisUtc;
private final TimeZoneKey sessionTimeZoneKey;
@@ -66,8 +67,6 @@ public final class SqlTime
@Override
public String toString()
{
- SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss.SSS");
- format.setTimeZone(getTimeZoneForKey(sessionTimeZoneKey));
- return format.format(new Date(millisUtc));
+ return Instant.ofEpochMilli(millisUtc).atZone(ZoneId.of(sessionTimeZoneKey.getId())).format(formatter);
}
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimeWithTimeZone.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimeWithTimeZone.java
index e63867d8cd..ba09d16550 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimeWithTimeZone.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimeWithTimeZone.java
@@ -15,17 +15,19 @@ package com.facebook.presto.spi.type;
import com.fasterxml.jackson.annotation.JsonValue;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.Objects;
import java.util.TimeZone;
import static com.facebook.presto.spi.type.DateTimeEncoding.unpackMillisUtc;
import static com.facebook.presto.spi.type.DateTimeEncoding.unpackZoneKey;
-import static com.facebook.presto.spi.type.TimeZoneIndex.getTimeZoneForKey;
public final class SqlTimeWithTimeZone
{
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS VV");
+
private final long millisUtc;
private final TimeZoneKey timeZoneKey;
@@ -81,8 +83,6 @@ public final class SqlTimeWithTimeZone
@Override
public String toString()
{
- SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss.SSS");
- format.setTimeZone(getTimeZoneForKey(timeZoneKey));
- return format.format(new Date(millisUtc)) + " " + timeZoneKey.getId();
+ return Instant.ofEpochMilli(millisUtc).atZone(ZoneId.of(timeZoneKey.getId())).format(formatter);
}
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestamp.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestamp.java
index eaa68b3c9f..6290daa6ea 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestamp.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestamp.java
@@ -15,14 +15,15 @@ package com.facebook.presto.spi.type;
import com.fasterxml.jackson.annotation.JsonValue;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.Objects;
-import static com.facebook.presto.spi.type.TimeZoneIndex.getTimeZoneForKey;
-
public final class SqlTimestamp
{
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SSS");
+
private final long millisUtc;
private final TimeZoneKey sessionTimeZoneKey;
@@ -66,8 +67,6 @@ public final class SqlTimestamp
@Override
public String toString()
{
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
- format.setTimeZone(getTimeZoneForKey(sessionTimeZoneKey));
- return format.format(new Date(millisUtc));
+ return Instant.ofEpochMilli(millisUtc).atZone(ZoneId.of(sessionTimeZoneKey.getId())).format(formatter);
}
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestampWithTimeZone.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestampWithTimeZone.java
index e171f42743..b9ad4eb7de 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestampWithTimeZone.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestampWithTimeZone.java
@@ -15,17 +15,19 @@ package com.facebook.presto.spi.type;
import com.fasterxml.jackson.annotation.JsonValue;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.Objects;
import java.util.TimeZone;
import static com.facebook.presto.spi.type.DateTimeEncoding.unpackMillisUtc;
import static com.facebook.presto.spi.type.DateTimeEncoding.unpackZoneKey;
-import static com.facebook.presto.spi.type.TimeZoneIndex.getTimeZoneForKey;
public final class SqlTimestampWithTimeZone
{
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SSS VV");
+
private final long millisUtc;
private final TimeZoneKey timeZoneKey;
@@ -81,8 +83,6 @@ public final class SqlTimestampWithTimeZone
@Override
public String toString()
{
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
- format.setTimeZone(getTimeZoneForKey(timeZoneKey));
- return format.format(new Date(millisUtc)) + " " + timeZoneKey.getId();
+ return Instant.ofEpochMilli(millisUtc).atZone(ZoneId.of(timeZoneKey.getId())).format(formatter);
}
} | ['presto-main/src/test/java/com/facebook/presto/operator/scalar/TestDateTimeFunctions.java', 'presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestamp.java', 'presto-main/src/test/java/com/facebook/presto/operator/scalar/FunctionAssertions.java', 'presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTime.java', 'presto-spi/src/main/java/com/facebook/presto/spi/type/SqlDate.java', 'presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimeWithTimeZone.java', 'presto-spi/src/main/java/com/facebook/presto/spi/type/SqlTimestampWithTimeZone.java'] | 7 | 7 | 0 | 0 | 7 | {'.java': 7} | "2016-04-21T01:41:51" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
180 | prestodb/presto/2139/2054 | prestodb | presto | https://github.com/prestodb/presto/issues/2054 | https://github.com/prestodb/presto/pull/2139 | https://github.com/prestodb/presto/pull/2139#issuecomment-69245731 | 2 | DISTINCT fails for JSON type when optimizeHashGeneration=true | fixes | ``` sql
SELECT DISTINCT CAST(ARRAY[1] AS JSON);
```
fails with:
```
com.facebook.presto.spi.PrestoException: Unexpected parameters (json) for function $operator$hash_code. Expected: $operator$hash_code(boolean), $operator$hash_code(bigint), $operator$hash_code(double), $operator$hash_code(varchar), $operator$hash_code(varbinary), $operator$hash_code(date), $operator$hash_code(time), $operator$hash_code(timestamp), $operator$hash_code(interval day to second), $operator$hash_code(interval year to month), $operator$hash_code(time with time zone), $operator$hash_code(timestamp with time zone)
at com.facebook.presto.metadata.FunctionRegistry.resolveFunction(FunctionRegistry.java:428)
at com.facebook.presto.metadata.MetadataManager.resolveFunction(MetadataManager.java:147)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitFunctionCall(ExpressionAnalyzer.java:601)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitFunctionCall(ExpressionAnalyzer.java:180)
at com.facebook.presto.sql.tree.FunctionCall.accept(FunctionCall.java:67)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:24)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.process(ExpressionAnalyzer.java:198)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitFunctionCall(ExpressionAnalyzer.java:598)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitFunctionCall(ExpressionAnalyzer.java:180)
at com.facebook.presto.sql.tree.FunctionCall.accept(FunctionCall.java:67)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyze(ExpressionAnalyzer.java:177)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyzeExpressions(ExpressionAnalyzer.java:928)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyzeExpressionsWithInputs(ExpressionAnalyzer.java:916)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypesFromInput(ExpressionAnalyzer.java:877)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypesFromInput(ExpressionAnalyzer.java:867)
at com.facebook.presto.sql.planner.InterpretedProjectionFunction.<init>(InterpretedProjectionFunction.java:57)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitScanFilterAndProject(LocalExecutionPlanner.java:852)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:723)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:344)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitAggregation(LocalExecutionPlanner.java:648)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitAggregation(LocalExecutionPlanner.java:344)
at com.facebook.presto.sql.planner.plan.AggregationNode.accept(AggregationNode.java:165)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:367)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:344)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:79)
at com.facebook.presto.sql.planner.LocalExecutionPlanner.plan(LocalExecutionPlanner.java:226)
at com.facebook.presto.execution.SqlTaskExecution.<init>(SqlTaskExecution.java:147)
at com.facebook.presto.execution.SqlTaskExecution.createSqlTaskExecution(SqlTaskExecution.java:109)
at com.facebook.presto.execution.SqlTaskExecutionFactory.create(SqlTaskExecutionFactory.java:101)
at com.facebook.presto.execution.SqlTask.updateTask(SqlTask.java:219)
at com.facebook.presto.execution.SqlTaskManager.updateTask(SqlTaskManager.java:223)
at com.facebook.presto.server.TaskResource.createOrUpdateTask(TaskResource.java:104)
at sun.reflect.GeneratedMethodAccessor142.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:497)
at org.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory$1.invoke(ResourceMethodInvocationHandlerFactory.java:81)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher$1.run(AbstractJavaResourceMethodDispatcher.java:151)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.invoke(AbstractJavaResourceMethodDispatcher.java:171)
at org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$ResponseOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:152)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:104)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:387)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:331)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:103)
at org.glassfish.jersey.server.ServerRuntime$1.run(ServerRuntime.java:271)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
at org.glassfish.jersey.internal.Errors.process(Errors.java:315)
at org.glassfish.jersey.internal.Errors.process(Errors.java:297)
at org.glassfish.jersey.internal.Errors.process(Errors.java:267)
at org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:297)
at org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:254)
at org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1030)
at org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:373)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:381)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:344)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:221)
at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:769)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1667)
at org.eclipse.jetty.servlets.UserAgentFilter.doFilter(UserAgentFilter.java:83)
at org.eclipse.jetty.servlets.GzipFilter.doFilter(GzipFilter.java:300)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1650)
at io.airlift.http.server.TraceTokenFilter.doFilter(TraceTokenFilter.java:62)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1650)
at io.airlift.http.server.TimingFilter.doFilter(TimingFilter.java:51)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1650)
at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:583)
at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1125)
at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:515)
at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1059)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
at org.eclipse.jetty.server.handler.HandlerCollection.handle(HandlerCollection.java:110)
at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:97)
at org.eclipse.jetty.server.handler.StatisticsHandler.handle(StatisticsHandler.java:159)
at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)
at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:97)
at org.eclipse.jetty.server.Server.handle(Server.java:485)
at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:290)
at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:248)
at org.eclipse.jetty.io.AbstractConnection$2.run(AbstractConnection.java:540)
at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:606)
at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:535)
at java.lang.Thread.run(Thread.java:745)
```
| 3c89a3fc1672ad47c9e8eff950d9d8e37ebe56a6 | 74c463092f277171c152c965482e0ad71cd2f88e | https://github.com/prestodb/presto/compare/3c89a3fc1672ad47c9e8eff950d9d8e37ebe56a6...74c463092f277171c152c965482e0ad71cd2f88e | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonOperators.java b/presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonOperators.java
index c2551f7bc7..e19fddd773 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonOperators.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonOperators.java
@@ -18,6 +18,7 @@ import com.facebook.presto.type.SqlType;
import io.airlift.slice.Slice;
import static com.facebook.presto.metadata.OperatorType.EQUAL;
+import static com.facebook.presto.metadata.OperatorType.HASH_CODE;
import static com.facebook.presto.metadata.OperatorType.NOT_EQUAL;
public final class JsonOperators
@@ -26,6 +27,13 @@ public final class JsonOperators
{
}
+ @ScalarOperator(HASH_CODE)
+ @SqlType(StandardTypes.BIGINT)
+ public static long hashCode(@SqlType(StandardTypes.JSON) Slice value)
+ {
+ return value.hashCode();
+ }
+
@ScalarOperator(EQUAL)
@SqlType(StandardTypes.BOOLEAN)
public static boolean equals(@SqlType(StandardTypes.JSON) Slice leftJson, @SqlType(StandardTypes.JSON) Slice rightJson) | ['presto-main/src/main/java/com/facebook/presto/operator/scalar/JsonOperators.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2014-12-19T21:05:55" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
192 | prestodb/presto/6802/6801 | prestodb | presto | https://github.com/prestodb/presto/issues/6801 | https://github.com/prestodb/presto/pull/6802 | https://github.com/prestodb/presto/pull/6802 | 1 | Error executing prepared statement when complex join criteria contains parameter | fixes | A query like this:
```sql
SELECT * FROM (VALUES 1) t(a) JOIN (VALUES 2) u(a) ON t.a + u.a < ?;
```
Fails to execute with "EXECUTE ... USING ..." with:
```
com.facebook.presto.sql.analyzer.SemanticException: line 1:67: query takes no parameters
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitParameter(ExpressionAnalyzer.java:896)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitParameter(ExpressionAnalyzer.java:254)
at com.facebook.presto.sql.tree.Parameter.accept(Parameter.java:48)
at com.facebook.presto.sql.tree.StackableAstVisitor.process(StackableAstVisitor.java:26)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.process(ExpressionAnalyzer.java:273)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.getOperator(ExpressionAnalyzer.java:1130)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitComparisonExpression(ExpressionAnalyzer.java:423)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitComparisonExpression(ExpressionAnalyzer.java:254)
at com.facebook.presto.sql.tree.ComparisonExpression.accept(ComparisonExpression.java:68)
at com.facebook.presto.sql.tree.StackableAstVisitor.process(StackableAstVisitor.java:26)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.process(ExpressionAnalyzer.java:273)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyze(ExpressionAnalyzer.java:230)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyzeExpressions(ExpressionAnalyzer.java:1391)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyzeExpressionsWithSymbols(ExpressionAnalyzer.java:1344)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypes(ExpressionAnalyzer.java:1310)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypes(ExpressionAnalyzer.java:1298)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypes(ExpressionAnalyzer.java:1286)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.desugar(DesugaringOptimizer.java:118)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitFilter(DesugaringOptimizer.java:92)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitFilter(DesugaringOptimizer.java:64)
at com.facebook.presto.sql.planner.plan.FilterNode.accept(FilterNode.java:71)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:96)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:83)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:64)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:96)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:83)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:64)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:96)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:83)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:64)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:96)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:83)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer$Rewriter.visitProject(DesugaringOptimizer.java:64)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.rewrite(SimplePlanRewriter.java:85)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.lambda$defaultRewrite$0(SimplePlanRewriter.java:74)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter$RewriteContext.defaultRewrite(SimplePlanRewriter.java:75)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:39)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.visitPlan(SimplePlanRewriter.java:23)
at com.facebook.presto.sql.planner.plan.PlanVisitor.visitOutput(PlanVisitor.java:50)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.plan.SimplePlanRewriter.rewriteWith(SimplePlanRewriter.java:28)
at com.facebook.presto.sql.planner.optimizations.DesugaringOptimizer.optimize(DesugaringOptimizer.java:61)
at com.facebook.presto.sql.planner.LogicalPlanner.plan(LogicalPlanner.java:120)
at com.facebook.presto.testing.LocalQueryRunner.createPlan(LocalQueryRunner.java:676)
at com.facebook.presto.testing.LocalQueryRunner.createPlan(LocalQueryRunner.java:642)
at com.facebook.presto.testing.LocalQueryRunner.createPlan(LocalQueryRunner.java:629)
at com.facebook.presto.testing.LocalQueryRunner.createDrivers(LocalQueryRunner.java:539)
at com.facebook.presto.testing.LocalQueryRunner.executeInternal(LocalQueryRunner.java:500)
at com.facebook.presto.testing.LocalQueryRunner.lambda$execute$2(LocalQueryRunner.java:473)
at com.facebook.presto.transaction.TransactionBuilder.execute(TransactionBuilder.java:149)
at com.facebook.presto.testing.LocalQueryRunner.inTransaction(LocalQueryRunner.java:485)
at com.facebook.presto.testing.LocalQueryRunner.execute(LocalQueryRunner.java:473)
at com.facebook.presto.tests.AbstractTestQueryFramework.computeActual(AbstractTestQueryFramework.java:88)
at com.facebook.presto.tests.TestLocalQueries.testExecuteUsingx(TestLocalQueries.java:46)
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.testng.internal.MethodInvocationHelper.invokeMethod(MethodInvocationHelper.java:85)
at org.testng.internal.Invoker.invokeMethod(Invoker.java:696)
at org.testng.internal.Invoker.invokeTestMethod(Invoker.java:882)
at org.testng.internal.Invoker.invokeTestMethods(Invoker.java:1189)
at org.testng.internal.TestMethodWorker.invokeTestMethods(TestMethodWorker.java:124)
at org.testng.internal.TestMethodWorker.run(TestMethodWorker.java:108)
at org.testng.TestRunner.privateRun(TestRunner.java:767)
at org.testng.TestRunner.run(TestRunner.java:617)
at org.testng.SuiteRunner.runTest(SuiteRunner.java:348)
at org.testng.SuiteRunner.runSequentially(SuiteRunner.java:343)
at org.testng.SuiteRunner.privateRun(SuiteRunner.java:305)
at org.testng.SuiteRunner.run(SuiteRunner.java:254)
at org.testng.SuiteRunnerWorker.runSuite(SuiteRunnerWorker.java:52)
at org.testng.SuiteRunnerWorker.run(SuiteRunnerWorker.java:86)
at org.testng.TestNG.runSuitesSequentially(TestNG.java:1224)
at org.testng.TestNG.runSuitesLocally(TestNG.java:1149)
at org.testng.TestNG.run(TestNG.java:1057)
at org.testng.IDEARemoteTestNG.run(IDEARemoteTestNG.java:72)
at org.testng.RemoteTestNGStarter.main(RemoteTestNGStarter.java:127)
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 com.intellij.rt.execution.application.AppMain.main(AppMain.java:147)
``` | 8f8fe148afc6cafe752f7bba37ea71edfb913631 | 42a76b91e4de121d7dfaf072eca4eab0e5ac27c5 | https://github.com/prestodb/presto/compare/8f8fe148afc6cafe752f7bba37ea71edfb913631...42a76b91e4de121d7dfaf072eca4eab0e5ac27c5 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
index cf374dc82b..8c10f859f5 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java
@@ -332,6 +332,7 @@ class RelationPlanner
rootPlanBuilder = subqueryPlanner.handleSubqueries(rootPlanBuilder, complexJoinExpressions, node);
for (Expression expression : complexJoinExpressions) {
+ expression = ExpressionTreeRewriter.rewriteWith(new ParameterRewriter(analysis.getParameters(), analysis), expression);
postInnerJoinConditions.add(rootPlanBuilder.rewrite(expression));
}
root = rootPlanBuilder.getRoot();
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 16dbf46cd7..d2ff43afab 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -7478,6 +7478,18 @@ public abstract class AbstractTestQueries
"VALUES (2, 4), (3, 8), (4, 4)");
}
+ @Test
+ public void testExecuteUsingComplexJoinCriteria()
+ {
+ String query = "SELECT * FROM (VALUES 1) t(a) JOIN (VALUES 2) u(a) ON t.a + u.a < ?";
+ Session session = Session.builder(getSession())
+ .addPreparedStatement("my_query", query)
+ .build();
+ assertQuery(session,
+ "EXECUTE my_query USING 5",
+ "VALUES (1, 2)");
+ }
+
@Test
public void testExecuteUsingWithSubquery()
{ | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/RelationPlanner.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-12-08T02:46:52" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
191 | prestodb/presto/6877/6875 | prestodb | presto | https://github.com/prestodb/presto/issues/6875 | https://github.com/prestodb/presto/pull/6877 | https://github.com/prestodb/presto/pull/6877 | 1 | Bad error when aggregation function is used in lambda expression | fixes | ```sql
SELECT transform(ARRAY[1], x -> max(x))
```
fails with:
```
java.lang.IllegalArgumentException: function must be of type com.facebook.presto.metadata.SqlScalarFunction, not com.facebook.presto.operator.aggregation.MaxAggregationFunction
at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)
at com.facebook.presto.util.Types.checkType(Types.java:28)
at com.facebook.presto.metadata.FunctionRegistry$2.load(FunctionRegistry.java:348)
at com.facebook.presto.metadata.FunctionRegistry$2.load(FunctionRegistry.java:342)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
at com.facebook.presto.metadata.FunctionRegistry.getScalarFunctionImplementation(FunctionRegistry.java:862)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitCall(ExpressionOptimizer.java:146)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitCall(ExpressionOptimizer.java:72)
at com.facebook.presto.sql.relational.CallExpression.accept(CallExpression.java:88)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitLambda(ExpressionOptimizer.java:191)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitLambda(ExpressionOptimizer.java:72)
at com.facebook.presto.sql.relational.LambdaDefinitionExpression.accept(LambdaDefinitionExpression.java:93)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.lambda$visitCall$3(ExpressionOptimizer.java:151)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.Iterator.forEachRemaining(Iterator.java:116)
at java.util.Spliterators$IteratorSpliterator.forEachRemaining(Spliterators.java:1801)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitCall(ExpressionOptimizer.java:152)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer$Visitor.visitCall(ExpressionOptimizer.java:72)
at com.facebook.presto.sql.relational.CallExpression.accept(CallExpression.java:88)
at com.facebook.presto.sql.relational.optimizer.ExpressionOptimizer.optimize(ExpressionOptimizer.java:69)
at com.facebook.presto.sql.relational.SqlToRowExpressionTranslator.translate(SqlToRowExpressionTranslator.java:146)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.toRowExpression(LocalExecutionPlanner.java:1119)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.lambda$visitScanFilterAndProject$5(LocalExecutionPlanner.java:1023)
at java.util.stream.ReferencePipeline$3$1.accept(ReferencePipeline.java:193)
at java.util.ArrayList$ArrayListSpliterator.forEachRemaining(ArrayList.java:1374)
at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481)
at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471)
at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(ReduceOps.java:708)
at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234)
at java.util.stream.ReferencePipeline.collect(ReferencePipeline.java:499)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitScanFilterAndProject(LocalExecutionPlanner.java:1024)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:951)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:536)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:81)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:575)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:536)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.LocalExecutionPlanner.plan(LocalExecutionPlanner.java:351)
at com.facebook.presto.sql.planner.LocalExecutionPlanner.plan(LocalExecutionPlanner.java:290)
at com.facebook.presto.execution.SqlTaskExecution.<init>(SqlTaskExecution.java:161)
at com.facebook.presto.execution.SqlTaskExecution.createSqlTaskExecution(SqlTaskExecution.java:120)
at com.facebook.presto.execution.SqlTaskExecutionFactory.create(SqlTaskExecutionFactory.java:70)
at com.facebook.presto.execution.SqlTask.updateTask(SqlTask.java:315)
at com.facebook.presto.execution.SqlTaskManager.updateTask(SqlTaskManager.java:324)
at com.facebook.presto.server.TaskResource.createOrUpdateTask(TaskResource.java:125)
at sun.reflect.GeneratedMethodAccessor154.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory$1.invoke(ResourceMethodInvocationHandlerFactory.java:81)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher$1.run(AbstractJavaResourceMethodDispatcher.java:144)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.invoke(AbstractJavaResourceMethodDispatcher.java:161)
at org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$ResponseOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:160)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:99)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:389)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:347)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:102)
at org.glassfish.jersey.server.ServerRuntime$2.run(ServerRuntime.java:326)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
at org.glassfish.jersey.internal.Errors.process(Errors.java:315)
at org.glassfish.jersey.internal.Errors.process(Errors.java:297)
at org.glassfish.jersey.internal.Errors.process(Errors.java:267)
at org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:317)
at org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:305)
at org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1154)
at org.glassfish.jersey.servlet.WebComponent.serviceImpl(WebComponent.java:473)
at org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:427)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:388)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:341)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:228)
at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:845)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1689)
at io.airlift.http.server.TraceTokenFilter.doFilter(TraceTokenFilter.java:63)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at io.airlift.http.server.TimingFilter.doFilter(TimingFilter.java:52)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:581)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143)
at org.eclipse.jetty.server.handler.gzip.GzipHandler.handle(GzipHandler.java:395)
at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1182)
at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:511)
at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1112)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
at org.eclipse.jetty.server.handler.HandlerCollection.handle(HandlerCollection.java:119)
at org.eclipse.jetty.server.handler.StatisticsHandler.handle(StatisticsHandler.java:169)
at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)
at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:134)
at org.eclipse.jetty.server.Server.handle(Server.java:523)
at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:320)
at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:251)
at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:273)
at org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:95)
at org.eclipse.jetty.io.SelectChannelEndPoint$2.run(SelectChannelEndPoint.java:93)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.executeProduceConsume(ExecuteProduceConsume.java:303)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.produceConsume(ExecuteProduceConsume.java:148)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.run(ExecuteProduceConsume.java:136)
at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:671)
at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:589)
at java.lang.Thread.run(Thread.java:745)
``` | cbdadcf70b0f55cbe844a31d4a2b32c9eb59063b | cd9c9354d2b6496176f81b33ad388ba5ca3f9a9e | https://github.com/prestodb/presto/compare/cbdadcf70b0f55cbe844a31d4a2b32c9eb59063b...cd9c9354d2b6496176f81b33ad388ba5ca3f9a9e | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregateExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregateExtractor.java
index 3cca1c8353..488bc316e4 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregateExtractor.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregateExtractor.java
@@ -13,7 +13,7 @@
*/
package com.facebook.presto.sql.analyzer;
-import com.facebook.presto.metadata.Metadata;
+import com.facebook.presto.metadata.FunctionRegistry;
import com.facebook.presto.sql.tree.DefaultExpressionTraversalVisitor;
import com.facebook.presto.sql.tree.FunctionCall;
import com.google.common.collect.ImmutableList;
@@ -25,21 +25,19 @@ import static java.util.Objects.requireNonNull;
class AggregateExtractor
extends DefaultExpressionTraversalVisitor<Void, Void>
{
- private final Metadata metadata;
+ private final FunctionRegistry functionRegistry;
private final ImmutableList.Builder<FunctionCall> aggregates = ImmutableList.builder();
- public AggregateExtractor(Metadata metadata)
+ public AggregateExtractor(FunctionRegistry functionRegistry)
{
- requireNonNull(metadata, "metadata is null");
-
- this.metadata = metadata;
+ this.functionRegistry = requireNonNull(functionRegistry, "functionRegistry is null");
}
@Override
protected Void visitFunctionCall(FunctionCall node, Void context)
{
- if (metadata.isAggregationFunction(node.getName()) && !node.getWindow().isPresent()) {
+ if (functionRegistry.isAggregationFunction(node.getName()) && !node.getWindow().isPresent()) {
aggregates.add(node);
return null;
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java
index 510424e048..a025d8a802 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java
@@ -278,7 +278,7 @@ class AggregationAnalyzer
protected Boolean visitFunctionCall(FunctionCall node, Void context)
{
if (!node.getWindow().isPresent() && metadata.isAggregationFunction(node.getName())) {
- AggregateExtractor aggregateExtractor = new AggregateExtractor(metadata);
+ AggregateExtractor aggregateExtractor = new AggregateExtractor(metadata.getFunctionRegistry());
WindowFunctionExtractor windowExtractor = new WindowFunctionExtractor();
for (Expression argument : node.getArguments()) {
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/Analyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/Analyzer.java
index 947ae045d9..0b8aefaf31 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/Analyzer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/Analyzer.java
@@ -14,6 +14,7 @@
package com.facebook.presto.sql.analyzer;
import com.facebook.presto.Session;
+import com.facebook.presto.metadata.FunctionRegistry;
import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.security.AccessControl;
import com.facebook.presto.sql.parser.SqlParser;
@@ -68,9 +69,9 @@ public class Analyzer
return analysis;
}
- static void verifyNoAggregatesOrWindowFunctions(Metadata metadata, Expression predicate, String clause)
+ static void verifyNoAggregatesOrWindowFunctions(FunctionRegistry functionRegistry, Expression predicate, String clause)
{
- AggregateExtractor extractor = new AggregateExtractor(metadata);
+ AggregateExtractor extractor = new AggregateExtractor(functionRegistry);
extractor.process(predicate, null);
WindowFunctionExtractor windowExtractor = new WindowFunctionExtractor();
@@ -79,7 +80,7 @@ public class Analyzer
List<FunctionCall> found = ImmutableList.copyOf(Iterables.concat(extractor.getAggregates(), windowExtractor.getWindowFunctions()));
if (!found.isEmpty()) {
- throw new SemanticException(CANNOT_HAVE_AGGREGATIONS_OR_WINDOWS, predicate, "%s clause cannot contain aggregations or window functions: %s", clause, found);
+ throw new SemanticException(CANNOT_HAVE_AGGREGATIONS_OR_WINDOWS, predicate, "%s cannot contain aggregations or window functions: %s", clause, found);
}
}
}
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
index 2a09ff69d9..a225c9497d 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
@@ -121,6 +121,7 @@ import static com.facebook.presto.spi.type.TinyintType.TINYINT;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
import static com.facebook.presto.spi.type.VarbinaryType.VARBINARY;
import static com.facebook.presto.spi.type.VarcharType.VARCHAR;
+import static com.facebook.presto.sql.analyzer.Analyzer.verifyNoAggregatesOrWindowFunctions;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.EXPRESSION_NOT_CONSTANT;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.INVALID_LITERAL;
import static com.facebook.presto.sql.analyzer.SemanticErrorCode.INVALID_PARAMETER_USAGE;
@@ -783,6 +784,7 @@ public class ExpressionAnalyzer
for (Expression expression : node.getArguments()) {
if (expression instanceof LambdaExpression) {
LambdaExpression lambdaExpression = (LambdaExpression) expression;
+ verifyNoAggregatesOrWindowFunctions(functionRegistry, lambdaExpression.getBody(), "Lambda expression");
// captures are not supported for now, use empty tuple descriptor
Expression lambdaBody = lambdaExpression.getBody();
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
index 608bf8378d..4470a22e2b 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
@@ -944,7 +944,7 @@ class StatementAnalyzer
analysis.addCoercion(expression, BOOLEAN, false);
}
- Analyzer.verifyNoAggregatesOrWindowFunctions(metadata, expression, "JOIN");
+ Analyzer.verifyNoAggregatesOrWindowFunctions(metadata.getFunctionRegistry(), expression, "JOIN clause");
// expressionInterpreter/optimizer only understands a subset of expression types
// TODO: remove this when the new expression tree is implemented
@@ -1514,7 +1514,7 @@ class StatementAnalyzer
groupByExpression = groupingColumn;
}
- Analyzer.verifyNoAggregatesOrWindowFunctions(metadata, groupByExpression, "GROUP BY");
+ Analyzer.verifyNoAggregatesOrWindowFunctions(metadata.getFunctionRegistry(), groupByExpression, "GROUP BY clause");
Type type = analysis.getType(groupByExpression);
if (!type.isComparable()) {
throw new SemanticException(TYPE_MISMATCH, node, "%s is not comparable, and therefore cannot be used in GROUP BY", type);
@@ -1631,7 +1631,7 @@ class StatementAnalyzer
public void analyzeWhere(Node node, Scope scope, Expression predicate)
{
- Analyzer.verifyNoAggregatesOrWindowFunctions(metadata, predicate, "WHERE");
+ Analyzer.verifyNoAggregatesOrWindowFunctions(metadata.getFunctionRegistry(), predicate, "WHERE clause");
ExpressionAnalysis expressionAnalysis = analyzeExpression(predicate, scope);
analysis.recordSubqueries(node, expressionAnalysis);
@@ -1664,7 +1664,7 @@ class StatementAnalyzer
Set<Expression> columnReferences,
List<Expression> expressions)
{
- AggregateExtractor extractor = new AggregateExtractor(metadata);
+ AggregateExtractor extractor = new AggregateExtractor(metadata.getFunctionRegistry());
for (Expression expression : expressions) {
extractor.process(expression);
}
@@ -1690,7 +1690,7 @@ class StatementAnalyzer
private boolean hasAggregates(QuerySpecification node)
{
- AggregateExtractor extractor = new AggregateExtractor(metadata);
+ AggregateExtractor extractor = new AggregateExtractor(metadata.getFunctionRegistry());
node.getSelect()
.getSelectItems().stream()
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 5d2e0b5a37..900c96af74 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -203,6 +203,12 @@ public abstract class AbstractTestQueries
assertQuery("SELECT apply((SELECT 10), i -> i * i)", "SELECT 100");
}
+ @Test
+ public void testLambdaWithAggregation()
+ {
+ assertQueryFails("SELECT transform(ARRAY[1], x -> max(x))", ".* Lambda expression cannot contain aggregations or window functions: .*");
+ }
+
@Test
public void testNonDeterministicFilter()
{ | ['presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregateExtractor.java', 'presto-main/src/main/java/com/facebook/presto/sql/analyzer/AggregationAnalyzer.java', 'presto-main/src/main/java/com/facebook/presto/sql/analyzer/Analyzer.java', 'presto-main/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java'] | 6 | 6 | 0 | 0 | 6 | {'.java': 6} | "2016-12-14T01:00:59" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
179 | prestodb/presto/2098/2095 | prestodb | presto | https://github.com/prestodb/presto/issues/2095 | https://github.com/prestodb/presto/pull/2098 | https://github.com/prestodb/presto/pull/2098#issuecomment-66523147 | 1 | row_number() with limit filter incorrect when filter contains NOT | fixes | The following query:
``` sql
SELECT * FROM (
SELECT row_number() OVER () rn
FROM (VALUES (0),(0),(0),(0))
)
WHERE NOT rn < 3;
```
produces the following (incorrect) output:
```
rn
----
(0 rows)
```
The correct output should be:
```
rn
----
3
4
(2 rows)
```
| 145b5881c237b6c6cba8e20985dc69b461e79c1f | 7f331bed914dc2afb8f3358fca214da22cc1b590 | https://github.com/prestodb/presto/compare/145b5881c237b6c6cba8e20985dc69b461e79c1f...7f331bed914dc2afb8f3358fca214da22cc1b590 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/WindowFilterPushDown.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/WindowFilterPushDown.java
index 85601e9b50..86a9c5e7a3 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/WindowFilterPushDown.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/WindowFilterPushDown.java
@@ -111,7 +111,8 @@ public class WindowFilterPushDown
if (filter.getLimit().isPresent()) {
return filter.getLimit();
}
- if (filterContainsWindowFunctions(node, filter.getFilterExpression().get())) {
+ if (filterContainsWindowFunctions(node, filter.getFilterExpression().get()) &&
+ filter.getFilterExpression().get() instanceof ComparisonExpression) {
Symbol rowNumberSymbol = Iterables.getOnlyElement(node.getWindowFunctions().entrySet()).getKey();
return WindowLimitExtractor.extract(filter.getFilterExpression().get(), rowNumberSymbol);
}
@@ -213,52 +214,56 @@ public class WindowFilterPushDown
@Override
protected Long visitComparisonExpression(ComparisonExpression node, Symbol rowNumberSymbol)
{
- QualifiedNameReference reference = extractReference(node);
- Literal literal = extractLiteral(node);
- if (!Symbol.fromQualifiedName(reference.getName()).equals(rowNumberSymbol)) {
+ Optional<QualifiedNameReference> reference = extractReference(node);
+ Optional<Literal> literal = extractLiteral(node);
+ if (!reference.isPresent() || !literal.isPresent()) {
+ return null;
+ }
+ if (!Symbol.fromQualifiedName(reference.get().getName()).equals(rowNumberSymbol)) {
return null;
}
+ long literalValue = extractValue(literal.get());
if (node.getLeft() instanceof QualifiedNameReference && node.getRight() instanceof Literal) {
if (node.getType() == ComparisonExpression.Type.LESS_THAN_OR_EQUAL) {
- return extractValue(literal);
+ return literalValue;
}
if (node.getType() == ComparisonExpression.Type.LESS_THAN) {
- return extractValue(literal) - 1;
+ return literalValue - 1;
}
}
else if (node.getLeft() instanceof Literal && node.getRight() instanceof QualifiedNameReference) {
if (node.getType() == ComparisonExpression.Type.GREATER_THAN_OR_EQUAL) {
- return extractValue(literal);
+ return literalValue;
}
if (node.getType() == ComparisonExpression.Type.GREATER_THAN) {
- return extractValue(literal) - 1;
+ return literalValue - 1;
}
}
return null;
}
}
- private static QualifiedNameReference extractReference(ComparisonExpression expression)
+ private static Optional<QualifiedNameReference> extractReference(ComparisonExpression expression)
{
if (expression.getLeft() instanceof QualifiedNameReference) {
- return (QualifiedNameReference) expression.getLeft();
+ return Optional.of((QualifiedNameReference) expression.getLeft());
}
if (expression.getRight() instanceof QualifiedNameReference) {
- return (QualifiedNameReference) expression.getRight();
+ return Optional.of((QualifiedNameReference) expression.getRight());
}
- throw new IllegalArgumentException("Comparison does not have a child of type QualifiedNameReference");
+ return Optional.absent();
}
- private static Literal extractLiteral(ComparisonExpression expression)
+ private static Optional<Literal> extractLiteral(ComparisonExpression expression)
{
if (expression.getLeft() instanceof Literal) {
- return (Literal) expression.getLeft();
+ return Optional.of((Literal) expression.getLeft());
}
if (expression.getRight() instanceof Literal) {
- return (Literal) expression.getRight();
+ return Optional.of((Literal) expression.getRight());
}
- throw new IllegalArgumentException("Comparison does not have a child of type Literal");
+ return Optional.absent();
}
private static long extractValue(Literal literal)
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index 1e130e2abd..16c35dc736 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -1873,6 +1873,29 @@ public abstract class AbstractTestQueries
assertEquals(actual, expected);
}
+ @Test
+ public void testRowNumberNoOptimization()
+ throws Exception
+ {
+ MaterializedResult actual = computeActual("" +
+ "SELECT orderkey, orderstatus FROM (\n" +
+ " SELECT row_number() OVER () rn, orderkey, orderstatus\n" +
+ " FROM orders\n" +
+ ") WHERE NOT rn <= 10\n");
+ MaterializedResult all = computeExpected("SELECT orderkey, orderstatus FROM ORDERS", actual.getTypes());
+ assertEquals(actual.getMaterializedRows().size(), all.getMaterializedRows().size() - 10);
+ assertTrue(all.getMaterializedRows().containsAll(actual.getMaterializedRows()));
+
+ actual = computeActual("" +
+ "SELECT orderkey, orderstatus FROM (\n" +
+ " SELECT row_number() OVER () rn, orderkey, orderstatus\n" +
+ " FROM orders\n" +
+ ") WHERE rn - 5 <= 10\n");
+ all = computeExpected("SELECT orderkey, orderstatus FROM ORDERS", actual.getTypes());
+ assertEquals(actual.getMaterializedRows().size(), 15);
+ assertTrue(all.getMaterializedRows().containsAll(actual.getMaterializedRows()));
+ }
+
@Test
public void testRowNumberUnpartitionedLimit()
throws Exception | ['presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java', 'presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/WindowFilterPushDown.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2014-12-10T21:00:19" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
181 | prestodb/presto/2250/2211 | prestodb | presto | https://github.com/prestodb/presto/issues/2211 | https://github.com/prestodb/presto/pull/2250 | https://github.com/prestodb/presto/pull/2250#issuecomment-70953284 | 1 | Bad error message for unhandled | fixes | This is caused by an uncategorized error coming from the function (which should be fixed independently), but uncategorized errors should not result in a "compiler failed" error message.
```
presto:tiny> select json_extract_scalar('', '');
Query 20150109_183146_00009_t36py failed: Compiler failed and interpreter is disabled
```
| 600547872b2207bbe415b4f12bd0be777f1ff870 | c35a0ad1c512bdce2409d94f329ac16f5e349580 | https://github.com/prestodb/presto/compare/600547872b2207bbe415b4f12bd0be777f1ff870...c35a0ad1c512bdce2409d94f329ac16f5e349580 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
index 0b08a0f343..dd568e9085 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java
@@ -772,26 +772,26 @@ public class LocalExecutionPlanner
}
Map<Symbol, Integer> outputMappings = outputMappingsBuilder.build();
- try {
- // compiler uses inputs instead of symbols, so rewrite the expressions first
- SymbolToInputRewriter symbolToInputRewriter = new SymbolToInputRewriter(sourceLayout);
- Expression rewrittenFilter = ExpressionTreeRewriter.rewriteWith(symbolToInputRewriter, filterExpression);
+ // compiler uses inputs instead of symbols, so rewrite the expressions first
+ SymbolToInputRewriter symbolToInputRewriter = new SymbolToInputRewriter(sourceLayout);
+ Expression rewrittenFilter = ExpressionTreeRewriter.rewriteWith(symbolToInputRewriter, filterExpression);
- List<Expression> rewrittenProjections = new ArrayList<>();
- for (Expression projection : projectionExpressions) {
- rewrittenProjections.add(ExpressionTreeRewriter.rewriteWith(symbolToInputRewriter, projection));
- }
+ List<Expression> rewrittenProjections = new ArrayList<>();
+ for (Expression projection : projectionExpressions) {
+ rewrittenProjections.add(ExpressionTreeRewriter.rewriteWith(symbolToInputRewriter, projection));
+ }
- IdentityHashMap<Expression, Type> expressionTypes = getExpressionTypesFromInput(
- context.getSession(),
- metadata,
- sqlParser,
- sourceTypes,
- concat(singleton(rewrittenFilter), rewrittenProjections));
+ IdentityHashMap<Expression, Type> expressionTypes = getExpressionTypesFromInput(
+ context.getSession(),
+ metadata,
+ sqlParser,
+ sourceTypes,
+ concat(singleton(rewrittenFilter), rewrittenProjections));
- RowExpression traslatedFilter = SqlToRowExpressionTranslator.translate(rewrittenFilter, expressionTypes, metadata, session, true);
- List<RowExpression> translatedProjections = SqlToRowExpressionTranslator.translate(rewrittenProjections, expressionTypes, metadata, session, true);
+ RowExpression traslatedFilter = SqlToRowExpressionTranslator.translate(rewrittenFilter, expressionTypes, metadata, session, true);
+ List<RowExpression> translatedProjections = SqlToRowExpressionTranslator.translate(rewrittenProjections, expressionTypes, metadata, session, true);
+ try {
if (columns != null) {
CursorProcessor cursorProcessor = compiler.compileCursorProcessor(traslatedFilter, translatedProjections, sourceNode.getId());
PageProcessor pageProcessor = compiler.compilePageProcessor(traslatedFilter, translatedProjections); | ['presto-main/src/main/java/com/facebook/presto/sql/planner/LocalExecutionPlanner.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2015-01-22T01:00:01" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
182 | prestodb/presto/2303/2301 | prestodb | presto | https://github.com/prestodb/presto/issues/2301 | https://github.com/prestodb/presto/pull/2303 | https://github.com/prestodb/presto/pull/2303#issuecomment-72136689 | 1 | INSERT should ignore hidden columns | fixes | When doing an `INSERT` that does not specify the column list (which is not yet supported), the column list should only be the visible columns (not hidden columns). Thus, it should be equivalent to the columns returned by `SELECT * FROM t`.
For example, using the tpch connector:
```
presto:tiny> describe region;
Column | Type | Null | Partition Key | Comment
-----------+---------+------+---------------+---------
regionkey | bigint | true | false |
name | varchar | true | false |
comment | varchar | true | false |
(3 rows)
presto:tiny> select * from region limit 0;
regionkey | name | comment
-----------+------+---------
(0 rows)
```
However, the check in `StatementAnalyzer` is including the hidden `row_number` columns:
```
presto:tiny> insert into region select * from region;
Query 20150129_235057_00017_b9dwj failed: Insert query has mismatched column types: Table: (bigint, varchar, varchar, bigint), Query: (bigint, varchar, varchar)
```
| 4802717e947e34f9384ba435bbcfb9f652fa1ff0 | 6d4c051ddb1f71b0b8b977a102203a7b7f6da9b1 | https://github.com/prestodb/presto/compare/4802717e947e34f9384ba435bbcfb9f652fa1ff0...6d4c051ddb1f71b0b8b977a102203a7b7f6da9b1 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
index 56dea1fa03..163872a2a1 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java
@@ -55,6 +55,7 @@ import com.facebook.presto.sql.tree.Values;
import com.facebook.presto.sql.tree.With;
import com.facebook.presto.sql.tree.WithQuery;
import com.google.common.base.Joiner;
+import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Ints;
@@ -364,7 +365,9 @@ class StatementAnalyzer
analysis.setInsertTarget(targetTableHandle.get());
List<ColumnMetadata> columns = metadata.getTableMetadata(targetTableHandle.get()).getColumns();
- Iterable<Type> tableTypes = transform(columns, ColumnMetadata::getType);
+ Iterable<Type> tableTypes = FluentIterable.from(columns)
+ .filter(column -> !column.isHidden())
+ .transform(ColumnMetadata::getType);
Iterable<Type> queryTypes = transform(descriptor.getVisibleFields(), Field::getType);
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java b/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
index b4baa460b0..2ac118f284 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
@@ -480,6 +480,22 @@ public class TestAnalyzer
analyze("WITH AB AS (SELECT * FROM t1) SELECT * FROM ab");
}
+ @Test
+ public void testInsert()
+ throws Exception
+ {
+ analyze("INSERT INTO t1 SELECT * FROM t1");
+ analyze("INSERT INTO t3 SELECT * FROM t3");
+ analyze("INSERT INTO t3 SELECT a, b FROM t3");
+ assertFails(MISMATCHED_SET_COLUMN_TYPES, "INSERT INTO t1 VALUES (1, 2)");
+
+ // ignore t5 hidden column
+ analyze("INSERT INTO t5 VALUES (1)");
+
+ // fail if hidden column provided
+ assertFails(MISMATCHED_SET_COLUMN_TYPES, "INSERT INTO t5 VALUES (1, 2)");
+ }
+
@Test
public void testDuplicateWithQuery()
throws Exception
@@ -751,7 +767,8 @@ public class TestAnalyzer
metadata.createTable(SESSION, "tpch", new TableMetadata("tpch", new ConnectorTableMetadata(table3,
ImmutableList.<ColumnMetadata>of(
new ColumnMetadata("a", BIGINT, 0, false),
- new ColumnMetadata("b", BIGINT, 1, false)))));
+ new ColumnMetadata("b", BIGINT, 1, false),
+ new ColumnMetadata("x", BIGINT, 2, false, null, true)))));
// table in different catalog
SchemaTableName table4 = new SchemaTableName("s2", "t4");
@@ -759,6 +776,13 @@ public class TestAnalyzer
ImmutableList.<ColumnMetadata>of(
new ColumnMetadata("a", BIGINT, 0, false)))));
+ // table with a hidden column
+ SchemaTableName table5 = new SchemaTableName("default", "t5");
+ metadata.createTable(SESSION, "tpch", new TableMetadata("tpch", new ConnectorTableMetadata(table5,
+ ImmutableList.<ColumnMetadata>of(
+ new ColumnMetadata("a", BIGINT, 0, false),
+ new ColumnMetadata("b", BIGINT, 1, false, null, true)))));
+
// valid view referencing table in same schema
String viewData1 = JsonCodec.jsonCodec(ViewDefinition.class).toJson(
new ViewDefinition("select a from t1", "tpch", "default", ImmutableList.of( | ['presto-main/src/main/java/com/facebook/presto/sql/analyzer/StatementAnalyzer.java', 'presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2015-01-30T00:57:12" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
183 | prestodb/presto/4320/3171 | prestodb | presto | https://github.com/prestodb/presto/issues/3171 | https://github.com/prestodb/presto/pull/4320 | https://github.com/prestodb/presto/pull/4320#issuecomment-170981790 | 1 | Bad error message when casting to parametric type without type parameters | fixes | ```
SELECT CAST(NULL AS MAP);
```
Fails with:
```
Query 20150625_162057_09252_bhbmd failed: Expected two types
java.lang.IllegalArgumentException: Expected two types
at com.google.common.base.Preconditions.checkArgument(Preconditions.java:122)
at com.facebook.presto.type.MapParametricType.createType(MapParametricType.java:41)
at com.facebook.presto.type.MapParametricType.createType(MapParametricType.java:23)
at com.facebook.presto.type.TypeRegistry.instantiateParametricType(TypeRegistry.java:136)
at com.facebook.presto.type.TypeRegistry.getType(TypeRegistry.java:110)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitCast(ExpressionAnalyzer.java:726)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer$Visitor.visitCast(ExpressionAnalyzer.java:206)
at com.facebook.presto.sql.tree.Cast.accept(Cast.java:61)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyze(ExpressionAnalyzer.java:179)
at com.facebook.presto.sql.analyzer.ExpressionAnalyzer.analyzeExpression(ExpressionAnalyzer.java:1018)
at com.facebook.presto.sql.analyzer.TupleAnalyzer.analyzeExpression(TupleAnalyzer.java:1106)
at com.facebook.presto.sql.analyzer.TupleAnalyzer.analyzeSelect(TupleAnalyzer.java:913)
at com.facebook.presto.sql.analyzer.TupleAnalyzer.visitQuerySpecification(TupleAnalyzer.java:353)
at com.facebook.presto.sql.analyzer.TupleAnalyzer.visitQuerySpecification(TupleAnalyzer.java:135)
at com.facebook.presto.sql.tree.QuerySpecification.accept(QuerySpecification.java:98)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)
at com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuery(StatementAnalyzer.java:520)
at com.facebook.presto.sql.analyzer.StatementAnalyzer.visitQuery(StatementAnalyzer.java:115)
at com.facebook.presto.sql.tree.Query.accept(Query.java:80)
at com.facebook.presto.sql.tree.AstVisitor.process(AstVisitor.java:22)
at com.facebook.presto.sql.analyzer.Analyzer.analyze(Analyzer.java:52)
at com.facebook.presto.execution.SqlQueryExecution.doAnalyzeQuery(SqlQueryExecution.java:252)
at com.facebook.presto.execution.SqlQueryExecution.analyzeQuery(SqlQueryExecution.java:238)
at com.facebook.presto.execution.SqlQueryExecution.start(SqlQueryExecution.java:202)
at com.facebook.presto.execution.QueuedExecution.lambda$start$130(QueuedExecution.java:68)
at com.facebook.presto.execution.QueuedExecution$$Lambda$237/901458406.run(Unknown Source)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
```
| a61f2412b36ca14b8c6592db94731775832ebf64 | e182bcbe086711c926e880e08f723a408f582db8 | https://github.com/prestodb/presto/compare/a61f2412b36ca14b8c6592db94731775832ebf64...e182bcbe086711c926e880e08f723a408f582db8 | diff --git a/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java b/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
index 469480afc9..e9b88a6208 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java
@@ -664,6 +664,9 @@ public class TestAnalyzer
assertFails(TYPE_MISMATCH, "SELECT CAST(date '2014-01-01' AS bigint)");
assertFails(TYPE_MISMATCH, "SELECT TRY_CAST(date '2014-01-01' AS bigint)");
assertFails(TYPE_MISMATCH, "SELECT CAST(null AS UNKNOWN)");
+ assertFails(TYPE_MISMATCH, "SELECT CAST(1 AS MAP)");
+ assertFails(TYPE_MISMATCH, "SELECT CAST(1 AS ARRAY)");
+ assertFails(TYPE_MISMATCH, "SELECT CAST(1 AS ROW)");
// arithmetic unary
assertFails(TYPE_MISMATCH, "SELECT -'a' FROM t1"); | ['presto-main/src/test/java/com/facebook/presto/sql/analyzer/TestAnalyzer.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2016-01-12T17:23:21" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
207 | prestodb/presto/5457/5449 | prestodb | presto | https://github.com/prestodb/presto/issues/5449 | https://github.com/prestodb/presto/pull/5457 | https://github.com/prestodb/presto/pull/5457 | 1 | array_agg should not ignore nulls | fix | ```
presto> select array_agg(x) from (values 1,2,3,null) t(x);
_col0
-----------
[1, 2, 3]
```
The expected result is `[1, 2, 3, null]`.
From the spec:
> ii) Otherwise, the result of `<array aggregate function>` is an array of N elements such that for all i, 1 (one) ≤ i ≤ N, the value of the i-th element is the value of the first column of Ri.
>
> NOTE 331 — **Null values are not eliminated when computing `<array aggregate function>`**. This, plus the optional `<sort specification list>`, sets `<array aggregate function>` apart from `<general set function>`s.
| b381dadddae2d54ea321b767bf2c1b9c4b23c7d1 | 29be269d77e121d03600ce99502f2c89055400a7 | https://github.com/prestodb/presto/compare/b381dadddae2d54ea321b767bf2c1b9c4b23c7d1...29be269d77e121d03600ce99502f2c89055400a7 | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/ArrayAggregationFunction.java b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/ArrayAggregationFunction.java
index 93540af632..b317a917e2 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/ArrayAggregationFunction.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/ArrayAggregationFunction.java
@@ -37,7 +37,7 @@ import java.util.List;
import static com.facebook.presto.metadata.Signature.typeVariable;
import static com.facebook.presto.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.BLOCK_INDEX;
-import static com.facebook.presto.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.BLOCK_INPUT_CHANNEL;
+import static com.facebook.presto.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.NULLABLE_BLOCK_INPUT_CHANNEL;
import static com.facebook.presto.operator.aggregation.AggregationMetadata.ParameterMetadata.ParameterType.STATE;
import static com.facebook.presto.operator.aggregation.AggregationUtils.generateAggregationName;
import static com.facebook.presto.spi.type.TypeSignature.parseTypeSignature;
@@ -111,7 +111,7 @@ public class ArrayAggregationFunction
private static List<ParameterMetadata> createInputParameterMetadata(Type value)
{
- return ImmutableList.of(new ParameterMetadata(STATE), new ParameterMetadata(BLOCK_INPUT_CHANNEL, value), new ParameterMetadata(BLOCK_INDEX));
+ return ImmutableList.of(new ParameterMetadata(STATE), new ParameterMetadata(NULLABLE_BLOCK_INPUT_CHANNEL, value), new ParameterMetadata(BLOCK_INDEX));
}
public static void input(Type type, ArrayAggregationState state, Block value, int position)
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/state/ArrayAggregationStateSerializer.java b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/state/ArrayAggregationStateSerializer.java
index 0f7aa2f876..f22ec14ec4 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/aggregation/state/ArrayAggregationStateSerializer.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/aggregation/state/ArrayAggregationStateSerializer.java
@@ -56,8 +56,7 @@ public class ArrayAggregationStateSerializer
int positionCount = stateBlock.getPositionCount();
BlockBuilder blockBuilder = elementType.createBlockBuilder(new BlockBuilderStatus(), positionCount);
for (int i = 0; i < positionCount; i++) {
- stateBlock.writePositionTo(i, blockBuilder);
- blockBuilder.closeEntry();
+ elementType.appendTo(stateBlock, i, blockBuilder);
}
state.setBlockBuilder(blockBuilder);
}
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestArrayAggregation.java b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestArrayAggregation.java
index b62d350320..e6503be30f 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestArrayAggregation.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestArrayAggregation.java
@@ -58,7 +58,7 @@ public class TestArrayAggregation
assertAggregation(
bigIntAgg,
1.0,
- null,
+ Arrays.asList(null, null, null),
createLongsBlock(new Long[] {null, null, null}));
}
@@ -71,7 +71,7 @@ public class TestArrayAggregation
assertAggregation(
bigIntAgg,
1.0,
- Arrays.asList(2L, 3L),
+ Arrays.asList(null, 2L, null, 3L, null),
createLongsBlock(new Long[] {null, 2L, null, 3L, null}));
}
| ['presto-main/src/main/java/com/facebook/presto/operator/aggregation/ArrayAggregationFunction.java', 'presto-main/src/main/java/com/facebook/presto/operator/aggregation/state/ArrayAggregationStateSerializer.java', 'presto-main/src/test/java/com/facebook/presto/operator/aggregation/TestArrayAggregation.java'] | 3 | 3 | 0 | 0 | 3 | {'.java': 3} | "2016-06-15T18:07:29" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
185 | prestodb/presto/8335/8331 | prestodb | presto | https://github.com/prestodb/presto/issues/8331 | https://github.com/prestodb/presto/pull/8335 | https://github.com/prestodb/presto/pull/8335#issuecomment-310477691 | 2 | Fix error handling of RLE block projection and filter | fixes | ```
<NULL failure message>
com.google.common.base.VerifyException
com.google.common.base.Verify.verify(Verify.java:99)
com.facebook.presto.operator.project.DictionaryAwarePageProjection.project(DictionaryAwarePageProjection.java:79)
| 980b407abc1d84a7751e276634d687035d37f4f5 | 7f0f62ecaed572616c099d62d1b7c0383874effc | https://github.com/prestodb/presto/compare/980b407abc1d84a7751e276634d687035d37f4f5...7f0f62ecaed572616c099d62d1b7c0383874effc | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageFilter.java b/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageFilter.java
index 2844a942ab..5bb1d25208 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageFilter.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageFilter.java
@@ -64,10 +64,12 @@ public class DictionaryAwarePageFilter
if (block instanceof RunLengthEncodedBlock) {
Block value = ((RunLengthEncodedBlock) block).getValue();
- Optional<boolean[]> selectedDictionaryPositions = processDictionary(session, value);
- // single value block is always considered effective
- verify(selectedDictionaryPositions.isPresent());
- return SelectedPositions.positionsRange(0, selectedDictionaryPositions.get()[0] ? page.getPositionCount() : 0);
+ Optional<boolean[]> selectedPosition = processDictionary(session, value);
+ // single value block is always considered effective, but the processing could have thrown
+ // in that case we fallback and process again so the correct error message sent
+ if (selectedPosition.isPresent()) {
+ return SelectedPositions.positionsRange(0, selectedPosition.get()[0] ? page.getPositionCount() : 0);
+ }
}
if (block instanceof DictionaryBlock) {
diff --git a/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java b/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java
index be740bd85d..c9d39bcd6b 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java
@@ -75,9 +75,11 @@ public class DictionaryAwarePageProjection
if (block instanceof RunLengthEncodedBlock) {
Block value = ((RunLengthEncodedBlock) block).getValue();
Optional<Block> projectedValue = processDictionary(session, value);
- // single value block is always considered effective
- verify(projectedValue.isPresent());
- return new RunLengthEncodedBlock(projectedValue.get(), selectedPositions.size());
+ // single value block is always considered effective, but the processing could have thrown
+ // in that case we fallback and process again so the correct error message sent
+ if (projectedValue.isPresent()) {
+ return new RunLengthEncodedBlock(projectedValue.get(), selectedPositions.size());
+ }
}
if (block instanceof DictionaryBlock) {
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageFilter.java b/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageFilter.java
index 63ae2032e8..7c2ae8ddb3 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageFilter.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageFilter.java
@@ -32,6 +32,7 @@ import java.util.stream.IntStream;
import static com.facebook.presto.block.BlockAssertions.createLongSequenceBlock;
import static com.facebook.presto.block.BlockAssertions.createLongsBlock;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
import static org.testng.Assert.assertTrue;
public class TestDictionaryAwarePageFilter
@@ -70,6 +71,15 @@ public class TestDictionaryAwarePageFilter
testFilter(filter, noMatch, filterRange);
}
+ @Test
+ public void testRleBlockWithFailure()
+ throws Exception
+ {
+ DictionaryAwarePageFilter filter = createDictionaryAwarePageFilter(true, LongArrayBlock.class);
+ RunLengthEncodedBlock fail = new RunLengthEncodedBlock(createLongSequenceBlock(-10, -9), 100);
+ assertThrows(NegativeValueException.class, () -> testFilter(filter, fail, true));
+ }
+
@Test
public void testDictionaryBlock()
throws Exception
@@ -84,6 +94,13 @@ public class TestDictionaryAwarePageFilter
testFilter(new DictionaryBlock(createLongSequenceBlock(4, 5), new int[100]), LongArrayBlock.class);
}
+ @Test
+ public void testDictionaryBlockWithFailure()
+ throws Exception
+ {
+ assertThrows(NegativeValueException.class, () -> testFilter(createDictionaryBlockWithFailure(20, 100), LongArrayBlock.class));
+ }
+
@Test
public void testDictionaryBlockProcessingWithUnusedFailure()
throws Exception
@@ -133,6 +150,14 @@ public class TestDictionaryAwarePageFilter
return new DictionaryBlock(dictionary, ids);
}
+ private static DictionaryBlock createDictionaryBlockWithFailure(int dictionarySize, int blockSize)
+ {
+ Block dictionary = createLongSequenceBlock(-10, dictionarySize - 10);
+ int[] ids = new int[blockSize];
+ Arrays.setAll(ids, index -> index % dictionarySize);
+ return new DictionaryBlock(dictionary, ids);
+ }
+
private static DictionaryBlock createDictionaryBlockWithUnusedEntries(int dictionarySize, int blockSize)
{
Block dictionary = createLongSequenceBlock(-10, dictionarySize);
@@ -257,6 +282,7 @@ public class TestDictionaryAwarePageFilter
IntArrayList selectedPositions = new IntArrayList();
for (int position = 0; position < block.getPositionCount(); position++) {
long value = block.getLong(position, 0);
+ verifyPositive(value);
boolean selected = isSelected(filterRange, value);
if (selected) {
@@ -286,5 +312,22 @@ public class TestDictionaryAwarePageFilter
return SelectedPositions.positionsList(selectedPositions.elements(), 3, selectedPositions.size() - 6);
}
+
+ private static long verifyPositive(long value)
+ {
+ if (value < 0) {
+ throw new NegativeValueException(value);
+ }
+ return value;
+ }
+ }
+
+ private static class NegativeValueException
+ extends RuntimeException
+ {
+ public NegativeValueException(long value)
+ {
+ super("value is negative: " + value);
+ }
}
}
diff --git a/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageProjection.java b/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageProjection.java
index 902ff44c65..7d20c3f82c 100644
--- a/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageProjection.java
+++ b/presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageProjection.java
@@ -35,6 +35,7 @@ import static com.facebook.presto.spi.block.DictionaryId.randomDictionaryId;
import static com.facebook.presto.spi.type.BigintType.BIGINT;
import static io.airlift.testing.Assertions.assertInstanceOf;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
public class TestDictionaryAwarePageProjection
{
@@ -66,6 +67,16 @@ public class TestDictionaryAwarePageProjection
testProject(block, RunLengthEncodedBlock.class);
}
+ @Test
+ public void testRleBlockWithFailure()
+ throws Exception
+ {
+ Block value = createLongSequenceBlock(-43, -42);
+ RunLengthEncodedBlock block = new RunLengthEncodedBlock(value, 100);
+
+ testProjectFails(block, RunLengthEncodedBlock.class);
+ }
+
@Test
public void testDictionaryBlock()
throws Exception
@@ -75,6 +86,15 @@ public class TestDictionaryAwarePageProjection
testProject(block, DictionaryBlock.class);
}
+ @Test
+ public void testDictionaryBlockWithFailure()
+ throws Exception
+ {
+ DictionaryBlock block = createDictionaryBlockWithFailure(10, 100);
+
+ testProjectFails(block, DictionaryBlock.class);
+ }
+
@Test
public void testDictionaryBlockProcessingWithUnusedFailure()
throws Exception
@@ -118,6 +138,14 @@ public class TestDictionaryAwarePageProjection
return new DictionaryBlock(dictionary, ids);
}
+ private static DictionaryBlock createDictionaryBlockWithFailure(int dictionarySize, int blockSize)
+ {
+ Block dictionary = createLongSequenceBlock(-10, dictionarySize - 10);
+ int[] ids = new int[blockSize];
+ Arrays.setAll(ids, index -> index % dictionarySize);
+ return new DictionaryBlock(dictionary, ids);
+ }
+
private static DictionaryBlock createDictionaryBlockWithUnusedEntries(int dictionarySize, int blockSize)
{
Block dictionary = createLongSequenceBlock(-10, dictionarySize);
@@ -134,6 +162,14 @@ public class TestDictionaryAwarePageProjection
testProjectList(lazyWrapper(block), expectedResultType, createProjection());
}
+ private static void testProjectFails(Block block, Class<? extends Block> expectedResultType)
+ {
+ assertThrows(NegativeValueException.class, () -> testProjectRange(block, expectedResultType, createProjection()));
+ assertThrows(NegativeValueException.class, () -> testProjectList(block, expectedResultType, createProjection()));
+ assertThrows(NegativeValueException.class, () -> testProjectRange(lazyWrapper(block), expectedResultType, createProjection()));
+ assertThrows(NegativeValueException.class, () -> testProjectList(lazyWrapper(block), expectedResultType, createProjection()));
+ }
+
private static void testProjectRange(Block block, Class<? extends Block> expectedResultType, DictionaryAwarePageProjection projection)
{
Block result = projection.project(null, new Page(block), SelectedPositions.positionsRange(5, 10));
@@ -212,9 +248,18 @@ public class TestDictionaryAwarePageProjection
private static long verifyPositive(long value)
{
if (value < 0) {
- throw new IllegalArgumentException("value is negative: " + value);
+ throw new NegativeValueException(value);
}
return value;
}
}
+
+ private static class NegativeValueException
+ extends RuntimeException
+ {
+ public NegativeValueException(long value)
+ {
+ super("value is negative: " + value);
+ }
+ }
} | ['presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageFilter.java', 'presto-main/src/main/java/com/facebook/presto/operator/project/DictionaryAwarePageProjection.java', 'presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageProjection.java', 'presto-main/src/test/java/com/facebook/presto/operator/project/TestDictionaryAwarePageFilter.java'] | 4 | 4 | 0 | 0 | 4 | {'.java': 4} | "2017-06-22T19:23:16" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
186 | prestodb/presto/9057/9056 | prestodb | presto | https://github.com/prestodb/presto/issues/9056 | https://github.com/prestodb/presto/pull/9057 | https://github.com/prestodb/presto/pull/9057 | 1 | Running queries counter leaks queries | fixes | Queries that fail before they get to run cause the running queries counter to increment but never decrement. This is caused by 516801ab482c9189344304b97ff4e4429488dfc7, which calls queryStarted but not queryStopped.
| 82821985dc14c02274a54b4328136b53df123699 | 5f9b803e5c1f7886c7e41e35d17feb565827e397 | https://github.com/prestodb/presto/compare/82821985dc14c02274a54b4328136b53df123699...5f9b803e5c1f7886c7e41e35d17feb565827e397 | diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java
index c2fa751646..43f442ff32 100644
--- a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java
+++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java
@@ -421,6 +421,7 @@ public class SqlQueryManager
queryMonitor.queryCreatedEvent(queryInfo);
queryMonitor.queryCompletedEvent(queryInfo);
stats.queryStarted();
+ stats.queryStopped();
stats.queryFinished(queryInfo);
}
finally { | ['presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2017-09-27T20:10:46" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
187 | prestodb/presto/8372/8316 | prestodb | presto | https://github.com/prestodb/presto/issues/8316 | https://github.com/prestodb/presto/pull/8372 | https://github.com/prestodb/presto/pull/8372 | 1 | Number of splits for intermediate stages in CLI shows incorrect values | fixes | There two related problems:
1) the number of running intermediate splits goes up and down throughout the execution of the query. This causes the progress bar to move forward and backward, since the chevron section of the bar depends on how many splits are running at a given point in time.
2) in cases where most leaf splits are done and the query is waiting on stragglers, intermediate stages show "0" splits running. This causes overall progress to show a misleading number, since the intermediate splits are being counted towards the total number of splits to be completed.
I believe this may be happening because RUNNING state for intermediate splits no longer counts splits that are BLOCKED. We need to fix the counter so that it reflects both (i.e., splits scheduled on workers, instead of just splits being scheduled on a CPU).
```
46:20 [32.4M rows, 3.01GB] [11.7K rows/s, 1.11MB/s] [========> ] 18%
STAGES ROWS ROWS/s BYTES BYTES/s QUEUED RUN DONE
0.........R 0 0 0B 0B 0 0 0
1.......R 0 0 0B 0B 0 0 0
2.....R 56.6M 20.3K 7.1G 2.61M 0 0 0
3...R 32.4M 11.7K 3.01G 1.11M 0 1 489
``` | 3f4a79d56e025405d40057ee10c59cbf853c7858 | d518b756fec6b995815b0761b0e15a6bedd32b0d | https://github.com/prestodb/presto/compare/3f4a79d56e025405d40057ee10c59cbf853c7858...d518b756fec6b995815b0761b0e15a6bedd32b0d | diff --git a/presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java b/presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java
index a8b39e6688..30f26ecea5 100644
--- a/presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java
+++ b/presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java
@@ -455,7 +455,7 @@ public class PipelineContext
new Duration(totalCpuTime, NANOSECONDS).convertToMostSuccinctTimeUnit(),
new Duration(totalUserTime, NANOSECONDS).convertToMostSuccinctTimeUnit(),
new Duration(totalBlockedTime, NANOSECONDS).convertToMostSuccinctTimeUnit(),
- fullyBlocked && (runningDrivers > 0 || runningPartitionedDrivers > 0),
+ fullyBlocked,
blockedReasons,
succinctBytes(rawInputDataSize),
diff --git a/presto-main/src/main/java/com/facebook/presto/server/StatementResource.java b/presto-main/src/main/java/com/facebook/presto/server/StatementResource.java
index 3e1e599f6f..684a77b642 100644
--- a/presto-main/src/main/java/com/facebook/presto/server/StatementResource.java
+++ b/presto-main/src/main/java/com/facebook/presto/server/StatementResource.java
@@ -625,7 +625,7 @@ public class StatementResource
.setNodes(globalUniqueNodes(outputStage).size())
.setTotalSplits(queryStats.getTotalDrivers())
.setQueuedSplits(queryStats.getQueuedDrivers())
- .setRunningSplits(queryStats.getRunningDrivers())
+ .setRunningSplits(queryStats.getRunningDrivers() + queryStats.getBlockedDrivers())
.setCompletedSplits(queryStats.getCompletedDrivers())
.setUserTimeMillis(queryStats.getTotalUserTime().toMillis())
.setCpuTimeMillis(queryStats.getTotalCpuTime().toMillis())
@@ -663,7 +663,7 @@ public class StatementResource
.setNodes(uniqueNodes.size())
.setTotalSplits(stageStats.getTotalDrivers())
.setQueuedSplits(stageStats.getQueuedDrivers())
- .setRunningSplits(stageStats.getRunningDrivers())
+ .setRunningSplits(stageStats.getRunningDrivers() + stageStats.getBlockedDrivers())
.setCompletedSplits(stageStats.getCompletedDrivers())
.setUserTimeMillis(stageStats.getTotalUserTime().toMillis())
.setCpuTimeMillis(stageStats.getTotalCpuTime().toMillis()) | ['presto-main/src/main/java/com/facebook/presto/operator/PipelineContext.java', 'presto-main/src/main/java/com/facebook/presto/server/StatementResource.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2017-06-27T00:36:21" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
188 | prestodb/presto/7424/7414 | prestodb | presto | https://github.com/prestodb/presto/issues/7414 | https://github.com/prestodb/presto/pull/7424 | https://github.com/prestodb/presto/pull/7424 | 1 | Broken full CI tests in presto-orc | fixes | Running full-ci in Jenkins turns up the following test failures. These can be reproduced in IntelliJ also.
```
testCharDirectSequence(com.facebook.presto.orc.TestFullOrcReader) Time elapsed: 2.737 sec <<< FAILURE!
java.lang.ArrayIndexOutOfBoundsException: 11111
testStringDirectSequence(com.facebook.presto.orc.TestFullOrcReader) Time elapsed: 55.727 sec <<< FAILURE!
java.lang.ArrayIndexOutOfBoundsException
Results :
Failed tests:
TestFullOrcReader>AbstractTestOrcReader.testCharDirectSequence:308 » ArrayIndexOutOfBounds
TestFullOrcReader.testStringDirectSequence » ArrayIndexOutOfBounds
``` | 34e31333a20d236b7896fc4e0a0b1185a241efc6 | 637fff3cf6de81ddfd98ff3bca9a30d35294f23d | https://github.com/prestodb/presto/compare/34e31333a20d236b7896fc4e0a0b1185a241efc6...637fff3cf6de81ddfd98ff3bca9a30d35294f23d | diff --git a/presto-main/src/test/java/com/facebook/presto/block/TestDictionaryBlock.java b/presto-main/src/test/java/com/facebook/presto/block/TestDictionaryBlock.java
index 9bbfc30219..25f4dc6d0e 100644
--- a/presto-main/src/test/java/com/facebook/presto/block/TestDictionaryBlock.java
+++ b/presto-main/src/test/java/com/facebook/presto/block/TestDictionaryBlock.java
@@ -19,7 +19,6 @@ import com.google.common.primitives.Ints;
import io.airlift.slice.Slice;
import org.testng.annotations.Test;
-import java.util.Arrays;
import java.util.List;
import static io.airlift.slice.SizeOf.SIZE_OF_INT;
@@ -55,6 +54,7 @@ public class TestDictionaryBlock
throws Exception
{
Slice[] expectedValues = createExpectedValues(10);
+ Slice firstExpectedValue = expectedValues[0];
DictionaryBlock dictionaryBlock = createDictionaryBlock(expectedValues, 100);
List<Integer> positionsToCopy = Ints.asList(0, 10, 20, 30, 40);
@@ -62,7 +62,8 @@ public class TestDictionaryBlock
assertEquals(copiedBlock.getDictionary().getPositionCount(), 1);
assertEquals(copiedBlock.getPositionCount(), positionsToCopy.size());
- assertBlock(copiedBlock.getDictionary(), Arrays.copyOfRange(expectedValues, 0, 1));
+ assertBlock(copiedBlock.getDictionary(), new Slice[]{firstExpectedValue});
+ assertBlock(copiedBlock, new Slice[]{firstExpectedValue, firstExpectedValue, firstExpectedValue, firstExpectedValue, firstExpectedValue});
}
@Test
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
index ef5b973ced..0a3f465a50 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java
@@ -255,6 +255,11 @@ public abstract class AbstractInterleavedBlock
@Override
public int getRegionSizeInBytes(int position, int length)
{
+ if (position == 0 && length == getPositionCount()) {
+ // Calculation of getRegionSizeInBytes is expensive in this class.
+ // On the other hand, getSizeInBytes result is cached or pre-computed.
+ return getSizeInBytes();
+ }
validateRange(position, length);
int result = 0;
for (int blockIndex = 0; blockIndex < getBlockCount(); blockIndex++) {
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlock.java
index 38f016dd94..8b6b50b9c9 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlock.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlock.java
@@ -218,15 +218,21 @@ public class DictionaryBlock
@Override
public int getRegionSizeInBytes(int positionOffset, int length)
{
+ if (positionOffset == 0 && length == getPositionCount()) {
+ // Calculation of getRegionSizeInBytes is expensive in this class.
+ // On the other hand, getSizeInBytes result is cached.
+ return getSizeInBytes();
+ }
+
int sizeInBytes = 0;
- boolean[] seen = new boolean[length];
- for (int i = positionOffset; i < length; i++) {
+ boolean[] seen = new boolean[dictionary.getPositionCount()];
+ for (int i = positionOffset; i < positionOffset + length; i++) {
int position = getId(i);
- if (!seen[position - positionOffset]) {
+ if (!seen[position]) {
if (!dictionary.isNull(position)) {
sizeInBytes += dictionary.getRegionSizeInBytes(position, 1);
}
- seen[position - positionOffset] = true;
+ seen[position] = true;
}
}
return sizeInBytes + (length * Integer.BYTES);
@@ -311,6 +317,9 @@ public class DictionaryBlock
public int getId(int position)
{
+ if (position < 0 || position >= positionCount) {
+ throw new IllegalArgumentException("Invalid position " + position + " in block with " + positionCount + " positions");
+ }
return ids[position + idsOffset];
}
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlockEncoding.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlockEncoding.java
index 099b3f1778..3bb8f3456b 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlockEncoding.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlockEncoding.java
@@ -81,8 +81,10 @@ public class DictionaryBlockEncoding
long leastSignificantBits = sliceInput.readLong();
long sequenceId = sliceInput.readLong();
- // we always compact the dictionary before we send it
- return new DictionaryBlock(positionCount, dictionaryBlock, ids, true, new DictionaryId(mostSignificantBits, leastSignificantBits, sequenceId));
+ // We always compact the dictionary before we send it. However, dictionaryBlock comes from sliceInput, which may over-retain memory.
+ // As a result, setting dictionaryIsCompacted to true is not appropriate here.
+ // TODO: fix DictionaryBlock so that dictionaryIsCompacted can be set to true when the underlying block over-retains memory.
+ return new DictionaryBlock(positionCount, dictionaryBlock, ids, false, new DictionaryId(mostSignificantBits, leastSignificantBits, sequenceId));
}
@Override
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/block/SliceArrayBlock.java b/presto-spi/src/main/java/com/facebook/presto/spi/block/SliceArrayBlock.java
index 62e9d7594b..9a9198ef17 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/block/SliceArrayBlock.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/block/SliceArrayBlock.java
@@ -192,6 +192,11 @@ public class SliceArrayBlock
public int getRegionSizeInBytes(int positionOffset, int length)
{
int positionCount = getPositionCount();
+ if (positionOffset == 0 && length == positionCount) {
+ // Calculation of getRegionSizeInBytes is expensive in this class.
+ // On the other hand, getSizeInBytes result is pre-computed.
+ return getSizeInBytes();
+ }
if (positionOffset < 0 || length < 0 || positionOffset + length > positionCount) {
throw new IndexOutOfBoundsException("Invalid position " + positionOffset + " in block with " + positionCount + " positions");
} | ['presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlock.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/SliceArrayBlock.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/DictionaryBlockEncoding.java', 'presto-main/src/test/java/com/facebook/presto/block/TestDictionaryBlock.java', 'presto-spi/src/main/java/com/facebook/presto/spi/block/AbstractInterleavedBlock.java'] | 5 | 5 | 0 | 0 | 5 | {'.java': 5} | "2017-02-22T01:54:21" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
190 | prestodb/presto/6977/6954 | prestodb | presto | https://github.com/prestodb/presto/issues/6954 | https://github.com/prestodb/presto/pull/6977 | https://github.com/prestodb/presto/pull/6977 | 1 | Query optimizer generates incorrect plans for some logical expressions | fixes | Reproduce with:
```
select (a=8 or b=2) and (a=8 or c=3) or (b=9) from (values (1, 2, 3)) as t (a, b, c);
```
`(a=8 or b=2) and (a=8 or c=3)` should become `a=8 or (b=2 and c=3)`. The query optimizer turns it into `a=8 and (b=2 and c=3)`
| 3730c09b8c9124356b43c4b5547b3f6af8f3d61f | f02780d30faded0c52343f39077bd962d9efbf96 | https://github.com/prestodb/presto/compare/3730c09b8c9124356b43c4b5547b3f6af8f3d61f...f02780d30faded0c52343f39077bd962d9efbf96 | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SimplifyExpressions.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SimplifyExpressions.java
index 76c9e65ad1..6d318c880e 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SimplifyExpressions.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SimplifyExpressions.java
@@ -59,6 +59,7 @@ import static com.facebook.presto.util.ImmutableCollectors.toImmutableList;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
public class SimplifyExpressions
@@ -212,11 +213,29 @@ public class SimplifyExpressions
@Override
public Expression rewriteLogicalBinaryExpression(LogicalBinaryExpression node, NodeContext context, ExpressionTreeRewriter<NodeContext> treeRewriter)
{
- List<Expression> predicates = extractPredicates(node.getType(), node).stream()
- .map(expression -> treeRewriter.rewrite(expression, NodeContext.NOT_ROOT_NODE))
- .collect(toImmutableList());
+ Expression expression = combinePredicates(
+ node.getType(),
+ extractPredicates(node.getType(), node).stream()
+ .map(subExpression -> treeRewriter.rewrite(subExpression, NodeContext.NOT_ROOT_NODE))
+ .collect(toImmutableList()));
+
+ if (!(expression instanceof LogicalBinaryExpression)) {
+ return expression;
+ }
+
+ Expression simplified = extractCommonPredicates((LogicalBinaryExpression) expression);
+
+ // Prefer AND LogicalBinaryExpression at the root if possible
+ if (context.isRootNode() && simplified instanceof LogicalBinaryExpression && ((LogicalBinaryExpression) simplified).getType() == OR) {
+ return distributeIfPossible((LogicalBinaryExpression) simplified);
+ }
+
+ return simplified;
+ }
- List<List<Expression>> subPredicates = getSubPredicates(predicates);
+ private static Expression extractCommonPredicates(LogicalBinaryExpression node)
+ {
+ List<List<Expression>> subPredicates = getSubPredicates(node);
Set<Expression> commonPredicates = ImmutableSet.copyOf(subPredicates.stream()
.map(ExtractCommonPredicatesExpressionRewriter::filterDeterministicPredicates)
@@ -234,26 +253,63 @@ public class SimplifyExpressions
.collect(toImmutableList());
Expression combinedUncorrelatedPredicates = combinePredicates(node.getType(), uncorrelatedPredicates);
- // Do not simplify top level conjuncts if it would result in top level disjuncts
- // Conjuncts are easier to process when pushing down predicates.
- if (context.isRootNode() && flippedNodeType == OR && !combinedUncorrelatedPredicates.equals(FALSE_LITERAL)) {
- return combinePredicates(node.getType(), predicates);
- }
-
return combinePredicates(flippedNodeType, ImmutableList.<Expression>builder()
.addAll(commonPredicates)
.add(combinedUncorrelatedPredicates)
.build());
}
- private static List<List<Expression>> getSubPredicates(List<Expression> predicates)
+ private static List<List<Expression>> getSubPredicates(LogicalBinaryExpression expression)
{
- return predicates.stream()
+ return extractPredicates(expression.getType(), expression).stream()
.map(predicate -> predicate instanceof LogicalBinaryExpression ?
extractPredicates((LogicalBinaryExpression) predicate) : ImmutableList.of(predicate))
.collect(toImmutableList());
}
+ /**
+ * Applies the boolean distributive property.
+ *
+ * For example:
+ * ( A & B ) | ( C & D ) => ( A | C ) & ( A | D ) & ( B | C ) & ( B | D )
+ *
+ * Returns the original expression if the expression is non-deterministic or if the distribution will
+ * expand the expression by too much.
+ */
+ private static Expression distributeIfPossible(LogicalBinaryExpression expression)
+ {
+ if (!DeterminismEvaluator.isDeterministic(expression)) {
+ // Do not distribute boolean expressions if there are any non-deterministic elements
+ // TODO: This can be optimized further if non-deterministic elements are not repeated
+ return expression;
+ }
+ List<Set<Expression>> subPredicates = getSubPredicates(expression).stream()
+ .map(ImmutableSet::copyOf)
+ .collect(toList());
+
+ int originalBaseExpressions = subPredicates.stream()
+ .mapToInt(Set::size)
+ .sum();
+ int newBaseExpressions = subPredicates.stream()
+ .mapToInt(Set::size)
+ .reduce(Math::multiplyExact)
+ .getAsInt() * subPredicates.size();
+ if (newBaseExpressions > originalBaseExpressions * 2) {
+ // Do not distribute boolean expressions if it would create 2x more base expressions
+ // (e.g. A, B, C, D from the above example). This is just an arbitrary heuristic to
+ // avoid cross product expression explosion.
+ return expression;
+ }
+
+ Set<List<Expression>> crossProduct = Sets.cartesianProduct(subPredicates);
+
+ return combinePredicates(
+ expression.getType().flip(),
+ crossProduct.stream()
+ .map(expressions -> combinePredicates(expression.getType(), expressions))
+ .collect(toImmutableList()));
+ }
+
private static Set<Expression> filterDeterministicPredicates(List<Expression> predicates)
{
return predicates.stream()
diff --git a/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestSimplifyExpressions.java b/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestSimplifyExpressions.java
index 07a68a85b7..c647f36e10 100644
--- a/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestSimplifyExpressions.java
+++ b/presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestSimplifyExpressions.java
@@ -65,8 +65,10 @@ public class TestSimplifyExpressions
}
@Test
- public void testExtractsCommonPredicate()
+ public void testExtractCommonPredicates()
{
+ assertSimplifies("X AND Y", "X AND Y");
+ assertSimplifies("X OR Y", "X OR Y");
assertSimplifies("X AND X", "X");
assertSimplifies("X OR X", "X");
assertSimplifies("(X OR Y) AND (X OR Y)", "X OR Y");
@@ -83,9 +85,18 @@ public class TestSimplifyExpressions
assertSimplifies("((X OR V) AND V) OR ((X OR V) AND V)", "V");
assertSimplifies("((X OR V) AND X) OR ((X OR V) AND V)", "X OR V");
- assertSimplifies("((X OR V) AND Z) OR ((X OR V) AND V)", "(((X OR V) AND Z) OR V)");
+ assertSimplifies("((X OR V) AND Z) OR ((X OR V) AND V)", "(X OR V) AND (Z OR V)");
assertSimplifies("X AND ((Y AND Z) OR (Y AND V) OR (Y AND X))", "X AND Y AND (Z OR V OR X)");
assertSimplifies("(A AND B AND C AND D) OR (A AND B AND E) OR (A AND F)", "A AND ((B AND C AND D) OR (B AND E) OR F)");
+
+ assertSimplifies("((A AND B) OR (A AND C)) AND D", "A AND (B OR C) AND D");
+ assertSimplifies("((A OR B) AND (A OR C)) OR D", "(A OR B OR D) AND (A OR C OR D)");
+ assertSimplifies("(((A AND B) OR (A AND C)) AND D) OR E", "(A OR E) AND (B OR C OR E) AND (D OR E)");
+ assertSimplifies("(((A OR B) AND (A OR C)) OR D) AND E", "(A OR (B AND C) OR D) AND E");
+
+ assertSimplifies("(A AND B) OR (C AND D)", "(A OR C) AND (A OR D) AND (B OR C) AND (B OR D)");
+ // No distribution since it would add too many new terms
+ assertSimplifies("(A AND B) OR (C AND D) OR (E AND F)", "(A AND B) OR (C AND D) OR (E AND F)");
}
private static void assertSimplifies(String expression, String expected) | ['presto-main/src/main/java/com/facebook/presto/sql/planner/optimizations/SimplifyExpressions.java', 'presto-main/src/test/java/com/facebook/presto/sql/planner/optimizations/TestSimplifyExpressions.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2016-12-28T21:20:05" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
189 | prestodb/presto/7037/7036 | prestodb | presto | https://github.com/prestodb/presto/issues/7036 | https://github.com/prestodb/presto/pull/7037 | https://github.com/prestodb/presto/pull/7037 | 1 | Try/Lambda fails codegen when two identical instances appears in a single expression | fixes | These following queries fails:
```
SELECT
try(1/x)+try(1/x)
FROM
(VALUES 2) t(x)
```
Stack trace:
```
com.facebook.presto.spi.PrestoException: Compiler failed and interpreter is disabled
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitScanFilterAndProject(LocalExecutionPlanner.java:1056)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:950)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitProject(LocalExecutionPlanner.java:538)
at com.facebook.presto.sql.planner.plan.ProjectNode.accept(ProjectNode.java:91)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:577)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitOutput(LocalExecutionPlanner.java:538)
at com.facebook.presto.sql.planner.plan.OutputNode.accept(OutputNode.java:81)
at com.facebook.presto.sql.planner.LocalExecutionPlanner.plan(LocalExecutionPlanner.java:353)
at com.facebook.presto.sql.planner.LocalExecutionPlanner.plan(LocalExecutionPlanner.java:292)
at com.facebook.presto.execution.SqlTaskExecution.<init>(SqlTaskExecution.java:161)
at com.facebook.presto.execution.SqlTaskExecution.createSqlTaskExecution(SqlTaskExecution.java:120)
at com.facebook.presto.execution.SqlTaskExecutionFactory.create(SqlTaskExecutionFactory.java:70)
at com.facebook.presto.execution.SqlTask.updateTask(SqlTask.java:315)
at com.facebook.presto.execution.SqlTaskManager.updateTask(SqlTaskManager.java:324)
at com.facebook.presto.server.TaskResource.createOrUpdateTask(TaskResource.java:125)
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.glassfish.jersey.server.model.internal.ResourceMethodInvocationHandlerFactory$1.invoke(ResourceMethodInvocationHandlerFactory.java:81)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher$1.run(AbstractJavaResourceMethodDispatcher.java:144)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.invoke(AbstractJavaResourceMethodDispatcher.java:161)
at org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$ResponseOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:160)
at org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:99)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:389)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:347)
at org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:102)
at org.glassfish.jersey.server.ServerRuntime$2.run(ServerRuntime.java:326)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
at org.glassfish.jersey.internal.Errors.process(Errors.java:315)
at org.glassfish.jersey.internal.Errors.process(Errors.java:297)
at org.glassfish.jersey.internal.Errors.process(Errors.java:267)
at org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:317)
at org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:305)
at org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1154)
at org.glassfish.jersey.servlet.WebComponent.serviceImpl(WebComponent.java:473)
at org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:427)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:388)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:341)
at org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:228)
at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:845)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1689)
at io.airlift.http.server.TraceTokenFilter.doFilter(TraceTokenFilter.java:63)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at io.airlift.http.server.TimingFilter.doFilter(TimingFilter.java:52)
at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1676)
at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:581)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:143)
at org.eclipse.jetty.server.handler.gzip.GzipHandler.handle(GzipHandler.java:395)
at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1182)
at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:511)
at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1112)
at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:141)
at org.eclipse.jetty.server.handler.HandlerCollection.handle(HandlerCollection.java:119)
at org.eclipse.jetty.server.handler.StatisticsHandler.handle(StatisticsHandler.java:169)
at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)
at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:134)
at org.eclipse.jetty.server.Server.handle(Server.java:523)
at org.eclipse.jetty.server.HttpChannel.handle(HttpChannel.java:320)
at org.eclipse.jetty.server.HttpConnection.onFillable(HttpConnection.java:251)
at org.eclipse.jetty.io.AbstractConnection$ReadCallback.succeeded(AbstractConnection.java:273)
at org.eclipse.jetty.io.FillInterest.fillable(FillInterest.java:95)
at org.eclipse.jetty.io.SelectChannelEndPoint$2.run(SelectChannelEndPoint.java:93)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.executeProduceConsume(ExecuteProduceConsume.java:303)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.produceConsume(ExecuteProduceConsume.java:148)
at org.eclipse.jetty.util.thread.strategy.ExecuteProduceConsume.run(ExecuteProduceConsume.java:136)
at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:671)
at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:589)
at java.lang.Thread.run(Thread.java:745)
Caused by: com.google.common.util.concurrent.UncheckedExecutionException: java.lang.IllegalArgumentException: Multiple entries with same key: $operator$DIVIDE(1, #0)=public java.lang.Long project_0_try_1(com.facebook.presto.spi.ConnectorSession session, com.facebook.presto.spi.block.Block block_0, int position) and $operator$DIVIDE(1, #0)=public java.lang.Long project_0_try_0(com.facebook.presto.spi.ConnectorSession session, com.facebook.presto.spi.block.Block block_0, int position)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2203)
at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
at com.facebook.presto.sql.gen.ExpressionCompiler.compilePageProcessor(ExpressionCompiler.java:99)
at com.facebook.presto.sql.planner.LocalExecutionPlanner$Visitor.visitScanFilterAndProject(LocalExecutionPlanner.java:1043)
... 69 more
Caused by: java.lang.IllegalArgumentException: Multiple entries with same key: $operator$DIVIDE(1, #0)=public java.lang.Long project_0_try_1(com.facebook.presto.spi.ConnectorSession session, com.facebook.presto.spi.block.Block block_0, int position) and $operator$DIVIDE(1, #0)=public java.lang.Long project_0_try_0(com.facebook.presto.spi.ConnectorSession session, com.facebook.presto.spi.block.Block block_0, int position)
at com.google.common.collect.ImmutableMap.checkNoConflict(ImmutableMap.java:150)
at com.google.common.collect.RegularImmutableMap.checkNoConflictInBucket(RegularImmutableMap.java:104)
at com.google.common.collect.RegularImmutableMap.<init>(RegularImmutableMap.java:70)
at com.google.common.collect.ImmutableMap$Builder.build(ImmutableMap.java:254)
at com.facebook.presto.sql.gen.PageProcessorCompiler.generateMethodsForLambdaAndTry(PageProcessorCompiler.java:798)
at com.facebook.presto.sql.gen.PageProcessorCompiler.generateProjectMethod(PageProcessorCompiler.java:845)
at com.facebook.presto.sql.gen.PageProcessorCompiler.generateMethods(PageProcessorCompiler.java:110)
at com.facebook.presto.sql.gen.ExpressionCompiler.compileProcessor(ExpressionCompiler.java:134)
at com.facebook.presto.sql.gen.ExpressionCompiler.compile(ExpressionCompiler.java:114)
at com.facebook.presto.sql.gen.ExpressionCompiler.access$300(ExpressionCompiler.java:46)
at com.facebook.presto.sql.gen.ExpressionCompiler$1.load(ExpressionCompiler.java:57)
at com.facebook.presto.sql.gen.ExpressionCompiler$1.load(ExpressionCompiler.java:52)
at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
... 75 more
``` | 618e68d7df6db4be45236cfb36c2e17392e8f227 | 8f94c916cd437ca2dce31a7c77c575bd0f78894b | https://github.com/prestodb/presto/compare/618e68d7df6db4be45236cfb36c2e17392e8f227...8f94c916cd437ca2dce31a7c77c575bd0f78894b | diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
index cdce084cef..0a2bf8d345 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java
@@ -42,10 +42,12 @@ import com.facebook.presto.sql.relational.VariableReferenceExpression;
import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Primitives;
import io.airlift.slice.Slice;
import java.util.List;
+import java.util.Set;
import static com.facebook.presto.bytecode.Access.PUBLIC;
import static com.facebook.presto.bytecode.Access.a;
@@ -187,14 +189,13 @@ public class CursorProcessorCompiler
RowExpression projection,
String methodPrefix)
{
- List<RowExpression> lambdaAndTryExpressions = extractLambdaAndTryExpressions(projection);
+ Set<RowExpression> lambdaAndTryExpressions = ImmutableSet.copyOf(extractLambdaAndTryExpressions(projection));
ImmutableMap.Builder<CallExpression, MethodDefinition> tryMethodMap = ImmutableMap.builder();
ImmutableMap.Builder<LambdaDefinitionExpression, FieldDefinition> lambdaFieldMap = ImmutableMap.builder();
- for (int i = 0; i < lambdaAndTryExpressions.size(); i++) {
- RowExpression expression = lambdaAndTryExpressions.get(i);
-
+ int counter = 0;
+ for (RowExpression expression : lambdaAndTryExpressions) {
if (expression instanceof CallExpression) {
CallExpression tryExpression = (CallExpression) expression;
verify(!Signatures.TRY.equals(tryExpression.getSignature().getName()));
@@ -217,7 +218,7 @@ public class CursorProcessorCompiler
MethodDefinition tryMethod = defineTryMethod(
innerExpressionVisitor,
containerClassDefinition,
- methodPrefix + "_try_" + i,
+ methodPrefix + "_try_" + counter,
inputParameters,
Primitives.wrap(tryExpression.getType().getJavaType()),
tryExpression,
@@ -227,7 +228,7 @@ public class CursorProcessorCompiler
}
else if (expression instanceof LambdaDefinitionExpression) {
LambdaDefinitionExpression lambdaExpression = (LambdaDefinitionExpression) expression;
- String fieldName = methodPrefix + "_lambda_" + i;
+ String fieldName = methodPrefix + "_lambda_" + counter;
PreGeneratedExpressions preGeneratedExpressions = new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
FieldDefinition methodHandleField = LambdaBytecodeGenerator.preGenerateLambdaExpression(
lambdaExpression,
@@ -242,6 +243,7 @@ public class CursorProcessorCompiler
else {
throw new VerifyException(format("unexpected expression: %s", expression.toString()));
}
+ counter++;
}
return new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java
index e2674c36bf..779f34e164 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java
@@ -41,6 +41,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Primitives;
import it.unimi.dsi.fastutil.longs.LongArrayList;
@@ -49,6 +50,7 @@ import javax.inject.Inject;
import java.lang.reflect.Constructor;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import static com.facebook.presto.bytecode.Access.FINAL;
import static com.facebook.presto.bytecode.Access.PRIVATE;
@@ -206,13 +208,12 @@ public class JoinFilterFunctionCompiler
int leftBlocksSize,
RowExpression filter)
{
- List<RowExpression> lambdaAndTryExpressions = extractLambdaAndTryExpressions(filter);
+ Set<RowExpression> lambdaAndTryExpressions = ImmutableSet.copyOf(extractLambdaAndTryExpressions(filter));
ImmutableMap.Builder<CallExpression, MethodDefinition> tryMethodMap = ImmutableMap.builder();
ImmutableMap.Builder<LambdaDefinitionExpression, FieldDefinition> lambdaFieldMap = ImmutableMap.builder();
- for (int i = 0; i < lambdaAndTryExpressions.size(); i++) {
- RowExpression expression = lambdaAndTryExpressions.get(i);
-
+ int counter = 0;
+ for (RowExpression expression : lambdaAndTryExpressions) {
if (expression instanceof CallExpression) {
CallExpression tryExpression = (CallExpression) expression;
verify(!Signatures.TRY.equals(tryExpression.getSignature().getName()));
@@ -241,7 +242,7 @@ public class JoinFilterFunctionCompiler
MethodDefinition tryMethod = defineTryMethod(
innerExpressionVisitor,
containerClassDefinition,
- "try_" + i,
+ "try_" + counter,
inputParameters,
Primitives.wrap(tryExpression.getType().getJavaType()),
tryExpression,
@@ -254,7 +255,7 @@ public class JoinFilterFunctionCompiler
PreGeneratedExpressions preGeneratedExpressions = new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
FieldDefinition methodHandleField = LambdaBytecodeGenerator.preGenerateLambdaExpression(
lambdaExpression,
- "lambda_" + i,
+ "lambda_" + counter,
containerClassDefinition,
preGeneratedExpressions,
callSiteBinder,
@@ -265,6 +266,7 @@ public class JoinFilterFunctionCompiler
else {
throw new VerifyException(format("unexpected expression: %s", expression.toString()));
}
+ counter++;
}
return new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java b/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
index dc3d308f1a..c88d29e35a 100644
--- a/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
+++ b/presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java
@@ -49,12 +49,14 @@ import com.facebook.presto.sql.relational.Signatures;
import com.google.common.base.VerifyException;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Primitives;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.TreeSet;
import java.util.stream.IntStream;
@@ -738,13 +740,12 @@ public class PageProcessorCompiler
RowExpression projection,
String methodPrefix)
{
- List<RowExpression> lambdaAndTryExpressions = extractLambdaAndTryExpressions(projection);
+ Set<RowExpression> lambdaAndTryExpressions = ImmutableSet.copyOf(extractLambdaAndTryExpressions(projection));
ImmutableMap.Builder<CallExpression, MethodDefinition> tryMethodMap = ImmutableMap.builder();
ImmutableMap.Builder<LambdaDefinitionExpression, FieldDefinition> lambdaFieldMap = ImmutableMap.builder();
- for (int i = 0; i < lambdaAndTryExpressions.size(); i++) {
- RowExpression expression = lambdaAndTryExpressions.get(i);
-
+ int counter = 0;
+ for (RowExpression expression : lambdaAndTryExpressions) {
if (expression instanceof CallExpression) {
CallExpression tryExpression = (CallExpression) expression;
verify(!Signatures.TRY.equals(tryExpression.getSignature().getName()));
@@ -769,7 +770,7 @@ public class PageProcessorCompiler
MethodDefinition tryMethod = defineTryMethod(
innerExpressionVisitor,
containerClassDefinition,
- methodPrefix + "_try_" + i,
+ methodPrefix + "_try_" + counter,
inputParameters,
Primitives.wrap(tryExpression.getType().getJavaType()),
tryExpression,
@@ -782,7 +783,7 @@ public class PageProcessorCompiler
PreGeneratedExpressions preGeneratedExpressions = new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
FieldDefinition methodHandleField = LambdaBytecodeGenerator.preGenerateLambdaExpression(
lambdaExpression,
- methodPrefix + "_lambda_" + i,
+ methodPrefix + "_lambda_" + counter,
containerClassDefinition,
preGeneratedExpressions,
callSiteBinder,
@@ -793,6 +794,7 @@ public class PageProcessorCompiler
else {
throw new VerifyException(format("unexpected expression: %s", expression.toString()));
}
+ counter++;
}
return new PreGeneratedExpressions(tryMethodMap.build(), lambdaFieldMap.build());
diff --git a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
index acf00efd70..2cbc0f0785 100644
--- a/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
+++ b/presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java
@@ -216,6 +216,16 @@ public abstract class AbstractTestQueries
assertQueryFails("SELECT transform(ARRAY[1], x -> max(x))", ".* Lambda expression cannot contain aggregations or window functions: .*");
}
+ @Test
+ public void testTryLambdaRepeated()
+ {
+ assertQuery("SELECT x + x FROM (SELECT apply(a, i -> i * i) x FROM (VALUES 3) t(a))", "SELECT 18");
+ assertQuery("SELECT apply(a, i -> i * i) + apply(a, i -> i * i) FROM (VALUES 3) t(a)", "SELECT 18");
+ assertQuery("SELECT apply(a, i -> i * i), apply(a, i -> i * i) FROM (VALUES 3) t(a)", "SELECT 9, 9");
+ assertQuery("SELECT try(10 / a) + try(10 / a) FROM (VALUES 5) t(a)", "SELECT 4");
+ assertQuery("SELECT try(10 / a), try(10 / a) FROM (VALUES 5) t(a)", "SELECT 2, 2");
+ }
+
@Test
public void testNonDeterministicFilter()
{ | ['presto-main/src/main/java/com/facebook/presto/sql/gen/JoinFilterFunctionCompiler.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/CursorProcessorCompiler.java', 'presto-main/src/main/java/com/facebook/presto/sql/gen/PageProcessorCompiler.java', 'presto-tests/src/main/java/com/facebook/presto/tests/AbstractTestQueries.java'] | 4 | 4 | 0 | 0 | 4 | {'.java': 4} | "2017-01-10T19:47:44" | 14,935 | Java | {'Java': 53409077, 'C++': 959227, 'JavaScript': 286856, 'Shell': 61154, 'Roff': 52281, 'Python': 39357, 'ANTLR': 33548, 'CMake': 33259, 'HTML': 29601, 'CSS': 28319, 'Mustache': 17803, 'Makefile': 17213, 'Thrift': 14675, 'NASL': 13553, 'Dockerfile': 8372, 'Batchfile': 795, 'PLSQL': 85} | Apache License 2.0 |
10,122 | deeplearning4j/deeplearning4j/4795/4792 | deeplearning4j | deeplearning4j | https://github.com/deeplearning4j/deeplearning4j/issues/4792 | https://github.com/deeplearning4j/deeplearning4j/pull/4795 | https://github.com/deeplearning4j/deeplearning4j/pull/4795 | 1 | MNIST downloader *still* doesn't reliably handle download errors | fix | Even with multiple passes on it, MNIST downloader *still* manages to not automatically handle download issues :/
Here's output (test failure) from most recent run of MnistFetcherTest.testMnistDataFetcher - master versions of codebase all round:
```
java.io.EOFException: Unexpected end of ZLIB input stream
at java.util.zip.InflaterInputStream.fill(InflaterInputStream.java:240)
at java.util.zip.InflaterInputStream.read(InflaterInputStream.java:158)
at java.util.zip.GZIPInputStream.read(GZIPInputStream.java:117)
at java.io.FilterInputStream.read(FilterInputStream.java:107)
at org.apache.commons.io.IOUtils.copyLarge(IOUtils.java:1792)
at org.apache.commons.io.IOUtils.copyLarge(IOUtils.java:1769)
at org.nd4j.util.ArchiveUtils.unzipFileTo(ArchiveUtils.java:131)
at org.deeplearning4j.base.MnistFetcher.downloadAndUntar(MnistFetcher.java:159)
at org.deeplearning4j.base.MnistFetcherTest.testMnistDataFetcher(MnistFetcherTest.java:51)
``` | 4f61de3511c6ff5a4902eb57cddde59f2beba5d8 | a1ba8ac48b4ccf87ccf41dfa27a36bcbc0d54767 | https://github.com/deeplearning4j/deeplearning4j/compare/4f61de3511c6ff5a4902eb57cddde59f2beba5d8...a1ba8ac48b4ccf87ccf41dfa27a36bcbc0d54767 | diff --git a/deeplearning4j-core/src/main/java/org/deeplearning4j/base/MnistFetcher.java b/deeplearning4j-core/src/main/java/org/deeplearning4j/base/MnistFetcher.java
index 30187ad22e..d2a502ea04 100755
--- a/deeplearning4j-core/src/main/java/org/deeplearning4j/base/MnistFetcher.java
+++ b/deeplearning4j-core/src/main/java/org/deeplearning4j/base/MnistFetcher.java
@@ -149,47 +149,50 @@ public class MnistFetcher {
}
log.info("Downloading {}...", getName());
- // getFromOrigin training records
- File tarFile = new File(baseDir, getTrainingFilesFilename());
- File testFileLabels = new File(baseDir, getTestFilesFilename());
+ // get features
+ File trainFeatures = new File(baseDir, getTrainingFilesFilename());
+ File testFeatures = new File(baseDir, getTestFilesFilename());
- tryDownloadingAFewTimes(new URL(getTrainingFilesURL()), tarFile, getTrainingFilesMD5());
- tryDownloadingAFewTimes(new URL(getTestFilesURL()), testFileLabels, getTestFilesMD5());
+ downloadAndExtract(new URL(getTrainingFilesURL()), trainFeatures, baseDir, getTrainingFilesMD5());
+ downloadAndExtract(new URL(getTestFilesURL()), testFeatures, baseDir, getTestFilesMD5());
- ArchiveUtils.unzipFileTo(tarFile.getAbsolutePath(), baseDir.getAbsolutePath());
- ArchiveUtils.unzipFileTo(testFileLabels.getAbsolutePath(), baseDir.getAbsolutePath());
+ // get labels
+ File trainLabels = new File(baseDir, getTrainingFileLabelsFilename());
+ File testLabels = new File(baseDir, getTestFileLabelsFilename());
- // getFromOrigin training records
- File labels = new File(baseDir, getTrainingFileLabelsFilename());
- File labelsTest = new File(baseDir, getTestFileLabelsFilename());
-
- tryDownloadingAFewTimes(new URL(getTrainingFileLabelsURL()), labels, getTrainingFileLabelsMD5());
- tryDownloadingAFewTimes(new URL(getTestFileLabelsURL()), labelsTest, getTestFileLabelsMD5());
-
- ArchiveUtils.unzipFileTo(labels.getAbsolutePath(), baseDir.getAbsolutePath());
- ArchiveUtils.unzipFileTo(labelsTest.getAbsolutePath(), baseDir.getAbsolutePath());
+ downloadAndExtract(new URL(getTrainingFileLabelsURL()), trainLabels, baseDir, getTrainingFileLabelsMD5());
+ downloadAndExtract(new URL(getTestFileLabelsURL()), testLabels, baseDir, getTestFileLabelsMD5());
fileDir = baseDir;
return fileDir;
}
- private void tryDownloadingAFewTimes(URL url, File f, String targetMD5) throws IOException {
- tryDownloadingAFewTimes(0, url, f, targetMD5);
+ private void downloadAndExtract(URL url, File f, File extractToDir, String targetMD5) throws IOException {
+ downloadAndExtract(0, url, f, extractToDir, targetMD5);
}
- private void tryDownloadingAFewTimes(int attempt, URL url, File f, String targetMD5) throws IOException {
+ private void downloadAndExtract(int attempt, URL url, File f, File extractToDir, String targetMD5) throws IOException {
int maxTries = 3;
- boolean isCorrectFile = f.isFile();
- if (attempt < maxTries && !isCorrectFile) {
- FileUtils.copyURLToFile(url, f);
- if (!checkMD5OfFile(targetMD5, f)) {
+ boolean isCorrectFile = f.exists() && f.isFile() && checkMD5OfFile(targetMD5, f);
+ if (attempt < maxTries) {
+ if(!isCorrectFile) {
+ FileUtils.copyURLToFile(url, f);
+ if (!checkMD5OfFile(targetMD5, f)) {
+ f.delete();
+ downloadAndExtract(attempt + 1, url, f, extractToDir, targetMD5);
+ }
+ }
+ // try extracting
+ try{
+ ArchiveUtils.unzipFileTo(f.getAbsolutePath(), extractToDir.getAbsolutePath());
+ } catch (Throwable t){
+ log.warn("Error extracting MNIST files from file {} - retrying...", f.getAbsolutePath(), t);
f.delete();
- tryDownloadingAFewTimes(attempt + 1, url, f, targetMD5);
+ downloadAndExtract(attempt + 1, url, f, extractToDir, targetMD5);
}
- } else if (isCorrectFile) {
- // do nothing, file downloaded
- } else {
- throw new IOException("Could not download " + url.getPath() + "\n properly despite trying " + maxTries
+ } else if (!isCorrectFile) {
+ //Too many attempts
+ throw new IOException("Could not download and extract " + url.getPath() + "\n properly despite trying " + maxTries
+ " times, check your connection. File info:" + "\nTarget MD5: " + targetMD5
+ "\nHash matches: " + checkMD5OfFile(targetMD5, f) + "\nIs valid file: " + f.isFile());
}
diff --git a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java
index 93dbbb6b73..22a143fedc 100755
--- a/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java
+++ b/deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java
@@ -163,7 +163,7 @@ public class MnistDataFetcher extends BaseDataFetcher {
@Override
public void fetch(int numExamples) {
if (!hasMore()) {
- throw new IllegalStateException("Unable to getFromOrigin more; there are no more images");
+ throw new IllegalStateException("Unable to get more; there are no more images");
}
float[][] featureData = new float[numExamples][0];
diff --git a/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java b/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java
index 3622d4dc20..0bd6c3d082 100755
--- a/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java
+++ b/deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java
@@ -89,7 +89,7 @@ public class MathUtils {
/**
* See: http://stackoverflow.com/questions/466204/rounding-off-to-nearest-power-of-2
- * @param v the number to getFromOrigin the next power of 2 for
+ * @param v the number to get the next power of 2 for
* @return the next power of 2 for the passed in value
*/
public static long nextPowOf2(long v) {
@@ -364,7 +364,7 @@ public class MathUtils {
* This returns the minimized loss values for a given vector.
* It is assumed that the x, y pairs are at
* vector[i], vector[i+1]
- * @param vector the vector of numbers to getFromOrigin the weights for
+ * @param vector the vector of numbers to get the weights for
* @return a double array with w_0 and w_1 are the associated indices.
*/
public static double[] weightsFor(List<Double> vector) {
@@ -430,7 +430,7 @@ public class MathUtils {
* This returns the minimized loss values for a given vector.
* It is assumed that the x, y pairs are at
* vector[i], vector[i+1]
- * @param vector the vector of numbers to getFromOrigin the weights for
+ * @param vector the vector of numbers to get the weights for
* @return a double array with w_0 and w_1 are the associated indices.
*/
public static double[] weightsFor(double[] vector) {
@@ -544,7 +544,7 @@ public class MathUtils {
/**
* This returns the given column over an n arrays
- * @param column the column to getFromOrigin values for
+ * @param column the column to get values for
* @param nums the arrays to extract values from
* @return a double array containing all of the numbers in that column
* for all of the arrays.
@@ -668,7 +668,7 @@ public class MathUtils {
/**
* This returns the x values of the given vector.
* These are assumed to be the even values of the vector.
- * @param vector the vector to getFromOrigin the values for
+ * @param vector the vector to get the values for
* @return the x values of the given vector
*/
public static double[] xVals(double[] vector) {
@@ -767,7 +767,7 @@ public class MathUtils {
/**
* This returns the entropy (information gain, or uncertainty of a random variable).
- * @param vector the vector of values to getFromOrigin the entropy for
+ * @param vector the vector of values to get the entropy for
* @return the entropy of the given vector
*/
public static double entropy(double[] vector) {
@@ -875,7 +875,7 @@ public class MathUtils {
/**
* This returns the entropy for a given vector of probabilities.
- * @param probabilities the probabilities to getFromOrigin the entropy for
+ * @param probabilities the probabilities to get the entropy for
* @return the entropy of the given probabilities.
*/
public static double information(double[] probabilities) {
@@ -912,7 +912,7 @@ public class MathUtils {
/**
* This will return the factorial of the given number n.
- * @param n the number to getFromOrigin the factorial for
+ * @param n the number to get the factorial for
* @return the factorial for this number
*/
public static double factorial(double n) {
diff --git a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/datasets/loader/ReutersNewsGroupsLoader.java b/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/datasets/loader/ReutersNewsGroupsLoader.java
deleted file mode 100755
index 2f2342e50e..0000000000
--- a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/datasets/loader/ReutersNewsGroupsLoader.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- *
- * * Copyright 2015 Skymind,Inc.
- * *
- * * Licensed under the Apache License, Version 2.0 (the "License");
- * * you may not use this file except in compliance with the License.
- * * You may obtain a copy of the License at
- * *
- * * http://www.apache.org/licenses/LICENSE-2.0
- * *
- * * Unless required by applicable law or agreed to in writing, software
- * * distributed under the License is distributed on an "AS IS" BASIS,
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * * See the License for the specific language governing permissions and
- * * limitations under the License.
- *
- */
-
-package org.deeplearning4j.datasets.loader;
-
-/**
- * @author Adam Gibson
- */
-// public class ReutersNewsGroupsLoader extends BaseDataFetcher {
-
-// private TextVectorizer textVectorizer;
-// private boolean tfidf;
-// public final static String NEWSGROUP_URL = "http://qwone.com/~jason/20Newsgroups/20news-18828.tar.gz";
-// private File reutersRootDir;
-// private static final Logger log = LoggerFactory.getLogger(ReutersNewsGroupsLoader.class);
-// private DataSet load;
-
-
-// public ReutersNewsGroupsLoader(boolean tfidf) throws Exception {
-// getIfNotExists();
-// LabelAwareSentenceIterator iter = new LabelAwareFileSentenceIterator(reutersRootDir);
-// List<String> labels =new ArrayList<>();
-// for(File f : reutersRootDir.listFiles()) {
-// if(f.isDirectory())
-// labels.add(f.getName());
-// }
-// TokenizerFactory tokenizerFactory = new UimaTokenizerFactory();
-
-// if(tfidf)
-// this.textVectorizer = new TfidfVectorizer.Builder()
-// .iterate(iter).labels(labels).tokenize(tokenizerFactory).build();
-
-// else
-// this.textVectorizer = new BagOfWordsVectorizer.Builder()
-// .iterate(iter).labels(labels).tokenize(tokenizerFactory).build();
-
-// load = this.textVectorizer.vectorize();
-// }
-
-// private void getIfNotExists() throws Exception {
-// String home = System.getProperty("user.home");
-// String rootDir = home + File.separator + "reuters";
-// reutersRootDir = new File(rootDir);
-// if(!reutersRootDir.exists())
-// reutersRootDir.mkdir();
-// else if(reutersRootDir.exists())
-// return;
-
-
-// File rootTarFile = new File(reutersRootDir,"20news-18828.tar.gz");
-// if(rootTarFile.exists())
-// rootTarFile.delete();
-// rootTarFile.createNewFile();
-
-// FileUtils.copyURLToFile(new URL(NEWSGROUP_URL), rootTarFile);
-// ArchiveUtils.unzipFileTo(rootTarFile.getAbsolutePath(), reutersRootDir.getAbsolutePath());
-// rootTarFile.delete();
-// FileUtils.copyDirectory(new File(reutersRootDir,"20news-18828"),reutersRootDir);
-// FileUtils.deleteDirectory(new File(reutersRootDir,"20news-18828"));
-// if(reutersRootDir.listFiles() == null)
-// throw new IllegalStateException("No files found!");
-
-// }
-
-
-// /**
-// * Fetches the next dataset. You need to call this
-// * to getFromOrigin a new dataset, otherwise {@link #next()}
-// * just returns the last data applyTransformToDestination fetch
-// *
-// * @param numExamples the number of examples to fetch
-// */
-// @Override
-// public void fetch(int numExamples) {
-// List<DataSet> newData = new ArrayList<>();
-// for(int grabbed = 0; grabbed < numExamples && cursor < load.numExamples(); cursor++,grabbed++) {
-// newData.add(load.get(cursor));
-// }
-
-// this.curr = DataSet.merge(newData);
-
-// }
-// }
diff --git a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java b/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java
index bc64873266..b0c69be645 100755
--- a/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java
+++ b/deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java
@@ -48,7 +48,7 @@ public class WindowConverter {
* Keep in mind each window is a multi word context.
*
* From there, each word uses the passed in model
- * as a lookup table to getFromOrigin what vectors are relevant
+ * as a lookup table to get what vectors are relevant
* to the passed in windows
* @param window the window to take in.
* @param vec the model to use as a lookup table
@@ -84,7 +84,7 @@ public class WindowConverter {
* Keep in mind each window is a multi word context.
*
* From there, each word uses the passed in model
- * as a lookup table to getFromOrigin what vectors are relevant
+ * as a lookup table to get what vectors are relevant
* to the passed in windows
* @param window the window to take in.
* @param vec the model to use as a lookup table
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/DataSetFetcher.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/DataSetFetcher.java
index fa4955d68b..86fe05477d 100755
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/DataSetFetcher.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/DataSetFetcher.java
@@ -47,7 +47,7 @@ public interface DataSetFetcher extends Serializable {
/**
* Fetches the next dataset. You need to call this
- * to getFromOrigin a new dataset, otherwise {@link #next()}
+ * to get a new dataset, otherwise {@link #next()}
* just returns the last data applyTransformToDestination fetch
* @param numExamples the number of examples to fetch
*/
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java
index 79c292a9e4..08571a5752 100644
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java
@@ -64,7 +64,7 @@ public class MovingWindowDataSetFetcher extends BaseDataFetcher {
/**
* Fetches the next dataset. You need to call this
- * to getFromOrigin a new dataset, otherwise {@link #next()}
+ * to get a new dataset, otherwise {@link #next()}
* just returns the last data applyTransformToDestination fetch
*
* @param numExamples the number of examples to fetch
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/feedforward/autoencoder/recursive/Tree.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/feedforward/autoencoder/recursive/Tree.java
index 7a06599184..200ef06759 100644
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/feedforward/autoencoder/recursive/Tree.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/feedforward/autoencoder/recursive/Tree.java
@@ -204,7 +204,7 @@ public class Tree implements Serializable {
/**
* Returns the distance between this node
* and the specified subnode
- * @param node the node to getFromOrigin the distance from
+ * @param node the node to get the distance from
* @return the distance between the 2 nodes
*/
public int depth(Tree node) {
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java
index 435c1fc8ca..f594bc4754 100755
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java
@@ -2169,7 +2169,7 @@ public class MultiLayerNetwork implements Serializable, Classifier, Layer, Neura
* Assigns the parameters of this model to the ones specified by this
* network. This is used in loading from input streams, factory methods, etc
*
- * @param network the network to getFromOrigin parameters from
+ * @param network the network to get parameters from
*/
public void update(MultiLayerNetwork network) {
this.defaultConfiguration =
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Dl4jReflection.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Dl4jReflection.java
index 5cbff31c42..b403aeb07b 100755
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Dl4jReflection.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Dl4jReflection.java
@@ -35,7 +35,7 @@ public class Dl4jReflection {
/**
* Gets the empty constructor from a class
- * @param clazz the class to getFromOrigin the constructor from
+ * @param clazz the class to get the constructor from
* @return the empty constructor for the class
*/
public static Constructor<?> getEmptyConstructor(Class<?> clazz) {
diff --git a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/StringGrid.java b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/StringGrid.java
index 55199ddac4..066dde28f0 100755
--- a/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/StringGrid.java
+++ b/deeplearning4j-nn/src/main/java/org/deeplearning4j/util/StringGrid.java
@@ -350,7 +350,7 @@ public class StringGrid extends ArrayList<List<String>> {
//wtf is wrong with you people?
if (chosenKey == null) {
- //getFromOrigin the max value of the cluster
+ //get the max value of the cluster
String max2 = maximalValue(cluster);
StringTokenizer val = new StringTokenizer(max2);
List<String> list = new ArrayList<>();
diff --git a/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/ec2/provision/ClusterSetup.java b/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/ec2/provision/ClusterSetup.java
index 975112576f..eac5798bb9 100755
--- a/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/ec2/provision/ClusterSetup.java
+++ b/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/ec2/provision/ClusterSetup.java
@@ -81,7 +81,7 @@ public class ClusterSetup {
boxCreator.create();
boxCreator.blockTillAllRunning();
List<String> hosts = boxCreator.getHosts();
- //provisionMaster(hosts.getFromOrigin(0));
+ //provisionMaster(hosts.get(0));
provisionWorkers(hosts);
diff --git a/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/s3/reader/S3Downloader.java b/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/s3/reader/S3Downloader.java
index 213503e462..1f55d66e2a 100755
--- a/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/s3/reader/S3Downloader.java
+++ b/deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/s3/reader/S3Downloader.java
@@ -86,7 +86,7 @@ public class S3Downloader extends BaseS3 {
/**
* Iterator style one list at a time
- * @param list the list to getFromOrigin the next batch for
+ * @param list the list to get the next batch for
* @return the next batch of objects or null if
* none are left
*/ | ['deeplearning4j-nn/src/main/java/org/deeplearning4j/util/Dl4jReflection.java', 'deeplearning4j-core/src/main/java/org/deeplearning4j/base/MnistFetcher.java', 'deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/datasets/loader/ReutersNewsGroupsLoader.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/DataSetFetcher.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/util/StringGrid.java', 'deeplearning4j-nearestneighbors-parent/nearestneighbor-core/src/main/java/org/deeplearning4j/clustering/util/MathUtils.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/datasets/iterator/impl/MovingWindowDataSetFetcher.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/layers/feedforward/autoencoder/recursive/Tree.java', 'deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/ec2/provision/ClusterSetup.java', 'deeplearning4j-core/src/main/java/org/deeplearning4j/datasets/fetchers/MnistDataFetcher.java', 'deeplearning4j-nlp-parent/deeplearning4j-nlp/src/main/java/org/deeplearning4j/text/movingwindow/WindowConverter.java', 'deeplearning4j-scaleout/deeplearning4j-aws/src/main/java/org/deeplearning4j/aws/s3/reader/S3Downloader.java', 'deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/multilayer/MultiLayerNetwork.java'] | 13 | 13 | 0 | 0 | 13 | {'.java': 13} | "2018-03-13T03:57:00" | 13,099 | Java | {'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931} | Apache License 2.0 |
10,107 | deeplearning4j/deeplearning4j/9552/9536 | deeplearning4j | deeplearning4j | https://github.com/deeplearning4j/deeplearning4j/issues/9536 | https://github.com/deeplearning4j/deeplearning4j/pull/9552 | https://github.com/deeplearning4j/deeplearning4j/pull/9552 | 1 | SpecifiedIndex and put(): changes not reflected (1.0.0M1) | fixes | #### Issue Description
Please describe your issue, along with:
- expected behavior
When setting a value using `INDArray.put(SpecifiedIndex, element)`, the changes should be reflected in the original array as well as the returned array.
- encountered behavior
Changes are not reflected in the array (and hence neither in the returned array).
#### Version Information
1.0.0-M1.1
Please indicate relevant versions, including, if relevant:
* Deeplearning4j version
nd4j-native 1.0.0-M1.1
* platform information (OS, etc)
Linux
* CUDA version, if used
None
* NVIDIA driver version, if in use
#N/A
#### Contributing
Happy to fix it - let me know what approaches have been attempted/considered previously.
In BaseNDArray:
```
@Override
public INDArray put(INDArrayIndex[] indices, Number element) {
Nd4j.getCompressor().autoDecompress(this);
INDArray get = get(indices);
for (int i = 0; i < get.length(); i++) get.putScalar(i, element.doubleValue());
return this;
}
```
Here, the get is not a view but a detached copy, and therefore the changes done in `get.putScalar` is not propagated to the original array.
Using
```
INDArray original = ...;
original.put(INDArrayIndex[] indices, INDArray element)
```
does solve the issue by copying item-by-item from the element array to the original array, but requires element to be of the same size as the original array - which could waste RAM.
Test case (Kotlin):
```
val a1 = Nd4j.arange(12.0).reshape(2L, 3, 2).castTo(DataType.INT16);
println("Original");
println(a1);
val indices = arrayOf(all(), indices(0, 2), point(1));
a1.put(indices, Nd4j.onesLike(a1).muli(-1).castTo(DataType.INT16));
println("a1.put(arrayOf(all(), indices(0,2), point(1)), Nd4j.onesLike(a1).muli(-1).castTo(DataType.INT16))");
println(a1);
```
Is there a better solution?
First reported in https://github.com/deeplearning4j/nd4j/issues/611 | 71ee908d10edef8165424b67a46f4797a202168c | c0c191f869a7004faca796dce2fe76ea0ee113f7 | https://github.com/deeplearning4j/deeplearning4j/compare/71ee908d10edef8165424b67a46f4797a202168c...c0c191f869a7004faca796dce2fe76ea0ee113f7 | diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java
index 9e057e5814..729d24fc5f 100644
--- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java
+++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java
@@ -2182,14 +2182,14 @@ public abstract class BaseNDArray implements INDArray, Iterable {
INDArrayIndex[] destinationIndices = indices.clone(); //Shallow clone
INDArrayIndex[] sourceIndices = indices.clone();
- for( int i=0; i<indices.length; i++){
+ for( int i = 0; i < indices.length; i++) {
INDArrayIndex idx = indices[i];
- if(idx instanceof SpecifiedIndex){
+ if(idx instanceof SpecifiedIndex) {
numSpecified++;
long[] idxs = ((SpecifiedIndex) idx).getIndexes();
specifiedIdxs.add(idxs);
specifiedIdxDims.add(i);
- } else if(idx instanceof PointIndex){
+ } else if(idx instanceof PointIndex) {
//Example: [2,3,3].put(point(1), ..., [1,x,y]) -> can't use point(1) on [1,x,y]
sourceIndices[i] = NDArrayIndex.point(0);
}
@@ -2202,9 +2202,9 @@ public abstract class BaseNDArray implements INDArray, Iterable {
}
NdIndexIterator iter = new NdIndexIterator(counts);
- while(iter.hasNext()){
+ while(iter.hasNext()) {
long[] iterationIdxs = iter.next();
- for(int i=0; i<iterationIdxs.length; i++ ){
+ for(int i = 0; i < iterationIdxs.length; i++) {
long[] indicesForDim = specifiedIdxs.get(i);
destinationIndices[dims[i]] = NDArrayIndex.point(indicesForDim[(int)iterationIdxs[i]]);
sourceIndices[dims[i]] = NDArrayIndex.point(iterationIdxs[i]);
@@ -2212,7 +2212,7 @@ public abstract class BaseNDArray implements INDArray, Iterable {
INDArray sourceView = element.get(sourceIndices);
INDArray destinationView = this.get(destinationIndices);
- destinationView.assign(sourceView);
+ return destinationView.assign(sourceView);
}
}
return this;
diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
index 08ee5b9cd0..02b15daf6d 100644
--- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
+++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java
@@ -51,6 +51,15 @@ public class IndexingTestsC extends BaseNd4jTestWithBackends {
+ @ParameterizedTest
+ @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
+ public void testSpecifiedIndexPut(Nd4jBackend backend) {
+ INDArray arr = Nd4j.arange(12.0).reshape(2,3,2);
+ INDArrayIndex[] indices = {NDArrayIndex.all(),NDArrayIndex.indices(0,2),NDArrayIndex.point(1)};
+ INDArray put = arr.put(indices,Nd4j.onesLike(arr.muli(-1)));
+ assertNotEquals(arr,put);
+ }
+
@ParameterizedTest
@MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") | ['nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/api/indexing/IndexingTestsC.java', 'nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ndarray/BaseNDArray.java'] | 2 | 2 | 0 | 0 | 2 | {'.java': 2} | "2021-12-01T09:49:04" | 13,099 | Java | {'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931} | Apache License 2.0 |
10,108 | deeplearning4j/deeplearning4j/9406/9403 | deeplearning4j | deeplearning4j | https://github.com/deeplearning4j/deeplearning4j/issues/9403 | https://github.com/deeplearning4j/deeplearning4j/pull/9406 | https://github.com/deeplearning4j/deeplearning4j/pull/9406 | 1 | MultiLayerConfiguration.Builder child class is missing new parameter while building | fix | #### Issue Description
When building a new configuration via `NeuralNetConfiguration.Builder`, such as the one in the main README of the repo:
```
MultiLayerConfiguration conf = new NeuralNetConfiguration.Builder()
.seed(seed)
.l2(0.0005)
.weightInit(WeightInit.XAVIER)
.updater(new Adam(1e-3))
.list()
...
.build();
```
a child class instance, one that extends `MultiLayerConfiguration.Builder`, is being returned and used to build the overall configuration. That _builder_ is not using at least one configuration parameter which was recently introduced for the original `MultiLayerConfiguration`:
- `public Builder overrideNinUponBuild(boolean overrideNinUponBuild)`
#### Version Information
* Impacted:
* **1.0.0-M1**
* **1.0.0-M1.1**
#### Additional Information
Class in question, that seems to be misbehaving:
`NeuralNetConfiguration.ListBuilder` | a066e465f4eee86bf1f50b0525373f97c359a512 | 12badf53ec2c27b7617fceafc6819238e7b9a5dc | https://github.com/deeplearning4j/deeplearning4j/compare/a066e465f4eee86bf1f50b0525373f97c359a512...12badf53ec2c27b7617fceafc6819238e7b9a5dc | diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java
index 6907e79ae2..0225c889f6 100755
--- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java
+++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java
@@ -181,6 +181,83 @@ public class NeuralNetConfiguration implements Serializable, Cloneable {
return layerwise;
}
+ @Override
+ public ListBuilder overrideNinUponBuild(boolean overrideNinUponBuild) {
+ super.overrideNinUponBuild(overrideNinUponBuild);
+ return this;
+ }
+
+ @Override
+ public ListBuilder inputPreProcessor(Integer layer, InputPreProcessor processor) {
+ super.inputPreProcessor(layer, processor);
+ return this;
+ }
+
+ @Override
+ public ListBuilder inputPreProcessors(Map<Integer, InputPreProcessor> processors) {
+ super.inputPreProcessors(processors);
+ return this;
+ }
+
+ @Override
+ public ListBuilder cacheMode(@NonNull CacheMode cacheMode) {
+ super.cacheMode(cacheMode);
+ return this;
+ }
+
+ @Override
+ public MultiLayerConfiguration.Builder backpropType(@NonNull BackpropType type) {
+ super.backpropType(type);
+ return this;
+ }
+
+ @Override
+ public ListBuilder tBPTTLength(int bpttLength) {
+ super.tBPTTLength(bpttLength);
+ return this;
+ }
+
+ @Override
+ public ListBuilder tBPTTForwardLength(int forwardLength) {
+ super.tBPTTForwardLength(forwardLength);
+ return this;
+ }
+
+ @Override
+ public ListBuilder tBPTTBackwardLength(int backwardLength) {
+ super.tBPTTBackwardLength(backwardLength);
+ return this;
+ }
+
+ @Override
+ public ListBuilder confs(List<NeuralNetConfiguration> confs) {
+ super.confs(confs);
+ return this;
+ }
+
+ @Override
+ public ListBuilder validateOutputLayerConfig(boolean validate) {
+ super.validateOutputLayerConfig(validate);
+ return this;
+ }
+
+ @Override
+ public ListBuilder validateTbpttConfig(boolean validate) {
+ super.validateTbpttConfig(validate);
+ return this;
+ }
+
+ @Override
+ public ListBuilder dataType(@NonNull DataType dataType) {
+ super.dataType(dataType);
+ return this;
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ super.finalize();
+ }
+
@Override
public ListBuilder setInputType(InputType inputType){
return (ListBuilder)super.setInputType(inputType);
@@ -228,12 +305,12 @@ public class NeuralNetConfiguration implements Serializable, Cloneable {
for (int i = 0; i < layerwise.size(); i++) {
if (layerwise.get(i) == null) {
throw new IllegalStateException("Invalid configuration: layer number " + i
- + " not specified. Expect layer " + "numbers to be 0 to " + (layerwise.size() - 1)
- + " inclusive (number of layers defined: " + layerwise.size() + ")");
+ + " not specified. Expect layer " + "numbers to be 0 to " + (layerwise.size() - 1)
+ + " inclusive (number of layers defined: " + layerwise.size() + ")");
}
if (layerwise.get(i).getLayer() == null)
throw new IllegalStateException("Cannot construct network: Layer config for" + "layer with index "
- + i + " is not defined)");
+ + i + " is not defined)");
//Layer names: set to default, if not set
if (layerwise.get(i).getLayer().getLayerName() == null) {
@@ -248,12 +325,12 @@ public class NeuralNetConfiguration implements Serializable, Cloneable {
return new MultiLayerConfiguration.Builder().inputPreProcessors(inputPreProcessors)
- .backpropType(backpropType).tBPTTForwardLength(tbpttFwdLength)
- .tBPTTBackwardLength(tbpttBackLength).setInputType(this.inputType)
- .trainingWorkspaceMode(wsmTrain).cacheMode(globalConfig.cacheMode)
- .inferenceWorkspaceMode(wsmTest).confs(list).validateOutputLayerConfig(validateOutputConfig)
- .dataType(globalConfig.dataType)
- .build();
+ .backpropType(backpropType).tBPTTForwardLength(tbpttFwdLength)
+ .tBPTTBackwardLength(tbpttBackLength).setInputType(this.inputType)
+ .trainingWorkspaceMode(wsmTrain).cacheMode(globalConfig.cacheMode)
+ .inferenceWorkspaceMode(wsmTest).confs(list).validateOutputLayerConfig(validateOutputConfig)
+ .dataType(globalConfig.dataType)
+ .build();
}
/** Helper class for setting input types */
@@ -651,7 +728,7 @@ public class NeuralNetConfiguration implements Serializable, Cloneable {
*/
public Builder weightInit(WeightInit weightInit) {
if(weightInit == WeightInit.DISTRIBUTION) {
- // throw new UnsupportedOperationException("Not supported!, Use weightInit(Distribution distribution) instead!");
+ // throw new UnsupportedOperationException("Not supported!, Use weightInit(Distribution distribution) instead!");
}
this.weightInitFn = weightInit.getWeightInitFunction(); | ['deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/NeuralNetConfiguration.java'] | 1 | 1 | 0 | 0 | 1 | {'.java': 1} | "2021-08-01T07:02:24" | 13,099 | Java | {'Java': 42895752, 'C++': 17237193, 'Cuda': 2203734, 'Kotlin': 2030453, 'JavaScript': 296767, 'C': 172853, 'CMake': 126415, 'Shell': 96643, 'TypeScript': 81217, 'Python': 77566, 'FreeMarker': 77257, 'HTML': 18609, 'CSS': 12974, 'PureBasic': 12254, 'Cython': 12094, 'Ruby': 4558, 'Batchfile': 1458, 'Scala': 1026, 'Smarty': 975, 'Starlark': 931} | Apache License 2.0 |