timoninmaxim commented on code in PR #12429: URL: https://github.com/apache/ignite/pull/12429#discussion_r2538636215
########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/ScopedContext.java: ########## @@ -0,0 +1,85 @@ +/* + * 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.thread.context; + +/** */ +public final class ScopedContext extends ContextDataChain<ScopedContext> { + /** */ + private static final ScopedContext ROOT = new ScopedContext(); + + /** */ + private final ContextAttribute<?> attr; + + /** */ + private final Object val; + + /** */ + private ScopedContext() { + attr = null; + val = null; + } + + /** */ + private <T> ScopedContext(ContextAttribute<T> attr, T val, ScopedContext prev) { + super(prev.storedAttributeBits() | attr.bitmask(), prev); + + this.attr = attr; + this.val = val; + } + + /** */ + public <T> ScopedContext with(ContextAttribute<T> attr, T val) { + return attr.get() == val ? this : new ScopedContext(attr, val, this); + } + + /** */ + public static ScopedContext create() { Review Comment: Looks as misnaming. This method doesn't create anything ########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/Scope.java: ########## @@ -15,32 +15,13 @@ * limitations under the License. */ -package org.apache.ignite.internal.processors.security; +package org.apache.ignite.internal.thread.context; -/** - * - */ -public class OperationSecurityContext implements AutoCloseable { - /** Ignite Security. */ - private final IgniteSecurity proc; - - /** Security context. */ - private final SecurityContext secCtx; - - /** - * @param proc Ignite Security. - * @param secCtx Security context. - */ - OperationSecurityContext(IgniteSecurity proc, SecurityContext secCtx) { - this.proc = proc; - this.secCtx = secCtx; - } +/** */ +public interface Scope extends AutoCloseable { + /** */ + Scope NOOP_SCOPE = () -> {}; /** {@inheritDoc} */ - @Override public void close() { - if (secCtx == null) - ((IgniteSecurityProcessor)proc).restoreDefaultContext(); - else - proc.withContext(secCtx); - } + @Override void close(); Review Comment: Let's add a comment why we override AutoCloseable#close. AFAIU, it's required to avoid declaring Exception? ########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/ContextAttribute.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.thread.context; + +import java.util.concurrent.atomic.AtomicInteger; + +/** */ +public class ContextAttribute<T> { + /** */ + static final AtomicInteger ID_GEN = new AtomicInteger(); + + /** */ + static final int MAX_ATTRIBUTE_CNT = Integer.SIZE; + + /** */ + private final byte id; + + /** */ + private final int bitmask; + + /** */ + private final T initVal; + + /** */ + private ContextAttribute(byte id, T initVal) { + this.id = id; + this.bitmask = 1 << id; Review Comment: Looks that storing ID is enough. The bitmask is a parameter of ContextDataChain only. ########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/ContextAttribute.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.thread.context; + +import java.util.concurrent.atomic.AtomicInteger; + +/** */ +public class ContextAttribute<T> { Review Comment: I suppose you publicate the "Scope" term. Let's use at least public terms if possible. `ScopeAttribute` looks better. ########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/ScopedContext.java: ########## @@ -0,0 +1,85 @@ +/* + * 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.thread.context; + +/** */ +public final class ScopedContext extends ContextDataChain<ScopedContext> { + /** */ + private static final ScopedContext ROOT = new ScopedContext(); + + /** */ + private final ContextAttribute<?> attr; + + /** */ + private final Object val; + + /** */ + private ScopedContext() { + attr = null; + val = null; + } + + /** */ + private <T> ScopedContext(ContextAttribute<T> attr, T val, ScopedContext prev) { + super(prev.storedAttributeBits() | attr.bitmask(), prev); + + this.attr = attr; + this.val = val; + } + + /** */ + public <T> ScopedContext with(ContextAttribute<T> attr, T val) { Review Comment: Looks weird, an object that stores an attribute value accepts another attribute (name + value). AFAIU, it's a responsibility of Scope to store all attributes within single scope. ########## modules/commons/src/main/java/org/apache/ignite/internal/thread/context/ContextAttribute.java: ########## @@ -0,0 +1,84 @@ +/* + * 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.thread.context; + +import java.util.concurrent.atomic.AtomicInteger; + +/** */ +public class ContextAttribute<T> { + /** */ + static final AtomicInteger ID_GEN = new AtomicInteger(); + + /** */ + static final int MAX_ATTRIBUTE_CNT = Integer.SIZE; + + /** */ + private final byte id; + + /** */ + private final int bitmask; + + /** */ + private final T initVal; + + /** */ + private ContextAttribute(byte id, T initVal) { + this.id = id; + this.bitmask = 1 << id; + this.initVal = initVal; + } + + /** */ + byte id() { + return id; + } + + /** */ + int bitmask() { + return bitmask; + } + + /** */ + public T get() { + ScopedContext sc = ThreadLocalContextStorage.get().findScopedContextFor(this); + + return sc == null ? initVal : sc.value(); + } + + /** */ + public static <T> ContextAttribute<T> newInstance() { + return newInstance(null); + } + + /** */ + public static <T> ContextAttribute<T> newInstance(T initVal) { + int id = ID_GEN.getAndIncrement(); + + if (MAX_ATTRIBUTE_CNT <= id) { + throw new RuntimeException("Exceeded maximum supported number of created Context Attributes instances" + Review Comment: assert is better, as we should not handle this exception. Developers must redesign this module, if amount of attributes too high. It even looks like we need a repository of known attributes with their IDs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
