This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-20339 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 0fed1ee9303a2c6b89474d3f826d9f936431f446 Author: amashenkov <andrey.mashen...@gmail.com> AuthorDate: Fri Sep 22 17:38:23 2023 +0300 Drop SchemaEvent. --- .../internal/schema/CatalogSchemaManager.java | 19 +------ .../ignite/internal/schema/event/SchemaEvent.java | 28 ---------- .../schema/event/SchemaEventParameters.java | 64 ---------------------- 3 files changed, 1 insertion(+), 110 deletions(-) diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogSchemaManager.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogSchemaManager.java index 8db331dd2d..73b4604470 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogSchemaManager.java +++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogSchemaManager.java @@ -45,13 +45,8 @@ import org.apache.ignite.internal.catalog.events.CatalogEventParameters; import org.apache.ignite.internal.catalog.events.CreateTableEventParameters; import org.apache.ignite.internal.catalog.events.TableEventParameters; import org.apache.ignite.internal.causality.IncrementalVersionedValue; -import org.apache.ignite.internal.event.AbstractEventProducer; -import org.apache.ignite.internal.logger.IgniteLogger; -import org.apache.ignite.internal.logger.Loggers; import org.apache.ignite.internal.manager.IgniteComponent; import org.apache.ignite.internal.metastorage.MetaStorageManager; -import org.apache.ignite.internal.schema.event.SchemaEvent; -import org.apache.ignite.internal.schema.event.SchemaEventParameters; import org.apache.ignite.internal.schema.marshaller.schema.SchemaSerializerImpl; import org.apache.ignite.internal.schema.registry.SchemaRegistryImpl; import org.apache.ignite.internal.util.ByteUtils; @@ -66,9 +61,7 @@ import org.jetbrains.annotations.Nullable; /** * This class services management of table schemas. */ -public class CatalogSchemaManager extends AbstractEventProducer<SchemaEvent, SchemaEventParameters> implements IgniteComponent { - private static final IgniteLogger LOGGER = Loggers.forClass(CatalogSchemaManager.class); - +public class CatalogSchemaManager implements IgniteComponent { /** Schema history key predicate part. */ private static final String SCHEMA_STORE_PREFIX = ".sch-hist."; private static final String LATEST_SCHEMA_VERSION_STORE_SUFFIX = ".sch-hist-latest"; @@ -174,16 +167,6 @@ public class CatalogSchemaManager extends AbstractEventProducer<SchemaEvent, Sch return failedFuture(e); } - // Fire event early, because dependent listeners have to register VersionedValues' update futures - var eventParams = new SchemaEventParameters(causalityToken, tableId, newSchema); - - fireEvent(SchemaEvent.CREATE, eventParams) - .whenComplete((v, e) -> { - if (e != null) { - LOGGER.warn("Error when processing CREATE event", e); - } - }); - return registriesVv.update(causalityToken, (registries, e) -> inBusyLock(busyLock, () -> { if (e != null) { return failedFuture(new IgniteInternalException(IgniteStringFormatter.format( diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEvent.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEvent.java deleted file mode 100644 index e3cbe007d1..0000000000 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEvent.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.event; - -import org.apache.ignite.internal.event.Event; - -/** - * Table management events. - */ -public enum SchemaEvent implements Event { - /** This event is fired when a schema was created. */ - CREATE -} diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEventParameters.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEventParameters.java deleted file mode 100644 index 2b95d4abc2..0000000000 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/event/SchemaEventParameters.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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.event; - -import org.apache.ignite.internal.event.EventParameters; -import org.apache.ignite.internal.schema.SchemaDescriptor; - -/** - * Table event parameter. - */ -public class SchemaEventParameters extends EventParameters { - /** Table identifier. */ - private final int tableId; - - /** Schema descriptor. */ - private final SchemaDescriptor schemaDescriptor; - - /** - * Constructor. - * - * @param causalityToken Causality token. - * @param tableId Table id. - * @param schemaDescriptor Schema descriptor. - */ - public SchemaEventParameters(long causalityToken, int tableId, SchemaDescriptor schemaDescriptor) { - super(causalityToken); - - this.tableId = tableId; - this.schemaDescriptor = schemaDescriptor; - } - - /** - * Get a table id. - * - * @return Table id. - */ - public int tableId() { - return tableId; - } - - /** - * Gets schema descriptor. - * - * @return Schema descriptor. - */ - public SchemaDescriptor schemaDescriptor() { - return schemaDescriptor; - } -}