Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-5267
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d5231e6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d5231e6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d5231e6 Branch: refs/heads/ignite-5075-pds Commit: 0d5231e6428a83ba9b862be58d9978d44bd58ca6 Parents: 281d105 34409fd Author: Alexey Goncharuk <[email protected]> Authored: Fri Jun 2 12:56:04 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Jun 2 12:56:04 2017 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryProcessor.java | 10 - .../query/h2/H2IndexingAbstractGeoSelfTest.java | 27 +- .../processors/query/h2/IgniteH2Indexing.java | 28 +- .../query/h2/ddl/DdlStatementsProcessor.java | 26 +- .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 15 +- .../DynamicIndexAbstractBasicSelfTest.java | 22 +- .../Apache.Ignite.Core.Tests.csproj | 1 + .../Binary/BinarySelfTest.cs | 2 +- .../Binary/EnumsTest.cs | 299 ++++++++++++++++++- .../Binary/EnumsTestOnline.cs | 45 +++ .../Impl/Binary/BinaryReader.cs | 9 +- .../Impl/Binary/BinaryReflectiveActions.cs | 11 +- .../Impl/Binary/BinaryUtils.cs | 2 + .../Impl/Binary/BinaryWriter.cs | 4 +- .../yardstick/config/ignite-db-base-config.xml | 118 ++++++++ .../config/ignite-db-localhost-config.xml | 53 ++++ .../yardstick/config/ignite-rdbms-config.xml | 70 +++++ .../config/sql/benchmark-jdbc-ignite.properties | 64 ++++ .../sql/benchmark-mysql-ignite.properties | 66 ++++ .../config/sql/benchmark-native.properties | 62 ++++ .../sql/benchmark-pgsql-ignite.properties | 66 ++++ modules/yardstick/config/sql/db-h2-queries.sql | 9 + .../yardstick/config/sql/db-mysql-queries.sql | 14 + .../yardstick/config/sql/db-pgsql-queries.sql | 14 + .../yardstick/config/sql/h2-insert-query.sql | 1 + .../yardstick/config/sql/rdbms-mysql-schema.sql | 5 + .../yardstick/config/sql/rdbms-pgsql-schema.sql | 10 + .../yardstick/IgniteBenchmarkArguments.java | 46 ++- .../cache/jdbc/IgniteNativeTxBenchmark.java | 169 +++++++++++ .../cache/jdbc/JdbcAbstractBenchmark.java | 51 +++- .../yardstick/cache/jdbc/JdbcPutBenchmark.java | 3 - .../yardstick/cache/jdbc/RdbmsBenchmark.java | 220 ++++++++++++++ .../ignite/yardstick/cache/model/Accounts.java | 62 ++++ .../ignite/yardstick/cache/model/Branches.java | 62 ++++ .../ignite/yardstick/cache/model/History.java | 69 +++++ .../ignite/yardstick/cache/model/Tellers.java | 62 ++++ 37 files changed, 1678 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d5231e6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d5231e6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d5231e6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractBasicSelfTest.java ----------------------------------------------------------------------
