You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/01/12 11:21:37 UTC
[ignite-3] branch ignite-13618 updated (17fc9ce -> 9319404)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
from 17fc9ce Minor. Add more benchmarks.
add 21551e3 IGNITE-13857 Update java version to 11
add ef06617 IGNITE-13562 Unified configuration: basic features and code generation tools
add edc458e IGNITE-13718 IgniteRunner application integrating configuration module and using it to configure REST API
add dd017fe IGNITE-13610 Added initial version of unified CLI tool. Fixes #4
add 77539e9 Added progress bar to the CLI tool
add cedb629 CLI tool: help improvements
add 0cd0b7d IGNITE-13875 Configure notifications for ignite-3 git repository (#10)
add 1747f88 Merge branch 'main' into ignite-13618
new ec3c4b2 Minor.
add 9b5a16b IGNITE-13875 Update .asf.yaml once more to enable config
add fad5da0 IGNITE-13782 Add reinit support for corrupted installation (#11)
add d1ce2a2 IGNITE-13784 Update 'module list' with information about installed modules (#13)
add 0688e1d IGNITE-13894 - Improve look&feel of the CLI tool (#12)
add a202a14 IGNITE-13898 Init directories in home directory instead of current (#15)
add 728b91f IGNITE-13899 Fix project structure, remove demo modules (#16)
add 929c198 IGNITE-13905 Support of cli extensions inside mvn modules (#18)
add 6e2bb92 IGNITE-13916 - Fixed POM structure (#19)
add fb45edc IGNITE-13925 - Configured Maven deployment
add 17b3cfe IGNITE-13923 - Added custom Maven repo support to the 'init' command
add 7f3ae46 IGNITE-13921 - Use CLI tool location folder for ignite-bin and ignite-work
add f1b1d0e Fixed Maven deployment
add 01a8570 IGNITE-13740: Create a "Getting Started" documentation page for Ignite 3.0 (#20)
add 504392e ignite-13740: fixing the navigation menu for the docs
add 1f0cba7 Merge branch 'main' of github.com:apache/ignite-3 into main
add 27a6576 IGNITE-13927 - Fixed Maven installation
add 20f41fc IGNITE-13934 - Added license checker and fixed license headers
add 6d1aba3 Added DEVNOTES
add 0441eed Added DEVNOTES
add 260a9fe Ignite 13740: documentation rewamp for Ignite 3.0 (#21)
add 657f079 ignite-13740: improving the getting started guide
add 4d1bcf8 ignite-13740: fixing formatting issues
add 5b05901 ignite-13740: fixing formatting issues
add fbd8740 IGNITE-13936 - Fixed node startup on Windows
add d9a19d5 IGNITE-13939 - Fixed highlighting on Windows
add e316b6a IGNITE-13937 - Updated the banner so that it uses only ASCII
add d60f077 IGNITE-13940 Fixed java versions in pom.xml, fixed tests on Windows platforms (#22)
add f3c3fa0 IGNITE-13943 - Changed default REST port to 10300
add 51ddaba IGNITE-13938 - Fixed progress bar
add c56be97 IGNITE-13740 - Added Linux/Windows tabs to the installation part of the tutorial
add e725e75 ignite-13740: renamed the Linux -> Unix tab and added the Windows (CMD) tab to all relevant sections.
add aa49512 ignite-13740: moved the curl command of Windows to an includes file (to avoid command duplicates on the getting started page).
add 779c95b IGNITE-13740 - Updated download link
add 7b0ced3 Merge branch 'main' of github.com:apache/ignite-3 into main
add 50f2895 IGNITE-13740 - Updated download link
add 09584c2 Merge branch 'main' of https://github.com/apache/ignite-3 into main
add d04869a ignite-13740: moved the curl command of Windows to an includes file (to avoid command duplicates on the getting started page).
add fc6fdef IGNITE-13950 - Fixed IgniteCliInterfaceTest on Windows (#23)
add 21e1ad2 IGNITE-13959 - Fixed the issue with running ignite.sh under non-bash shells
add c80f0bf Added RC smoke test procedure to DEVNOTES
new 63c7e5a Merge branch 'main' into ignite-13618
new 9319404 Minor.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 45 +
.gitignore | 1 +
DEVNOTES.md | 48 ++
docs/.gitignore | 5 +
docs/Gemfile | 29 +
docs/README.adoc | 252 ++++++
docs/_config.yml | 46 ++
docs/_data/toc.yaml | 22 +
docs/_docs/ignite-cli-tool.adoc | 39 +
.../includes/ignite-cli-download-windows.adoc | 18 +
docs/_docs/includes/prereqs.adoc | 20 +
docs/_docs/index.adoc | 41 +
docs/_docs/installation/installing-using-exe.adoc | 37 +
docs/_docs/quick-start/getting-started-guide.adoc | 235 ++++++
docs/_includes/copyright.html | 22 +
docs/_includes/footer.html | 20 +
docs/_includes/header.html | 36 +
docs/_includes/left-nav.html | 88 ++
docs/_includes/right-nav.html | 21 +
docs/_includes/section-toc.html | 31 +
docs/_includes/toc.html | 63 ++
docs/_layouts/default.html | 72 ++
docs/_layouts/doc.html | 33 +
docs/_layouts/toc.html | 32 +
docs/_plugins/asciidoctor-extensions.rb | 180 ++++
docs/_sass/callouts.scss | 75 ++
docs/_sass/code.scss | 115 +++
docs/_sass/docs.scss | 238 ++++++
docs/_sass/footer.scss | 48 ++
docs/_sass/github.scss | 223 +++++
docs/_sass/header.scss | 374 +++++++++
docs/_sass/layout.scss | 45 +
docs/_sass/left-nav.scss | 109 +++
docs/_sass/right-nav.scss | 73 ++
docs/_sass/rouge-base16-solarized.scss | 99 +++
docs/_sass/text.scss | 62 ++
docs/_sass/variables.scss | 33 +
docs/assets/css/asciidoc-pygments.css | 59 ++
.../util/Factory.java => docs/assets/css/docs.scss | 19 +-
.../Factory.java => docs/assets/css/styles.scss | 28 +-
docs/assets/images/apple-blob.svg | 16 +
docs/assets/images/arrow-down-white.svg | 3 +
docs/assets/images/arrow-down.svg | 3 +
docs/assets/images/background-lines.svg | 54 ++
docs/assets/images/cancel.svg | 11 +
docs/assets/images/checkmark-green.svg | 3 +
docs/assets/images/copy-icon.svg | 6 +
docs/assets/images/cpp.svg | 9 +
docs/assets/images/dev-internal-bg.jpg | Bin 0 -> 23014 bytes
docs/assets/images/dotnet.svg | 9 +
docs/assets/images/edition-ce.svg | 16 +
docs/assets/images/edition-ee.svg | 25 +
docs/assets/images/edition-ue.svg | 28 +
docs/assets/images/events-nav-arrow.svg | 3 +
docs/assets/images/feature-easy-installation.svg | 28 +
docs/assets/images/feature-fast.svg | 16 +
docs/assets/images/feature-reliable.svg | 25 +
docs/assets/images/github-gray.svg | 3 +
docs/assets/images/github-white.svg | 3 +
docs/assets/images/glowing-box.svg | 170 ++++
docs/assets/images/integrations/hibernate.svg | 6 +
docs/assets/images/integrations/kafka.svg | 3 +
docs/assets/images/integrations/more.svg | 18 +
docs/assets/images/integrations/oracle.svg | 3 +
docs/assets/images/integrations/osgi.svg | 17 +
docs/assets/images/integrations/spark.svg | 7 +
docs/assets/images/integrations/spring.svg | 3 +
docs/assets/images/java.svg | 9 +
docs/assets/images/left-nav-arrow.svg | 3 +
docs/assets/images/lines-bg-1.svg | 54 ++
docs/assets/images/lines-bg-2.svg | 54 ++
docs/assets/images/lines-bg-3.svg | 54 ++
docs/assets/images/lines-bg-4.svg | 54 ++
docs/assets/images/menu-icon.svg | 3 +
docs/assets/images/mousepad-blob.svg | 9 +
...piece-of-paper-with-folded-top-right-corner.svg | 117 +++
docs/assets/images/scala.svg | 31 +
docs/assets/images/search.svg | 15 +
docs/assets/images/violent-blob.svg | 28 +
docs/assets/images/watermelon-blob.svg | 9 +
docs/assets/js/anchor.min.js | 9 +
docs/assets/js/code-copy-to-clipboard.js | 70 ++
docs/assets/js/code-tabs.js | 155 ++++
docs/assets/js/docs-menu.js | 64 ++
docs/assets/js/index.js | 51 ++
docs/assets/js/page-nav.js | 37 +
docs/assets/js/top-navigation.js | 92 +++
docs/favicon.ico | Bin 0 -> 9780 bytes
docs/run.sh | 23 +
modules/cli-common/pom.xml | 33 +
.../apache/ignite/cli/common/IgniteCommand.java} | 15 +-
modules/cli/ignite.sh | 27 +
modules/cli/pom.xml | 260 ++++++
.../apache/ignite/cli/CliPathsConfigLoader.java | 80 ++
.../org/apache/ignite/cli/CliVersionInfo.java} | 53 +-
.../org/apache/ignite/cli/CommandFactory.java} | 34 +-
.../java/org/apache/ignite/cli/ErrorHandler.java | 60 ++
.../org/apache/ignite/cli/HelpFactoryImpl.java | 164 ++++
.../org/apache/ignite/cli/IgniteCLIException.java} | 20 +-
.../java/org/apache/ignite/cli/IgniteCliApp.java} | 32 +-
.../java/org/apache/ignite/cli/IgnitePaths.java | 84 ++
.../org/apache/ignite/cli/IgniteProgressBar.java | 128 +++
.../org/apache/ignite/cli/InteractiveWrapper.java | 93 +++
.../src/main/java/org/apache/ignite/cli/Table.java | 174 ++++
.../org/apache/ignite/cli/VersionProvider.java} | 37 +-
.../ignite/cli/builtins/SystemPathResolver.java | 58 ++
.../cli/builtins/config/ConfigurationClient.java | 116 +++
.../cli/builtins/config/HttpClientFactory.java} | 24 +-
.../cli/builtins/init/InitIgniteCommand.java | 132 +++
.../cli/builtins/module/MavenArtifactResolver.java | 295 +++++++
.../cli/builtins/module/MavenCoordinates.java | 45 +
.../ignite/cli/builtins/module/ModuleManager.java | 224 +++++
.../ignite/cli/builtins/module/ModuleStorage.java | 141 ++++
.../ignite/cli/builtins/module/ResolveResult.java} | 27 +-
.../builtins/module/StandardModuleDefinition.java} | 36 +-
.../ignite/cli/builtins/node/NodeManager.java | 239 ++++++
.../org/apache/ignite/cli/spec/CategorySpec.java} | 33 +-
.../org/apache/ignite/cli/spec/CommandSpec.java} | 19 +-
.../apache/ignite/cli/spec/ConfigCommandSpec.java | 106 +++
.../org/apache/ignite/cli/spec/IgniteCliSpec.java | 116 +++
.../ignite/cli/spec/InitIgniteCommandSpec.java} | 50 +-
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 192 +++++
.../apache/ignite/cli/spec/NodeCommandSpec.java | 177 ++++
.../org/apache/ignite/cli/spec/SpecAdapter.java | 56 ++
.../cli/src/main/resources/builtin_modules.conf | 7 +
modules/cli/src/main/resources/default-config.xml | 29 +
modules/cli/src/main/resources/logback.xml | 31 +
modules/cli/src/main/resources/version.properties | 18 +
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 486 +++++++++++
.../cli/builtins/init/InitIgniteCommandTest.java | 110 +++
.../ignite/cli/builtins/init/ModuleMangerTest.java | 112 +++
.../cli/src/test/resources/builtin_modules.conf | 13 +
modules/cli/src/test/resources/logback-test.xml | 31 +
modules/cli/src/test/resources/version.properties | 18 +
modules/commons/pom.xml | 15 +-
.../generator/MarshallerCodeGenerator.java | 17 +
.../generator/TupleColumnAccessCodeGenerator.java | 164 +---
.../benchmarks/SerializerBenchmarkTest.java | 8 +-
modules/configuration-annotation-processor/pom.xml | 116 +++
.../internal/ConfigurationDescription.java} | 45 +-
.../processor/internal/ConfigurationElement.java | 74 ++
.../processor/internal/ConfigurationNode.java | 53 ++
.../processor/internal/Processor.java | 910 +++++++++++++++++++++
.../processor/internal/ProcessorException.java} | 20 +-
.../configuration/processor/internal/Utils.java | 217 +++++
.../internal/pojo/ChangeClassGenerator.java | 87 ++
.../processor/internal/pojo/ClassGenerator.java | 127 +++
.../processor/internal/pojo/FieldMapping.java} | 45 +-
.../internal/pojo/InitClassGenerator.java | 83 ++
.../internal/pojo/ViewClassGenerator.java | 79 ++
.../internal/validation/ValidationGenerator.java | 174 ++++
.../services/javax.annotation.processing.Processor | 1 +
.../processor/internal/AbstractProcessorTest.java | 164 ++++
.../processor/internal/ConfigSet.java | 123 +++
.../processor/internal/HasFieldMatcher.java | 129 +++
.../processor/internal/HasMethodMatcher.java | 126 +++
.../processor/internal/ParsedClass.java | 107 +++
.../processor/internal/ProcessorTest.java | 104 +++
.../configuration/processor/internal/Types.java} | 49 +-
.../sample/AutoAdjustConfigurationSchema.java} | 42 +-
.../sample/BaselineConfigurationSchema.java} | 35 +-
.../sample/CacheConfigurationSchema.java} | 21 +-
.../sample/ClusterWideConfigurationSchema.java} | 34 +-
.../sample/LocalConfigurationSchema.java} | 20 +-
.../sample/NodeConfigurationSchema.java} | 41 +-
.../ignite/configuration/sample/UsageTest.java | 95 +++
.../sample/validation/AutoAdjustValidator.java} | 25 +-
.../sample/validation/AutoAdjustValidator2.java | 41 +
.../sample/validation/NodeValidator.java} | 49 +-
.../internal/TestConfigurationSchema.java} | 31 +-
modules/configuration/pom.xml | 57 ++
.../configuration/ConfigurationProperty.java} | 45 +-
.../ignite/configuration/ConfigurationTree.java} | 18 +-
.../ignite/configuration/ConfigurationValue.java} | 15 +-
.../apache/ignite/configuration/Configurator.java | 207 +++++
.../ignite/configuration/PropertyListener.java | 61 ++
.../ignite/configuration/PublicConfigurator.java} | 45 +-
.../ignite/configuration/annotation/Config.java | 69 ++
.../configuration/annotation/ConfigValue.java} | 56 +-
.../configuration/annotation/NamedConfigValue.java | 51 ++
.../ignite/configuration/annotation/Validate.java | 75 ++
.../ignite/configuration/annotation/Value.java} | 51 +-
.../internal/DynamicConfiguration.java | 150 ++++
.../configuration/internal/DynamicProperty.java | 203 +++++
.../ignite/configuration/internal/Modifier.java | 48 ++
.../ignite/configuration/internal/NamedList.java} | 28 +-
.../internal/NamedListConfiguration.java | 126 +++
.../internal/selector/BaseSelectors.java | 157 ++++
.../configuration/internal/selector/Selector.java} | 45 +-
.../selector/SelectorNotFoundException.java} | 19 +-
.../internal/validation/MaxValidator.java | 44 +
.../internal/validation/MemberKey.java} | 35 +-
.../internal/validation/MinValidator.java | 44 +
.../internal/validation/NotNullValidator.java} | 25 +-
.../storage/ConfigurationStorage.java | 56 ++
.../configuration/storage/StorageException.java} | 30 +-
.../ConfigurationValidationException.java} | 20 +-
.../configuration/validation/FieldValidator.java | 47 ++
modules/ignite-runner/pom.xml | 90 ++
.../java/org/apache/ignite/app/IgniteRunner.java | 124 +++
.../ignite/configuration/ConfigurationModule.java | 82 ++
.../extended/AutoAdjustConfigurationSchema.java} | 28 +-
.../extended/BaselineConfigurationSchema.java} | 23 +-
.../extended/DataStorageConfigurationSchema.java} | 29 +-
.../extended/LocalConfigurationSchema.java} | 27 +-
.../extended/RestConfigurationSchema.java} | 27 +-
.../presentation/FormatConverter.java} | 27 +-
.../presentation/json/JsonConverter.java | 63 ++
.../java/org/apache/ignite/rest/ErrorResult.java} | 27 +-
.../java/org/apache/ignite/rest/RestModule.java | 160 ++++
.../org/apache/ignite/utils/IgniteProperties.java | 75 ++
.../src/main/resources/bootstrap-config.json | 1 +
.../src/main/resources/ignite.properties | 18 +
.../src/main/resources/simplelogger.properties | 19 +
pom.xml | 130 ++-
215 files changed, 13914 insertions(+), 1034 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 DEVNOTES.md
create mode 100644 docs/.gitignore
create mode 100644 docs/Gemfile
create mode 100644 docs/README.adoc
create mode 100644 docs/_config.yml
create mode 100644 docs/_data/toc.yaml
create mode 100644 docs/_docs/ignite-cli-tool.adoc
create mode 100644 docs/_docs/includes/ignite-cli-download-windows.adoc
create mode 100644 docs/_docs/includes/prereqs.adoc
create mode 100644 docs/_docs/index.adoc
create mode 100644 docs/_docs/installation/installing-using-exe.adoc
create mode 100644 docs/_docs/quick-start/getting-started-guide.adoc
create mode 100644 docs/_includes/copyright.html
create mode 100644 docs/_includes/footer.html
create mode 100644 docs/_includes/header.html
create mode 100644 docs/_includes/left-nav.html
create mode 100644 docs/_includes/right-nav.html
create mode 100644 docs/_includes/section-toc.html
create mode 100644 docs/_includes/toc.html
create mode 100644 docs/_layouts/default.html
create mode 100644 docs/_layouts/doc.html
create mode 100644 docs/_layouts/toc.html
create mode 100644 docs/_plugins/asciidoctor-extensions.rb
create mode 100644 docs/_sass/callouts.scss
create mode 100644 docs/_sass/code.scss
create mode 100644 docs/_sass/docs.scss
create mode 100644 docs/_sass/footer.scss
create mode 100644 docs/_sass/github.scss
create mode 100644 docs/_sass/header.scss
create mode 100644 docs/_sass/layout.scss
create mode 100644 docs/_sass/left-nav.scss
create mode 100644 docs/_sass/right-nav.scss
create mode 100644 docs/_sass/rouge-base16-solarized.scss
create mode 100644 docs/_sass/text.scss
create mode 100644 docs/_sass/variables.scss
create mode 100644 docs/assets/css/asciidoc-pygments.css
copy modules/commons/src/main/java/org/apache/ignite/internal/util/Factory.java => docs/assets/css/docs.scss (78%)
copy modules/commons/src/main/java/org/apache/ignite/internal/util/Factory.java => docs/assets/css/styles.scss (78%)
create mode 100644 docs/assets/images/apple-blob.svg
create mode 100644 docs/assets/images/arrow-down-white.svg
create mode 100644 docs/assets/images/arrow-down.svg
create mode 100644 docs/assets/images/background-lines.svg
create mode 100644 docs/assets/images/cancel.svg
create mode 100644 docs/assets/images/checkmark-green.svg
create mode 100644 docs/assets/images/copy-icon.svg
create mode 100644 docs/assets/images/cpp.svg
create mode 100644 docs/assets/images/dev-internal-bg.jpg
create mode 100644 docs/assets/images/dotnet.svg
create mode 100644 docs/assets/images/edition-ce.svg
create mode 100644 docs/assets/images/edition-ee.svg
create mode 100644 docs/assets/images/edition-ue.svg
create mode 100644 docs/assets/images/events-nav-arrow.svg
create mode 100644 docs/assets/images/feature-easy-installation.svg
create mode 100644 docs/assets/images/feature-fast.svg
create mode 100644 docs/assets/images/feature-reliable.svg
create mode 100644 docs/assets/images/github-gray.svg
create mode 100644 docs/assets/images/github-white.svg
create mode 100644 docs/assets/images/glowing-box.svg
create mode 100644 docs/assets/images/integrations/hibernate.svg
create mode 100644 docs/assets/images/integrations/kafka.svg
create mode 100644 docs/assets/images/integrations/more.svg
create mode 100644 docs/assets/images/integrations/oracle.svg
create mode 100644 docs/assets/images/integrations/osgi.svg
create mode 100644 docs/assets/images/integrations/spark.svg
create mode 100644 docs/assets/images/integrations/spring.svg
create mode 100644 docs/assets/images/java.svg
create mode 100644 docs/assets/images/left-nav-arrow.svg
create mode 100644 docs/assets/images/lines-bg-1.svg
create mode 100644 docs/assets/images/lines-bg-2.svg
create mode 100644 docs/assets/images/lines-bg-3.svg
create mode 100644 docs/assets/images/lines-bg-4.svg
create mode 100644 docs/assets/images/menu-icon.svg
create mode 100644 docs/assets/images/mousepad-blob.svg
create mode 100644 docs/assets/images/piece-of-paper-with-folded-top-right-corner.svg
create mode 100644 docs/assets/images/scala.svg
create mode 100644 docs/assets/images/search.svg
create mode 100644 docs/assets/images/violent-blob.svg
create mode 100644 docs/assets/images/watermelon-blob.svg
create mode 100644 docs/assets/js/anchor.min.js
create mode 100644 docs/assets/js/code-copy-to-clipboard.js
create mode 100644 docs/assets/js/code-tabs.js
create mode 100644 docs/assets/js/docs-menu.js
create mode 100644 docs/assets/js/index.js
create mode 100644 docs/assets/js/page-nav.js
create mode 100644 docs/assets/js/top-navigation.js
create mode 100644 docs/favicon.ico
create mode 100755 docs/run.sh
create mode 100644 modules/cli-common/pom.xml
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java} (78%)
create mode 100644 modules/cli/ignite.sh
create mode 100644 modules/cli/pom.xml
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/CliPathsConfigLoader.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java} (51%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => cli/src/main/java/org/apache/ignite/cli/CommandFactory.java} (55%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/ErrorHandler.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/HelpFactoryImpl.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => cli/src/main/java/org/apache/ignite/cli/IgniteCLIException.java} (71%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializerFactory.java => cli/src/main/java/org/apache/ignite/cli/IgniteCliApp.java} (58%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/IgnitePaths.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/IgniteProgressBar.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/InteractiveWrapper.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/Table.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => cli/src/main/java/org/apache/ignite/cli/VersionProvider.java} (58%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => cli/src/main/java/org/apache/ignite/cli/builtins/config/HttpClientFactory.java} (68%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenArtifactResolver.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenCoordinates.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleManager.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => cli/src/main/java/org/apache/ignite/cli/builtins/module/ResolveResult.java} (71%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => cli/src/main/java/org/apache/ignite/cli/builtins/module/StandardModuleDefinition.java} (57%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/builtins/node/NodeManager.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => cli/src/main/java/org/apache/ignite/cli/spec/CategorySpec.java} (60%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => cli/src/main/java/org/apache/ignite/cli/spec/CommandSpec.java} (77%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/spec/ConfigCommandSpec.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/spec/IgniteCliSpec.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => cli/src/main/java/org/apache/ignite/cli/spec/InitIgniteCommandSpec.java} (53%)
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/spec/ModuleCommandSpec.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/spec/NodeCommandSpec.java
create mode 100644 modules/cli/src/main/java/org/apache/ignite/cli/spec/SpecAdapter.java
create mode 100644 modules/cli/src/main/resources/builtin_modules.conf
create mode 100644 modules/cli/src/main/resources/default-config.xml
create mode 100644 modules/cli/src/main/resources/logback.xml
create mode 100644 modules/cli/src/main/resources/version.properties
create mode 100644 modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
create mode 100644 modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
create mode 100644 modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/ModuleMangerTest.java
create mode 100644 modules/cli/src/test/resources/builtin_modules.conf
create mode 100644 modules/cli/src/test/resources/logback-test.xml
create mode 100644 modules/cli/src/test/resources/version.properties
create mode 100644 modules/configuration-annotation-processor/pom.xml
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/ConfigurationDescription.java} (56%)
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/ConfigurationElement.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/ConfigurationNode.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/Processor.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/ProcessorException.java} (68%)
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/Utils.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/pojo/ChangeClassGenerator.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/pojo/ClassGenerator.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/pojo/FieldMapping.java} (52%)
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/pojo/InitClassGenerator.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/pojo/ViewClassGenerator.java
create mode 100644 modules/configuration-annotation-processor/src/main/java/org/apache/ignite/configuration/processor/internal/validation/ValidationGenerator.java
create mode 100644 modules/configuration-annotation-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/AbstractProcessorTest.java
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ConfigSet.java
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasFieldMatcher.java
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/HasMethodMatcher.java
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ParsedClass.java
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/ProcessorTest.java
copy modules/{commons/src/test/java/org/apache/ignite/internal/schema/ColumnTest.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/processor/internal/Types.java} (50%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/Serializer.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/AutoAdjustConfigurationSchema.java} (50%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/BaselineConfigurationSchema.java} (61%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/CacheConfigurationSchema.java} (67%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/ClusterWideConfigurationSchema.java} (60%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/LocalConfigurationSchema.java} (68%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/Serializer.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/NodeConfigurationSchema.java} (52%)
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/UsageTest.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializerFactory.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/validation/AutoAdjustValidator.java} (50%)
create mode 100644 modules/configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/validation/AutoAdjustValidator2.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration-annotation-processor/src/test/java/org/apache/ignite/configuration/sample/validation/NodeValidator.java} (50%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration-annotation-processor/src/test/resources/org/apache/ignite/configuration/processor/internal/TestConfigurationSchema.java} (63%)
create mode 100644 modules/configuration/pom.xml
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration/src/main/java/org/apache/ignite/configuration/ConfigurationProperty.java} (54%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration/src/main/java/org/apache/ignite/configuration/ConfigurationTree.java} (64%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => configuration/src/main/java/org/apache/ignite/configuration/ConfigurationValue.java} (79%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/Configurator.java
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/PropertyListener.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration/src/main/java/org/apache/ignite/configuration/PublicConfigurator.java} (56%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/annotation/Config.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration/src/main/java/org/apache/ignite/configuration/annotation/ConfigValue.java} (53%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/annotation/NamedConfigValue.java
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/annotation/Validate.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration/src/main/java/org/apache/ignite/configuration/annotation/Value.java} (52%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicConfiguration.java
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/DynamicProperty.java
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/Modifier.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => configuration/src/main/java/org/apache/ignite/configuration/internal/NamedList.java} (66%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/NamedListConfiguration.java
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/selector/BaseSelectors.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Pair.java => configuration/src/main/java/org/apache/ignite/configuration/internal/selector/Selector.java} (56%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => configuration/src/main/java/org/apache/ignite/configuration/internal/selector/SelectorNotFoundException.java} (67%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/validation/MaxValidator.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializerFactory.java => configuration/src/main/java/org/apache/ignite/configuration/internal/validation/MemberKey.java} (50%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/internal/validation/MinValidator.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializerFactory.java => configuration/src/main/java/org/apache/ignite/configuration/internal/validation/NotNullValidator.java} (51%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/storage/ConfigurationStorage.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/marshaller/SerializationException.java => configuration/src/main/java/org/apache/ignite/configuration/storage/StorageException.java} (65%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => configuration/src/main/java/org/apache/ignite/configuration/validation/ConfigurationValidationException.java} (74%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/configuration/validation/FieldValidator.java
create mode 100644 modules/ignite-runner/pom.xml
create mode 100644 modules/ignite-runner/src/main/java/org/apache/ignite/app/IgniteRunner.java
create mode 100644 modules/ignite-runner/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => ignite-runner/src/main/java/org/apache/ignite/configuration/extended/AutoAdjustConfigurationSchema.java} (64%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => ignite-runner/src/main/java/org/apache/ignite/configuration/extended/BaselineConfigurationSchema.java} (72%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => ignite-runner/src/main/java/org/apache/ignite/configuration/extended/DataStorageConfigurationSchema.java} (67%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => ignite-runner/src/main/java/org/apache/ignite/configuration/extended/LocalConfigurationSchema.java} (62%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => ignite-runner/src/main/java/org/apache/ignite/configuration/extended/RestConfigurationSchema.java} (71%)
copy modules/{commons/src/main/java/org/apache/ignite/internal/schema/InvalidTypeException.java => ignite-runner/src/main/java/org/apache/ignite/configuration/presentation/FormatConverter.java} (67%)
create mode 100644 modules/ignite-runner/src/main/java/org/apache/ignite/configuration/presentation/json/JsonConverter.java
copy modules/{commons/src/main/java/org/apache/ignite/internal/util/Factory.java => ignite-runner/src/main/java/org/apache/ignite/rest/ErrorResult.java} (73%)
create mode 100644 modules/ignite-runner/src/main/java/org/apache/ignite/rest/RestModule.java
create mode 100644 modules/ignite-runner/src/main/java/org/apache/ignite/utils/IgniteProperties.java
create mode 100644 modules/ignite-runner/src/main/resources/bootstrap-config.json
create mode 100644 modules/ignite-runner/src/main/resources/ignite.properties
create mode 100644 modules/ignite-runner/src/main/resources/simplelogger.properties
[ignite-3] 01/03: Minor.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit ec3c4b22d623ea52da0223e9ee3365eb93ba80cc
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Dec 22 17:01:00 2020 +0300
Minor.
---
.../marshaller/generator/SerializerGenerator.java | 1 +
.../generator/TupleColumnAccessCodeGenerator.java | 164 ++++-----------------
.../benchmarks/SerializerBenchmarkTest.java | 2 +-
pom.xml | 2 +
4 files changed, 35 insertions(+), 134 deletions(-)
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
index 33b8729..244e659 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
+++ b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
@@ -28,6 +28,7 @@ import com.squareup.javapoet.TypeSpec;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
import javax.annotation.processing.Generated;
import javax.lang.model.element.Modifier;
import jdk.jfr.Experimental;
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/TupleColumnAccessCodeGenerator.java b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/TupleColumnAccessCodeGenerator.java
index 54fd30f..51186de 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/TupleColumnAccessCodeGenerator.java
+++ b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/TupleColumnAccessCodeGenerator.java
@@ -18,116 +18,14 @@
package org.apache.ignite.internal.schema.marshaller.generator;
import com.squareup.javapoet.CodeBlock;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
import java.util.BitSet;
import java.util.UUID;
-import org.apache.ignite.internal.schema.Tuple;
-import org.apache.ignite.internal.schema.TupleAssembler;
import org.apache.ignite.internal.schema.marshaller.BinaryMode;
/**
* Tuple access code generator.
*/
public class TupleColumnAccessCodeGenerator {
- /** Tuple method handler. */
- public static final MethodHandle READ_BYTE;
- /** Tuple method handler. */
- public static final MethodHandle READ_SHORT;
- /** Tuple method handler. */
- public static final MethodHandle READ_INT;
- /** Tuple method handler. */
- public static final MethodHandle READ_LONG;
- /** Tuple method handler. */
- public static final MethodHandle READ_FLOAT;
- /** Tuple method handler. */
- public static final MethodHandle READ_DOUBLE;
- /** Tuple method handler. */
- public static final MethodHandle READ_BYTE_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_SHORT_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_INT_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_LONG_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_FLOAT_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_DOUBLE_BOXED;
- /** Tuple method handler. */
- public static final MethodHandle READ_UUID;
- /** Tuple method handler. */
- public static final MethodHandle READ_BITSET;
- /** Tuple method handler. */
- public static final MethodHandle READ_STRING;
- /** Tuple method handler. */
- public static final MethodHandle READ_BYTE_ARR;
-
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_NULL;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_BYTE;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_SHORT;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_INT;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_LONG;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_FLOAT;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_DOUBLE;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_UUID;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_BITSET;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_STRING;
- /** Tuple assembler method handler. */
- public static final MethodHandle WRITE_BYTE_ARR;
-
- /**
- * Initializes static handlers.
- */
- static {
- try {
- MethodHandles.Lookup lookup = MethodHandles.lookup();
-
- READ_BYTE = lookup.findVirtual(Tuple.class, "byteValue", MethodType.methodType(byte.class, int.class));
- READ_SHORT = lookup.findVirtual(Tuple.class, "shortValue", MethodType.methodType(short.class, int.class));
- READ_INT = lookup.findVirtual(Tuple.class, "intValue", MethodType.methodType(int.class, int.class));
- READ_LONG = lookup.findVirtual(Tuple.class, "longValue", MethodType.methodType(long.class, int.class));
- READ_FLOAT = lookup.findVirtual(Tuple.class, "floatValue", MethodType.methodType(float.class, int.class));
- READ_DOUBLE = lookup.findVirtual(Tuple.class, "doubleValue", MethodType.methodType(double.class, int.class));
- READ_BYTE_BOXED = lookup.findVirtual(Tuple.class, "byteValueBoxed", MethodType.methodType(Byte.class, int.class));
- READ_SHORT_BOXED = lookup.findVirtual(Tuple.class, "shortValueBoxed", MethodType.methodType(Short.class, int.class));
- READ_INT_BOXED = lookup.findVirtual(Tuple.class, "intValueBoxed", MethodType.methodType(Integer.class, int.class));
- READ_LONG_BOXED = lookup.findVirtual(Tuple.class, "longValueBoxed", MethodType.methodType(Long.class, int.class));
- READ_FLOAT_BOXED = lookup.findVirtual(Tuple.class, "floatValueBoxed", MethodType.methodType(Float.class, int.class));
- READ_DOUBLE_BOXED = lookup.findVirtual(Tuple.class, "doubleValueBoxed", MethodType.methodType(Double.class, int.class));
- READ_UUID = lookup.findVirtual(Tuple.class, "uuidValue", MethodType.methodType(UUID.class, int.class));
- READ_BITSET = lookup.findVirtual(Tuple.class, "bitmaskValue", MethodType.methodType(BitSet.class, int.class));
- READ_STRING = lookup.findVirtual(Tuple.class, "stringValue", MethodType.methodType(String.class, int.class));
- READ_BYTE_ARR = lookup.findVirtual(Tuple.class, "bytesValue", MethodType.methodType(byte[].class, int.class));
-
- WRITE_NULL = lookup.findVirtual(TupleAssembler.class, "appendNull", MethodType.methodType(void.class));
- WRITE_BYTE = lookup.findVirtual(TupleAssembler.class, "appendByte", MethodType.methodType(void.class, byte.class));
- WRITE_SHORT = lookup.findVirtual(TupleAssembler.class, "appendShort", MethodType.methodType(void.class, short.class));
- WRITE_INT = lookup.findVirtual(TupleAssembler.class, "appendInt", MethodType.methodType(void.class, int.class));
- WRITE_LONG = lookup.findVirtual(TupleAssembler.class, "appendLong", MethodType.methodType(void.class, long.class));
- WRITE_FLOAT = lookup.findVirtual(TupleAssembler.class, "appendFloat", MethodType.methodType(void.class, float.class));
- WRITE_DOUBLE = lookup.findVirtual(TupleAssembler.class, "appendDouble", MethodType.methodType(void.class, double.class));
- WRITE_UUID = lookup.findVirtual(TupleAssembler.class, "appendUuid", MethodType.methodType(void.class, UUID.class));
- WRITE_BITSET = lookup.findVirtual(TupleAssembler.class, "appendBitmask", MethodType.methodType(void.class, BitSet.class));
- WRITE_STRING = lookup.findVirtual(TupleAssembler.class, "appendString", MethodType.methodType(void.class, String.class));
- WRITE_BYTE_ARR = lookup.findVirtual(TupleAssembler.class, "appendBytes", MethodType.methodType(void.class, byte[].class));
- }
- catch (NoSuchMethodException | IllegalAccessException e) {
- throw new IllegalStateException(e);
- }
- }
-
/**
* @param mode Binary mode.
* @param colIdx Column index in schema.
@@ -136,47 +34,47 @@ public class TupleColumnAccessCodeGenerator {
static TupleColumnAccessCodeGenerator createAccessor(BinaryMode mode, int colIdx) {
switch (mode) {
case P_BYTE:
- return new TupleColumnAccessCodeGenerator("READ_BYTE", "WRITE_BYTE", byte.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("byteValue", "appendByte", byte.class, colIdx);
case P_SHORT:
- return new TupleColumnAccessCodeGenerator("READ_SHORT", "WRITE_SHORT", short.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("shortValue", "appendShort", short.class, colIdx);
case P_INT:
- return new TupleColumnAccessCodeGenerator("READ_INT", "WRITE_INT", int.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("intValue", "appendInt", int.class, colIdx);
case P_LONG:
- return new TupleColumnAccessCodeGenerator("READ_LONG", "WRITE_LONG", long.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("longValue", "appendLong", long.class, colIdx);
case P_FLOAT:
- return new TupleColumnAccessCodeGenerator("READ_FLOAT", "WRITE_FLOAT", float.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("floatValue", "appendFloat", float.class, colIdx);
case P_DOUBLE:
- return new TupleColumnAccessCodeGenerator("READ_DOUBLE", "WRITE_DOUBLE", double.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("doubleValue", "appendDouble", double.class, colIdx);
case BYTE:
- return new TupleColumnAccessCodeGenerator("READ_BYTE_BOXED", "WRITE_BYTE", Byte.class, byte.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("byteValueBoxed", "appendByte", Byte.class, byte.class, colIdx);
case SHORT:
- return new TupleColumnAccessCodeGenerator("READ_SHORT_BOXED", "WRITE_SHORT", Short.class, short.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("shortValueBoxed", "appendShort", Short.class, short.class, colIdx);
case INT:
- return new TupleColumnAccessCodeGenerator("READ_INT_BOXED", "WRITE_INT", Integer.class, int.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("intValueBoxed", "appendInt", Integer.class, int.class, colIdx);
case LONG:
- return new TupleColumnAccessCodeGenerator("READ_LONG_BOXED", "WRITE_LONG", Long.class, long.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("longValueBoxed", "appendLong", Long.class, long.class, colIdx);
case FLOAT:
- return new TupleColumnAccessCodeGenerator("READ_FLOAT_BOXED", "WRITE_FLOAT", Float.class, float.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("floatValueBoxed", "appendFloat", Float.class, float.class, colIdx);
case DOUBLE:
- return new TupleColumnAccessCodeGenerator("READ_DOUBLE_BOXED", "WRITE_DOUBLE", Double.class, double.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("doubleValueBoxed", "appendDouble", Double.class, double.class, colIdx);
case STRING:
- return new TupleColumnAccessCodeGenerator("READ_STRING", "WRITE_STRING", String.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("stringValue", "appendString", String.class, colIdx);
case UUID:
- return new TupleColumnAccessCodeGenerator("READ_UUID", "WRITE_UUID", UUID.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("uuidValue", "appendUuid", UUID.class, colIdx);
case BYTE_ARR:
- return new TupleColumnAccessCodeGenerator("READ_BYTE_ARR", "WRITE_BYTE_ARR", byte[].class, colIdx);
+ return new TupleColumnAccessCodeGenerator("bytesValue", "appendBytes", byte[].class, colIdx);
case BITSET:
- return new TupleColumnAccessCodeGenerator("READ_BITSET", "WRITE_BITSET", BitSet.class, colIdx);
+ return new TupleColumnAccessCodeGenerator("bitmaskValue", "appendBitmask", BitSet.class, colIdx);
}
throw new IllegalStateException("Unsupported binary mode: " + mode);
}
/** Reader handle name. */
- private final String readHandleName;
+ private final String readMethodName;
/** Writer handle name. */
- private final String writeHandleName;
+ private final String writeMethodName;
/** Mapped value type. */
private final Class<?> mappedType;
@@ -190,28 +88,28 @@ public class TupleColumnAccessCodeGenerator {
/**
* Constructor.
*
- * @param readHandleName Reader handle name.
- * @param writeHandleName Writer handle name.
+ * @param readMethodName Reader handle name.
+ * @param writeMethodName Writer handle name.
* @param mappedType Mapped value type.
* @param colIdx Column index in schema.
*/
- TupleColumnAccessCodeGenerator(String readHandleName, String writeHandleName, Class<?> mappedType, int colIdx) {
- this(readHandleName, writeHandleName, mappedType, mappedType, colIdx);
+ TupleColumnAccessCodeGenerator(String readMethodName, String writeMethodName, Class<?> mappedType, int colIdx) {
+ this(readMethodName, writeMethodName, mappedType, mappedType, colIdx);
}
/**
* Constructor.
*
- * @param readHandleName Reader handle name.
- * @param writeHandleName Writer handle name.
+ * @param readMethodName Reader handle name.
+ * @param writeMethodName Writer handle name.
* @param mappedType Mapped value type.
* @param writeArgType Write method argument type.
* @param colIdx Column index in schema.
*/
- TupleColumnAccessCodeGenerator(String readHandleName, String writeHandleName, Class<?> mappedType,
+ TupleColumnAccessCodeGenerator(String readMethodName, String writeMethodName, Class<?> mappedType,
Class<?> writeArgType, int colIdx) {
- this.readHandleName = readHandleName;
- this.writeHandleName = writeHandleName;
+ this.readMethodName = readMethodName;
+ this.writeMethodName = writeMethodName;
this.colIdx = colIdx;
this.mappedType = mappedType;
this.writeArgType = writeArgType;
@@ -229,7 +127,7 @@ public class TupleColumnAccessCodeGenerator {
* @return Code that reads column value from tuple.
*/
public CodeBlock read(String tuple) {
- return CodeBlock.of("($T)$T.$L.invokeExact($L, $L)", mappedType, TupleColumnAccessCodeGenerator.class, readHandleName, tuple, colIdx);
+ return CodeBlock.of("($T)$L.$L($L)", mappedType, tuple, readMethodName, colIdx);
}
/**
@@ -239,15 +137,15 @@ public class TupleColumnAccessCodeGenerator {
*/
public CodeBlock write(String asmVar, String valExpr) {
if (mappedType.isPrimitive())
- return CodeBlock.builder().addStatement("$T.$L.invokeExact($L, ($T)$L)", TupleColumnAccessCodeGenerator.class, writeHandleName, asmVar, writeArgType, valExpr).build();
+ return CodeBlock.builder().addStatement("$L.$L(($T)$L)", asmVar, writeMethodName, writeArgType, valExpr).build();
else {
return CodeBlock.builder()
.add("{\n").indent()
.addStatement("Object fVal")
.beginControlFlow("if((fVal = $L) == null)", valExpr)
- .addStatement("$T.WRITE_NULL.invokeExact($L)", TupleColumnAccessCodeGenerator.class, asmVar)
+ .addStatement("$L.appendNull()", asmVar)
.nextControlFlow("else")
- .addStatement("$T.$L.invokeExact($L, ($T)fVal)", TupleColumnAccessCodeGenerator.class, writeHandleName, asmVar, writeArgType)
+ .addStatement("$L.$L(($T)fVal)", asmVar, writeMethodName, writeArgType)
.endControlFlow()
.unindent()
.add("}\n")
diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
index a6b893a..d92825a 100644
--- a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
@@ -71,7 +71,7 @@ public class SerializerBenchmarkTest {
private Factory<?> objectFactory;
/** Object fields count. */
- @Param({"0", "1", "10", "100"})
+ @Param({/*"0", "1", */"10", "100"})
public int fieldsCount;
/** Serializer. */
diff --git a/pom.xml b/pom.xml
index 23d7483..26ab8c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,8 @@
<!-- Maven plugins -->
<maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.source>11</maven.compiler.source> <!-- Requires for correct compilation in IDEA. -->
+ <maven.compiler.target>11</maven.compiler.target>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
[ignite-3] 02/03: Merge branch 'main' into ignite-13618
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 63c7e5ade19b259e8f8f32a0fe5330434409f97c
Merge: ec3c4b2 c80f0bf
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Jan 12 13:12:29 2021 +0300
Merge branch 'main' into ignite-13618
# Conflicts:
# pom.xml
.asf.yaml | 2 -
DEVNOTES.md | 48 +++
docs/.gitignore | 5 +
.../resources/version.properties => docs/Gemfile | 23 +-
docs/README.adoc | 252 ++++++++++++++
docs/_config.yml | 46 +++
.../version.properties => docs/_data/toc.yaml | 16 +-
docs/_docs/ignite-cli-tool.adoc | 39 +++
.../includes/ignite-cli-download-windows.adoc | 18 +
docs/_docs/includes/prereqs.adoc | 20 ++
docs/_docs/index.adoc | 41 +++
docs/_docs/installation/installing-using-exe.adoc | 37 ++
docs/_docs/quick-start/getting-started-guide.adoc | 235 +++++++++++++
.../pom.xml => docs/_includes/copyright.html | 26 +-
.../_includes/footer.html | 17 +-
.../_includes/header.html | 31 +-
docs/_includes/left-nav.html | 88 +++++
.../_includes/right-nav.html | 16 +-
.../_includes/section-toc.html | 26 +-
docs/_includes/toc.html | 63 ++++
docs/_layouts/default.html | 72 ++++
.../default-config.xml => docs/_layouts/doc.html | 30 +-
.../default-config.xml => docs/_layouts/toc.html | 29 +-
docs/_plugins/asciidoctor-extensions.rb | 180 ++++++++++
docs/_sass/callouts.scss | 75 +++++
docs/_sass/code.scss | 115 +++++++
docs/_sass/docs.scss | 238 +++++++++++++
docs/_sass/footer.scss | 48 +++
docs/_sass/github.scss | 223 ++++++++++++
docs/_sass/header.scss | 374 +++++++++++++++++++++
docs/_sass/layout.scss | 45 +++
docs/_sass/left-nav.scss | 109 ++++++
docs/_sass/right-nav.scss | 73 ++++
docs/_sass/rouge-base16-solarized.scss | 99 ++++++
docs/_sass/text.scss | 62 ++++
docs/_sass/variables.scss | 33 ++
docs/assets/css/asciidoc-pygments.css | 59 ++++
.../assets/css/docs.scss | 12 +-
.../assets/css/styles.scss | 17 +-
docs/assets/images/apple-blob.svg | 16 +
docs/assets/images/arrow-down-white.svg | 3 +
docs/assets/images/arrow-down.svg | 3 +
docs/assets/images/background-lines.svg | 54 +++
docs/assets/images/cancel.svg | 11 +
docs/assets/images/checkmark-green.svg | 3 +
docs/assets/images/copy-icon.svg | 6 +
docs/assets/images/cpp.svg | 9 +
docs/assets/images/dev-internal-bg.jpg | Bin 0 -> 23014 bytes
docs/assets/images/dotnet.svg | 9 +
docs/assets/images/edition-ce.svg | 16 +
docs/assets/images/edition-ee.svg | 25 ++
docs/assets/images/edition-ue.svg | 28 ++
docs/assets/images/events-nav-arrow.svg | 3 +
docs/assets/images/feature-easy-installation.svg | 28 ++
docs/assets/images/feature-fast.svg | 16 +
docs/assets/images/feature-reliable.svg | 25 ++
docs/assets/images/github-gray.svg | 3 +
docs/assets/images/github-white.svg | 3 +
docs/assets/images/glowing-box.svg | 170 ++++++++++
docs/assets/images/integrations/hibernate.svg | 6 +
docs/assets/images/integrations/kafka.svg | 3 +
docs/assets/images/integrations/more.svg | 18 +
docs/assets/images/integrations/oracle.svg | 3 +
docs/assets/images/integrations/osgi.svg | 17 +
docs/assets/images/integrations/spark.svg | 7 +
docs/assets/images/integrations/spring.svg | 3 +
docs/assets/images/java.svg | 9 +
docs/assets/images/left-nav-arrow.svg | 3 +
docs/assets/images/lines-bg-1.svg | 54 +++
docs/assets/images/lines-bg-2.svg | 54 +++
docs/assets/images/lines-bg-3.svg | 54 +++
docs/assets/images/lines-bg-4.svg | 54 +++
docs/assets/images/menu-icon.svg | 3 +
docs/assets/images/mousepad-blob.svg | 9 +
...piece-of-paper-with-folded-top-right-corner.svg | 117 +++++++
docs/assets/images/scala.svg | 31 ++
docs/assets/images/search.svg | 15 +
docs/assets/images/violent-blob.svg | 28 ++
docs/assets/images/watermelon-blob.svg | 9 +
docs/assets/js/anchor.min.js | 9 +
docs/assets/js/code-copy-to-clipboard.js | 70 ++++
docs/assets/js/code-tabs.js | 155 +++++++++
docs/assets/js/docs-menu.js | 64 ++++
docs/assets/js/index.js | 51 +++
docs/assets/js/page-nav.js | 37 ++
docs/assets/js/top-navigation.js | 92 +++++
docs/favicon.ico | Bin 0 -> 9780 bytes
.../resources/version.properties => docs/run.sh | 13 +-
modules/{cli-demo => }/cli-common/pom.xml | 12 +-
.../apache/ignite/cli/common/IgniteCommand.java | 0
modules/cli-demo/cli/ignite.sh | 11 -
.../progressbar/IgniteProgressBarRenderer.java | 43 ---
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 102 ------
.../cli/src/main/resources/builtin_modules.conf | 13 -
.../cli-demo/cli/src/main/resources/logback.xml | 14 -
.../demo-module-all/demo-module-cli/pom.xml | 55 ---
.../ignite/snapshot/cli/SnapshotCommand.java | 65 ----
.../org.apache.ignite.cli.common.IgniteCommand | 1 -
modules/cli-demo/demo-module-all/pom.xml | 56 ---
modules/cli-demo/pom.xml | 90 -----
.../resources/version.properties => cli/ignite.sh} | 21 +-
modules/{cli-demo => }/cli/pom.xml | 62 ++--
.../apache/ignite/cli/CliPathsConfigLoader.java | 25 +-
.../java/org/apache/ignite/cli/CliVersionInfo.java | 0
.../java/org/apache/ignite/cli/CommandFactory.java | 0
.../java/org/apache/ignite/cli/ErrorHandler.java | 0
.../org/apache/ignite/cli/HelpFactoryImpl.java | 21 +-
.../org/apache/ignite/cli/IgniteCLIException.java | 0
.../java/org/apache/ignite/cli/IgniteCliApp.java | 14 +-
.../java/org/apache/ignite/cli/IgnitePaths.java | 24 ++
.../org/apache/ignite/cli/IgniteProgressBar.java | 82 +++--
.../org/apache/ignite/cli/InteractiveWrapper.java | 0
.../src/main/java/org/apache/ignite/cli/Table.java | 2 +-
.../org/apache/ignite/cli/VersionProvider.java | 0
.../ignite/cli/builtins/SystemPathResolver.java | 22 +-
.../cli/builtins/config/ConfigurationClient.java | 12 +-
.../cli/builtins/config/HttpClientFactory.java | 0
.../cli/builtins/init/InitIgniteCommand.java | 91 +++--
.../cli/builtins/module/MavenArtifactResolver.java | 28 +-
.../cli/builtins/module/MavenCoordinates.java | 2 +-
.../ignite/cli/builtins/module/ModuleManager.java | 69 +++-
.../ignite/cli/builtins/module/ModuleStorage.java | 31 +-
.../ignite/cli/builtins/module/ResolveResult.java | 0
.../builtins/module/StandardModuleDefinition.java | 0
.../ignite/cli/builtins/node/NodeManager.java | 58 ++--
.../org/apache/ignite/cli/spec/CategorySpec.java | 0
.../org/apache/ignite/cli/spec/CommandSpec.java | 0
.../apache/ignite/cli/spec/ConfigCommandSpec.java | 43 +--
.../org/apache/ignite/cli/spec/IgniteCliSpec.java | 23 +-
.../ignite/cli/spec/InitIgniteCommandSpec.java | 12 +-
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 192 +++++++++++
.../apache/ignite/cli/spec/NodeCommandSpec.java | 92 +++--
.../org/apache/ignite/cli/spec/SpecAdapter.java | 27 +-
.../cli/src/main/resources/builtin_modules.conf | 7 +
.../cli/src/main/resources/default-config.xml | 0
.../src/main/resources/logback.xml} | 26 +-
.../cli/src/main/resources/version.properties | 0
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 205 +++++++----
.../cli/builtins/init/InitIgniteCommandTest.java | 110 ++++++
.../ignite/cli/builtins/init/ModuleMangerTest.java | 112 ++++++
.../cli/src/test/resources/builtin_modules.conf | 13 +
.../src/test/resources/logback-test.xml} | 26 +-
.../src/test}/resources/version.properties | 0
modules/configuration-annotation-processor/pom.xml | 35 +-
.../processor/internal/AbstractProcessorTest.java | 10 +-
.../configuration/processor/internal/Types.java | 17 +
.../internal/TestConfigurationSchema.java | 19 +-
modules/configuration/pom.xml | 26 +-
modules/ignite-runner/pom.xml | 28 +-
.../java/org/apache/ignite/app/IgniteRunner.java | 36 +-
.../java/org/apache/ignite/rest/RestModule.java | 4 +-
.../src/main/resources/bootstrap-config.json | 2 +-
pom.xml | 120 +++----
153 files changed, 5496 insertions(+), 1076 deletions(-)
diff --cc pom.xml
index 26ab8c3,61b5716..9e41870
--- a/pom.xml
+++ b/pom.xml
@@@ -46,86 -43,11 +43,20 @@@
</licenses>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+ <!-- Dependencies versions. -->
+ <javapoet.version>1.13.0</javapoet.version>
+ <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
+ <jetbrains.annotations.version>20.1.0</jetbrains.annotations.version>
+ <jmh.framework.verion>1.9.3</jmh.framework.verion>
+ <junit.jupiter.version>5.7.0</junit.jupiter.version>
+ <mockito.core.version>3.6.28</mockito.core.version>
+
+ <!-- Maven plugins -->
- <maven.compiler.release>11</maven.compiler.release>
- <maven.compiler.source>11</maven.compiler.source> <!-- Requires for correct compilation in IDEA. -->
+ <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
-
- <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
- <maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>
- <apache.rat.plugin.version>0.13</apache.rat.plugin.version>
+ <maven.compiler.release>11</maven.compiler.release>
</properties>
- <profiles>
- <profile>
- <id>check-licenses</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${apache.rat.plugin.version}</version>
- <configuration>
- <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
- <licenses>
- <license implementation="org.apache.rat.analysis.license.FullTextMatchingLicense">
- <licenseFamilyCategory>IAL20</licenseFamilyCategory>
- <licenseFamilyName>Ignite Apache License 2.0</licenseFamilyName>
- <fullText>
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- </fullText>
- </license>
- </licenses>
- <licenseFamilies>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>Ignite Apache License 2.0</familyName>
- </licenseFamily>
- </licenseFamilies>
- </configuration>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>README.md</exclude>
- <exclude>work/**</exclude>
- <exclude>**/target/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@@ -139,10 -61,18 +70,19 @@@
<module>modules/configuration</module>
<module>modules/configuration-annotation-processor</module>
<module>modules/ignite-runner</module>
- <module>modules/cli-demo</module>
+ <module>modules/cli-common</module>
+ <module>modules/cli</module>
+ <module>modules/commons</module>
</modules>
+ <distributionManagement>
+ <repository>
+ <id>apache.staging</id>
+ <name>Apache Staging Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ </distributionManagement>
+
<build>
<plugins>
<plugin>
[ignite-3] 03/03: Minor.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 931940433391f65f2a24883a4529d7f9cc79c79f
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Tue Jan 12 14:21:11 2021 +0300
Minor.
---
modules/commons/pom.xml | 15 +++++++--------
.../marshaller/generator/MarshallerCodeGenerator.java | 17 +++++++++++++++++
.../marshaller/generator/SerializerGenerator.java | 1 -
.../internal/benchmarks/SerializerBenchmarkTest.java | 10 +++++-----
pom.xml | 2 +-
5 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index a5b64e8..f0e00db 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -51,6 +51,12 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
@@ -66,20 +72,13 @@
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
- <version>${jmh.framework.verion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openjdk.jmh</groupId>
- <artifactId>jmh-generator-annprocess</artifactId>
- <version>${jmh.framework.verion}</version>
+ <version>${jmh.framework.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.api.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/MarshallerCodeGenerator.java b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/MarshallerCodeGenerator.java
index bca3256..73615c2 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/MarshallerCodeGenerator.java
+++ b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/MarshallerCodeGenerator.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.ignite.internal.schema.marshaller.generator;
import com.squareup.javapoet.CodeBlock;
diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
index 244e659..33b8729 100644
--- a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
+++ b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/generator/SerializerGenerator.java
@@ -28,7 +28,6 @@ import com.squareup.javapoet.TypeSpec;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.InvocationTargetException;
import java.util.Objects;
-import java.util.concurrent.TimeUnit;
import javax.annotation.processing.Generated;
import javax.lang.model.element.Modifier;
import jdk.jfr.Experimental;
diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
index d92825a..160ad4a 100644
--- a/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/benchmarks/SerializerBenchmarkTest.java
@@ -55,8 +55,8 @@ import static org.apache.ignite.internal.schema.NativeType.LONG;
* Serializer benchmark.
*/
@State(Scope.Benchmark)
-@Warmup(time = 10, iterations = 3, timeUnit = TimeUnit.SECONDS)
-@Measurement(time = 10, iterations = 5, timeUnit = TimeUnit.SECONDS)
+@Warmup(time = 30, timeUnit = TimeUnit.SECONDS)
+@Measurement(time = 60, timeUnit = TimeUnit.SECONDS)
@BenchmarkMode({Mode.Throughput, Mode.AverageTime})
@OutputTimeUnit(TimeUnit.MICROSECONDS)
@Fork(jvmArgs = "-Djava.lang.invoke.stringConcat=BC_SB" /* Workaround for Java 9+ */, value = 1)
@@ -71,7 +71,7 @@ public class SerializerBenchmarkTest {
private Factory<?> objectFactory;
/** Object fields count. */
- @Param({/*"0", "1", */"10", "100"})
+ @Param({"0", "1", "10", "100"})
public int fieldsCount;
/** Serializer. */
@@ -90,10 +90,10 @@ public class SerializerBenchmarkTest {
}
/**
- * @throws Exception If failed.
+ *
*/
@Setup
- public void init() throws Exception {
+ public void init() {
Thread.currentThread().setContextClassLoader(CompilerUtils.dynamicClassLoader());
long seed = System.currentTimeMillis();
diff --git a/pom.xml b/pom.xml
index 9e41870..566560d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<javapoet.version>1.13.0</javapoet.version>
<javax.annotation.api.version>1.3.2</javax.annotation.api.version>
<jetbrains.annotations.version>20.1.0</jetbrains.annotations.version>
- <jmh.framework.verion>1.9.3</jmh.framework.verion>
+ <jmh.framework.version>1.9.3</jmh.framework.version>
<junit.jupiter.version>5.7.0</junit.jupiter.version>
<mockito.core.version>3.6.28</mockito.core.version>