This is an automated email from the ASF dual-hosted git repository. gvvinblade pushed a commit to branch ignite-12248 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 4219f2df04c97fe860b3c0d4cd6bc65f662af57d Merge: aa5b981 bf7c6d2 Author: Igor Seliverstov <[email protected]> AuthorDate: Tue Oct 8 16:26:56 2019 +0300 Merge branch 'ignite-master' into ignite-12248 # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java bin/control.sh | 2 - bin/ignite-tf.sh | 2 - bin/ignite.sh | 10 +- bin/ignitevisorcmd.sh | 2 - bin/include/functions.sh | 9 +- .../ml/preprocessing/encoding/EncoderExample.java | 105 + .../encoding/EncoderExampleWithNormalization.java | 112 + .../encoding/LabelEncoderExample.java | 111 + .../ml/preprocessing/encoding/package-info.java | 16 +- .../internal/jdbc2/JdbcMetadataSelfTest.java | 9 +- .../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 83 +- .../ignite/codegen/MessageCodeGenerator.java | 2 +- .../SystemViewRowAttributeWalkerGenerator.java | 18 + .../org/apache/ignite/internal/IgniteKernal.java | 6 +- .../binary/BinaryCachingMetadataHandler.java | 27 +- .../ignite/internal/binary/BinaryContext.java | 91 +- .../internal/binary/BinaryMetadataHandler.java | 11 + .../internal/binary/BinaryNoopMetadataHandler.java | 9 +- .../binary/builder/BinaryObjectBuilderImpl.java | 32 +- .../apache/ignite/internal/client/GridClient.java | 11 +- .../internal/client/impl/GridClientImpl.java | 5 - .../client/router/impl/GridRouterClientImpl.java | 5 - .../internal/client/thin/TcpIgniteClient.java | 6 + .../jdbc/thin/JdbcThinDatabaseMetadata.java | 4 +- ...temViewAdapter.java => AbstractSystemView.java} | 48 +- .../managers/systemview/GridSystemViewManager.java | 71 +- .../managers/systemview/SystemViewAdapter.java | 48 +- .../SystemViewInnerCollectionsAdapter.java | 82 + .../walker/ContinuousQueryViewWalker.java | 81 + .../systemview/walker/TransactionViewWalker.java | 97 + .../cache/CacheAffinitySharedManager.java | 104 +- .../processors/cache/CacheGroupContext.java | 7 + .../processors/cache/GridCacheProcessor.java | 39 +- .../cache/IgniteCacheOffheapManagerImpl.java | 15 +- .../binary/CacheObjectBinaryProcessorImpl.java | 5 + .../dht/preloader/CacheGroupAffinityMessage.java | 5 +- .../preloader/GridDhtPartitionsExchangeFuture.java | 57 +- .../dht/topology/PartitionsEvictManager.java | 19 +- .../cache/persistence/GridCacheOffheapManager.java | 8 +- .../continuous/CacheContinuousQueryHandler.java | 24 +- .../continuous/CacheContinuousQueryHandlerV3.java | 4 +- .../cache/transactions/IgniteTxManager.java | 13 + .../continuous/GridContinuousProcessor.java | 135 +- .../processors/odbc/ClientListenerProcessor.java | 6 +- .../processors/query/GridQueryProcessor.java | 86 +- .../internal/processors/query/QueryUtils.java | 2 +- .../query/schema/SchemaOperationWorker.java | 2 +- .../lang/gridfunc/ReadOnlyCollectionView2X.java | 10 +- .../ignite/internal/util/nio/GridNioServer.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 + .../spi/systemview/view/ContinuousQueryView.java | 213 + .../spi/systemview/view/TransactionView.java | 287 + .../binary/TestCachingMetadataHandler.java | 9 +- .../ignite/internal/metric/JmxExporterSpiTest.java | 196 +- .../ignite/internal/metric/SystemViewSelfTest.java | 194 +- .../processors/cache/ClientDelayedJoinTest.java | 239 + .../cache/IgniteMarshallerCacheFSRestoreTest.java | 7 +- .../DropCacheContextDuringEvictionTest.java | 103 + .../PartitionsEvictManagerAbstractTest.java | 209 + .../PartitionsEvictionTaskFailureHandlerTest.java | 49 + .../IgnitePdsCacheRebalancingAbstractTest.java | 74 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 5 + .../ignite/testsuites/IgniteCacheTestSuite5.java | 3 + .../query/h2/H2IndexesSystemViewTest.java | 26 +- .../systemview/walker/SqlIndexViewWalker.java | 63 + .../systemview/walker/SqlSchemaViewWalker.java | 46 + .../walker/SqlTableColumnViewWalker.java | 64 + .../systemview/walker/SqlTableViewWalker.java | 60 + .../systemview/walker/SqlViewColumnViewWalker.java | 58 + .../systemview/walker/SqlViewViewWalker.java | 48 + .../processors/query/h2/IgniteH2Indexing.java | 19 + .../processors/query/h2/SchemaManager.java | 81 +- .../processors/query/h2/database/H2TreeIndex.java | 20 +- .../query/h2/sys/view/SqlSystemViewIndexes.java | 132 - .../query/h2/sys/view/SqlSystemViewSchemas.java | 73 - .../query/h2/sys/view/SqlSystemViewTables.java | 96 - .../ignite/spi/systemview/view/SqlIndexView.java | 137 + .../ignite/spi/systemview/view/SqlSchemaView.java} | 30 +- .../spi/systemview/view/SqlTableColumnView.java | 122 + .../ignite/spi/systemview/view/SqlTableView.java | 103 + .../spi/systemview/view/SqlViewColumnView.java | 87 + .../ignite/spi/systemview/view/SqlViewView.java | 53 + .../cache/CacheRegisterMetadataLocallyTest.java | 302 + .../cache/index/AbstractSchemaSelfTest.java | 8 +- .../index/H2DynamicIndexAbstractSelfTest.java | 54 +- .../index/StopNodeOnRebuildIndexFailureTest.java | 237 + .../cache/metric/SqlViewExporterSpiTest.java | 302 +- .../processors/query/SqlSystemViewsSelfTest.java | 91 +- .../IgniteBinaryCacheQueryTestSuite.java | 2 + .../IgniteCacheWithIndexingTestSuite.java | 3 + .../dataset/feature/extractor/ExtractionUtils.java | 85 + .../extractor/impl/ObjectArrayVectorizer.java | 59 + .../builder/data/SimpleDatasetDataBuilder.java | 22 +- ...Value.java => IllegalFeatureTypeException.java} | 14 +- ...reValue.java => IllegalLabelTypeException.java} | 14 +- ...ureValue.java => NonDoubleVectorException.java} | 13 +- ...tureValue.java => UndefinedLabelException.java} | 13 +- ...e.java => UnknownCategorialValueException.java} | 6 +- .../encoding/EncoderPartitionData.java | 23 + .../encoding/EncoderPreprocessor.java | 20 +- .../ml/preprocessing/encoding/EncoderTrainer.java | 124 +- .../ml/preprocessing/encoding/EncoderType.java | 5 +- .../frequency/FrequencyEncoderPreprocessor.java | 4 +- .../LabelEncoderPreprocessor.java} | 54 +- .../{EncoderType.java => label/package-info.java} | 18 +- .../onehotencoder/OneHotEncoderPreprocessor.java | 4 +- .../stringencoder/StringEncoderPreprocessor.java | 14 +- .../VectorFinalizationPreprocessor.java | 77 + .../finalization/VectorFinalizationTrainer.java | 39 + .../package-info.java} | 18 +- .../normalization/NormalizationPreprocessor.java | 2 + .../ml/tree/data/DecisionTreeDataBuilder.java | 11 +- .../apache/ignite/ml/util/MLSandboxDatasets.java | 5 +- .../org/apache/ignite/ml/util/SandboxMLCache.java | 97 +- .../ml/src/main/resources/datasets/mushrooms.csv | 8125 ++++++++++++++++++++ .../ml/preprocessing/PreprocessingTestSuite.java | 2 + .../preprocessing/encoding/EncoderTrainerTest.java | 102 +- .../encoding/LabelEncoderPreprocessorTest.java | 62 + .../encoding/OneHotEncoderPreprocessorTest.java | 67 +- .../encoding/StringEncoderPreprocessorTest.java | 17 +- .../BinaryClassificationEvaluatorTest.java | 6 +- .../scoring/evaluator/RegressionEvaluatorTest.java | 4 +- .../ignite/spark/IgniteDataFrameSettings.scala | 19 + .../scala/org/apache/ignite/spark/IgniteRDD.scala | 11 +- .../org/apache/ignite/spark/JavaIgniteRDD.scala | 13 +- .../ignite/spark/impl/IgniteRelationProvider.scala | 3 + .../org/apache/ignite/spark/impl/QueryHelper.scala | 9 +- .../spark/JavaEmbeddedIgniteRDDSelfTest.java | 6 +- ...avaEmbeddedIgniteRDDWithLocalStoreSelfTest.java | 227 + .../ignite/testsuites/IgniteRDDTestSuite.java | 4 +- modules/sqlline/bin/sqlline.sh | 2 - .../web-console/web-agent/bin/ignite-web-agent.sh | 2 - .../web-console/web-agent/bin/include/functions.sh | 9 +- 133 files changed, 13987 insertions(+), 1010 deletions(-) diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java index a94eaad,0352a2f..6740834 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java @@@ -74,8 -78,41 +81,44 @@@ import static org.apache.ignite.interna */ public class SchemaManager { /** */ + public static final String SQL_SCHEMA_VIEW = "schemas"; + + /** */ + public static final String SQL_SCHEMA_VIEW_DESC = "SQL schemas"; + + /** */ + public static final String SQL_TBLS_VIEW = "tables"; + + /** */ + public static final String SQL_TBLS_VIEW_DESC = "SQL tables"; + + /** */ + public static final String SQL_VIEWS_VIEW = "views"; + + /** */ + public static final String SQL_VIEWS_VIEW_DESC = "SQL views"; + + /** */ + public static final String SQL_IDXS_VIEW = "indexes"; + + /** */ + public static final String SQL_IDXS_VIEW_DESC = "SQL indexes"; + + /** */ + public static final String SQL_TBL_COLS_VIEW = metricName("table", "columns"); + + /** */ + public static final String SQL_TBL_COLS_VIEW_DESC = "SQL table columns"; + + /** */ + public static final String SQL_VIEW_COLS_VIEW = metricName("view", "columns"); + + /** */ + public static final String SQL_VIEW_COLS_VIEW_DESC = "SQL view columns"; + ++ /** */ + private final SchemaChangeListener lsnr; + /** Connection manager. */ private final ConnectionManager connMgr; @@@ -109,8 -147,40 +152,41 @@@ this.ctx = ctx; this.connMgr = connMgr; + lsnr = schemaChangeListener(ctx); log = ctx.log(SchemaManager.class); + + ctx.systemView().registerView(SQL_SCHEMA_VIEW, SQL_SCHEMA_VIEW_DESC, + SqlSchemaView.class, + schemas.values(), + SqlSchemaView::new); + + ctx.systemView().registerView(SQL_TBLS_VIEW, SQL_TBLS_VIEW_DESC, + SqlTableView.class, + dataTables.values(), + SqlTableView::new); + + ctx.systemView().registerView(SQL_VIEWS_VIEW, SQL_VIEWS_VIEW_DESC, + SqlViewView.class, + systemViews, + SqlViewView::new); + + ctx.systemView().registerInnerCollectionView(SQL_IDXS_VIEW, SQL_IDXS_VIEW_DESC, + SqlIndexView.class, + dataTables.values(), + GridH2Table::getIndexes, + SqlIndexView::new); + + ctx.systemView().registerInnerArrayView(SQL_TBL_COLS_VIEW, SQL_TBL_COLS_VIEW_DESC, + SqlTableColumnView.class, + dataTables.values(), + GridH2Table::getColumns, + SqlTableColumnView::new); + + ctx.systemView().registerInnerArrayView(SQL_VIEW_COLS_VIEW, SQL_VIEW_COLS_VIEW_DESC, + SqlViewColumnView.class, + systemViews, + SqlSystemView::getColumns, + SqlViewColumnView::new); } /**
