Datasets:

tiginamaria

/

bug-localization

like 2

micrometer-metrics/micrometer/3544/3543

micrometer-metrics

micrometer

https://github.com/micrometer-metrics/micrometer/issues/3543

https://github.com/micrometer-metrics/micrometer/pull/3544

https://github.com/micrometer-metrics/micrometer/pull/3544

fixes

Fix logic to choose ObservationConvention

There are two issues with the logic that chooses and applies the `ObservationConvention` on the `Observation`s. 1. The logic can choose and apply multiple conventions, also in one case it can mix them together 2. In one case the logic pics the wrong convention Here's the old and the new decision matrix: **OLD:** ``` 1. custom default no pre-cofigured -> custom 2. custom default pre-cofigured -> custom on top of pre-cofigured 3. no custom default no pre-cofigured -> default 4. no custom default pre-cofigured -> default on top of pre-cofigured (*) 5. custom no default no pre-cofigured -> custom 6. custom no default pre-cofigured -> custom on top of pre-cofigured 7. no custom no default no pre-cofigured -> local 8. no custom no default pre-cofigured -> pre-cofigured ``` _(*): This logic is wrong: 1. they are mixed, 2. pre-cofigured should have choosen_ **NEW:** ``` 1. custom default no pre-configured -> custom 2. custom default pre-configured -> custom (not really a valid case, use custom) 3. no custom default no pre-configured -> default 4. no custom default pre-configured -> pre-configured 5. custom no default no pre-configured -> custom (providing default is recommended) 6. custom no default pre-configured -> custom (providing default is recommended) 7. no custom no default no pre-configured -> local names/tags will be used 8. no custom no default pre-configured -> pre-configured ``` cc: @bclozel

4647bf2813f1fd5da668835e2304864f99ed4c95

c9dad1f182b85398e74a7fb57a4ec1e61c96d002

https://github.com/micrometer-metrics/micrometer/compare/4647bf2813f1fd5da668835e2304864f99ed4c95...c9dad1f182b85398e74a7fb57a4ec1e61c96d002

diff --git a/micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationRegistryCompatibilityKit.java b/micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationRegistryCompatibilityKit.java index 0d4ef3a38..ffb7cf982 100644 --- a/micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationRegistryCompatibilityKit.java +++ b/micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationRegistryCompatibilityKit.java @@ -765,8 +765,6 @@ public abstract class ObservationRegistryCompatibilityKit { .highCardinalityKeyValue("hcTag1", "0") // should override the previous line .highCardinalityKeyValue("hcTag1", "3").highCardinalityKeyValues(KeyValues.of("hcTag2", "4")) - .observationConvention(new TestObservationConvention("local")) - .observationConvention(new UnsupportedObservationConvention("local")) .contextualName("test.observation.42").error(exception).start(); observation.stop(); @@ -774,16 +772,13 @@ public abstract class ObservationRegistryCompatibilityKit { assertThat(context).isSameAs(testContext); assertThat(context.getName()).isEqualTo("test.observation"); assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("lcTag1", "1"), - KeyValue.of("lcTag2", "2"), KeyValue.of("local.context.class", "TestContext"), - KeyValue.of("global.context.class", "TestContext")); + KeyValue.of("lcTag2", "2"), KeyValue.of("global.context.class", "TestContext")); assertThat(context.getHighCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("hcTag1", "3"), - KeyValue.of("hcTag2", "4"), KeyValue.of("local.uuid", testContext.uuid), - KeyValue.of("global.uuid", testContext.uuid)); + KeyValue.of("hcTag2", "4"), KeyValue.of("global.uuid", testContext.uuid)); assertThat(context.getAllKeyValues()).containsExactlyInAnyOrder(KeyValue.of("lcTag1", "1"), - KeyValue.of("lcTag2", "2"), KeyValue.of("local.context.class", "TestContext"), - KeyValue.of("global.context.class", "TestContext"), KeyValue.of("hcTag1", "3"), - KeyValue.of("hcTag2", "4"), KeyValue.of("local.uuid", testContext.uuid), + KeyValue.of("lcTag2", "2"), KeyValue.of("global.context.class", "TestContext"), + KeyValue.of("hcTag1", "3"), KeyValue.of("hcTag2", "4"), KeyValue.of("global.uuid", testContext.uuid)); assertThat((String) context.get("context.field")).isEqualTo("42"); @@ -795,9 +790,9 @@ public abstract class ObservationRegistryCompatibilityKit { .containsOnlyOnce("contextualName='test.observation.42'") .containsOnlyOnce("error='java.io.IOException: simulated'") .containsOnlyOnce( - "lowCardinalityKeyValues=[global.context.class='TestContext', lcTag1='1', lcTag2='2', local.context.class='TestContext']") - .containsOnlyOnce("highCardinalityKeyValues=[global.uuid='" + testContext.uuid - + "', hcTag1='3', hcTag2='4', local.uuid='" + testContext.uuid + "']") + "lowCardinalityKeyValues=[global.context.class='TestContext', lcTag1='1', lcTag2='2']") + .containsOnlyOnce( + "highCardinalityKeyValues=[global.uuid='" + testContext.uuid + "', hcTag1='3', hcTag2='4']") .containsOnlyOnce("map=[context.field='42']"); }); } diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java b/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java index 7ae94e224..17fde2019 100644 --- a/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java +++ b/micrometer-observation/src/main/java/io/micrometer/observation/Observation.java @@ -127,6 +127,7 @@ public interface Observation extends ObservationView { return new SimpleObservation(name, registry, context == null ? new Context() : context); } + // @formatter:off /** * Creates but <b>does not start</b> an {@link Observation}. Remember to call * {@link Observation#start()} when you want the measurements to start. When the @@ -143,15 +144,37 @@ public interface Observation extends ObservationView { * {@link ObservationRegistry.ObservationConfig#getObservationConvention(Context, ObservationConvention)}) * was found. The {@link ObservationConvention} implementation can override * {@link Observation} names (i.e. name and contextual name) and key values. + * <pre> + * Here you can find the matrix of choosing the convention: + * 1. custom default no pre-configured -> custom + * 2. custom default pre-configured -> custom (not a valid case, just use custom) + * 3. no custom default no pre-configured -> default + * 4. no custom default pre-configured -> pre-configured + * 5. custom no default no pre-configured -> custom (providing default is recommended) + * 6. custom no default pre-configured -> custom (providing default is recommended) + * 7. no custom no default no pre-configured -> local names/tags will be used + * 8. no custom no default pre-configured -> pre-configured + * </pre> + * <p> + * Also, if you set a convention using, + * {@link Observation#observationConvention(ObservationConvention)} (not recommended), + * the convention you set here will be used and everything else (custom, default, + * pre-configured) will be ignored. + * </p> + * <p> + * If you want to add to the all the contexts or mutate them, + * use the ObservationFilter (e.g.: add region=cloud-1 or remove PII). + * </p> * @param <T> type of context * @param customConvention custom convention. If {@code null}, the default one will be * picked. * @param defaultConvention default convention when no custom convention was passed, - * nor a configured one was found + * nor a pre-configured one was found * @param contextSupplier supplier for the observation context * @param registry observation registry * @return created but not started observation */ + // @formatter:on static <T extends Context> Observation createNotStarted(@Nullable ObservationConvention<T> customConvention, ObservationConvention<T> defaultConvention, Supplier<T> contextSupplier, ObservationRegistry registry) { if (registry.isNoop()) { @@ -174,6 +197,11 @@ public interface Observation extends ObservationView { /** * Creates and starts an {@link Observation}. When no registry is passed or * observation is not applicable will return a no-op observation. + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param observationConvention observation convention * @param registry observation registry * @return started observation @@ -192,6 +220,11 @@ public interface Observation extends ObservationView { * {@link ObservationRegistry.ObservationConfig#observationPredicate(ObservationPredicate) * ObservationConfig#observationPredicate}), a no-op observation will also be * returned. + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param <T> type of context * @param observationConvention observation convention * @param contextSupplier mutable context supplier @@ -216,6 +249,11 @@ public interface Observation extends ObservationView { * provide a default one if neither a custom nor a pre-configured one (via * {@link ObservationRegistry.ObservationConfig#getObservationConvention(Context, ObservationConvention)}) * was found. + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param <T> type of context * @param registry observation registry * @param contextSupplier the observation context supplier @@ -235,6 +273,11 @@ public interface Observation extends ObservationView { * {@link Observation#start()} when you want the measurements to start. When no * registry is passed or observation is not applicable will return a no-op * observation. + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param observationConvention observation convention * @param registry observation registry * @return created but not started observation @@ -265,6 +308,11 @@ public interface Observation extends ObservationView { * of {@link Context} to be passed and if you're not providing one we won't be able to * initialize it ourselves. * </p> + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param <T> type of context * @param observationConvention observation convention * @param contextSupplier mutable context supplier @@ -380,8 +428,8 @@ public interface Observation extends ObservationView { /** * Adds an observation convention that can be used to attach key values to the - * observation. WARNING: You must add ObservationConvention instances to the - * Observation before it is started. + * observation. WARNING: You must set the ObservationConvention to the Observation + * before it is started. * @param observationConvention observation convention * @return this */ diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java b/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java index 93e51050a..7381eaec1 100644 --- a/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java +++ b/micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.Supplier; /** * Implementations of this interface are responsible for managing state of an @@ -135,6 +136,11 @@ public interface ObservationRegistry { /** * Register an {@link ObservationConvention}. + * <p> + * Please check the javadoc of + * {@link Observation#createNotStarted(ObservationConvention, ObservationConvention, Supplier, ObservationRegistry)} + * method for the logic of choosing the convention. + * </p> * @param observationConvention observation convention * @return This configuration instance */ diff --git a/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java b/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java index b70cab91a..7aaaa2a39 100644 --- a/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java +++ b/micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java @@ -38,8 +38,9 @@ class SimpleObservation implements Observation { private final Context context; + @Nullable @SuppressWarnings("rawtypes") - private final Collection<ObservationConvention> conventions; + private ObservationConvention convention; @SuppressWarnings("rawtypes") private final Deque<ObservationHandler> handlers; @@ -50,16 +51,20 @@ class SimpleObservation implements Observation { this.registry = registry; this.context = context; this.context.setName(name); - this.conventions = getConventionsFromConfig(registry, context); + this.convention = getConventionFromConfig(registry, context); this.handlers = getHandlersFromConfig(registry, context); this.filters = registry.observationConfig().getObservationFilters(); } SimpleObservation(ObservationConvention<? extends Context> convention, ObservationRegistry registry, Context context) { - this((String) null, registry, context); // name is set later in start() + this.registry = registry; + this.context = context; + // name is set later in start() + this.handlers = getHandlersFromConfig(registry, context); + this.filters = registry.observationConfig().getObservationFilters(); if (convention.supportsContext(context)) { - this.conventions.add(convention); + this.convention = convention; } else { throw new IllegalStateException( @@ -67,10 +72,10 @@ class SimpleObservation implements Observation { } } - private static Collection<ObservationConvention> getConventionsFromConfig(ObservationRegistry registry, - Context context) { + @Nullable + private static ObservationConvention getConventionFromConfig(ObservationRegistry registry, Context context) { return registry.observationConfig().getObservationConventions().stream() - .filter(convention -> convention.supportsContext(context)).collect(Collectors.toList()); + .filter(convention -> convention.supportsContext(context)).findFirst().orElse(null); } private static Deque<ObservationHandler> getHandlersFromConfig(ObservationRegistry registry, Context context) { @@ -105,7 +110,7 @@ class SimpleObservation implements Observation { @Override public Observation observationConvention(ObservationConvention<?> convention) { if (convention.supportsContext(context)) { - this.conventions.add(convention); + this.convention = convention; } return this; } @@ -125,18 +130,13 @@ class SimpleObservation implements Observation { @Override public Observation start() { - // We want to rename with the first matching convention - boolean nameChanged = false; - for (ObservationConvention convention : this.conventions) { + if (this.convention != null) { this.context.addLowCardinalityKeyValues(convention.getLowCardinalityKeyValues(context)); this.context.addHighCardinalityKeyValues(convention.getHighCardinalityKeyValues(context)); - if (!nameChanged) { - String newName = convention.getName(); - if (StringUtils.isNotBlank(newName)) { - this.context.setName(newName); - nameChanged = true; - } + String newName = convention.getName(); + if (StringUtils.isNotBlank(newName)) { + this.context.setName(newName); } } @@ -152,18 +152,13 @@ class SimpleObservation implements Observation { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void stop() { - // We want to rename with the first matching convention - boolean contextualNameChanged = false; - for (ObservationConvention convention : this.conventions) { + if (this.convention != null) { this.context.addLowCardinalityKeyValues(convention.getLowCardinalityKeyValues(context)); this.context.addHighCardinalityKeyValues(convention.getHighCardinalityKeyValues(context)); - if (!contextualNameChanged) { - String newContextualName = convention.getContextualName(context); - if (StringUtils.isNotBlank(newContextualName)) { - this.context.setContextualName(newContextualName); - contextualNameChanged = true; - } + String newContextualName = convention.getContextualName(context); + if (StringUtils.isNotBlank(newContextualName)) { + this.context.setContextualName(newContextualName); } } diff --git a/micrometer-observation/src/test/java/io/micrometer/observation/ObservationRegistryTest.java b/micrometer-observation/src/test/java/io/micrometer/observation/ObservationRegistryTest.java index d2d36fb5c..2832fd921 100644 --- a/micrometer-observation/src/test/java/io/micrometer/observation/ObservationRegistryTest.java +++ b/micrometer-observation/src/test/java/io/micrometer/observation/ObservationRegistryTest.java @@ -96,8 +96,6 @@ class ObservationRegistryTest { registry.observationConfig().observationHandler(c -> true); // Define a convention MessagingConvention messagingConvention = new OurCompanyStandardMessagingConvention(); - // Register a semantic name provider - registry.observationConfig().observationConvention(new OurCompanyObservationConvention()); Observation.Context myContext = new MessagingContext().put("foo", "hello"); // Observation convention wants to use a MessagingConvention @@ -125,6 +123,12 @@ class ObservationRegistryTest { this.messagingConvention = messagingConvention; } + // Here we override the default "observation" name + @Override + public String getName() { + return "new name"; + } + @Override public KeyValues getLowCardinalityKeyValues(MessagingContext context) { return KeyValues.of(this.messagingConvention.queueName(context.get("foo"))); @@ -153,22 +157,4 @@ class ObservationRegistryTest { } - static class OurCompanyObservationConvention implements GlobalObservationConvention<Observation.Context> { - - // Here we override the default "observation" name - @Override - public String getName() { - return "new name"; - } - - // This semantic name provider is only applicable when we're using a messaging - // context - - @Override - public boolean supportsContext(Observation.Context context) { - return context instanceof MessagingContext; - } - - } - } diff --git a/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java b/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java index 39cc1f19f..81d3d2a55 100644 --- a/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java +++ b/micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java @@ -16,6 +16,8 @@ package io.micrometer.observation; import io.micrometer.common.KeyValue; +import io.micrometer.common.KeyValues; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -32,7 +34,12 @@ import static org.assertj.core.api.Assertions.assertThat; */ class ObservationTests { - private final ObservationRegistry registry = ObservationRegistry.create(); + private ObservationRegistry registry; + + @BeforeEach + void setUp() { + this.registry = ObservationRegistry.create(); + } @Test void notHavingAnyHandlersShouldResultInNoopObservation() { @@ -150,6 +157,138 @@ class ObservationTests { } } + @Test + void customAndDefaultAndNoGlobalConventionShouldResolveToCustomConvention() { + registry.observationConfig().observationHandler(context -> true); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(new CustomConvention(), new DefaultConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("custom.name"); + assertThat(context.getContextualName()).isEqualTo("custom.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("custom", "present"), KeyValue.of("low", "custom")); + } + + @Test + void customAndDefaultAndGlobalConventionShouldResolveToCustomConvention() { + registry.observationConfig().observationHandler(context -> true); + registry.observationConfig().observationConvention(new GlobalConvention()); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(new CustomConvention(), new DefaultConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("custom.name"); + assertThat(context.getContextualName()).isEqualTo("custom.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("custom", "present"), KeyValue.of("low", "custom")); + } + + @Test + void noCustomAndDefaultAndNoGlobalConventionShouldResolveToDefaultConvention() { + registry.observationConfig().observationHandler(context -> true); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(null, new DefaultConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("default.name"); + assertThat(context.getContextualName()).isEqualTo("default.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("default", "present"), KeyValue.of("low", "default")); + } + + @Test + void noCustomAndDefaultAndGlobalConventionShouldResolveToDefaultConvention() { + registry.observationConfig().observationHandler(context -> true); + registry.observationConfig().observationConvention(new GlobalConvention()); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(null, new DefaultConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("global.name"); + assertThat(context.getContextualName()).isEqualTo("global.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("global", "present"), KeyValue.of("low", "global")); + } + + @Test + void customAndNoDefaultAndNoGlobalConventionShouldResolveToCustomConvention() { + registry.observationConfig().observationHandler(context -> true); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(new CustomConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("custom.name"); + assertThat(context.getContextualName()).isEqualTo("custom.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("custom", "present"), KeyValue.of("low", "custom")); + } + + @Test + void customAndNoDefaultAndGlobalConventionShouldResolveToCustomConvention() { + registry.observationConfig().observationHandler(context -> true); + registry.observationConfig().observationConvention(new GlobalConvention()); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(new CustomConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("custom.name"); + assertThat(context.getContextualName()).isEqualTo("custom.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("custom", "present"), KeyValue.of("low", "custom")); + } + + @Test + void noCustomAndNoDefaultAndNoGlobalConventionShouldResolveToNoConvention() { + registry.observationConfig().observationHandler(context -> true); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted("local.name", () -> context, registry).contextualName("local.contextualName") + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("local.name"); + assertThat(context.getContextualName()).isEqualTo("local.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("low", "local")); + } + + @Test + void noCustomAndNoDefaultAndGlobalConventionShouldResolveToGlobalConvention() { + registry.observationConfig().observationHandler(context -> true); + registry.observationConfig().observationConvention(new GlobalConvention()); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted("local.name", () -> context, registry).contextualName("local.contextualName") + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local").start().stop(); + + assertThat(context.getName()).isEqualTo("global.name"); + assertThat(context.getContextualName()).isEqualTo("global.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("global", "present"), KeyValue.of("low", "global")); + } + + @Test + void instrumentationAndCustomAndDefaultAndGlobalConventionShouldResolveToInstrumentationConvention() { + registry.observationConfig().observationHandler(context -> true); + registry.observationConfig().observationConvention(new GlobalConvention()); + + Observation.Context context = new Observation.Context(); + Observation.createNotStarted(new CustomConvention(), new DefaultConvention(), () -> context, registry) + .lowCardinalityKeyValue("local", "present").lowCardinalityKeyValue("low", "local") + .observationConvention(new InstrumentationConvention()).start().stop(); + + assertThat(context.getName()).isEqualTo("instrumentation.name"); + assertThat(context.getContextualName()).isEqualTo("instrumentation.contextualName"); + assertThat(context.getLowCardinalityKeyValues()).containsExactlyInAnyOrder(KeyValue.of("local", "present"), + KeyValue.of("instrumentation", "present"), KeyValue.of("low", "instrumentation")); + } + static class Service { String executeCallable() throws IOException { @@ -167,4 +306,100 @@ class ObservationTests { } + static class CustomConvention implements ObservationConvention<Observation.Context> { + + @Override + public String getName() { + return "custom.name"; + } + + @Override + public String getContextualName(Observation.Context context) { + return "custom.contextualName"; + } + + @Override + public KeyValues getLowCardinalityKeyValues(Observation.Context context) { + return KeyValues.of("low", "custom", "custom", "present"); + } + + @Override + public boolean supportsContext(Observation.Context context) { + return true; + } + + } + + static class DefaultConvention implements ObservationConvention<Observation.Context> { + + @Override + public String getName() { + return "default.name"; + } + + @Override + public String getContextualName(Observation.Context context) { + return "default.contextualName"; + } + + @Override + public KeyValues getLowCardinalityKeyValues(Observation.Context context) { + return KeyValues.of("low", "default", "default", "present"); + } + + @Override + public boolean supportsContext(Observation.Context context) { + return true; + } + + } + + static class GlobalConvention implements GlobalObservationConvention<Observation.Context> { + + @Override + public String getName() { + return "global.name"; + } + + @Override + public String getContextualName(Observation.Context context) { + return "global.contextualName"; + } + + @Override + public KeyValues getLowCardinalityKeyValues(Observation.Context context) { + return KeyValues.of("low", "global", "global", "present"); + } + + @Override + public boolean supportsContext(Observation.Context context) { + return true; + } + + } + + static class InstrumentationConvention implements ObservationConvention<Observation.Context> { + + @Override + public String getName() { + return "instrumentation.name"; + } + + @Override + public String getContextualName(Observation.Context context) { + return "instrumentation.contextualName"; + } + + @Override + public KeyValues getLowCardinalityKeyValues(Observation.Context context) { + return KeyValues.of("low", "instrumentation", "instrumentation", "present"); + } + + @Override + public boolean supportsContext(Observation.Context context) { + return true; + } + + } + }

['micrometer-observation/src/test/java/io/micrometer/observation/ObservationTests.java', 'micrometer-observation/src/main/java/io/micrometer/observation/ObservationRegistry.java', 'micrometer-observation/src/main/java/io/micrometer/observation/SimpleObservation.java', 'micrometer-observation/src/main/java/io/micrometer/observation/Observation.java', 'micrometer-observation/src/test/java/io/micrometer/observation/ObservationRegistryTest.java', 'micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationRegistryCompatibilityKit.java']

{'.java': 6}

Java

{'Java': 4710724, 'Shell': 5270, 'Kotlin': 4163}

Apache License 2.0

micrometer-metrics/micrometer/461/379

micrometer-metrics

micrometer

https://github.com/micrometer-metrics/micrometer/issues/379

https://github.com/micrometer-metrics/micrometer/pull/461

https://github.com/micrometer-metrics/micrometer/pull/461

fixes

Influx Metric Registry Publish Can Fail Silently

I had a bug in my logic to create timer metrics which passed in 'null' as one of the values of a tag. The next execution of the publish method would then throw a NullPointerException when invoking writeTimer. The exception wasn't handled in the publish method, bubbled back to the Executor which then failed silently and as result all no more metrics were ever sent. Currently, the publish method implementation inside InfluxMetricRegistry only catches MalformedURLException and IOException ie. ``` } catch (MalformedURLException e) { throw new IllegalArgumentException("Malformed InfluxDB publishing endpoint, see '" + config.prefix() + ".uri'", e); } catch (IOException e) { logger.warn("failed to send metrics", e); } ``` I am unsure of the best solution for this however I believe that the NullPointerException should be handled and the appropriate log message should be displayed.

4226e9621db2cf22b8df9d69e175f0789242883f

9bad61aec1139afeba221a2a8d1d9a7e2d8ccabe

https://github.com/micrometer-metrics/micrometer/compare/4226e9621db2cf22b8df9d69e175f0789242883f...9bad61aec1139afeba221a2a8d1d9a7e2d8ccabe

diff --git a/implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java b/implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java index 0e249361d..afe7db303 100644 --- a/implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java +++ b/implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java @@ -81,7 +81,7 @@ public class InfluxMeterRegistry extends StepMeterRegistry { .lines().collect(joining("\\n"))); } } - } catch (IOException e) { + } catch (Throwable e) { logger.warn("unable to create database '{}'", config.db(), e); } finally { quietlyCloseUrlConnection(con);

['implementations/micrometer-registry-influx/src/main/java/io/micrometer/influx/InfluxMeterRegistry.java']

{'.java': 1}

Java

{'Java': 4710724, 'Shell': 5270, 'Kotlin': 4163}

Apache License 2.0

strimzi/strimzi-kafka-operator/2439/2411

strimzi

strimzi-kafka-operator

https://github.com/strimzi/strimzi-kafka-operator/issues/2411

https://github.com/strimzi/strimzi-kafka-operator/pull/2439

https://github.com/strimzi/strimzi-kafka-operator/pull/2439

fixes

[Bug] ZooKeeper user entry not deleted when KafkaUser is deleted

When a new `KafkaUser` resource is created with quotas, a new user entry is created in ZooKeeper in the `/config/users` znode (i.e. `/config/users/my-user`). It contains a JSON with `version` and `config` fields. When the `KafkaUser` resource is deleted, the above entry isn't deleted but the `config` field is emptied. Because the `KafkaUser` isn't there anymore, the user entry should be completely deleted.

aeead4d3abbd5899a2541b3585e4d02b0f013653

39f628583363f5cf2bcdef674d80bc88f8021a43

https://github.com/strimzi/strimzi-kafka-operator/compare/aeead4d3abbd5899a2541b3585e4d02b0f013653...39f628583363f5cf2bcdef674d80bc88f8021a43

diff --git a/systemtest/src/test/java/io/strimzi/systemtest/UserST.java b/systemtest/src/test/java/io/strimzi/systemtest/UserST.java index 5c2d2f93b..c5bde6605 100644 --- a/systemtest/src/test/java/io/strimzi/systemtest/UserST.java +++ b/systemtest/src/test/java/io/strimzi/systemtest/UserST.java @@ -171,12 +171,19 @@ class UserST extends BaseST { assertThat(result.out().contains("producer_byte_rate=" + prodRate), is(true)); assertThat(result.out().contains("consumer_byte_rate=" + consRate), is(true)); + String zkListCommand = "sh /opt/kafka/bin/zookeeper-shell.sh localhost:21810 <<< 'ls /config/users'"; + ExecResult zkResult = cmdKubeClient().execInPod(KafkaResources.zookeeperPodName(CLUSTER_NAME, 0), "/bin/bash", "-c", zkListCommand); + assertThat(zkResult.out().contains(userName), is(true)); + + // delete user KafkaUserResource.kafkaUserClient().inNamespace(NAMESPACE).withName(userName).delete(); KafkaUserUtils.waitForKafkaUserDeletion(userName); ExecResult resultAfterDelete = cmdKubeClient().execInPod(KafkaResources.kafkaPodName(CLUSTER_NAME, 0), "/bin/bash", "-c", command); assertThat(resultAfterDelete.out(), emptyString()); + ExecResult zkDeleteResult = cmdKubeClient().execInPod(KafkaResources.zookeeperPodName(CLUSTER_NAME, 0), "/bin/bash", "-c", zkListCommand); + assertThat(zkDeleteResult.out().contains(userName), is(false)); } void createBigAmountOfUsers(String typeOfUser) { diff --git a/user-operator/src/main/java/io/strimzi/operator/user/operator/KafkaUserQuotasOperator.java b/user-operator/src/main/java/io/strimzi/operator/user/operator/KafkaUserQuotasOperator.java index 48aaf1028..5d4126c2f 100644 --- a/user-operator/src/main/java/io/strimzi/operator/user/operator/KafkaUserQuotasOperator.java +++ b/user-operator/src/main/java/io/strimzi/operator/user/operator/KafkaUserQuotasOperator.java @@ -195,6 +195,12 @@ public class KafkaUserQuotasOperator { return false; } + private boolean configJsonIsEmpty(JsonObject json) { + validateJsonVersion(json); + JsonObject config = json.getJsonObject("config"); + return config.isEmpty(); + } + /** * Delete the quotas for the given user. * It is not an error if the user doesn't exist, or doesn't currently have any quotas. @@ -206,7 +212,13 @@ public class KafkaUserQuotasOperator { if (data != null) { log.debug("Deleting quotas for user {}", username); - zkClient.writeData("/config/users/" + username, removeQuotasFromJsonUser(data)); + JsonObject deleteJson = removeQuotasFromJsonUser(data); + if (configJsonIsEmpty(deleteJson)) { + zkClient.deleteRecursive("/config/users/" + username); + log.debug("User {} deleted from ZK store", username); + } else { + zkClient.writeData("/config/users/" + username, deleteJson.toBuffer().getBytes()); + } notifyChanges(username); } else { log.warn("Quotas for user {} already don't exist", username); @@ -218,9 +230,9 @@ public class KafkaUserQuotasOperator { * * @param user JSON string with existing user configuration as byte[] * - * @return Returns the updated JSON without the quotas as byte array + * @return Returns the updated JSON without the quotas */ - protected byte[] removeQuotasFromJsonUser(byte[] user) { + protected JsonObject removeQuotasFromJsonUser(byte[] user) { JsonObject json = new JsonObject(new String(user, StandardCharsets.UTF_8)); validateJsonVersion(json); @@ -238,8 +250,7 @@ public class KafkaUserQuotasOperator { config.remove("request_percentage"); } } - - return json.encode().getBytes(StandardCharsets.UTF_8); + return json; } protected void validateJsonVersion(JsonObject json) { diff --git a/user-operator/src/main/java/io/strimzi/operator/user/operator/ScramShaCredentials.java b/user-operator/src/main/java/io/strimzi/operator/user/operator/ScramShaCredentials.java index 151a59567..051b098c6 100644 --- a/user-operator/src/main/java/io/strimzi/operator/user/operator/ScramShaCredentials.java +++ b/user-operator/src/main/java/io/strimzi/operator/user/operator/ScramShaCredentials.java @@ -56,6 +56,12 @@ public class ScramShaCredentials { notifyChanges(username); } + private boolean configJsonIsEmpty(JsonObject json) { + validateJsonVersion(json); + JsonObject config = json.getJsonObject("config"); + return config.isEmpty(); + } + /** * Delete the SCRAM-SHA credentials for the given user. * It is not an error if the user doesn't exist, or doesn't currently have any SCRAM-SHA credentials. @@ -67,7 +73,12 @@ public class ScramShaCredentials { if (data != null) { log.debug("Deleting {} credentials for user {}", mechanism.mechanismName(), username); - zkClient.writeData("/config/users/" + username, deleteUserJson(data)); + JsonObject deletedJson = deleteUserJson(data); + if (configJsonIsEmpty(deletedJson)) { + zkClient.deleteRecursive("/config/users/" + username); + } else { + zkClient.writeData("/config/users/" + username, deletedJson.toBuffer().getBytes()); + } notifyChanges(username); } else { log.warn("Credentials for user {} already don't exist", username); @@ -154,6 +165,11 @@ public class ScramShaCredentials { } } + /* test */ + boolean isPathExist(String path) { + return zkClient.exists(path); + } + /** * Generates the JSON with the credentials * @@ -209,9 +225,9 @@ public class ScramShaCredentials { * * @param user JSON string with existing user configuration as byte[] * - * @return Returns the updated JSON without the SCRAM credentials as byte array + * @return Returns the updated JSON without the SCRAM credentials */ - protected byte[] deleteUserJson(byte[] user) { + protected JsonObject deleteUserJson(byte[] user) { JsonObject json = new JsonObject(new String(user, Charset.defaultCharset())); validateJsonVersion(json); @@ -224,7 +240,7 @@ public class ScramShaCredentials { json.getJsonObject("config").remove(mechanism.mechanismName()); } - return json.encode().getBytes(Charset.defaultCharset()); + return json; } protected void validateJsonVersion(JsonObject json) { diff --git a/user-operator/src/test/java/io/strimzi/operator/user/operator/KafkaUserQuotasIT.java b/user-operator/src/test/java/io/strimzi/operator/user/operator/KafkaUserQuotasIT.java index 61adfafd8..63ceb649b 100644 --- a/user-operator/src/test/java/io/strimzi/operator/user/operator/KafkaUserQuotasIT.java +++ b/user-operator/src/test/java/io/strimzi/operator/user/operator/KafkaUserQuotasIT.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -84,6 +84,7 @@ public class KafkaUserQuotasIT { assertThat(kuq.exists("normalDelete"), is(true)); kuq.delete("normalDelete"); assertThat(kuq.exists("normalDelete"), is(false)); + assertThat(kuq.isPathExist("/config/users/normalDelete"), is(false)); } @Test @@ -94,6 +95,7 @@ public class KafkaUserQuotasIT { kuq.delete("doubleDelete"); kuq.delete("doubleDelete"); assertThat(kuq.exists("doubleDelete"), is(false)); + assertThat(kuq.isPathExist("/config/users/doubleDelete"), is(false)); } @Test @@ -141,23 +143,26 @@ public class KafkaUserQuotasIT { @Test public void testDeletion() { JsonObject original = new JsonObject().put("version", 1).put("config", kuq.quotasToJson(defaultQuotas)); - JsonObject updated = new JsonObject(new String(kuq.removeQuotasFromJsonUser(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + original.getJsonObject("config").put("persist", 42); + JsonObject updated = kuq.removeQuotasFromJsonUser(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(nullValue())); + assertThat(updated.getJsonObject("config").getInteger("persist"), is(42)); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("producer_byte_rate", "1000").put("consumer_byte_rate", "2000")); - updated = new JsonObject(new String(kuq.removeQuotasFromJsonUser(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = kuq.removeQuotasFromJsonUser(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("producer_byte_rate"), is(nullValue())); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(nullValue())); original = new JsonObject().put("version", 1).put("config", new JsonObject()); - updated = new JsonObject(new String(kuq.removeQuotasFromJsonUser(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = kuq.removeQuotasFromJsonUser(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(nullValue())); assertThat(updated.getJsonObject("config").getString("producer_byte_rate"), is(nullValue())); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("consumer_byte_rate", "1000")); - updated = new JsonObject(new String(kuq.removeQuotasFromJsonUser(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = kuq.removeQuotasFromJsonUser(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("producer_byte_rate"), is(nullValue())); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(nullValue())); + } @Test @@ -165,14 +170,14 @@ public class KafkaUserQuotasIT { JsonObject original = new JsonObject().put("version", 1).put("config", new JsonObject().put("consumer_byte_rate", "1000")); KafkaUserQuotas quotas = new KafkaUserQuotas(); quotas.setConsumerByteRate(2000); - JsonObject updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), quotas), Charset.defaultCharset())); + JsonObject updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), quotas), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(notNullValue())); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is("2000")); quotas.setConsumerByteRate(3000); quotas.setProducerByteRate(4000); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("consumer_byte_rate", "1000").put("producer_byte_rate", "2000")); - updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), quotas), Charset.defaultCharset())); + updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), quotas), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(notNullValue())); assertThat(updated.getJsonObject("config").getString("producer_byte_rate"), is(notNullValue())); assertThat(updated.getJsonObject("config").getString("producer_byte_rate"), is("4000")); @@ -181,7 +186,7 @@ public class KafkaUserQuotasIT { original = new JsonObject().put("version", 1).put("config", new JsonObject()); quotas.setProducerByteRate(null); quotas.setConsumerByteRate(1000); - updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), quotas), Charset.defaultCharset())); + updated = new JsonObject(new String(kuq.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), quotas), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("consumer_byte_rate"), is(notNullValue())); } } diff --git a/user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsTest.java b/user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsIT.java similarity index 83% rename from user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsTest.java rename to user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsIT.java index e174b614a..6b04446d7 100644 --- a/user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsTest.java +++ b/user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsIT.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -21,7 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; -public class ScramShaCredentialsTest { +public class ScramShaCredentialsIT { private static EmbeddedZooKeeper zkServer; @@ -57,6 +57,7 @@ public class ScramShaCredentialsTest { public void normalDelete() { scramShaCred.createOrUpdate("normalDelete", "foo-password"); scramShaCred.delete("normalDelete"); + assertThat(scramShaCred.isPathExist("/config/users/normalDelete"), is(false)); } @Test @@ -64,6 +65,7 @@ public class ScramShaCredentialsTest { scramShaCred.createOrUpdate("doubleDelete", "foo-password"); scramShaCred.delete("doubleDelete"); scramShaCred.delete("doubleDelete"); + assertThat(scramShaCred.isPathExist("/config/users/doubleDelete"), is(false)); } @Test @@ -76,7 +78,6 @@ public class ScramShaCredentialsTest { public void userExists() { scramShaCred.createOrUpdate("userExists", "foo-password"); assertThat(scramShaCred.exists("userExists"), is(true)); - } @Test @@ -124,20 +125,22 @@ public class ScramShaCredentialsTest { @Test public void testDeletion() { JsonObject original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-512", "somecredentials")); - JsonObject updated = new JsonObject(new String(scramShaCred.deleteUserJson(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + original.getJsonObject("config").put("persist", 42); + JsonObject updated = scramShaCred.deleteUserJson(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(nullValue())); + assertThat(updated.getJsonObject("config").getInteger("persist"), is(42)); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-512", "somecredentials").put("SCRAM-SHA-256", "somecredentials")); - updated = new JsonObject(new String(scramShaCred.deleteUserJson(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = scramShaCred.deleteUserJson(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(nullValue())); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-256"), is("somecredentials")); original = new JsonObject().put("version", 1).put("config", new JsonObject()); - updated = new JsonObject(new String(scramShaCred.deleteUserJson(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = scramShaCred.deleteUserJson(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(nullValue())); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-256", "somecredentials")); - updated = new JsonObject(new String(scramShaCred.deleteUserJson(original.encode().getBytes(Charset.defaultCharset())), Charset.defaultCharset())); + updated = scramShaCred.deleteUserJson(original.encode().getBytes(StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(nullValue())); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-256"), is("somecredentials")); } @@ -145,20 +148,20 @@ public class ScramShaCredentialsTest { @Test public void testUpdate() { JsonObject original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-512", "somecredentials")); - JsonObject updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), "password"), Charset.defaultCharset())); + JsonObject updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), "password"), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(notNullValue())); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-512", "somecredentials").put("SCRAM-SHA-256", "somecredentials")); - updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), "password"), Charset.defaultCharset())); + updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), "password"), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(notNullValue())); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-256"), is("somecredentials")); original = new JsonObject().put("version", 1).put("config", new JsonObject()); - updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), "password"), Charset.defaultCharset())); + updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), "password"), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(notNullValue())); original = new JsonObject().put("version", 1).put("config", new JsonObject().put("SCRAM-SHA-256", "somecredentials")); - updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(Charset.defaultCharset()), "password"), Charset.defaultCharset())); + updated = new JsonObject(new String(scramShaCred.updateUserJson(original.encode().getBytes(StandardCharsets.UTF_8), "password"), StandardCharsets.UTF_8)); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-512"), is(notNullValue())); assertThat(updated.getJsonObject("config").getString("SCRAM-SHA-256"), is("somecredentials")); }

['systemtest/src/test/java/io/strimzi/systemtest/UserST.java', 'user-operator/src/test/java/io/strimzi/operator/user/operator/ScramShaCredentialsTest.java', 'user-operator/src/main/java/io/strimzi/operator/user/operator/ScramShaCredentials.java', 'user-operator/src/test/java/io/strimzi/operator/user/operator/KafkaUserQuotasIT.java', 'user-operator/src/main/java/io/strimzi/operator/user/operator/KafkaUserQuotasOperator.java']

{'.java': 5}

Java

{'Java': 12877351, 'Shell': 138457, 'Groovy': 36170, 'Makefile': 32136, 'Mustache': 11378, 'Dockerfile': 8089, 'Awk': 514, '1C Enterprise': 272}

Apache License 2.0

discord-jda/jda/1860/1859

discord-jda

jda

https://github.com/discord-jda/JDA/issues/1859

https://github.com/discord-jda/JDA/pull/1860

https://github.com/discord-jda/JDA/pull/1860

closes

Unable to resolve value with key emoji to type unsigned long: `null`

<!-- For questions join the official JDA discord server: https://discord.gg/0hMr4ce0tIl3SLv5 --> [download]: https://bintray.com/dv8fromtheworld/maven/JDA/_latestVersion [guild]: https://discord.gg/0hMr4ce0tIk3pSjp [stack overflow]: https://stackoverflow.com/questions/tagged/java ## General Troubleshooting <!-- Hey there! Before you report a bug or suggest a new feature, please make sure to follow these steps first! --> - [x] I have checked for similar issues. - [x] I have updated to the [latest JDA version][download]. - [x] I have checked the branches or the maintainers' PRs for upcoming bug fixes. <!-- This is not the place to learn Java. Please refer to [StackOverflow][stack overflow] for your general programming questions. --> ## Bug Report <!-- Provide a small description of the bug you are experiencing. --> ### Expected Behavior <!-- Tell us what you expect to happen instead. --> No exception. ### Exception or Error ```java [JDA [71 / 132] MainWS-ReadThread] [WebSocketClient]: Got an unexpected Json-parse error. Please redirect the following message to the devs: JDA 4.3.0_333 Unable to resolve value with key emoji to type unsigned long: null MESSAGE_REACTION_REMOVE_EMOJI -> {"emoji":{"name":"old_delete_source","id":526232446295998475},"guild_id":guild-id,"message_id":message-id,"channel_id":channel-id} net.dv8tion.jda.api.exceptions.ParsingException: Unable to resolve value with key emoji to type unsigned long: null at net.dv8tion.jda.api.utils.data.DataObject.valueError(DataObject.java:807) at net.dv8tion.jda.api.utils.data.DataObject.getUnsignedLong(DataObject.java:512) at net.dv8tion.jda.internal.handle.MessageReactionClearEmoteHandler.handleInternally(MessageReactionClearEmoteHandler.java:68) at net.dv8tion.jda.internal.handle.SocketHandler.handle(SocketHandler.java:36) at net.dv8tion.jda.internal.requests.WebSocketClient.onDispatch(WebSocketClient.java:952) at net.dv8tion.jda.internal.requests.WebSocketClient.onEvent(WebSocketClient.java:839) at net.dv8tion.jda.internal.requests.WebSocketClient.handleEvent(WebSocketClient.java:817) at net.dv8tion.jda.internal.requests.WebSocketClient.onBinaryMessage(WebSocketClient.java:991) at com.neovisionaries.ws.client.ListenerManager.callOnBinaryMessage(ListenerManager.java:382) at com.neovisionaries.ws.client.ReadingThread.callOnBinaryMessage(ReadingThread.java:276) at com.neovisionaries.ws.client.ReadingThread.handleBinaryFrame(ReadingThread.java:983) at com.neovisionaries.ws.client.ReadingThread.handleFrame(ReadingThread.java:746) at com.neovisionaries.ws.client.ReadingThread.main(ReadingThread.java:108) at com.neovisionaries.ws.client.ReadingThread.runMain(ReadingThread.java:64) at com.neovisionaries.ws.client.WebSocketThread.run(WebSocketThread.java:45) ```

64f7a7c5dff92f75609fe8de80322c8cfae546f1

310dcf01b3d9dbb93764822b242597c821e281fb

https://github.com/discord-jda/jda/compare/64f7a7c5dff92f75609fe8de80322c8cfae546f1...310dcf01b3d9dbb93764822b242597c821e281fb

diff --git a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java index 2ef364f3..42c39bff 100644 --- a/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java +++ b/src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java @@ -65,7 +65,7 @@ public class MessageReactionClearEmoteHandler extends SocketHandler } else { - long emoteId = emoji.getUnsignedLong("emoji"); + long emoteId = emoji.getUnsignedLong("id"); Emote emote = getJDA().getEmoteById(emoteId); if (emote == null) {

['src/main/java/net/dv8tion/jda/internal/handle/MessageReactionClearEmoteHandler.java']

{'.java': 1}

Java

{'Java': 6408306, 'Kotlin': 15446, 'HTML': 2425}

Apache License 2.0

crate/crate/13311/13306

crate

crate

https://github.com/crate/crate/issues/13306

https://github.com/crate/crate/pull/13311

https://github.com/crate/crate/pull/13311

fixes

`DECLARE CURSOR` requires superuser privileges

### CrateDB version 5.1.1 ### CrateDB setup information local / cloud logged in as non-superuser with `ALL` privileges on `cluster` level ### Steps to Reproduce ```sql BEGIN; DECLARE this_cursor NO SCROLL CURSOR FOR SELECT * FROM sys.summits; END; ``` ### Expected Result Cursor is created ### Actual Result ``` UnauthorizedException[User "admin" is not authorized to execute the statement. Superuser permissions are required] ```

570fbd936a92839e0edbc077124a45ea28437f7c

78a421e2e939fd63ddbe0ced26d6649812517e77

https://github.com/crate/crate/compare/570fbd936a92839e0edbc077124a45ea28437f7c...78a421e2e939fd63ddbe0ced26d6649812517e77

diff --git a/server/src/main/java/io/crate/auth/AccessControlImpl.java b/server/src/main/java/io/crate/auth/AccessControlImpl.java index 8a00969d67..4f5a179573 100644 --- a/server/src/main/java/io/crate/auth/AccessControlImpl.java +++ b/server/src/main/java/io/crate/auth/AccessControlImpl.java @@ -46,6 +46,7 @@ import io.crate.analyze.AnalyzedCreateTable; import io.crate.analyze.AnalyzedCreateTableAs; import io.crate.analyze.AnalyzedCreateUser; import io.crate.analyze.AnalyzedDeallocate; +import io.crate.analyze.AnalyzedDeclare; import io.crate.analyze.AnalyzedDeleteStatement; import io.crate.analyze.AnalyzedDiscard; import io.crate.analyze.AnalyzedDropFunction; @@ -264,6 +265,12 @@ public final class AccessControlImpl implements AccessControl { return null; } + @Override + public Void visitDeclare(AnalyzedDeclare declare, User user) { + declare.query().accept(this, user); + return null; + } + @Override public Void visitSwapTable(AnalyzedSwapTable swapTable, User user) { if (!user.hasPrivilege(Privilege.Type.AL, Privilege.Clazz.CLUSTER, null, defaultSchema)) { diff --git a/server/src/test/java/io/crate/auth/AccessControlMayExecuteTest.java b/server/src/test/java/io/crate/auth/AccessControlMayExecuteTest.java index db05561b15..878789a202 100644 --- a/server/src/test/java/io/crate/auth/AccessControlMayExecuteTest.java +++ b/server/src/test/java/io/crate/auth/AccessControlMayExecuteTest.java @@ -700,4 +700,10 @@ public class AccessControlMayExecuteTest extends CrateDummyClusterServiceUnitTes analyze("ANALYZE", user); assertAskedForCluster(Privilege.Type.AL); } + + @Test + public void test_declare_cursor_for_non_super_users() { + analyze("DECLARE this_cursor NO SCROLL CURSOR FOR SELECT * FROM sys.summits;", user); + assertAskedForTable(Privilege.Type.DQL, "sys.summits"); + } }

['server/src/test/java/io/crate/auth/AccessControlMayExecuteTest.java', 'server/src/main/java/io/crate/auth/AccessControlImpl.java']

{'.java': 2}

Java

{'Java': 32426037, 'Python': 71123, 'ANTLR': 46794, 'Shell': 13730, 'Batchfile': 4343}

Apache License 2.0

crate/crate/14430/14407

crate

crate

https://github.com/crate/crate/issues/14407

https://github.com/crate/crate/pull/14430

https://github.com/crate/crate/pull/14430

fixes

Filtering on a column with `INDEX OFF` doesn't behave correctly

### CrateDB version 5.4.0 ### Problem description Filtering on a column with `INDEX OFF` doesn't behave consistently. ### Steps to Reproduce ``` cr> create table t(a int INDEX OFF); CREATE OK, 1 row affected (0.327 sec) ``` ``` cr> select * from t where a = 1; SQLParseException[Cannot search on field [a] since it is not indexed.] ``` this seems fine, but: ``` cr> select * from t where a > 1; +---+ | a | +---+ +---+ SELECT 0 rows in set (0.008 sec) ``` and: ``` cr> insert into t(a) values(2), (3); INSERT OK, 2 rows affected (0.043 sec) cr> refresh table t; REFRESH OK, 1 row affected (0.003 sec) cr> select * from t where a > 1; +---+ | a | +---+ +---+ SELECT 0 rows in set (0.003 sec) cr> select * from t where a + 1 > 1; +---+ | a | +---+ | 3 | | 2 | +---+ SELECT 2 rows in set (0.008 sec) ```

b5a431633404f49606663a724ede749b3203eeb6

11c896f00254852744ef79a760141d17692b22cb

https://github.com/crate/crate/compare/b5a431633404f49606663a724ede749b3203eeb6...11c896f00254852744ef79a760141d17692b22cb

diff --git a/server/src/main/java/io/crate/execution/engine/collect/collectors/OptimizeQueryForSearchAfter.java b/server/src/main/java/io/crate/execution/engine/collect/collectors/OptimizeQueryForSearchAfter.java index c5016973f7..29e5959a94 100644 --- a/server/src/main/java/io/crate/execution/engine/collect/collectors/OptimizeQueryForSearchAfter.java +++ b/server/src/main/java/io/crate/execution/engine/collect/collectors/OptimizeQueryForSearchAfter.java @@ -82,20 +82,20 @@ public class OptimizeQueryForSearchAfter implements Function<FieldDoc, Query> { BooleanQuery.Builder booleanQuery = new BooleanQuery.Builder(); booleanQuery.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST); if (orderBy.reverseFlags()[i]) { - booleanQuery.add(eqQuery.rangeQuery(columnName, null, value, false, true, ref.hasDocValues()), + booleanQuery.add(eqQuery.rangeQuery(columnName, null, value, false, true, ref.hasDocValues(), ref.indexType()), BooleanClause.Occur.MUST_NOT); } else { - booleanQuery.add(eqQuery.rangeQuery(columnName, value, null, true, false, ref.hasDocValues()), + booleanQuery.add(eqQuery.rangeQuery(columnName, value, null, true, false, ref.hasDocValues(), ref.indexType()), BooleanClause.Occur.MUST_NOT); } orderQuery = booleanQuery.build(); } else { if (orderBy.reverseFlags()[i]) { orderQuery = eqQuery.rangeQuery( - columnName, value, null, false, false, ref.hasDocValues()); + columnName, value, null, false, false, ref.hasDocValues(), ref.indexType()); } else { orderQuery = eqQuery.rangeQuery( - columnName, null, value, false, false, ref.hasDocValues()); + columnName, null, value, false, false, ref.hasDocValues(), ref.indexType()); } } queryBuilder.add(orderQuery, BooleanClause.Occur.MUST); diff --git a/server/src/main/java/io/crate/expression/operator/CmpOperator.java b/server/src/main/java/io/crate/expression/operator/CmpOperator.java index 3882583e5b..172ee7b94d 100644 --- a/server/src/main/java/io/crate/expression/operator/CmpOperator.java +++ b/server/src/main/java/io/crate/expression/operator/CmpOperator.java @@ -94,13 +94,13 @@ public final class CmpOperator extends Operator<Object> { String field = ref.column().fqn(); return switch (functionName) { case GtOperator.NAME -> eqQuery.rangeQuery( - field, value, null, false, false, ref.hasDocValues()); + field, value, null, false, false, ref.hasDocValues(), ref.indexType()); case GteOperator.NAME -> eqQuery.rangeQuery( - field, value, null, true, false, ref.hasDocValues()); + field, value, null, true, false, ref.hasDocValues(), ref.indexType()); case LtOperator.NAME -> - eqQuery.rangeQuery(field, null, value, false, false, ref.hasDocValues()); + eqQuery.rangeQuery(field, null, value, false, false, ref.hasDocValues(), ref.indexType()); case LteOperator.NAME -> - eqQuery.rangeQuery(field, null, value, false, true, ref.hasDocValues()); + eqQuery.rangeQuery(field, null, value, false, true, ref.hasDocValues(), ref.indexType()); default -> throw new IllegalArgumentException(functionName + " is not a supported comparison operator"); }; } diff --git a/server/src/main/java/io/crate/expression/operator/EqOperator.java b/server/src/main/java/io/crate/expression/operator/EqOperator.java index 66b04f1f7b..7b12193ccf 100644 --- a/server/src/main/java/io/crate/expression/operator/EqOperator.java +++ b/server/src/main/java/io/crate/expression/operator/EqOperator.java @@ -56,7 +56,6 @@ import io.crate.expression.scalar.NumTermsPerDocQuery; import io.crate.expression.symbol.Function; import io.crate.expression.symbol.Literal; import io.crate.expression.symbol.Symbol; -import io.crate.lucene.LuceneQueryBuilder; import io.crate.lucene.LuceneQueryBuilder.Context; import io.crate.metadata.IndexType; import io.crate.metadata.NodeContext; @@ -147,26 +146,30 @@ public final class EqOperator extends Operator<Object> { return new MatchNoDocsQuery("`" + fqn + "` = null is always null"); } DataType<?> dataType = ref.valueType(); - if (dataType.id() != ObjectType.ID && dataType.id() != ArrayType.ID && ref.indexType() == IndexType.NONE) { - throw new IllegalArgumentException( - "Cannot search on field [" + fqn + "] since it is not indexed."); - } return switch (dataType.id()) { - case ObjectType.ID -> refEqObject(function, fqn, (ObjectType) dataType, (Map<String, Object>) value, context); - case ArrayType.ID -> termsAndGenericFilter( + case ObjectType.ID -> refEqObject( + function, + fqn, + (ObjectType) dataType, + (Map<String, Object>) value, + context, + ref.hasDocValues(), + ref.indexType()); + case ArrayType.ID -> refEqArray( function, ref.column().fqn(), ArrayType.unnest(dataType), (Collection<?>) value, - context - ); - default -> fromPrimitive(dataType, fqn, value); + context, + ref.hasDocValues(), + ref.indexType()); + default -> fromPrimitive(dataType, fqn, value, ref.hasDocValues(), ref.indexType()); }; } @Nullable @SuppressWarnings("unchecked") - public static Query termsQuery(String column, DataType<?> type, Collection<?> values) { + public static Query termsQuery(String column, DataType<?> type, Collection<?> values, boolean hasDocValues, IndexType indexType) { List<?> nonNullValues = values.stream().filter(Objects::nonNull).toList(); if (nonNullValues.isEmpty()) { return null; @@ -193,20 +196,29 @@ public final class EqOperator extends Operator<Object> { column, nonNullValues.stream().map(x -> new BytesRef(((BitString) x).bitSet().toByteArray())).toList() ); - default -> booleanShould(column, type, nonNullValues); + default -> booleanShould(column, type, nonNullValues, hasDocValues, indexType); }; } @Nullable - private static Query booleanShould(String column, DataType<?> type, Collection<?> values) { + private static Query booleanShould(String column, + DataType<?> type, + Collection<?> values, + boolean hasDocValues, + IndexType indexType) { BooleanQuery.Builder builder = new BooleanQuery.Builder(); for (var term : values) { - builder.add(EqOperator.fromPrimitive(type, column, term), Occur.SHOULD); + builder.add(EqOperator.fromPrimitive(type, column, term, hasDocValues, indexType), Occur.SHOULD); } return new ConstantScoreQuery(builder.build()); } - private static Query termsAndGenericFilter(Function function, String column, DataType<?> elementType, Collection<?> values, LuceneQueryBuilder.Context context) { + private static Query refEqArray(Function function, + String column, + DataType<?> elementType, Collection<?> values, + Context context, + boolean hasDocValues, + IndexType indexType) { MappedFieldType fieldType = context.getFieldTypeOrNull(column); if (fieldType == null) { if (elementType.id() == ObjectType.ID) { @@ -237,7 +249,7 @@ public final class EqOperator extends Operator<Object> { // wrap boolTermsFilter and genericFunction filter in an additional BooleanFilter to control the ordering of the filters // termsFilter is applied first // afterwards the more expensive genericFunctionFilter - Query termsQuery = termsQuery(column, elementType, values); + Query termsQuery = termsQuery(column, elementType, values, hasDocValues, indexType); if (termsQuery == null) { return genericFunctionFilter; } @@ -248,7 +260,7 @@ public final class EqOperator extends Operator<Object> { } @SuppressWarnings("unchecked") - public static Query fromPrimitive(DataType<?> type, String column, Object value) { + public static Query fromPrimitive(DataType<?> type, String column, Object value, boolean hasDocValues, IndexType indexType) { if (column.equals(DocSysColumns.ID.name())) { return new TermQuery(new Term(column, Uid.encodeId((String) value))); } @@ -257,7 +269,7 @@ public final class EqOperator extends Operator<Object> { if (eqQuery == null) { return null; } - return ((EqQuery<Object>) eqQuery).termQuery(column, value); + return ((EqQuery<Object>) eqQuery).termQuery(column, value, hasDocValues, indexType); } /** @@ -279,7 +291,9 @@ public final class EqOperator extends Operator<Object> { String fqn, ObjectType type, Map<String, Object> value, - LuceneQueryBuilder.Context context) { + Context context, + boolean hasDocValues, + IndexType indexType) { BooleanQuery.Builder boolBuilder = new BooleanQuery.Builder(); int preFilters = 0; for (Map.Entry<String, Object> entry : value.entrySet()) { @@ -292,9 +306,10 @@ public final class EqOperator extends Operator<Object> { String fqNestedColumn = fqn + '.' + key; Query innerQuery; if (DataTypes.isArray(innerType)) { - innerQuery = termsAndGenericFilter(eq, fqNestedColumn, innerType, (Collection<?>) entry.getValue(), context); + innerQuery = refEqArray( + eq, fqNestedColumn, innerType, (Collection<?>) entry.getValue(), context, hasDocValues, indexType); } else { - innerQuery = fromPrimitive(innerType, fqNestedColumn, entry.getValue()); + innerQuery = fromPrimitive(innerType, fqNestedColumn, entry.getValue(), hasDocValues, indexType); } if (innerQuery == null) { continue; diff --git a/server/src/main/java/io/crate/expression/operator/any/AnyEqOperator.java b/server/src/main/java/io/crate/expression/operator/any/AnyEqOperator.java index 215f6a8da8..5103fdcdfe 100644 --- a/server/src/main/java/io/crate/expression/operator/any/AnyEqOperator.java +++ b/server/src/main/java/io/crate/expression/operator/any/AnyEqOperator.java @@ -68,7 +68,7 @@ public final class AnyEqOperator extends AnyOperator { return new MatchNoDocsQuery("column does not exist in this index"); } DataType<?> innerType = ArrayType.unnest(probe.valueType()); - return EqOperator.termsQuery(columnName, innerType, values); + return EqOperator.termsQuery(columnName, innerType, values, probe.hasDocValues(), probe.indexType()); } @Override @@ -85,7 +85,12 @@ public final class AnyEqOperator extends AnyOperator { // [1, 2] = any(nested_array_ref) return arrayLiteralEqAnyArray(any, candidates, probe.value(), context); } - return EqOperator.fromPrimitive(ArrayType.unnest(candidates.valueType()), candidates.column().fqn(), probe.value()); + return EqOperator.fromPrimitive( + ArrayType.unnest(candidates.valueType()), + candidates.column().fqn(), + probe.value(), + candidates.hasDocValues(), + candidates.indexType()); } private static Query arrayLiteralEqAnyArray(Function function, @@ -97,8 +102,9 @@ public final class AnyEqOperator extends AnyOperator { Query termsQuery = EqOperator.termsQuery( candidates.column().fqn(), ArrayType.unnest(candidates.valueType()), - terms - ); + terms, + candidates.hasDocValues(), + candidates.indexType()); Query genericFunctionFilter = LuceneQueryBuilder.genericFunctionFilter(function, context); if (termsQuery == null) { return genericFunctionFilter; diff --git a/server/src/main/java/io/crate/expression/operator/any/AnyNeqOperator.java b/server/src/main/java/io/crate/expression/operator/any/AnyNeqOperator.java index 94bc967a96..e3fba3f4e4 100644 --- a/server/src/main/java/io/crate/expression/operator/any/AnyNeqOperator.java +++ b/server/src/main/java/io/crate/expression/operator/any/AnyNeqOperator.java @@ -65,7 +65,14 @@ public final class AnyNeqOperator extends AnyOperator { BooleanQuery.Builder andBuilder = new BooleanQuery.Builder(); for (Object value : (Iterable<?>) candidates.value()) { - andBuilder.add(EqOperator.fromPrimitive(probe.valueType(), probe.column().fqn(), value), BooleanClause.Occur.MUST); + andBuilder.add( + EqOperator.fromPrimitive( + probe.valueType(), + probe.column().fqn(), + value, + probe.hasDocValues(), + probe.indexType()), + BooleanClause.Occur.MUST); } Query exists = IsNullPredicate.refExistsQuery(probe, context, false); return new BooleanQuery.Builder() @@ -96,11 +103,11 @@ public final class AnyNeqOperator extends AnyOperator { BooleanQuery.Builder query = new BooleanQuery.Builder(); query.setMinimumNumberShouldMatch(1); query.add( - eqQuery.rangeQuery(columnName, value, null, false, false, candidates.hasDocValues()), + eqQuery.rangeQuery(columnName, value, null, false, false, candidates.hasDocValues(), candidates.indexType()), BooleanClause.Occur.SHOULD ); query.add( - eqQuery.rangeQuery(columnName, null, value, false, false, candidates.hasDocValues()), + eqQuery.rangeQuery(columnName, null, value, false, false, candidates.hasDocValues(), candidates.indexType()), BooleanClause.Occur.SHOULD ); return query.build(); diff --git a/server/src/main/java/io/crate/expression/scalar/SubscriptFunction.java b/server/src/main/java/io/crate/expression/scalar/SubscriptFunction.java index ef31afd33e..d1da2a14f1 100644 --- a/server/src/main/java/io/crate/expression/scalar/SubscriptFunction.java +++ b/server/src/main/java/io/crate/expression/scalar/SubscriptFunction.java @@ -47,6 +47,7 @@ import io.crate.expression.symbol.Literal; import io.crate.expression.symbol.Symbol; import io.crate.lucene.LuceneQueryBuilder; import io.crate.lucene.LuceneQueryBuilder.Context; +import io.crate.metadata.IndexType; import io.crate.metadata.NodeContext; import io.crate.metadata.Reference; import io.crate.metadata.Scalar; @@ -224,19 +225,19 @@ public class SubscriptFunction extends Scalar<Object, Object[]> { } private interface PreFilterQueryBuilder { - Query buildQuery(String field, EqQuery<Object> eqQuery, Object value, boolean hasDocValues); + Query buildQuery(String field, EqQuery<Object> eqQuery, Object value, boolean hasDocValues, IndexType indexType); } private static final Map<String, PreFilterQueryBuilder> PRE_FILTER_QUERY_BUILDER_BY_OP = Map.of( - EqOperator.NAME, (field, eqQuery, value, haDocValues) -> eqQuery.termQuery(field, value), - GteOperator.NAME, (field, eqQuery, value, hasDocValues) -> - eqQuery.rangeQuery(field, value, null, true, false, hasDocValues), - GtOperator.NAME, (field, eqQuery, value, hasDocValues) -> - eqQuery.rangeQuery(field, value, null, false, false, hasDocValues), - LteOperator.NAME, (field, eqQuery, value, hasDocValues) -> - eqQuery.rangeQuery(field, null, value, false, true, hasDocValues), - LtOperator.NAME, (field, eqQuery, value, hasDocValues) -> - eqQuery.rangeQuery(field, null, value, false, false, hasDocValues) + EqOperator.NAME, (field, eqQuery, value, haDocValues, indexType) -> eqQuery.termQuery(field, value, haDocValues, indexType), + GteOperator.NAME, (field, eqQuery, value, hasDocValues, indexType) -> + eqQuery.rangeQuery(field, value, null, true, false, hasDocValues, indexType), + GtOperator.NAME, (field, eqQuery, value, hasDocValues, indexType) -> + eqQuery.rangeQuery(field, value, null, false, false, hasDocValues, indexType), + LteOperator.NAME, (field, eqQuery, value, hasDocValues, indexType) -> + eqQuery.rangeQuery(field, null, value, false, true, hasDocValues, indexType), + LtOperator.NAME, (field, eqQuery, value, hasDocValues, indexType) -> + eqQuery.rangeQuery(field, null, value, false, false, hasDocValues, indexType) ); @Override @@ -271,7 +272,7 @@ public class SubscriptFunction extends Scalar<Object, Object[]> { } BooleanQuery.Builder builder = new BooleanQuery.Builder(); builder.add( - preFilterQueryBuilder.buildQuery(ref.column().fqn(), eqQuery, cmpLiteral.value(), ref.hasDocValues()), + preFilterQueryBuilder.buildQuery(ref.column().fqn(), eqQuery, cmpLiteral.value(), ref.hasDocValues(), ref.indexType()), BooleanClause.Occur.MUST); builder.add(LuceneQueryBuilder.genericFunctionFilter(parent, context), BooleanClause.Occur.FILTER); return builder.build(); diff --git a/server/src/main/java/io/crate/types/BitStringType.java b/server/src/main/java/io/crate/types/BitStringType.java index f6e5d69d60..8c3c2e9636 100644 --- a/server/src/main/java/io/crate/types/BitStringType.java +++ b/server/src/main/java/io/crate/types/BitStringType.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; +import org.apache.lucene.document.SortedSetDocValuesField; import org.jetbrains.annotations.Nullable; import org.apache.lucene.document.FieldType; @@ -45,6 +46,7 @@ import io.crate.Streamer; import io.crate.execution.dml.BitStringIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; import io.crate.metadata.settings.SessionSettings; @@ -69,7 +71,10 @@ public final class BitStringType extends DataType<BitString> implements Streamer new EqQuery<BitString>() { @Override - public Query termQuery(String field, BitString value) { + public Query termQuery(String field, BitString value, boolean hasDocValues, IndexType indexType) { + if (hasDocValues) { + return SortedSetDocValuesField.newSlowExactQuery(field, new BytesRef(value.bitSet().toByteArray())); + } return new TermQuery(new Term(field, new BytesRef(value.bitSet().toByteArray()))); } @@ -79,7 +84,11 @@ public final class BitStringType extends DataType<BitString> implements Streamer BitString upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { + // TODO: this should be a bug: + // select * from t where a > b'001'; + // => UnsupportedFunctionException[Unknown function: (doc.t.a > B'001') return null; } } diff --git a/server/src/main/java/io/crate/types/BooleanType.java b/server/src/main/java/io/crate/types/BooleanType.java index 2c2d0095ee..7618ab5ad4 100644 --- a/server/src/main/java/io/crate/types/BooleanType.java +++ b/server/src/main/java/io/crate/types/BooleanType.java @@ -27,6 +27,7 @@ import java.util.Map; import java.util.function.Function; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; @@ -39,6 +40,7 @@ import io.crate.Streamer; import io.crate.execution.dml.BooleanIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; @@ -57,7 +59,13 @@ public class BooleanType extends DataType<Boolean> implements Streamer<Boolean>, } @Override - public Query termQuery(String field, Boolean value) { + public Query termQuery(String field, Boolean value, boolean hasDocValues, IndexType indexType) { + assert value != null: "Cannot perform = NULL, IS NULL should be used"; + if (hasDocValues) { + return SortedNumericDocValuesField.newSlowExactQuery( + field, + value ? 1 : 0); + } return new TermQuery(new Term(field, indexedValue(value))); } @@ -67,7 +75,17 @@ public class BooleanType extends DataType<Boolean> implements Streamer<Boolean>, Boolean upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { + if (hasDocValues) { + if (lowerTerm == null || upperTerm == null) { + return null; + } + return SortedNumericDocValuesField.newSlowRangeQuery( + field, + lowerTerm ? 1 : 0, + upperTerm ? 1 : 0); + } return new TermRangeQuery( field, indexedValue(lowerTerm), indexedValue(upperTerm), includeLower, includeUpper); } diff --git a/server/src/main/java/io/crate/types/DoubleType.java b/server/src/main/java/io/crate/types/DoubleType.java index dc6f32d4da..e3b652889d 100644 --- a/server/src/main/java/io/crate/types/DoubleType.java +++ b/server/src/main/java/io/crate/types/DoubleType.java @@ -26,10 +26,10 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.function.Function; +import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.DoublePoint; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.RamUsageEstimator; @@ -40,6 +40,7 @@ import io.crate.Streamer; import io.crate.execution.dml.DoubleIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; @@ -55,8 +56,16 @@ public class DoubleType extends DataType<Double> implements FixedWidthType, Stre new EqQuery<Double>() { @Override - public Query termQuery(String field, Double value) { - return DoublePoint.newExactQuery(field, value); + public Query termQuery(String field, Double value, boolean hasDocValues, IndexType indexType) { + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return DoubleField.newExactQuery(field, value); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.doubleToSortableLong(value)); + } else if (isIndexed) { + return DoublePoint.newExactQuery(field, value); + } + return null; } @Override @@ -65,7 +74,8 @@ public class DoubleType extends DataType<Double> implements FixedWidthType, Stre Double upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { double lower; if (lowerTerm == null) { lower = Double.NEGATIVE_INFINITY; @@ -79,16 +89,18 @@ public class DoubleType extends DataType<Double> implements FixedWidthType, Stre } else { upper = includeUpper ? upperTerm : DoublePoint.nextDown(upperTerm); } - Query indexQuery = DoublePoint.newRangeQuery(field, lower, upper); - if (hasDocValues) { - Query dvQuery = SortedNumericDocValuesField.newSlowRangeQuery( - field, - NumericUtils.doubleToSortableLong(lower), - NumericUtils.doubleToSortableLong(upper) - ); - return new IndexOrDocValuesQuery(indexQuery, dvQuery); + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return DoubleField.newRangeQuery(field, lower, upper); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowRangeQuery( + field, + NumericUtils.doubleToSortableLong(lower), + NumericUtils.doubleToSortableLong(upper)); + } else if (isIndexed) { + return DoublePoint.newRangeQuery(field, lower, upper); } - return indexQuery; + return null; } } ) { diff --git a/server/src/main/java/io/crate/types/EqQuery.java b/server/src/main/java/io/crate/types/EqQuery.java index 8cca9c0883..5e446b888f 100644 --- a/server/src/main/java/io/crate/types/EqQuery.java +++ b/server/src/main/java/io/crate/types/EqQuery.java @@ -23,17 +23,20 @@ package io.crate.types; import org.apache.lucene.search.Query; +import io.crate.metadata.IndexType; + /** * For types which can be stored in Lucene and support optimized equality related queries **/ public interface EqQuery<T> { - Query termQuery(String field, T value); + Query termQuery(String field, T value, boolean hasDocValues, IndexType indexType); Query rangeQuery(String field, T lowerTerm, T upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues); + boolean hasDocValues, + IndexType indexType); } diff --git a/server/src/main/java/io/crate/types/FloatType.java b/server/src/main/java/io/crate/types/FloatType.java index c91ece1ca5..c8acb0c7fd 100644 --- a/server/src/main/java/io/crate/types/FloatType.java +++ b/server/src/main/java/io/crate/types/FloatType.java @@ -27,9 +27,9 @@ import java.math.BigInteger; import java.util.function.Function; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.FloatField; import org.apache.lucene.document.FloatPoint; import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.RamUsageEstimator; @@ -40,6 +40,7 @@ import io.crate.Streamer; import io.crate.execution.dml.FloatIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; @@ -55,8 +56,16 @@ public class FloatType extends DataType<Float> implements Streamer<Float>, Fixed new EqQuery<Float>() { @Override - public Query termQuery(String field, Float value) { - return FloatPoint.newExactQuery(field, value); + public Query termQuery(String field, Float value, boolean hasDocValues, IndexType indexType) { + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return FloatField.newExactQuery(field, value); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowExactQuery(field, NumericUtils.floatToSortableInt(value)); + } else if (isIndexed) { + return FloatPoint.newExactQuery(field, value); + } + return null; } @Override @@ -65,7 +74,8 @@ public class FloatType extends DataType<Float> implements Streamer<Float>, Fixed Float upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { float lower; if (lowerTerm == null) { lower = Float.NEGATIVE_INFINITY; @@ -79,16 +89,18 @@ public class FloatType extends DataType<Float> implements Streamer<Float>, Fixed } else { upper = includeUpper ? upperTerm : FloatPoint.nextDown(upperTerm); } - - Query indexQuery = FloatPoint.newRangeQuery(field, lower, upper); - if (hasDocValues) { - Query dvQuery = SortedNumericDocValuesField - .newSlowRangeQuery(field, - NumericUtils.floatToSortableInt(lower), - NumericUtils.floatToSortableInt(upper)); - return new IndexOrDocValuesQuery(indexQuery, dvQuery); + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return FloatField.newRangeQuery(field, lower, upper); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowRangeQuery( + field, + NumericUtils.floatToSortableInt(lower), + NumericUtils.floatToSortableInt(upper)); + } else if (isIndexed) { + return FloatPoint.newRangeQuery(field, lower, upper); } - return indexQuery; + return null; } } ) { diff --git a/server/src/main/java/io/crate/types/FloatVectorType.java b/server/src/main/java/io/crate/types/FloatVectorType.java index e8005f0b49..6179bab481 100644 --- a/server/src/main/java/io/crate/types/FloatVectorType.java +++ b/server/src/main/java/io/crate/types/FloatVectorType.java @@ -40,6 +40,7 @@ import io.crate.Streamer; import io.crate.execution.dml.FloatVectorIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; import io.crate.sql.tree.ColumnDefinition; @@ -57,7 +58,7 @@ public class FloatVectorType extends DataType<float[]> implements Streamer<float private static final EqQuery<float[]> EQ_QUERY = new EqQuery<float[]>() { @Override - public Query termQuery(String field, float[] value) { + public Query termQuery(String field, float[] value, boolean hasDocValues, IndexType indexType) { return null; } @@ -67,7 +68,8 @@ public class FloatVectorType extends DataType<float[]> implements Streamer<float float[] upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { return null; } }; diff --git a/server/src/main/java/io/crate/types/IntEqQuery.java b/server/src/main/java/io/crate/types/IntEqQuery.java index 834aa49db3..585430857f 100644 --- a/server/src/main/java/io/crate/types/IntEqQuery.java +++ b/server/src/main/java/io/crate/types/IntEqQuery.java @@ -21,16 +21,26 @@ package io.crate.types; +import org.apache.lucene.document.IntField; import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.Query; +import io.crate.metadata.IndexType; + public class IntEqQuery implements EqQuery<Number> { @Override - public Query termQuery(String field, Number value) { - return IntPoint.newExactQuery(field, value.intValue()); + public Query termQuery(String field, Number value, boolean hasDocValues, IndexType indexType) { + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return IntField.newExactQuery(field, value.intValue()); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowExactQuery(field, value.intValue()); + } else if (isIndexed) { + return IntPoint.newExactQuery(field, value.intValue()); + } + return null; } @Override @@ -39,7 +49,8 @@ public class IntEqQuery implements EqQuery<Number> { Number upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { int lower = Integer.MIN_VALUE; if (lowerTerm != null) { lower = includeLower ? lowerTerm.intValue() : lowerTerm.intValue() + 1; @@ -48,11 +59,14 @@ public class IntEqQuery implements EqQuery<Number> { if (upperTerm != null) { upper = includeUpper ? upperTerm.intValue() : upperTerm.intValue() - 1; } - Query indexquery = IntPoint.newRangeQuery(field, lower, upper); - if (hasDocValues) { - return new IndexOrDocValuesQuery( - indexquery, SortedNumericDocValuesField.newSlowRangeQuery(field, lower, upper)); + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return IntField.newRangeQuery(field, lower, upper); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowRangeQuery(field, lower, upper); + } else if (isIndexed) { + return IntPoint.newRangeQuery(field, lower, upper); } - return indexquery; + return null; } } diff --git a/server/src/main/java/io/crate/types/IpType.java b/server/src/main/java/io/crate/types/IpType.java index eafca8ef2f..d40534a7c9 100644 --- a/server/src/main/java/io/crate/types/IpType.java +++ b/server/src/main/java/io/crate/types/IpType.java @@ -27,7 +27,10 @@ import java.util.function.Function; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.InetAddressPoint; +import org.apache.lucene.document.SortedSetDocValuesField; +import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.Query; +import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.RamUsageEstimator; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -37,6 +40,7 @@ import io.crate.Streamer; import io.crate.execution.dml.IpIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; @@ -51,8 +55,19 @@ public class IpType extends DataType<String> implements Streamer<String> { new EqQuery<String>() { @Override - public Query termQuery(String field, String value) { - return InetAddressPoint.newExactQuery(field, InetAddresses.forString(value)); + public Query termQuery(String field, String value, boolean hasDocValues, IndexType indexType) { + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return new IndexOrDocValuesQuery( + InetAddressPoint.newExactQuery(field, InetAddresses.forString(value)), + SortedSetDocValuesField.newSlowExactQuery(field, new BytesRef(InetAddressPoint.encode(InetAddresses.forString(value)))) + ); + } else if (hasDocValues) { + return SortedSetDocValuesField.newSlowExactQuery(field, new BytesRef(InetAddressPoint.encode(InetAddresses.forString(value)))); + } else if (isIndexed) { + return InetAddressPoint.newExactQuery(field, InetAddresses.forString(value)); + } + return null; } @Override @@ -61,7 +76,8 @@ public class IpType extends DataType<String> implements Streamer<String> { String upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { InetAddress lower; if (lowerTerm == null) { lower = InetAddressPoint.MIN_VALUE; @@ -69,6 +85,7 @@ public class IpType extends DataType<String> implements Streamer<String> { var lowerAddress = InetAddresses.forString(lowerTerm); lower = includeLower ? lowerAddress : InetAddressPoint.nextUp(lowerAddress); } + includeLower = true; // lowerAddress has been adjusted InetAddress upper; if (upperTerm == null) { @@ -77,8 +94,29 @@ public class IpType extends DataType<String> implements Streamer<String> { var upperAddress = InetAddresses.forString(upperTerm); upper = includeUpper ? upperAddress : InetAddressPoint.nextDown(upperAddress); } - - return InetAddressPoint.newRangeQuery(field, lower, upper); + includeUpper = true; // upperAddress has been adjusted + + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return new IndexOrDocValuesQuery( + InetAddressPoint.newRangeQuery(field, lower, upper), + SortedSetDocValuesField.newSlowRangeQuery( + field, + new BytesRef(InetAddressPoint.encode(lower)), + new BytesRef(InetAddressPoint.encode(upper)), + includeLower, + includeUpper)); + } else if (hasDocValues) { + return SortedSetDocValuesField.newSlowRangeQuery( + field, + new BytesRef(InetAddressPoint.encode(lower)), + new BytesRef(InetAddressPoint.encode(upper)), + includeLower, + includeUpper); + } else if (isIndexed) { + return InetAddressPoint.newRangeQuery(field, lower, upper); + } + return null; } } ) { diff --git a/server/src/main/java/io/crate/types/LongEqQuery.java b/server/src/main/java/io/crate/types/LongEqQuery.java index 83904b5880..bc690f12aa 100644 --- a/server/src/main/java/io/crate/types/LongEqQuery.java +++ b/server/src/main/java/io/crate/types/LongEqQuery.java @@ -21,16 +21,26 @@ package io.crate.types; +import org.apache.lucene.document.LongField; import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.Query; +import io.crate.metadata.IndexType; + public class LongEqQuery implements EqQuery<Long> { @Override - public Query termQuery(String field, Long value) { - return LongPoint.newExactQuery(field, value); + public Query termQuery(String field, Long value, boolean hasDocValues, IndexType indexType) { + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return LongField.newExactQuery(field, value); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowExactQuery(field, value); + } else if (isIndexed) { + return LongPoint.newExactQuery(field, value); + } + return null; } @Override @@ -39,18 +49,22 @@ public class LongEqQuery implements EqQuery<Long> { Long upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { + boolean hasDocValues, + IndexType indexType) { long lower = lowerTerm == null ? Long.MIN_VALUE : (includeLower ? lowerTerm : lowerTerm + 1); long upper = upperTerm == null ? Long.MAX_VALUE : (includeUpper ? upperTerm : upperTerm - 1); - Query indexQuery = LongPoint.newRangeQuery(field, lower, upper); - if (hasDocValues) { - return new IndexOrDocValuesQuery(indexQuery, - SortedNumericDocValuesField.newSlowRangeQuery(field, lower, upper)); + boolean isIndexed = indexType != IndexType.NONE; + if (hasDocValues && isIndexed) { + return LongField.newRangeQuery(field, lower, upper); + } else if (hasDocValues) { + return SortedNumericDocValuesField.newSlowRangeQuery(field, lower, upper); + } else if (isIndexed) { + return LongPoint.newRangeQuery(field, lower, upper); } - return indexQuery; + return null; } } diff --git a/server/src/main/java/io/crate/types/StringType.java b/server/src/main/java/io/crate/types/StringType.java index 2c3ffde4b9..c510290a34 100644 --- a/server/src/main/java/io/crate/types/StringType.java +++ b/server/src/main/java/io/crate/types/StringType.java @@ -33,6 +33,7 @@ import java.util.Objects; import java.util.function.Function; import java.util.function.Supplier; +import org.apache.lucene.document.SortedSetDocValuesField; import org.jetbrains.annotations.Nullable; import org.apache.lucene.document.FieldType; @@ -55,6 +56,7 @@ import io.crate.execution.dml.FulltextIndexer; import io.crate.execution.dml.StringIndexer; import io.crate.execution.dml.ValueIndexer; import io.crate.metadata.ColumnIdent; +import io.crate.metadata.IndexType; import io.crate.metadata.Reference; import io.crate.metadata.RelationName; import io.crate.metadata.settings.SessionSettings; @@ -78,8 +80,14 @@ public class StringType extends DataType<String> implements Streamer<String> { new EqQuery<Object>() { @Override - public Query termQuery(String field, Object value) { - return new TermQuery(new Term(field, BytesRefs.toBytesRef(value))); + public Query termQuery(String field, Object value, boolean hasDocValues, IndexType indexType) { + if (indexType == IndexType.PLAIN && hasDocValues) { + return SortedSetDocValuesField.newSlowExactQuery(field, BytesRefs.toBytesRef(value)); + } else if (indexType != IndexType.NONE) { + return new TermQuery(new Term(field, BytesRefs.toBytesRef(value))); + } else { + return null; + } } @Override @@ -88,14 +96,27 @@ public class StringType extends DataType<String> implements Streamer<String> { Object upperTerm, boolean includeLower, boolean includeUpper, - boolean hasDocValues) { - return new TermRangeQuery( - field, - BytesRefs.toBytesRef(lowerTerm), - BytesRefs.toBytesRef(upperTerm), - includeLower, - includeUpper - ); + boolean hasDocValues, + IndexType indexType) { + if (indexType == IndexType.PLAIN && hasDocValues) { + return SortedSetDocValuesField.newSlowRangeQuery( + field, + BytesRefs.toBytesRef(lowerTerm), + BytesRefs.toBytesRef(upperTerm), + includeLower, + includeUpper + ); + } else if (indexType != null && upperTerm != null && lowerTerm != null) { + return new TermRangeQuery( + field, + BytesRefs.toBytesRef(lowerTerm), + BytesRefs.toBytesRef(upperTerm), + includeLower, + includeUpper + ); + } else { + return null; + } } } ) { diff --git a/server/src/test/java/io/crate/expression/operator/EqOperatorTest.java b/server/src/test/java/io/crate/expression/operator/EqOperatorTest.java index 8e6ea65274..071e36ac2e 100644 --- a/server/src/test/java/io/crate/expression/operator/EqOperatorTest.java +++ b/server/src/test/java/io/crate/expression/operator/EqOperatorTest.java @@ -34,6 +34,7 @@ import org.junit.Test; import io.crate.expression.scalar.ScalarTestCase; import io.crate.lucene.GenericFunctionQuery; +import io.crate.metadata.IndexType; import io.crate.metadata.doc.DocSysColumns; import io.crate.testing.Asserts; import io.crate.testing.DataTypeTesting; @@ -141,7 +142,17 @@ public class EqOperatorTest extends ScalarTestCase { @Test public void test_terms_query_on__id_encodes_ids() throws Exception { - Query query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar")); + Query query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), true, IndexType.FULLTEXT); + assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); + query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), true, IndexType.PLAIN); + assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); + query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), true, IndexType.NONE); + assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); + query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), false, IndexType.FULLTEXT); + assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); + query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), false, IndexType.PLAIN); + assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); + query = EqOperator.termsQuery(DocSysColumns.ID.name(), DataTypes.STRING, List.of("foo", "bar"), false, IndexType.NONE); assertThat(query).hasToString("_id:([7e 8a] [ff 62 61 72])"); } diff --git a/server/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java b/server/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java index 3ebc9f3681..44eca5c7af 100644 --- a/server/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java +++ b/server/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java @@ -30,7 +30,6 @@ import static io.crate.testing.TestingHelpers.printedTable; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.CONFLICT; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import java.util.ArrayList; @@ -292,11 +291,8 @@ public class DDLIntegrationTest extends IntegTestCase { String quote = "Would it save you a lot of time if I just gave up and went mad now?"; execute("insert into quotes (id, quote) values (?, ?)", new Object[]{1, quote}); execute("refresh table quotes"); - - Asserts.assertSQLError(() -> execute("select quote from quotes where quote = ?", new Object[]{quote})) - .hasPGError(INTERNAL_ERROR) - .hasHTTPError(BAD_REQUEST, 4000) - .hasMessageContaining("Cannot search on field [quote] since it is not indexed."); + execute("select quote from quotes where quote = ?", new Object[]{quote}); + assertThat(response).hasRows(quote); } @Test diff --git a/server/src/test/java/io/crate/integrationtests/LuceneQueryBuilderIntegrationTest.java b/server/src/test/java/io/crate/integrationtests/LuceneQueryBuilderIntegrationTest.java index ef5696752a..f11410a99a 100644 --- a/server/src/test/java/io/crate/integrationtests/LuceneQueryBuilderIntegrationTest.java +++ b/server/src/test/java/io/crate/integrationtests/LuceneQueryBuilderIntegrationTest.java @@ -36,6 +36,7 @@ import org.elasticsearch.test.IntegTestCase; import org.junit.Test; import io.crate.testing.DataTypeTesting; +import io.crate.testing.UseJdbc; import io.crate.testing.UseRandomizedOptimizerRules; import io.crate.types.DataType; @@ -425,4 +426,192 @@ public class LuceneQueryBuilderIntegrationTest extends IntegTestCase { .as("query doesn't match") .hasRowCount(0L); } + + @UseJdbc(0) + @Test + public void test_eq_queries_with_index_on_and_column_store_true() { + execute( + """ + create table t ( + a bit(2), + b double, + c float, + d ip, + e string, + f boolean, + g int, + h long, + i string index using fulltext + ) + """ + ); + String firstRow = "(B'01', 1.1, 1.1, '1.1.1.1', 'a', false, 1, 1, 'a')"; + String expectedFirstRow = "B'01'| 1.1| 1.1| 1.1.1.1| a| false| 1| 1| a"; + String secondRow = "(B'10', 1.2, 1.2, '1.1.1.2', 'b', true, 2, 2, 'b')"; + String expectedSecondRow = "B'10'| 1.2| 1.2| 1.1.1.2| b| true| 2| 2| b"; + execute("insert into t values " + firstRow + ", " + secondRow); + refresh(); + + // EqQuery.termQuery + assertThat(execute("select * from t where a = B'01'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where b = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where c = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where d = '1.1.1.1'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where e = 'a'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where f = false")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where g = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where h = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where i = 'a'")).hasRows(expectedFirstRow); + + // EqQuery.RangeQuery + //UnsupportedFunctionException: Unknown function: (mgjihphcgyjgklnrovd.t.a > B'01'), no overload found for matching argument types: (bit, bit). Possible candidates: op_>(byte, byte):boolean, op_>(boolean, boolean):boolean, op_>(character, character):boolean, op_>(text, text):boolean, op_>(ip, ip):boolean, op_>(double precision, double precision):boolean, op_>(real, real):boolean, op_>(smallint, smallint):boolean, op_>(integer, integer):boolean, op_>(interval, interval):boolean, op_>(bigint, bigint):boolean, op_>(timestamp with time zone, timestamp with time zone):boolean, op_>(timestamp without time zone, timestamp without time zone):boolean, op_>(date, date):boolean + //assertThat(execute("select * from t where a > B'01'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where b > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where c > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where d > '1.1.1.1'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where e > 'a'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where f > false")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where g > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where h > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where i > 'a'")).hasRows(expectedSecondRow); + } + + @UseJdbc(0) + @Test + public void test_eq_queries_with_index_off_and_column_store_true() { + execute( + """ + create table t ( + a bit(2) index off, + b double index off, + c float index off, + d ip index off, + e string index off, + f boolean index off, + g int index off, + h long index off + ) + """ + ); + String firstRow = "(B'01', 1.1, 1.1, '1.1.1.1', 'a', false, 1, 1)"; + String expectedFirstRow = "B'01'| 1.1| 1.1| 1.1.1.1| a| false| 1| 1"; + String secondRow = "(B'10', 1.2, 1.2, '1.1.1.2', 'b', true, 2, 2)"; + String expectedSecondRow = "B'10'| 1.2| 1.2| 1.1.1.2| b| true| 2| 2"; + execute("insert into t values " + firstRow + ", " + secondRow); + refresh(); + + // EqQuery.termQuery + assertThat(execute("select * from t where a = B'01'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where b = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where c = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where d = '1.1.1.1'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where e = 'a'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where f = false")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where g = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where h = 1")).hasRows(expectedFirstRow); + + // EqQuery.RangeQuery + // UnsupportedFunctionException: Unknown function + //assertThat(execute("select * from t where a > B'01'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where b > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where c > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where d > '1.1.1.1'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where e > 'a'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where f > false")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where g > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where h > 1")).hasRows(expectedSecondRow); + } + + @UseJdbc(0) + @Test + public void test_eq_queries_with_index_off_and_column_store_false() { + execute( + """ + create table t ( + a bit(2) index off, + b double index off storage with (columnstore=false), + c float index off storage with (columnstore=false), + d ip index off, + e string index off storage with (columnstore=false), + f boolean index off, + g int index off storage with (columnstore=false), + h long index off storage with (columnstore=false) + ) + """ + ); + String firstRow = "(B'01', 1.1, 1.1, '1.1.1.1', 'a', false, 1, 1)"; + String expectedFirstRow = "B'01'| 1.1| 1.1| 1.1.1.1| a| false| 1| 1"; + String secondRow = "(B'10', 1.2, 1.2, '1.1.1.2', 'b', true, 2, 2)"; + String expectedSecondRow = "B'10'| 1.2| 1.2| 1.1.1.2| b| true| 2| 2"; + execute("insert into t values " + firstRow + ", " + secondRow); + refresh(); + + // EqQuery.termQuery + assertThat(execute("select * from t where a = B'01'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where b = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where c = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where d = '1.1.1.1'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where e = 'a'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where f = false")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where g = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where h = 1")).hasRows(expectedFirstRow); + + // EqQuery.RangeQuery + //assertThat(execute("select * from t where a > B'01'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where b > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where c > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where d > '1.1.1.1'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where e > 'a'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where f > false")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where g > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where h > 1")).hasRows(expectedSecondRow); + } + + @UseJdbc(0) + @Test + public void test_eq_queries_with_index_on_and_column_store_false() { + execute( + """ + create table t ( + a bit(2), + b double storage with (columnstore=false), + c float storage with (columnstore=false), + d ip, + e string storage with (columnstore=false), + f boolean, + g int storage with (columnstore=false), + h long storage with (columnstore=false), + i text index using fulltext storage with (columnstore=false) + ) + """ + ); + String firstRow = "(B'01', 1.1, 1.1, '1.1.1.1', 'a', false, 1, 1, 'a')"; + String expectedFirstRow = "B'01'| 1.1| 1.1| 1.1.1.1| a| false| 1| 1| a"; + String secondRow = "(B'10', 1.2, 1.2, '1.1.1.2', 'b', true, 2, 2, 'b')"; + String expectedSecondRow = "B'10'| 1.2| 1.2| 1.1.1.2| b| true| 2| 2| b"; + execute("insert into t values " + firstRow + ", " + secondRow); + refresh(); + + // EqQuery.termQuery + assertThat(execute("select * from t where a = B'01'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where b = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where c = 1.1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where d = '1.1.1.1'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where e = 'a'")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where f = false")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where g = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where h = 1")).hasRows(expectedFirstRow); + assertThat(execute("select * from t where i = 'a'")).hasRows(expectedFirstRow); + + // EqQuery.RangeQuery + //assertThat(execute("select * from t where a > B'01'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where b > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where c > 1.1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where d > '1.1.1.1'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where e > 'a'")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where f > false")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where g > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where h > 1")).hasRows(expectedSecondRow); + assertThat(execute("select * from t where i > 'a'")).hasRows(expectedSecondRow); + } }

['server/src/main/java/io/crate/types/FloatVectorType.java', 'server/src/main/java/io/crate/expression/scalar/SubscriptFunction.java', 'server/src/main/java/io/crate/types/BooleanType.java', 'server/src/main/java/io/crate/expression/operator/any/AnyEqOperator.java', 'server/src/main/java/io/crate/types/LongEqQuery.java', 'server/src/main/java/io/crate/types/StringType.java', 'server/src/main/java/io/crate/types/IpType.java', 'server/src/main/java/io/crate/expression/operator/any/AnyNeqOperator.java', 'server/src/test/java/io/crate/integrationtests/DDLIntegrationTest.java', 'server/src/main/java/io/crate/types/EqQuery.java', 'server/src/main/java/io/crate/execution/engine/collect/collectors/OptimizeQueryForSearchAfter.java', 'server/src/main/java/io/crate/expression/operator/EqOperator.java', 'server/src/main/java/io/crate/types/BitStringType.java', 'server/src/main/java/io/crate/types/FloatType.java', 'server/src/test/java/io/crate/expression/operator/EqOperatorTest.java', 'server/src/test/java/io/crate/integrationtests/LuceneQueryBuilderIntegrationTest.java', 'server/src/main/java/io/crate/expression/operator/CmpOperator.java', 'server/src/main/java/io/crate/types/IntEqQuery.java', 'server/src/main/java/io/crate/types/DoubleType.java']

{'.java': 19}

Java

{'Java': 32426037, 'Python': 71123, 'ANTLR': 46794, 'Shell': 13730, 'Batchfile': 4343}

Apache License 2.0

kestra-io/kestra/1821/1809

kestra-io

kestra

https://github.com/kestra-io/kestra/issues/1809

https://github.com/kestra-io/kestra/pull/1821

https://github.com/kestra-io/kestra/pull/1821

close

Simplify `EachParallel` with `WorkingDirectory` child tasks

### Issue description This flow works: ```yaml id: reproducer namespace: dev tasks: - id: parallel type: io.kestra.core.tasks.flows.EachParallel value: ["1", "2", "3", "4", "5", "6"] tasks: - id: seq type: io.kestra.core.tasks.flows.Sequential tasks: - id: pythonScripts type: io.kestra.core.tasks.flows.WorkingDirectory tasks: - id: cloneRepository type: io.kestra.plugin.git.Clone url: https://github.com/kestra-io/scripts branch: main - id: python type: io.kestra.plugin.scripts.python.Commands runner: DOCKER docker: image: ghcr.io/kestra-io/pydata:latest commands: - python etl/parametrized.py {{ parents[0].taskrun.value }} ``` however, it seems that it should already work without having to add the `Sequential` task, because `WorkingDirectory` already runs everything sequentially. However, without Sequential, the `taskrun.value` cannot be accessed: ```yaml id: reproducer namespace: dev tasks: - id: parallel type: io.kestra.core.tasks.flows.EachParallel value: ["1", "2", "3", "4", "5", "6"] tasks: - id: pythonScripts type: io.kestra.core.tasks.flows.WorkingDirectory tasks: - id: cloneRepository type: io.kestra.plugin.git.Clone url: https://github.com/kestra-io/scripts branch: main - id: python type: io.kestra.plugin.scripts.python.Commands runner: DOCKER docker: image: ghcr.io/kestra-io/pydata:latest commands: - python etl/parametrized.py {{ taskrun.value }} ``` this gives - `Missing variable: 'value' on 'python etl/parametrized.py {{ taskrun.value }}' at line 1` cc @loicmathieu

f8c55c52b10426343ac918b0579fc875b7e5dbe8

321df04d6bdc6efd0b32a75b2f5216ac38d30448

https://github.com/kestra-io/kestra/compare/f8c55c52b10426343ac918b0579fc875b7e5dbe8...321df04d6bdc6efd0b32a75b2f5216ac38d30448

diff --git a/core/src/main/java/io/kestra/core/tasks/flows/WorkingDirectory.java b/core/src/main/java/io/kestra/core/tasks/flows/WorkingDirectory.java index ffbb49d2..77b7a0b2 100644 --- a/core/src/main/java/io/kestra/core/tasks/flows/WorkingDirectory.java +++ b/core/src/main/java/io/kestra/core/tasks/flows/WorkingDirectory.java @@ -166,6 +166,7 @@ public class WorkingDirectory extends Sequential { .flowId(parent.getFlowId()) .taskId(task.getId()) .parentTaskRunId(parent.getId()) + .value(parent.getValue()) // copy parent value so that it can be used with existing flowable tasks easily .state(new State()) .build() )

['core/src/main/java/io/kestra/core/tasks/flows/WorkingDirectory.java']

{'.java': 1}

Java

{'Java': 2257332, 'Vue': 639984, 'JavaScript': 128289, 'SCSS': 30353, 'PLpgSQL': 10778, 'Handlebars': 5013, 'CSS': 2172, 'Python': 1969, 'Batchfile': 1966, 'HTML': 1430, 'Shell': 1308, 'Dockerfile': 611}

Apache License 2.0

pytorch/serve/1143/1130

pytorch

serve

https://github.com/pytorch/serve/issues/1130

https://github.com/pytorch/serve/pull/1143

https://github.com/pytorch/serve/pull/1143

fixes

Custom Requirements installation failed

Please have a look at [FAQ's](../../docs/FAQs.md) and [Troubleshooting guide](../../docs/Troubleshooting.md), your query may be already addressed. Your issue may already be reported! Please search on the [issue tracker](https://github.com/pytorch/serve/issues) before creating one. ## Context We are using torchserve to deploy, predict and explain pytorch lightning models in kubelow. For the inference service, we are using the official docker hub image - `pytorch/torchserve-kfs:0.4.0` Since the docker image doen't contain `pytorch-lightning` package. We are added it in `requirements.txt` and bundling it using `torch-model-archiver`. When `install_py_dep_per_model` is set to `true` the packages listed in the `requirements.txt` are **not getting installed**. The issue is getting reproduced in both standalone and docker images. * torchserve version: 0.4.0 * torch-model-archiver version: 0.4.0 * torch version: 1.8.1 * torchvision version [if any]: 0.9.1 * torchtext version [if any]: 0.9.1 * torchaudio version [if any]: * java version: ubuntu@ubuntu-ThinkPad-L490:~/Documents/facebook/phase2/mlflow-torchserve/examples/IrisClassification$ java --version openjdk 11.0.11-ea 2021-04-20 OpenJDK Runtime Environment (build 11.0.11-ea+4-Ubuntu-0ubuntu3.16.04.1) OpenJDK 64-Bit Server VM (build 11.0.11-ea+4-Ubuntu-0ubuntu3.16.04.1, mixed mode, sharing) * Operating System and version: Ubuntu - 16.04 ## Your Environment <!--- Include as many relevant details about the environment you experienced the bug in --> * Installed using source? [yes/no]: no * Are you planning to deploy it using docker container? [yes/no]: yes * Is it a CPU or GPU environment?: CPU * Using a default/custom handler? [If possible upload/share custom handler/model]: custom * What kind of model is it e.g. vision, text, audio?: vision/text * Are you planning to use local models from model-store or public url being used e.g. from S3 bucket etc.? [If public url then provide link.]: local model * Provide config.properties, logs [ts.log] and parameters used for model registration/update APIs: * Link to your project [if any]: ## Expected Behavior When `install_py_dep_per_model` is set to `true`, pytorch lightning should be installed and model should load successfully. ## Current Behavior when `install_py_dep_per_model` is set to `true`, torchserve is throwing the error (attached logs) It is strange that, even if `pytorch_lightning` is present in the environment and `install_py_dep_per_model` is set to `true`, the same error is getting reproduced. ## Possible Solution <!--- Not obligatory, but suggest a fix/reason for the bug --> ## Steps to Reproduce [iris.zip](https://github.com/pytorch/serve/files/6677618/iris.zip) 1. Unzip iris.zip - It contains `iris.mar` and `config.properties` file 2. Create a directory `model-store` 3. copy iris.mar inside `model-store` 4. set `install_py_dep_per_model=false` in config.properties 5. Install pytorch lightning using pip - `pip install pytorch_lightning==1.3.2` 5. start torchserve with following command `torchserve --start --ts-config config.properties` 6. Model will be loaded successfully. 7. Stop the torchserve - `torchserve --stop` 8. Uninstall pytorch lightining using `pip uninstall pytorch-lightning` 9. set `install_py_dep_per_model` to true now. 10. start torchserve with following command `torchserve --start --ts-config config.properties` ## Failure Logs [if any] Failure logs are attached in ts-failure.txt [ts-failure.txt](https://github.com/pytorch/serve/files/6677666/ts-failure.txt) Success scenario log [ts-success.txt](https://github.com/pytorch/serve/files/6677678/ts-success.txt)

a2822284d3e70fee342b4c009a6fab643b965067

f8f519b924c0dc3472844f448d88f2f7f5127f71

https://github.com/pytorch/serve/compare/a2822284d3e70fee342b4c009a6fab643b965067...f8f519b924c0dc3472844f448d88f2f7f5127f71

diff --git a/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java b/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java index 372d2afd..b633b9e7 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java +++ b/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java @@ -1,8 +1,10 @@ package org.pytorch.serve.wlm; import com.google.gson.JsonObject; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.nio.file.Path; import java.nio.file.Paths; @@ -145,10 +147,10 @@ public final class ModelManager { } } - logger.info("Model {} loaded.", tempModel.getModelName()); - setupModelDependencies(tempModel); + logger.info("Model {} loaded.", tempModel.getModelName()); + return archive; } @@ -211,15 +213,40 @@ public final class ModelManager { + requirementsFilePath; // NOPMD String[] envp = - EnvironmentUtils.getEnvString(configManager.getModelServerHome(), null, null); + EnvironmentUtils.getEnvString( + configManager.getModelServerHome(), + model.getModelDir().getAbsolutePath(), + null); + Process process = Runtime.getRuntime() .exec( packageInstallCommand, envp, model.getModelDir().getAbsoluteFile()); + int exitCode = process.waitFor(); + if (exitCode != 0) { + + String line; + StringBuilder outputString = new StringBuilder(); + // process's stdout is InputStream for caller process + BufferedReader brdr = + new BufferedReader(new InputStreamReader(process.getInputStream())); + while ((line = brdr.readLine()) != null) { + outputString.append(line); + } + StringBuilder errorString = new StringBuilder(); + // process's stderr is ErrorStream for caller process + brdr = new BufferedReader(new InputStreamReader(process.getErrorStream())); + while ((line = brdr.readLine()) != null) { + errorString.append(line); + } + + logger.info("Dependency installation stdout:\\n" + outputString.toString()); + logger.error("Dependency installation stderr:\\n" + errorString.toString()); + throw new ModelException( "Custom pip package installation failed for " + model.getModelName()); }

['frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java']

{'.java': 1}

Java

{'Java': 876672, 'Python': 695487, 'Jupyter Notebook': 83389, 'Shell': 34326, 'Dockerfile': 7806, 'Mustache': 1583}

Apache License 2.0

pytorch/serve/1550/1549

pytorch

serve

https://github.com/pytorch/serve/issues/1549

https://github.com/pytorch/serve/pull/1550

https://github.com/pytorch/serve/pull/1550

fixes

When an envelope is set in config.properties, the envelope of the workflow function is still null.

## Context <!--- How has this issue affected you? What are you trying to accomplish? --> <!--- Providing context helps us come up with a solution that is most useful in the real world --> * torchserve version: `0.5.3` * torch-model-archiver version: * torch version: `1.10.0` * torchvision version [if any]: * torchtext version [if any]: * torchaudio version [if any]: * java version: * Operating System and version: Ubuntu 18.04 ## Your Environment I use the image `pytorch/torchserve:0.5.3-cpu` as the environment. * Installed using source? [yes/no]: No * Are you planning to deploy it using docker container? [yes/no]: yes * Is it a CPU or GPU environment?: CPU * Using a default/custom handler? [If possible upload/share custom handler/model]: custom, see below. * What kind of model is it e.g. vision, text, audio?: vision **I test with two workflows:** - dog_breed_classification in the examples * Are you planning to use local models from model-store or public url being used e.g. from S3 bucket etc.? [If public url then provide link.]: * Provide config.properties, logs [ts.log] and parameters used for model registration/update APIs: ``` inference_address=http://0.0.0.0:8000 management_address=http://0.0.0.0:8001 metrics_address=http://0.0.0.0:8002 number_of_netty_threads=32 job_queue_size=1000 install_py_dep_per_model=true service_envelope=kservev2 load_models=all ``` * Link to your project [if any]: ## Expected Behavior The workflow function should have the same envelope as the workflow model does. The envelope of the workflow functions and models should be the same as specified in the config.properties. ## Current Behavior The workflow function's envelope is null while the workflow model's envelope is as specified in the config.properties. ## Reasons ### The envelope of the workflow function is not set correctly. > https://github.com/pytorch/serve/blob/6a191f822f2e759c2aad07b8f9eacbedcb039827/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java#L122 While the models' envelope are set to the default envelope specified in config.properties, the workflow funcitons' envelope is null. ## Possible Solution It is possible to set all the workflow model/functions' envelope to null, whatever the service_envelope specifed in the config.properties. However, this creates an inconsistence between the model api standard and the workflow api standard. And all the models in the workflow use null envelope while other models use another envelope. Therefore, it is not a desired solution. In order to solve the issue and maintain the consistency between APIs of workflow and standalone models: Set the envelope of workflow functions to the default envelope as regular models (those have `.mar` files) ## Steps to Reproduce 1. Pull the image `pytorch/torchserve:0.5.3-cpu` 2. Set the `service_envelope` to any envelope, run the container with the workflow. ## Failure Logs [if any] I add some print in `ts/model_service_worker.py`: ```python class TorchModelServiceWorker(object): @staticmethod def load_model(load_model_request): try: model_dir = load_model_request["modelPath"].decode("utf-8") model_name = load_model_request["modelName"].decode("utf-8") handler = load_model_request["handler"].decode("utf-8") if load_model_request["handler"] else None envelope = load_model_request["envelope"].decode("utf-8") if "envelope" in load_model_request else None envelope = envelope if envelope is not None and len(envelope) > 0 else None print("=" * 50) print("model name:", model_name) print("envelope: ", envelope) ``` Below are the logs when loading the `dog_breed_classification`: ```diff + 2022-03-22T06:39:04,375 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0-stdout MODEL_LOG - ================================================== + 2022-03-22T06:39:04,375 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__pre_processing + 2022-03-22T06:39:04,375 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0-stdout MODEL_LOG - envelope: None 2022-03-22T06:39:04,375 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__pre_processing, batchSize: 1 2022-03-22T06:39:04,376 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0 org.pytorch.serve.wlm.WorkerThread - Backend response time: 1 2022-03-22T06:39:04,376 [DEBUG] W-9024-dog_breed_wf_new__pre_processing_1.0 org.pytorch.serve.wlm.WorkerThread - W-9024-dog_breed_wf_new__pre_processing_1.0 State change WORKER_STARTED -> WORKER_MODEL_LOADED 2022-03-22T06:39:04,376 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0 TS_METRICS - W-9024-dog_breed_wf_new__pre_processing_1.0.ms:959|#Level:Host|#hostname:8b026932f222,timestamp:1647931144 2022-03-22T06:39:04,376 [INFO ] W-9024-dog_breed_wf_new__pre_processing_1.0 TS_METRICS - WorkerThreadTime.ms:1|#Level:Host|#hostname:8b026932f222,timestamp:null 2022-03-22T06:39:04,875 [DEBUG] pool-6-thread-2 org.pytorch.serve.wlm.ModelVersionedRefs - Adding new version 1.0 for model dog_breed_wf_new__dog_breed_classification 2022-03-22T06:39:04,875 [DEBUG] pool-6-thread-2 org.pytorch.serve.wlm.ModelVersionedRefs - Setting default version to 1.0 for model dog_breed_wf_new__dog_breed_classification 2022-03-22T06:39:04,875 [INFO ] pool-6-thread-2 org.pytorch.serve.wlm.ModelManager - Model dog_breed_wf_new__dog_breed_classification loaded. 2022-03-22T06:39:04,875 [DEBUG] pool-6-thread-2 org.pytorch.serve.wlm.ModelManager - updateModel: dog_breed_wf_new__dog_breed_classification, count: 1 2022-03-22T06:39:04,876 [DEBUG] W-9026-dog_breed_wf_new__dog_breed_classification_1.0 org.pytorch.serve.wlm.WorkerLifeCycle - Worker cmdline: [/home/venv/bin/python, /home/venv/lib/python3.8/site-packages/ts/model_service_worker.py, --sock-type, unix, --sock-name, /home/model-server/tmp/.ts.sock.9026] 2022-03-22T06:39:05,040 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - Listening on port: /home/model-server/tmp/.ts.sock.9025 2022-03-22T06:39:05,041 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - [PID]14321 2022-03-22T06:39:05,041 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - Torch worker started. 2022-03-22T06:39:05,041 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - Python runtime: 3.8.0 2022-03-22T06:39:05,041 [DEBUG] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 org.pytorch.serve.wlm.WorkerThread - W-9025-dog_breed_wf_new__cat_dog_classification_1.0 State change null -> WORKER_STARTED 2022-03-22T06:39:05,041 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 org.pytorch.serve.wlm.WorkerThread - Connecting to: /home/model-server/tmp/.ts.sock.9025 2022-03-22T06:39:05,042 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - Connection accepted: /home/model-server/tmp/.ts.sock.9025. 2022-03-22T06:39:05,042 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 org.pytorch.serve.wlm.WorkerThread - Flushing req. to backend at: 1647931145042 + 2022-03-22T06:39:05,042 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - ================================================== + 2022-03-22T06:39:05,043 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__cat_dog_classification + 2022-03-22T06:39:05,043 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - envelope: kservev2 2022-03-22T06:39:05,043 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__cat_dog_classification, batchSize: 4 2022-03-22T06:39:05,781 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - Listening on port: /home/model-server/tmp/.ts.sock.9026 2022-03-22T06:39:05,782 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - [PID]14334 2022-03-22T06:39:05,782 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - Torch worker started. 2022-03-22T06:39:05,782 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - Python runtime: 3.8.0 2022-03-22T06:39:05,782 [DEBUG] W-9026-dog_breed_wf_new__dog_breed_classification_1.0 org.pytorch.serve.wlm.WorkerThread - W-9026-dog_breed_wf_new__dog_breed_classification_1.0 State change null -> WORKER_STARTED 2022-03-22T06:39:05,782 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0 org.pytorch.serve.wlm.WorkerThread - Connecting to: /home/model-server/tmp/.ts.sock.9026 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - Connection accepted: /home/model-server/tmp/.ts.sock.9026. 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0 org.pytorch.serve.wlm.WorkerThread - Flushing req. to backend at: 1647931145783 + 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - ================================================== + 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__dog_breed_classification + 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - envelope: kservev2 2022-03-22T06:39:05,783 [INFO ] W-9026-dog_breed_wf_new__dog_breed_classification_1.0-stdout MODEL_LOG - model_name: dog_breed_wf_new__dog_breed_classification, batchSize: 4 2022-03-22T06:39:06,366 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0-stdout MODEL_LOG - Missing the index_to_name.json file. Inference output will not include class name. 2022-03-22T06:39:06,366 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 org.pytorch.serve.wlm.WorkerThread - Backend response time: 1324 2022-03-22T06:39:06,366 [DEBUG] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 org.pytorch.serve.wlm.WorkerThread - W-9025-dog_breed_wf_new__cat_dog_classification_1.0 State change WORKER_STARTED -> WORKER_MODEL_LOADED 2022-03-22T06:39:06,366 [INFO ] W-9025-dog_breed_wf_new__cat_dog_classification_1.0 TS_METRICS - W-9025-dog_breed_wf_new__cat_dog_classification_1.0.ms:2231|#Level:Host|#hostname:8b026932f222,tim ```

7aae58eb0f1d6fc1b61524fb99a7fd9dfc44f71c

62ec076e60edd51f819c5f1ba054c5ecbd566e0e

https://github.com/pytorch/serve/compare/7aae58eb0f1d6fc1b61524fb99a7fd9dfc44f71c...62ec076e60edd51f819c5f1ba054c5ecbd566e0e

diff --git a/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java b/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java index 2cc8d7a2..7245241c 100644 --- a/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java +++ b/frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java @@ -125,7 +125,7 @@ public final class ModelManager { manifest.getModel().setModelVersion("1.0"); manifest.getModel().setModelName(modelName); manifest.getModel().setHandler(new File(handler).getName()); - + manifest.getModel().setEnvelope(configManager.getTsServiceEnvelope()); File f = new File(handler.substring(0, handler.lastIndexOf(':'))); archive = new ModelArchive(manifest, url, f.getParentFile(), true); } else {

['frontend/server/src/main/java/org/pytorch/serve/wlm/ModelManager.java']

{'.java': 1}

Java

{'Java': 876672, 'Python': 695487, 'Jupyter Notebook': 83389, 'Shell': 34326, 'Dockerfile': 7806, 'Mustache': 1583}

Apache License 2.0

movingblocks/terasology/3588/3587

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3587

https://github.com/MovingBlocks/Terasology/pull/3588

https://github.com/MovingBlocks/Terasology/pull/3588

fixes

Game behaves poorly on interacting with the windowed/fullscreen option

### What you were trying to do Change from windowed to fullscreen mode. Expected that interacting with (clicking/activating) the display mode drop-down would show all the available options on one interaction then let me choose with a second interaction ### What actually happened Game window disappeared (as if about to change display mode) but game kept running and the whole OS started mildly freaking out (seems like it outright crashed an OS process for @Adrijaned on Linux). It feels like the game gets stuck in a state where it is trying to swap windowed state constantly Theory is that it relates to how activating the UI widget works, likely after tabbing was introduced. Actually tabbing to the widget and varying the display mode with down arrow works. Only clicking the widget with the mouse makes the game freak out. It seems like too much happens at once. Interacting with the drop-down should first reveal the options then not activate a given item until a second interaction (second mouse click or hitting enter after selecting an option with the arrow keys) May similarly affect the drop-down widget in general? See also #3581 and #3561 for potential clues ### How to reproduce * Run game * Go to video settings * Click on the Display Mode drop-down (using tab plus arrow keys still work fine) If other drop-downs are also affected it may be easier to test with those. After interacting poorly with the display mode drop-down i have to force-kill the game - it may destabilize your OS, beware! ### Log details and game version No applicable logging, latest develop branch as of this write-up ### Computer details Win10 with a 4k monitor in case it matters

2bad493b1e9e095f17d0d2f1a432831cb8b3e299

53377977162105b02b7421c8719bd38cde9956d9

https://github.com/movingblocks/terasology/compare/2bad493b1e9e095f17d0d2f1a432831cb8b3e299...53377977162105b02b7421c8719bd38cde9956d9

diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdown.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdown.java index ae4a319e5..188408a74 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdown.java +++ b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdown.java @@ -110,7 +110,7 @@ public void onDraw(Canvas canvas) { for (int i = 0; i < optionListeners.size(); ++i) { if (optionListeners.get(i).isMouseOver()) { canvas.setMode(HOVER_MODE); - } else if (i==highlighted) { + } else if (i==highlighted && TabbingManager.focusedWidget != null && TabbingManager.focusedWidget.equals(this)) { canvas.setMode(HOVER_MODE); setSelection(getOptions().get(highlighted)); } else { diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdownScrollable.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdownScrollable.java index 7bf230520..5b91489f7 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdownScrollable.java +++ b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdownScrollable.java @@ -24,6 +24,7 @@ import org.terasology.rendering.nui.Canvas; import org.terasology.rendering.nui.InteractionListener; import org.terasology.rendering.nui.SubRegion; +import org.terasology.rendering.nui.TabbingManager; import org.terasology.rendering.nui.databinding.Binding; import org.terasology.rendering.nui.databinding.DefaultBinding; import org.terasology.rendering.nui.events.NUIMouseClickEvent; @@ -191,7 +192,7 @@ private void createScrollbarItems(Canvas canvas, Rect2i frame, Font font, Border private void readItemMouseOver(Canvas canvas, int i) { if (optionListeners.get(i).isMouseOver()) { canvas.setMode(HOVER_MODE); - } else if (i == highlighted) { + } else if (i == highlighted && TabbingManager.focusedWidget != null && TabbingManager.focusedWidget.equals(this)) { canvas.setMode(HOVER_MODE); setSelection(getOptions().get(highlighted)); } else {

['engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdown.java', 'engine/src/main/java/org/terasology/rendering/nui/widgets/UIDropdownScrollable.java']

{'.java': 2}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3666/3665

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3665

https://github.com/MovingBlocks/Terasology/pull/3666

https://github.com/MovingBlocks/Terasology/pull/3666

fixes

OpenGL Line Width Warning

When hovering over anything that creates a hitbox outline, the following error gets printed out every tick: `[main] WARN OpenGL - [api] [deprecated] API_ID_LINE_WIDTH deprecated behavior warning has been generated. Wide lines have been deprecated. glLineWidth set to 2.000000. glLineWidth with width greater than 1.0 will generate GL_INVALID_VALUE error in future versions` This is due to several `glLineWidth` calls where the parameter is 2 (unsurprisingly). This means the fix is very simply just changing these calls to use 1 instead.

65729fc3ae0dea8ac45458302bc653e8530274f7

b845970bd8f613ccc1bf1c3b7213d34fe65bf3eb

https://github.com/movingblocks/terasology/compare/65729fc3ae0dea8ac45458302bc653e8530274f7...b845970bd8f613ccc1bf1c3b7213d34fe65bf3eb

diff --git a/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java b/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java index 329a431d8..d2052c7c7 100644 --- a/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java +++ b/engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java @@ -399,7 +399,7 @@ public void renderOverlay() { if (config.getRendering().isRenderPlacingBox()) { if (aabb != null) { aabbRenderer.setAABB(aabb); - aabbRenderer.render(2f); + aabbRenderer.render(1f); } } } diff --git a/engine/src/main/java/org/terasology/rendering/logic/RegionOutlineRenderer.java b/engine/src/main/java/org/terasology/rendering/logic/RegionOutlineRenderer.java index fd2233ceb..726acb32e 100644 --- a/engine/src/main/java/org/terasology/rendering/logic/RegionOutlineRenderer.java +++ b/engine/src/main/java/org/terasology/rendering/logic/RegionOutlineRenderer.java @@ -96,7 +96,7 @@ public void renderOverlay() { return; // skip everything if there is nothing to do to avoid possibly costly draw mode changes } glDisable(GL_DEPTH_TEST); - glLineWidth(2); + glLineWidth(1); Vector3f cameraPosition = worldRenderer.getActiveCamera().getPosition(); FloatBuffer tempMatrixBuffer44 = BufferUtils.createFloatBuffer(16); diff --git a/engine/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java b/engine/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java index 1b5812169..3648d92ad 100644 --- a/engine/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java +++ b/engine/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java @@ -312,7 +312,7 @@ public void renderOverlay() { material.setFloat("sunlight", 1.0f, true); material.setFloat("blockLight", 1.0f, true); material.setMatrix4("projectionMatrix", worldRenderer.getActiveCamera().getProjectionMatrix()); - glLineWidth(2); + glLineWidth(1); Vector3f worldPos = new Vector3f();

['engine/src/main/java/org/terasology/logic/players/LocalPlayerSystem.java', 'engine/src/main/java/org/terasology/rendering/logic/RegionOutlineRenderer.java', 'engine/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java']

{'.java': 3}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3689/3688

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3688

https://github.com/MovingBlocks/Terasology/pull/3689

https://github.com/MovingBlocks/Terasology/pull/3689

fixes

Terrible things happen when starting a _second_ game without a game restart

### What you were trying to do Test unrelated things! Which sometimes involve jumping into more than one world. ### What actually happened Inconsistently would get warped worlds with messed up data, from broken chunks to entirely messed up block data (hills of torches, pure water world, etc) ### How to reproduce This is the minimal use case I could consistently reproduce real quick * Step 0: (Unsure if needed: start from a clean game, no saves or config) * Step 1: Start the game from source, create a new game, pick Core, quick start * Step 2: Verify all looks well, exit back to the main menu * Step 3: Create a new game, pick Core, quick start - bad things happen Similar issues have happened in the past (malformed block ids through some scenario), but I thought they were all long gone. Game state handling between multiple games in one game launch has remained a fragile area, however. Chances are something isn't being reset properly when leaving the first game world.

67024bd9c97aee9122039080795a508d9a3a629e

6ab352f0f34052ef63b9941b8ad2987394d2c8a8

https://github.com/movingblocks/terasology/compare/67024bd9c97aee9122039080795a508d9a3a629e...6ab352f0f34052ef63b9941b8ad2987394d2c8a8

diff --git a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIText.java b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIText.java index 609681bef..40fc96c2e 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/widgets/UIText.java +++ b/engine/src/main/java/org/terasology/rendering/nui/widgets/UIText.java @@ -17,6 +17,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.ObjectArrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.terasology.input.Keyboard; @@ -677,15 +678,7 @@ public void bindText(Binding<String> binding) { * contents of linesOfText or text accordingly. */ public String getText() { - String arrayText = ""; - if(linesOfText.length > 0) { - arrayText = String.join("\\n", linesOfText); - } - - if(text.get() != "") { - return text.get() + "\\n" + arrayText; - } - return text.get() + arrayText; + return String.join("\\n", ObjectArrays.concat(text.get(), linesOfText)); } /**

['engine/src/main/java/org/terasology/rendering/nui/widgets/UIText.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3749/3745

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3745

https://github.com/MovingBlocks/Terasology/pull/3749

https://github.com/MovingBlocks/Terasology/pull/3749

fix

Can't run game with "./gradlew game"

I create local repo on my machine. Follow instructions, but if I try do **./gradlew game** i see this: **java.lang.RuntimeException: java.util.concurrent.ExecutionException: org.reflections.ReflectionsException: could not create Vfs.Dir from url, no matching UrlType was found [file:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext/libatk-wrapper.so] either use fromURL(final URL url, final List<UrlType> urlTypes) or use the static setDefaultURLTypes(final List<UrlType> urlTypes) or addDefaultURLTypes(UrlType urlType) with your specialized UrlType.** Logs file here [Terasology-init.log](https://github.com/MovingBlocks/Terasology/files/3665893/Terasology-init.log) And, i think, that's my another problem, but i hope u can help. If I try run any build in my IDEA, i see this: **Exception in thread "main" java.lang.IllegalArgumentException: input == null! at javax.imageio.ImageIO.read(ImageIO.java:1394) at org.terasology.splash.overlay.ImageOverlay.<init>(ImageOverlay.java:38) at org.terasology.splash.overlay.TriggerImageOverlay.<init>(TriggerImageOverlay.java:30) at org.terasology.engine.Terasology.configureSplashScreen(Terasology.java:206) at org.terasology.engine.Terasology.main(Terasology.java:125)** OS - Ubuntu 18.04.3 LTS java -version openjdk version "1.8.0_222" OpenJDK Runtime Environment (build 1.8.0_222-8u222-b10-1ubuntu1~18.04.1-b10) OpenJDK 64-Bit Server VM (build 25.222-b10, mixed mode)

bd30280ea1b914218dfdee0a721456b28e7c7d56

4717dce65980f0457241d9c1d9c7031c675ca1ff

https://github.com/movingblocks/terasology/compare/bd30280ea1b914218dfdee0a721456b28e7c7d56...4717dce65980f0457241d9c1d9c7031c675ca1ff

diff --git a/engine/src/main/java/org/terasology/reflection/TypeRegistry.java b/engine/src/main/java/org/terasology/reflection/TypeRegistry.java index 78c1d801a..ecd1d42e6 100644 --- a/engine/src/main/java/org/terasology/reflection/TypeRegistry.java +++ b/engine/src/main/java/org/terasology/reflection/TypeRegistry.java @@ -110,7 +110,6 @@ private void initializeReflections(ClassLoader classLoader) { .toArray(ClassLoader[]::new) )) .filterInputsBy(TypeRegistry::filterWhitelistedTypes) - .useParallelExecutor() ); }

['engine/src/main/java/org/terasology/reflection/TypeRegistry.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3294/2755

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/2755

https://github.com/MovingBlocks/Terasology/pull/3294

https://github.com/MovingBlocks/Terasology/pull/3294

fix

StackOverflow in NUI editor when setting to 2 items to be on top of each other

<!-- Thanks for taking the time to submit a thorough issue report for Terasology! :-) Please fill out whichever details below seem relevant to your issue. Note that suggestions, general questions & support should go in the forum: * http://forum.terasology.org/forum/suggestions.21 * http://forum.terasology.org/forum/support.20/ Bug reports and crashes likely resulting from bugs in the engine go here on GitHub. --> ### What you were trying to do When using the NUI editor, had an item with its position-bottom target set to TOP and widget to the id of the second item. Then accidentally set the second item's position-top target set to TOP and widget to the id of the first item. ### What actually happened A StackOverflow error is thrown, and everytime the NUI Editor is launched the exception is thrown again. Probably because when throwing the exception the file is auto-saved then when relaunching the editor it loads the auto-save and the exception is thrown again. ### How to reproduce * Create a new screen in the NUI Editor * Add 2 UILabels (for example, but probably can be done with anything) * Add a position-bottom to the first UILabel. Set its widget value to the id of the second UILabel, and its target to TOP * Add a position-top to the second UILabel. Set its widget value to the id of the first UILabel ### Log details, and UI code [Terasology Menu Log](https://github.com/MovingBlocks/Terasology/files/702622/Terasology-menu.log.txt) And the UI where it occured. ```json { "selectedAsset": "New Screen", "editorContents": { "type": "PlaceholderScreen", "skin": "engine:default", "contents": { "type": "RelativeLayout", "contents": [ { "type": "UILabel", "id": "sampleLabel", "layoutInfo": { "width": 500, "position-horizontal-center": {}, "position-vertical-center": {}, "position-bottom": { "widget": "newWidget", "target": "TOP" } }, "text": "Welcome to the Terasology NUI editor!\\r\\nVisit https://github.com/Terasology/TutorialNui/wiki for a quick overview of the editor,\\r\\nas well as the NUI framework itself." }, { "type": "engine:UILabel", "id": "newWidget", "layoutInfo": { "position-top": { "target": "TOP", "widget": "sampleLabel" } } } ] } } } ```

9e037d1c197a448573e2a33b1011a7a9d391ee85

83fb6f6a5f3dbfd88c5ae3af00bf5fc334501817

https://github.com/movingblocks/terasology/compare/9e037d1c197a448573e2a33b1011a7a9d391ee85...83fb6f6a5f3dbfd88c5ae3af00bf5fc334501817

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layouts/relative/RelativeLayout.java b/engine/src/main/java/org/terasology/rendering/nui/layouts/relative/RelativeLayout.java index 1a93c0ea9..340896884 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layouts/relative/RelativeLayout.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layouts/relative/RelativeLayout.java @@ -190,9 +190,13 @@ private Rect2i getTargetRegion(String id, Canvas canvas) { } WidgetInfo target = contentLookup.get(id); if (target != null) { - Rect2i region = getRegion(target, canvas); - loopDetectionId = ""; - return region; + try { + Rect2i region = getRegion(target, canvas); + loopDetectionId = ""; + return region; + } catch (StackOverflowError e){ + logger.error("Stack Overflow detected resolving layout of element {}, unable to render", loopDetectionId); + } } } loopDetectionId = "";

['engine/src/main/java/org/terasology/rendering/nui/layouts/relative/RelativeLayout.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3763/3740

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3740

https://github.com/MovingBlocks/Terasology/pull/3763

https://github.com/MovingBlocks/Terasology/pull/3763

fixes

Trees in JoshariasSurvival are broken, yet same worldgen in plain Core is fine. BiomesAPI quirk?

Also happens if you use the Shattered Planes worldgen. Trees just have trunk pieces, no leaf blocks. Happened relatively recently, the closest guess I have is that it happened with the BiomesAPI thing where we also lost the hue on leaf/grass blocks temporarily until a better redo later?

45f5dcc0ae00563bb97d9f75f5c16d246b9516c9

b04a0700666a01fa3dd366c2417e40d674c6a9bb

https://github.com/movingblocks/terasology/compare/45f5dcc0ae00563bb97d9f75f5c16d246b9516c9...b04a0700666a01fa3dd366c2417e40d674c6a9bb

diff --git a/modules/Core/src/main/java/org/terasology/core/world/generator/rasterizers/TreeRasterizer.java b/modules/Core/src/main/java/org/terasology/core/world/generator/rasterizers/TreeRasterizer.java index a445fd679..5b6654325 100644 --- a/modules/Core/src/main/java/org/terasology/core/world/generator/rasterizers/TreeRasterizer.java +++ b/modules/Core/src/main/java/org/terasology/core/world/generator/rasterizers/TreeRasterizer.java @@ -43,6 +43,15 @@ public class TreeRasterizer implements WorldRasterizer { @Override public void initialize() { blockManager = CoreRegistry.get(BlockManager.class); + //TODO: Remove these lines when lazy block registration is fixed + //Currently they are required to ensure that the blocks are all registered before worldgen + blockManager.getBlock("CoreBlocks:OakTrunk"); + blockManager.getBlock("CoreBlocks:PineTrunk"); + blockManager.getBlock("CoreBlocks:BirchTrunk"); + blockManager.getBlock("CoreBlocks:GreenLeaf"); + blockManager.getBlock("CoreBlocks:DarkLeaf"); + blockManager.getBlock("CoreBlocks:RedLeaf"); + blockManager.getBlock("CoreBlocks:Cactus"); } @Override

['modules/Core/src/main/java/org/terasology/core/world/generator/rasterizers/TreeRasterizer.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3790/3768

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3768

https://github.com/MovingBlocks/Terasology/pull/3790

https://github.com/MovingBlocks/Terasology/pull/3790

fixes

Error Dialog cannot be closed

# What you were trying to do Close the error dialog coming up on starting a game whilst having dependency issues underneath. ### What actually happened The "Ok" button is not clickable. It's also not greyed out or anything, but if I click on it, simply nothing happens. ### How to reproduce * Create and save a game and exit Terasology (e.g. LaS) * Enforce a dependency issue for some module used in the game (e.g. adapt dependency version of LaS dependency) * Try to load the game (should result in an error dialog popping up) * Try to click the "Ok" button

b8e06611b9c436b9b0980444802a1ae4085ed1ad

70ac0dca842a321db86c5f9a2f7c75a7270b9d62

https://github.com/movingblocks/terasology/compare/b8e06611b9c436b9b0980444802a1ae4085ed1ad...70ac0dca842a321db86c5f9a2f7c75a7270b9d62

diff --git a/engine/src/main/java/org/terasology/input/InputSystem.java b/engine/src/main/java/org/terasology/input/InputSystem.java index 4a25ee0cd..4436af65f 100644 --- a/engine/src/main/java/org/terasology/input/InputSystem.java +++ b/engine/src/main/java/org/terasology/input/InputSystem.java @@ -155,8 +155,8 @@ private void updateInputEntities() { || inputEntities.length != 2 || inputEntities[0] == null || inputEntities[1] == null - || !inputEntities[0].equals(localPlayer.getClientEntity()) - || !inputEntities[1].equals(localPlayer.getCharacterEntity())) { + || inputEntities[0] != localPlayer.getClientEntity() + || inputEntities[1] != localPlayer.getCharacterEntity()) { inputEntities = new EntityRef[]{localPlayer.getClientEntity(), localPlayer.getCharacterEntity()}; } }

['engine/src/main/java/org/terasology/input/InputSystem.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3824/3556

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3556

https://github.com/MovingBlocks/Terasology/pull/3824

https://github.com/MovingBlocks/Terasology/pull/3824

fixes

Unplugging joystick leads to crash

### What you were trying to do * I tried unplugging my joystick by pulling the cord ### What actually happened * My joystick got unplugged as planned * Terasology crashed in a way not planned at all ### How to reproduce * Step 1: Use a joystick * Step 2: Pull the cord * Step 3: No profit ### Log details and game version https://pastebin.com/vKT69jL3 ### Computer details * In the logfile. More info on request.

4e95d495f21d5a687a48d1edb0f389fb66d7e1cc

c58ddbf8e8cd6336a402bb7368731cccd88a52b7

https://github.com/movingblocks/terasology/compare/4e95d495f21d5a687a48d1edb0f389fb66d7e1cc...c58ddbf8e8cd6336a402bb7368731cccd88a52b7

diff --git a/engine/src/main/java/org/terasology/input/lwjgl/JInputControllerDevice.java b/engine/src/main/java/org/terasology/input/lwjgl/JInputControllerDevice.java index 83c40910d..5d147734c 100644 --- a/engine/src/main/java/org/terasology/input/lwjgl/JInputControllerDevice.java +++ b/engine/src/main/java/org/terasology/input/lwjgl/JInputControllerDevice.java @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Queue; import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; /** * Retrieves information on connected controllers through JInput. @@ -72,7 +73,8 @@ public class JInputControllerDevice implements ControllerDevice { .build(); private ControllerConfig config; - private final List<Controller> controllers = new ArrayList<>(); + /* MUST be a CopyOnWriteArrayList! Or else you just get crashes when unplugging controllers. */ + private final List<Controller> controllers = new CopyOnWriteArrayList<>(); public JInputControllerDevice(ControllerConfig config) { this.config = config;

['engine/src/main/java/org/terasology/input/lwjgl/JInputControllerDevice.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3097/3091

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3091

https://github.com/MovingBlocks/Terasology/pull/3097

https://github.com/MovingBlocks/Terasology/pull/3097

fix

Telemetry: indirect breaking of blocks causes NullPointerException

Relatively minor issue: some types of destruction can result in indirect breakage of blocks, such as when you break a block *below* a billboard plant, torch, or loose rock in JoshariasSurvival. This can lead to `EntityDestructionAuthoritySystem.recordDestroyed()` encountering a null `instigator` causing an NPE and stopping the destruction (meaning the thing on top doesn't pop) We should either null-proof the use of instigator or find an alternative way to associate the block destruction with whomever did it. Likely of interest to @GabrielXia :-) ``` 13:29:57.153 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.network.NetworkComponent added to EntityRef{id = 55761, netId = 1999, prefab = 'Core:dustEffect'} 13:29:57.153 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.logic.location.LocationComponent added to EntityRef{id = 55761, netId = 1999, prefab = 'Core:dustEffect'} 13:29:57.153 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.entitySystem.entity.internal.EntityInfoComponent removed from EntityRef{id = 55758, netId = 1997} 13:29:57.153 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.entitySystem.entity.internal.EntityInfoComponent added to EntityRef{id = 55758, netId = 1997} 13:29:57.153 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.logic.health.HealthComponent removed from EntityRef{id = 55758, netId = 1997} 13:29:57.154 [main] ERROR o.t.e.event.internal.EventSystemImpl - Failed to invoke event java.lang.NullPointerException: null at org.terasology.logic.health.EntityDestructionAuthoritySystem.recordDestroyed(EntityDestructionAuthoritySystem.java:47) at org.terasology.logic.health.EntityDestructionAuthoritySystem.onDestroy(EntityDestructionAuthoritySystem.java:33) at org.terasology.logic.health.EntityDestructionAuthoritySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.world.block.structure.BlockStructuralSupportSystem.validateSupportForBlockOnSide(BlockStructuralSupportSystem.java:113) at org.terasology.world.block.structure.BlockStructuralSupportSystem.checkForSupportRemoved(BlockStructuralSupportSystem.java:85) at org.terasology.world.block.structure.BlockStructuralSupportSystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.world.internal.EntityAwareWorldProvider.updateBlockEntity(EntityAwareWorldProvider.java:155) at org.terasology.world.internal.EntityAwareWorldProvider.setBlock(EntityAwareWorldProvider.java:120) at org.terasology.world.internal.WorldProviderWrapper.setBlock(WorldProviderWrapper.java:52) at org.terasology.world.block.entity.BlockEntitySystem.doDestroy(BlockEntitySystem.java:88) at org.terasology.world.block.entity.BlockEntitySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.health.EntityDestructionAuthoritySystem.onDestroy(EntityDestructionAuthoritySystem.java:37) at org.terasology.logic.health.EntityDestructionAuthoritySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.health.HealthAuthoritySystem.doDamage(HealthAuthoritySystem.java:181) at org.terasology.logic.health.HealthAuthoritySystem.checkDamage(HealthAuthoritySystem.java:196) at org.terasology.logic.health.HealthAuthoritySystem.onDamage(HealthAuthoritySystem.java:188) at org.terasology.logic.health.HealthAuthoritySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.health.HealthAuthoritySystem.damageEntity(HealthAuthoritySystem.java:121) at org.terasology.logic.health.BlockDamageAuthoritySystem.onAttackHealthlessBlock(BlockDamageAuthoritySystem.java:221) at org.terasology.logic.health.BlockDamageAuthoritySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendConsumableEvent(EventSystemImpl.java:279) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:258) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.characters.CharacterSystem.onAttackRequest(CharacterSystem.java:217) at org.terasology.logic.characters.CharacterSystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.network.internal.NetClient.processEvents(NetClient.java:527) at org.terasology.network.internal.NetClient.processReceivedMessages(NetClient.java:423) at org.terasology.network.internal.NetClient.update(NetClient.java:230) at org.terasology.network.internal.NetworkSystemImpl.update(NetworkSystemImpl.java:319) at org.terasology.engine.subsystem.common.NetworkSubsystem.preUpdate(NetworkSubsystem.java:46) at org.terasology.engine.TerasologyEngine.tick(TerasologyEngine.java:428) at org.terasology.engine.TerasologyEngine.mainLoop(TerasologyEngine.java:400) at org.terasology.engine.TerasologyEngine.run(TerasologyEngine.java:376) at org.terasology.engine.Terasology.main(Terasology.java:142) 13:29:57.483 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.particles.components.affectors.AccelerationAffectorComponent added to EntityRef{id = 55882, netId = 2000, prefab = 'Core:defaultBlockParticles'} 13:29:57.483 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.entitySystem.entity.internal.EntityInfoComponent added to EntityRef{id = 55882, netId = 2000, prefab = 'Core:defaultBlockParticles'} 13:29:57.483 [main] INFO o.t.n.internal.NetworkSystemImpl - Component class org.terasology.network.NetworkComponent added to EntityRef{id = 55882, netId = 2000, prefab = 'Core:defaultBlockParticles'} ```

79e6d0182ac888f1f52881aa97b6e299f219b24e

1060b88e32842d99a3f4e48387579abb985d233c

https://github.com/movingblocks/terasology/compare/79e6d0182ac888f1f52881aa97b6e299f219b24e...1060b88e32842d99a3f4e48387579abb985d233c

diff --git a/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java index e79321d66..84c633a32 100644 --- a/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java +++ b/engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java @@ -30,7 +30,7 @@ public class EntityDestructionAuthoritySystem extends BaseComponentSystem { @ReceiveEvent public void onDestroy(DestroyEvent event, EntityRef entity) { - recordDestroyed(event,entity); + recordDestroyed(event, entity); BeforeDestroyEvent destroyCheck = new BeforeDestroyEvent(event.getInstigator(), event.getDirectCause(), event.getDamageType()); entity.send(destroyCheck); if (!destroyCheck.isConsumed()) { @@ -41,40 +41,42 @@ public void onDestroy(DestroyEvent event, EntityRef entity) { private void recordDestroyed(DestroyEvent event, EntityRef entityRef) { EntityRef instigator = event.getInstigator(); - if (entityRef.hasComponent(BlockComponent.class)) { - BlockComponent blockComponent = entityRef.getComponent(BlockComponent.class); - String blockName = blockComponent.getBlock().getDisplayName(); - if (instigator.hasComponent(GamePlayStatsComponent.class)) { - GamePlayStatsComponent gamePlayStatsComponent = instigator.getComponent(GamePlayStatsComponent.class); - Map<String, Integer> blockDestroyedMap = gamePlayStatsComponent.blockDestroyedMap; - if (blockDestroyedMap.containsKey(blockName)) { - blockDestroyedMap.put(blockName, blockDestroyedMap.get(blockName) + 1); + if (instigator != null) { + if (entityRef.hasComponent(BlockComponent.class)) { + BlockComponent blockComponent = entityRef.getComponent(BlockComponent.class); + String blockName = blockComponent.getBlock().getDisplayName(); + if (instigator.hasComponent(GamePlayStatsComponent.class)) { + GamePlayStatsComponent gamePlayStatsComponent = instigator.getComponent(GamePlayStatsComponent.class); + Map<String, Integer> blockDestroyedMap = gamePlayStatsComponent.blockDestroyedMap; + if (blockDestroyedMap.containsKey(blockName)) { + blockDestroyedMap.put(blockName, blockDestroyedMap.get(blockName) + 1); + } else { + blockDestroyedMap.put(blockName, 1); + } + instigator.saveComponent(gamePlayStatsComponent); } else { + GamePlayStatsComponent gamePlayStatsComponent = new GamePlayStatsComponent(); + Map<String, Integer> blockDestroyedMap = gamePlayStatsComponent.blockDestroyedMap; blockDestroyedMap.put(blockName, 1); + instigator.addOrSaveComponent(gamePlayStatsComponent); } - instigator.saveComponent(gamePlayStatsComponent); - } else { - GamePlayStatsComponent gamePlayStatsComponent = new GamePlayStatsComponent(); - Map<String, Integer> blockDestroyedMap = gamePlayStatsComponent.blockDestroyedMap; - blockDestroyedMap.put(blockName, 1); - instigator.addOrSaveComponent(gamePlayStatsComponent); - } - } else if (entityRef.hasComponent(CharacterComponent.class)) { - String monsterName = entityRef.getParentPrefab().getName(); - if (instigator.hasComponent(GamePlayStatsComponent.class)) { - GamePlayStatsComponent gamePlayStatsComponent = instigator.getComponent(GamePlayStatsComponent.class); - Map<String, Integer> creatureKilled = gamePlayStatsComponent.creatureKilled; - if (creatureKilled.containsKey(monsterName)) { - creatureKilled.put(monsterName, creatureKilled.get(monsterName) + 1); + } else if (entityRef.hasComponent(CharacterComponent.class)) { + String creatureName = entityRef.getParentPrefab().getName(); + if (instigator.hasComponent(GamePlayStatsComponent.class)) { + GamePlayStatsComponent gamePlayStatsComponent = instigator.getComponent(GamePlayStatsComponent.class); + Map<String, Integer> creatureKilled = gamePlayStatsComponent.creatureKilled; + if (creatureKilled.containsKey(creatureName)) { + creatureKilled.put(creatureName, creatureKilled.get(creatureName) + 1); + } else { + creatureKilled.put(creatureName, 1); + } + instigator.saveComponent(gamePlayStatsComponent); } else { - creatureKilled.put(monsterName, 1); + GamePlayStatsComponent gamePlayStatsComponent = new GamePlayStatsComponent(); + Map<String, Integer> creatureKilled = gamePlayStatsComponent.creatureKilled; + creatureKilled.put(creatureName, 1); + instigator.addOrSaveComponent(gamePlayStatsComponent); } - instigator.saveComponent(gamePlayStatsComponent); - } else { - GamePlayStatsComponent gamePlayStatsComponent = new GamePlayStatsComponent(); - Map<String, Integer> creatureKilled = gamePlayStatsComponent.creatureKilled; - creatureKilled.put(monsterName, 1); - instigator.addOrSaveComponent(gamePlayStatsComponent); } } }

['engine/src/main/java/org/terasology/logic/health/EntityDestructionAuthoritySystem.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3852/3850

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3850

https://github.com/MovingBlocks/Terasology/pull/3852

https://github.com/MovingBlocks/Terasology/pull/3852

fixes

Server connection test updates actively selected server not the origin server

### What you were trying to do Look at servers accurately on the Join Game screen showing multiple servers ### What actually happened Clicked a bad server (offline) first by accident, then selected a working server. When the failed ping test came back from the bad server it showed the result (being unable to connect to the server) on the good server, despite the other stats showing online and all is well. Some threaded check holding that call probably needs to pick its update target better. Maybe at present it just updates the field regardless of the selected server, when perhaps it should be a call-back with the specific server queried? And if that isn't visible /selected then don't show it. ### How to reproduce * Make sure there's both a working and not-working server in the join game list * Select the broken server (should start a server query that'll time out) * Quickly select a working server and wait a second or two, the connection to the good server will show that it "failed"

95ee75e3eaef95d45569a3edfbf4ad875536d49c

d2f7e685392760395747ff2c1f09ae37d653d8ea

https://github.com/movingblocks/terasology/compare/95ee75e3eaef95d45569a3edfbf4ad875536d49c...d2f7e685392760395747ff2c1f09ae37d653d8ea

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/JoinGameScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/JoinGameScreen.java index 8948a88be..ab0562a63 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/JoinGameScreen.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/JoinGameScreen.java @@ -473,6 +473,7 @@ private String getModulesText(Future<ServerInfoMessage> info) { private void refreshPing() { String address = visibleList.getSelection().getAddress(); int port = visibleList.getSelection().getPort(); + String name = visibleList.getSelection().getName(); UILabel ping = find("ping", UILabel.class); ping.setText("Requested"); @@ -486,6 +487,8 @@ private void refreshPing() { } } catch (IOException e) { String text = translationSystem.translate("${engine:menu#connection-failed}"); + // Check if selection name is same as earlier when response is received before updating ping field + if (name.equals(visibleList.getSelection().getName())) GameThread.asynch(() -> ping.setText(FontColor.getColored(text, Color.RED))); } });

['engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/JoinGameScreen.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3858/3741

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3741

https://github.com/MovingBlocks/Terasology/pull/3858

https://github.com/MovingBlocks/Terasology/pull/3858

fixed

Harden 'search' command against malformed assets

### What you were trying to do Search for stuff in the in-game console, like `search stone` ### What actually happened Got a one-line error in the game console. Turned out an asset was misconfigured (was pointing to a template asset in the wrong module). After fixing that another similar case hit where the JSON in another asset was malformed, yet the error didn't give any clue _which _ asset. Turns out I guess that to be able to search the engine goes and looks at every possible asset which means if it encounters even a single broken asset it'll error out and the search fails. #1402 is a bigger goal to better validate assets (warnings at compile time somehow? Code scanning step?). But maybe we can harden `search` to better log what is breaking it? #2874 also seems mildly similar ### How to reproduce * Break an asset (like remove a comma or mess up a module name in a URI) * Run the game and make sure the asset is within the active module set * Run a `search` command for anything - get error! ### Example log `An error occurred while executing command 'search': Unable to resolve based block definition 'CoreBlocks:rock'` (in that case the `rock` template actually lived in the CoreAssets module instead)

118079bb09ad795a88475bd3d78ff80a7cc1e54c

e417b18b83cb5595033880257124fff637c80eef

https://github.com/movingblocks/terasology/compare/118079bb09ad795a88475bd3d78ff80a7cc1e54c...e417b18b83cb5595033880257124fff637c80eef

diff --git a/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java b/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java index a566bf51a..3b8bd34a9 100644 --- a/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java +++ b/engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java @@ -49,6 +49,7 @@ import org.terasology.logic.console.suggesters.ScreenSuggester; import org.terasology.logic.console.suggesters.SkinSuggester; import org.terasology.logic.inventory.events.DropItemEvent; +import org.terasology.logic.location.Location; import org.terasology.logic.location.LocationComponent; import org.terasology.logic.permission.PermissionManager; import org.terasology.math.Direction; @@ -83,15 +84,15 @@ import java.io.IOException; import java.net.UnknownHostException; -import java.util.concurrent.Callable; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; import java.util.List; import java.util.Set; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.Locale; import java.util.Optional; import java.util.Arrays; +import java.util.concurrent.Callable; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; /** * Adds a series of useful commands to the game. Likely these could be moved to more fitting places over time. @@ -253,10 +254,27 @@ private List<String> findPrefabMatches(String searchLowercase) { * @return List of blocks that match searched string */ private List<String> findBlockMatches(String searchLowercase) { - return assetManager.getAvailableAssets(BlockFamilyDefinition.class) - .stream().<Optional<BlockFamilyDefinition>>map(urn -> assetManager.getAsset(urn, BlockFamilyDefinition.class)) - .filter(def -> def.isPresent() && def.get().isLoadable() && matchesSearch(searchLowercase, def.get())) - .map(r -> new BlockUri(r.get().getUrn()).toString()).collect(Collectors.toList()); + ResourceUrn curUrn; + List<String> outputList=new ArrayList<String>(); + for (ResourceUrn urn : assetManager.getAvailableAssets(BlockFamilyDefinition.class)) { + // Current urn for logging purposes to find the broken urn + curUrn = urn; + try{ + Optional<BlockFamilyDefinition> def = assetManager.getAsset(urn, BlockFamilyDefinition.class); + if (def.isPresent() && def.get().isLoadable() && matchesSearch(searchLowercase, def.get())) { + outputList.add(new BlockUri(def.get().getUrn()).toString()); + } + } + // If a prefab is broken , it will throw an exception + catch(Exception e){ + console.addMessage("Note : Search may not return results if invalid assets are present"); + console.addMessage("Error parsing : "+curUrn.toString()); + console.addMessage(e.toString()); + continue; + } + } + return outputList; + } /**

['engine/src/main/java/org/terasology/logic/console/commands/CoreCommands.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/4056/4031

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/4031

https://github.com/MovingBlocks/Terasology/pull/4056

https://github.com/MovingBlocks/Terasology/pull/4056

fixes

Serialization stack overflow

The game crashed with a stack overflow error. The stack trace was the following, repeated many times: at org.terasology.persistence.typeHandling.FutureTypeHandler.serialize(FutureTypeHandler.java:32) at org.terasology.persistence.typeHandling.coreTypes.RuntimeDelegatingTypeHandler.serializeViaDelegate(RuntimeDelegatingTypeHandler.java:162) at org.terasology.persistence.typeHandling.coreTypes.RuntimeDelegatingTypeHandler.serializeNonNull(RuntimeDelegatingTypeHandler.java:118) at org.terasology.persistence.typeHandling.TypeHandler.serialize(TypeHandler.java:49) at org.terasology.persistence.typeHandling.coreTypes.ObjectFieldMapTypeHandler.serializeNonNull(ObjectFieldMapTypeHandler.java:71) at org.terasology.persistence.typeHandling.TypeHandler.serialize(TypeHandler.java:49) It ran for a minute or so before this happened, using much more CPU than usual (but this was probably just the ocean falling into caves). I was using JS + FlowingLiquids (and some almost certainly irrelevant changes that would never have even executed under the circumstances). I haven't been able to replicate it in any other worlds, and I can't load the one where I originally saw it because chunk generation times out.

26f605be6552cf6473a7b25a1270f9a0de014476

b955fe6f9c5134f2e2de9c31a8afc0340e429920

https://github.com/movingblocks/terasology/compare/26f605be6552cf6473a7b25a1270f9a0de014476...b955fe6f9c5134f2e2de9c31a8afc0340e429920

diff --git a/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java b/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java index 3e974f550..212e9006c 100644 --- a/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java +++ b/engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java @@ -94,7 +94,7 @@ public class ParticleEmitterComponent implements Component { /** * This emitter's particle pool. */ - public ParticlePool particlePool; + public transient ParticlePool particlePool; /** * Maps Generator component -> Function that processes that Generator diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java index 2ae9261e8..b524383b7 100644 --- a/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java +++ b/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java @@ -68,9 +68,14 @@ public PersistedData serializeNonNull(T value, PersistedDataSerializer serialize if (!Objects.equals(val, Defaults.defaultValue(field.getType()))) { TypeHandler handler = entry.getValue(); - PersistedData fieldValue = handler.serialize(val, serializer); - if (fieldValue != null) { - mappedData.put(getFieldName(field), fieldValue); + try { + PersistedData fieldValue = handler.serialize(val, serializer); + if (fieldValue != null) { + mappedData.put(getFieldName(field), fieldValue); + } + } catch (StackOverflowError e) { + logger.error("Likely circular reference in field {}.", field); + throw e; } } }

['engine/src/main/java/org/terasology/particles/components/ParticleEmitterComponent.java', 'engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/ObjectFieldMapTypeHandler.java']

{'.java': 2}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/4093/4092

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/4092

https://github.com/MovingBlocks/Terasology/pull/4093

https://github.com/MovingBlocks/Terasology/pull/4093

fixes

Null pointer exception when trying to use load latest.

<!-- Thanks for taking the time to submit a thorough issue report for Terasology! :-) Please fill out whichever details below seem relevant to your issue. Note that suggestions, general questions & support should go in the forum: * http://forum.terasology.org/forum/suggestions.21 * http://forum.terasology.org/forum/support.20/ Bug reports and crashes likely resulting from bugs in the engine go here on GitHub. --> ### What you were trying to do Use the load latest configuration. ### What actually happened Null pointer exception in the Terasology java class ### How to reproduce * Step 1 Try to use the load latest configuration. * Step 2 Crash... ### Log details and game version I think 3.2.0 ### Computer details i7 7700k GTX 2080ti 16GB Ram NVMe 128gb SSD

f683f12906677363da41fc261ca82566d20b8c2b

dc2250151f3559ccadc88e886ea2720c5a529713

https://github.com/movingblocks/terasology/compare/f683f12906677363da41fc261ca82566d20b8c2b...dc2250151f3559ccadc88e886ea2720c5a529713

diff --git a/engine/src/main/java/org/terasology/engine/TerasologyEngine.java b/engine/src/main/java/org/terasology/engine/TerasologyEngine.java index 209e1fb95..3ece241eb 100644 --- a/engine/src/main/java/org/terasology/engine/TerasologyEngine.java +++ b/engine/src/main/java/org/terasology/engine/TerasologyEngine.java @@ -137,6 +137,7 @@ public class TerasologyEngine implements GameEngine { private TimeSubsystem timeSubsystem; private Deque<EngineSubsystem> allSubsystems; private ModuleAwareAssetTypeManager assetTypeManager; + private boolean initialisedAlready; /** * Contains objects that live for the duration of this engine. @@ -201,40 +202,43 @@ protected void addToClassesOnClasspathsToAddToEngine(Class<?> clazz) { public void initialize() { Thread.currentThread().setPriority(Thread.MAX_PRIORITY); Stopwatch totalInitTime = Stopwatch.createStarted(); - try { - logger.info("Initializing Terasology..."); - logEnvironmentInfo(); + if (!initialisedAlready) { + try { + logger.info("Initializing Terasology..."); + logEnvironmentInfo(); - // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as possible. - GameThread.setToCurrentThread(); + // TODO: Need to get everything thread safe and get rid of the concept of "GameThread" as much as possible. + GameThread.setToCurrentThread(); - preInitSubsystems(); + preInitSubsystems(); - initManagers(); + initManagers(); - initSubsystems(); + initSubsystems(); - changeStatus(TerasologyEngineStatus.INITIALIZING_ASSET_MANAGEMENT); - initAssets(); + changeStatus(TerasologyEngineStatus.INITIALIZING_ASSET_MANAGEMENT); + initAssets(); - EnvironmentSwitchHandler environmentSwitcher = new EnvironmentSwitchHandler(); - rootContext.put(EnvironmentSwitchHandler.class, environmentSwitcher); + EnvironmentSwitchHandler environmentSwitcher = new EnvironmentSwitchHandler(); + rootContext.put(EnvironmentSwitchHandler.class, environmentSwitcher); - environmentSwitcher.handleSwitchToGameEnvironment(rootContext); + environmentSwitcher.handleSwitchToGameEnvironment(rootContext); - postInitSubsystems(); + postInitSubsystems(); - verifyInitialisation(); + verifyInitialisation(); - /* - * Prevent objects being put in engine context after init phase. Engine states should use/create a - * child context. - */ - CoreRegistry.setContext(null); - } catch (RuntimeException e) { - logger.error("Failed to initialise Terasology", e); - cleanup(); - throw e; + /* + * Prevent objects being put in engine context after init phase. Engine states should use/create a + * child context. + */ + CoreRegistry.setContext(null); + initialisedAlready = true; + } catch (RuntimeException e) { + logger.error("Failed to initialise Terasology", e); + cleanup(); + throw e; + } } double seconds = 0.001 * totalInitTime.elapsed(TimeUnit.MILLISECONDS); diff --git a/facades/PC/src/main/java/org/terasology/engine/Terasology.java b/facades/PC/src/main/java/org/terasology/engine/Terasology.java index 9887c9417..bac293d19 100644 --- a/facades/PC/src/main/java/org/terasology/engine/Terasology.java +++ b/facades/PC/src/main/java/org/terasology/engine/Terasology.java @@ -152,6 +152,7 @@ public static void main(String[] args) { engine.run(new StateHeadlessSetup()); } else { if (loadLastGame) { + engine.initialize(); //initialize the managers first engine.getFromEngineContext(ThreadManager.class).submitTask("loadGame", () -> { GameManifest gameManifest = getLatestGameManifest(); if (gameManifest != null) {

['facades/PC/src/main/java/org/terasology/engine/Terasology.java', 'engine/src/main/java/org/terasology/engine/TerasologyEngine.java']

{'.java': 2}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/4131/2469

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/2469

https://github.com/MovingBlocks/Terasology/pull/4131

https://github.com/MovingBlocks/Terasology/pull/4131

fixes

Crash when Characters die from fall damage during server prediction

### What you were trying to do Move a deer with high movement speed off a cliff ### What actually happened Server crashes with ConcurrentModificationException, similar to (but distinct from) #2468 since it's a different collection and the event is dispatch from the `update` method of a component system rather than a BT Node. ### How to reproduce Kill a (non-player) character with fall damage (via CharacterMoveInputEvent). ### Log details and game version ``` "main@1" prio=10 tid=0x1 nid=NA runnable java.lang.Thread.State: RUNNABLE at org.terasology.logic.characters.ServerCharacterPredictionSystem.onDestroy(ServerCharacterPredictionSystem.java:97) at org.terasology.logic.characters.ServerCharacterPredictionSystemMethodAccess.invoke(Unknown Source:-1) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.PojoEntityManager.destroy(PojoEntityManager.java:538) at org.terasology.entitySystem.entity.internal.BaseEntityRef.destroy(BaseEntityRef.java:138) at org.terasology.logic.health.EntityDestructionAuthoritySystem.onDestroy(EntityDestructionAuthoritySystem.java:32) at org.terasology.logic.health.EntityDestructionAuthoritySystemMethodAccess.invoke(Unknown Source:-1) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.health.HealthAuthoritySystem.doDamage(HealthAuthoritySystem.java:185) at org.terasology.logic.health.HealthAuthoritySystem.checkDamage(HealthAuthoritySystem.java:200) at org.terasology.logic.health.HealthAuthoritySystem.onLand(HealthAuthoritySystem.java:241) at org.terasology.logic.health.HealthAuthoritySystemMethodAccess.invoke(Unknown Source:-1) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.logic.characters.KinematicCharacterMover.walk(KinematicCharacterMover.java:647) at org.terasology.logic.characters.KinematicCharacterMover.updatePosition(KinematicCharacterMover.java:559) at org.terasology.logic.characters.KinematicCharacterMover.step(KinematicCharacterMover.java:103) at org.terasology.logic.characters.ServerCharacterPredictionSystem.stepState(ServerCharacterPredictionSystem.java:168) at org.terasology.logic.characters.ServerCharacterPredictionSystem.onPlayerInput(ServerCharacterPredictionSystem.java:126) at org.terasology.logic.characters.ServerCharacterPredictionSystemMethodAccess.invoke(Unknown Source:-1) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:506) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:269) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:260) at org.terasology.entitySystem.entity.internal.BaseEntityRef.send(BaseEntityRef.java:145) at org.terasology.flexiblemovement.FlexibleMovementSystem.update(FlexibleMovementSystem.java:37) at org.terasology.engine.modes.StateIngame.update(StateIngame.java:176) at org.terasology.engine.TerasologyEngine.mainLoop(TerasologyEngine.java:413) at org.terasology.engine.TerasologyEngine.run(TerasologyEngine.java:368) - locked <0x1906> (a org.terasology.engine.TerasologyEngine) at org.terasology.engine.Terasology.main(Terasology.java:152) ``` ##

a3d99b4f794f509c7f197d3d7b2b2b0f60b9ac8f

b34013d7c529d8eb3540ed0034c36fb66a8367dc

https://github.com/movingblocks/terasology/compare/a3d99b4f794f509c7f197d3d7b2b2b0f60b9ac8f...b34013d7c529d8eb3540ed0034c36fb66a8367dc

diff --git a/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java b/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java index 91906d244..562c279f1 100644 --- a/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java +++ b/engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java @@ -16,6 +16,8 @@ package org.terasology.logic.characters; + +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +45,7 @@ import org.terasology.utilities.collection.CircularBuffer; import org.terasology.world.WorldProvider; +import java.util.List; import java.util.Map; @RegisterSystem(RegisterMode.AUTHORITY) @@ -81,6 +84,7 @@ public class ServerCharacterPredictionSystem extends BaseComponentSystem impleme private CharacterMover characterMover; private Map<EntityRef, CircularBuffer<CharacterStateEvent>> characterStates = Maps.newHashMap(); + private List<EntityRef> characterStatesToRemove = Lists.newArrayList(); private Map<EntityRef, CharacterMoveInputEvent> lastInputEvent = Maps.newHashMap(); private long nextSendState; private CharacterMovementSystemUtility characterMovementSystemUtility; @@ -103,7 +107,7 @@ public void onCreate(final OnActivatedComponent event, final EntityRef entity) { @ReceiveEvent(components = {CharacterMovementComponent.class, LocationComponent.class, AliveCharacterComponent.class}) public void onDestroy(final BeforeDeactivateComponent event, final EntityRef entity) { physics.removeCharacterCollider(entity); - characterStates.remove(entity); + characterStatesToRemove.add(entity); lastInputEvent.remove(entity); } @@ -200,7 +204,8 @@ public void update(float delta) { // Haven't received input in a while, repeat last input CharacterMoveInputEvent lastInput = lastInputEvent.get(entry.getKey()); if (lastInput != null) { - CharacterMoveInputEvent newInput = new CharacterMoveInputEvent(lastInput, (int) (time.getGameTimeInMs() - state.getTime())); + CharacterMoveInputEvent newInput = new CharacterMoveInputEvent(lastInput, + (int) (time.getGameTimeInMs() - state.getTime())); onPlayerInput(newInput, entry.getKey()); } entry.getKey().send(state); @@ -214,9 +219,12 @@ public void update(float delta) { if (entry.getKey().equals(localPlayer.getCharacterEntity())) { continue; } - - setToTime(renderTime, entry.getKey(), entry.getValue()); + if (!characterStatesToRemove.contains(entry.getKey())) { + setToTime(renderTime, entry.getKey(), entry.getValue()); + } } + characterStates.keySet().removeAll(characterStatesToRemove); + characterStatesToRemove.clear(); } private void setToTime(long renderTime, EntityRef entity, CircularBuffer<CharacterStateEvent> buffer) {

['engine/src/main/java/org/terasology/logic/characters/ServerCharacterPredictionSystem.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3174/3158

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3158

https://github.com/MovingBlocks/Terasology/pull/3174

https://github.com/MovingBlocks/Terasology/pull/3174

resolves

Improve null handling / logging in ItemPickupAuthoritySystem

Noticed this issue on startup with the new module BasicCrafting enabled. It isn't caused by BC but that module exercises stuff on initialization that triggers it. Some block somewhere isn't fully configured right and that's tripping up that bit of code - it doesn't seem to lead to any issues, but it would be good to be able to log more cleanly what is going on. ``` 21:40:17.348 [main] INFO o.t.w.b.internal.BlockManagerImpl - Registered Block core:RedShroom with id 31 21:40:17.374 [main] ERROR o.t.e.event.internal.EventSystemImpl - Failed to invoke event java.lang.NullPointerException: null at org.terasology.logic.inventory.ItemPickupAuthoritySystem.updateExtentsOnBlockItemBoxShape(ItemPickupAuthoritySystem.java:92) at org.terasology.logic.inventory.ItemPickupAuthoritySystemMethodAccess.invoke(Unknown Source) at org.terasology.entitySystem.event.internal.EventSystemImpl$ByteCodeEventHandlerInfo.invoke(EventSystemImpl.java:516) at org.terasology.entitySystem.event.internal.EventSystemImpl.sendStandardEvent(EventSystemImpl.java:279) at org.terasology.entitySystem.event.internal.EventSystemImpl.send(EventSystemImpl.java:270) at org.terasology.entitySystem.entity.internal.PojoEntityManager.create(PojoEntityManager.java:166) at org.terasology.entitySystem.entity.internal.PojoEntityManager.create(PojoEntityManager.java:274) at org.terasology.crafting.systems.IconManagerImpl.loadItems(IconManagerImpl.java:144) at org.terasology.crafting.systems.IconManagerImpl.postBegin(IconManagerImpl.java:69) at org.terasology.engine.modes.loadProcesses.PostBeginSystems.step(PostBeginSystems.java:53) at org.terasology.engine.modes.StateLoading.update(StateLoading.java:242) at org.terasology.engine.TerasologyEngine.tick(TerasologyEngine.java:437) at org.terasology.engine.TerasologyEngine.mainLoop(TerasologyEngine.java:400) at org.terasology.engine.TerasologyEngine.run(TerasologyEngine.java:376) at org.terasology.engine.Terasology.main(Terasology.java:154) 21:40:17.439 [main] INFO o.t.w.b.internal.BlockManagerImpl - Registered BlockFamily[Core:Cotton4] 21:40:17.439 [main] INFO o.t.w.b.internal.BlockManagerImpl - Registered Block Core:Cotton4 with id 32 ``` Goal: Catch and handle the null more gracefully in `ItemPickupAuthoritySystem.updateExtentsOnBlockItemBoxShape` - try to see what other information is available and log the details at WARN level then continue normally instead of throwing the stacktrace. Running with Core + BC enabled and checking the startup logs shows this issue repeatedly so it shouldn't be hard to trigger the condition. Good bite-sized issue and we can create a GCI task for it if somebody is interested.

9377f61647a9d2dd313adb17aae4a1aea01c3a3d

f8ed134e1a619f0ba9fccb7c96a33f1121f02494

https://github.com/movingblocks/terasology/compare/9377f61647a9d2dd313adb17aae4a1aea01c3a3d...f8ed134e1a619f0ba9fccb7c96a33f1121f02494

diff --git a/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java b/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java index f84565863..389923880 100644 --- a/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java +++ b/engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java @@ -17,6 +17,8 @@ package org.terasology.logic.inventory; import com.bulletphysics.collision.shapes.BoxShape; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.terasology.engine.Time; import org.terasology.entitySystem.Component; import org.terasology.entitySystem.entity.EntityRef; @@ -44,6 +46,8 @@ */ @RegisterSystem(RegisterMode.AUTHORITY) public class ItemPickupAuthoritySystem extends BaseComponentSystem { + private static final Logger LOGGER = LoggerFactory.getLogger(ItemPickupAuthoritySystem.class); + @In private EntitySystemLibrary library; @@ -89,6 +93,12 @@ public void updateExtentsOnBlockItemBoxShape(OnAddedComponent event, EntityRef i BlockItemComponent blockItemComponent, BoxShapeComponent boxShapeComponent) { BlockFamily blockFamily = blockItemComponent.blockFamily; + + if (blockFamily == null) { + LOGGER.warn("Prefab " + itemEntity.getParentPrefab().getName() + " does not have a block family"); + return; + } + if (blockFamily.getArchetypeBlock().getCollisionShape() instanceof BoxShape) { javax.vecmath.Vector3f extents = ((BoxShape) blockFamily.getArchetypeBlock().getCollisionShape()).getHalfExtentsWithoutMargin(new javax.vecmath.Vector3f()); extents.scale(2.0f);

['engine/src/main/java/org/terasology/logic/inventory/ItemPickupAuthoritySystem.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3492/3486

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3486

https://github.com/MovingBlocks/Terasology/pull/3492

https://github.com/MovingBlocks/Terasology/pull/3492

fixes

Region3i.EMPTY bug

There is a serious flaw in the way Region3i deals with empty regions. For some reason (optimization?) Region3i has a public and static instance Region3i.EMPTY. There is nothing that prevents users from accidentally changing the empty region. What makes it even worse is that the factory functions sometimes just return Region3i.EMPTY, to save the costs of a copy constructor. This code snippet can destroy the invariant of the empty region being empty: ``` Vector3i a = foo(); Vector3i b = bar(); Region3i region = Region3i.createFromMinMax(a, b); region.expand(otherRegion); // Oops, Region3i.EMPTY is now equal to otherRegion ``` ### How to confirm This test fails if added to the Region3i tests. ``` @Test public void testFactoryShouldNotReturnTheEmptySingleton() { Region3i constructed = Region3i.createFromMinMax(Vector3i.zero(), Vector3i.one().negate()); assertFalse(constructed == Region3i.EMPTY); // This fails } ``` ### Suggested Solution Remove Region3i.EMPTY, and no longer threat is as special instance. Add Region3i.empty(), creating a new empty region each time it is called.

b6f2a203f8d5236485c3af1f383301cbdd303fe4

0f117c1565f686783717c9b7bcf57eff6d83de89

https://github.com/movingblocks/terasology/compare/b6f2a203f8d5236485c3af1f383301cbdd303fe4...0f117c1565f686783717c9b7bcf57eff6d83de89

diff --git a/engine-tests/src/test/java/org/terasology/math/Region3iTest.java b/engine-tests/src/test/java/org/terasology/math/Region3iTest.java index 056719183..2101f3ba8 100644 --- a/engine-tests/src/test/java/org/terasology/math/Region3iTest.java +++ b/engine-tests/src/test/java/org/terasology/math/Region3iTest.java @@ -33,10 +33,9 @@ public class Region3iTest { @Test - public void testEmptyConstructor() { - Region3i region = Region3i.EMPTY; - assertEquals(new Vector3i(), region.size()); - assertTrue(region.isEmpty()); + public void testEmptyRegion() { + assertEquals(Region3i.empty().size(), Vector3i.zero()); + assertTrue(Region3i.empty().isEmpty()); } @Test @@ -127,7 +126,7 @@ public void testSimpleIntersect() { public void testNonTouchingIntersect() { Region3i region1 = Region3i.createFromMinMax(new Vector3i(), new Vector3i(32, 32, 32)); Region3i region2 = Region3i.createFromMinMax(new Vector3i(103, 103, 103), new Vector3i(170, 170, 170)); - assertEquals(Region3i.EMPTY, region1.intersect(region2)); + assertEquals(Region3i.empty(), region1.intersect(region2)); } @Test diff --git a/engine/src/main/java/org/terasology/math/Region3i.java b/engine/src/main/java/org/terasology/math/Region3i.java index 11a706c23..700e0753d 100644 --- a/engine/src/main/java/org/terasology/math/Region3i.java +++ b/engine/src/main/java/org/terasology/math/Region3i.java @@ -28,7 +28,14 @@ * */ public final class Region3i implements Iterable<Vector3i> { - public static final Region3i EMPTY = new Region3i(); + + /** + * @deprecated As of 24 sep 2018, because it is error prone. + * Everyone can change this instance and destroy the invariant properties. + * Some methods used to return this instance silently on special cases. + */ + @Deprecated + public static final Region3i EMPTY = Region3i.empty(); private final Vector3i min = new Vector3i(); private final Vector3i size = new Vector3i(); @@ -44,6 +51,14 @@ private Region3i(BaseVector3i min, BaseVector3i size) { this.size.set(size); } + /** + * An empty Region with size (0,0,0). + * @return An empty Region3i + */ + public static Region3i empty() { + return new Region3i(); + } + /** * @param min the min point of the region * @param size the size of the region @@ -51,7 +66,7 @@ private Region3i(BaseVector3i min, BaseVector3i size) { */ public static Region3i createFromMinAndSize(BaseVector3i min, BaseVector3i size) { if (size.x() <= 0 || size.y() <= 0 || size.z() <= 0) { - return EMPTY; + return empty(); } return new Region3i(min, size); } @@ -118,7 +133,7 @@ public static Region3i createBounded(BaseVector3i a, BaseVector3i b) { public static Region3i createFromMinMax(BaseVector3i min, BaseVector3i max) { Vector3i size = new Vector3i(max.x() - min.x() + 1, max.y() - min.y() + 1, max.z() - min.z() + 1); if (size.x <= 0 || size.y <= 0 || size.z <= 0) { - return EMPTY; + return empty(); } return new Region3i(min, size); } diff --git a/engine/src/main/java/org/terasology/rendering/world/RenderableWorldImpl.java b/engine/src/main/java/org/terasology/rendering/world/RenderableWorldImpl.java index 153119133..44a1f3634 100644 --- a/engine/src/main/java/org/terasology/rendering/world/RenderableWorldImpl.java +++ b/engine/src/main/java/org/terasology/rendering/world/RenderableWorldImpl.java @@ -65,7 +65,7 @@ class RenderableWorldImpl implements RenderableWorld { private ChunkTessellator chunkTessellator; private final ChunkMeshUpdateManager chunkMeshUpdateManager; private final List<RenderableChunk> chunksInProximityOfCamera = Lists.newArrayListWithCapacity(MAX_LOADABLE_CHUNKS); - private Region3i renderableRegion = Region3i.EMPTY; + private Region3i renderableRegion = Region3i.empty(); private ViewDistance currentViewDistance; private RenderQueuesHelper renderQueues; diff --git a/engine/src/main/java/org/terasology/world/block/regions/BlockRegionComponent.java b/engine/src/main/java/org/terasology/world/block/regions/BlockRegionComponent.java index 4c006d86d..8338f8ba5 100644 --- a/engine/src/main/java/org/terasology/world/block/regions/BlockRegionComponent.java +++ b/engine/src/main/java/org/terasology/world/block/regions/BlockRegionComponent.java @@ -24,7 +24,7 @@ */ public class BlockRegionComponent implements Component { @Replicate - public Region3i region = Region3i.EMPTY; + public Region3i region = Region3i.empty(); public boolean overrideBlockEntities = true; public BlockRegionComponent() { diff --git a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java index 86bc73e08..abecb8a81 100644 --- a/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java +++ b/engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java @@ -36,8 +36,8 @@ public class ChunkRelevanceRegion { private Vector3i relevanceDistance = new Vector3i(); private boolean dirty; private Vector3i center = new Vector3i(); - private Region3i currentRegion = Region3i.EMPTY; - private Region3i previousRegion = Region3i.EMPTY; + private Region3i currentRegion = Region3i.empty(); + private Region3i previousRegion = Region3i.empty(); private ChunkRegionListener listener; private Set<Vector3i> relevantChunks = Sets.newLinkedHashSet(); @@ -123,7 +123,7 @@ private Region3i calculateRegion() { Vector3i extents = new Vector3i(relevanceDistance.x / 2, relevanceDistance.y / 2, relevanceDistance.z / 2); return Region3i.createFromCenterExtents(ChunkMath.calcChunkPos(loc.getWorldPosition()), extents); } - return Region3i.EMPTY; + return Region3i.empty(); } private Vector3i calculateCenter() {

['engine/src/main/java/org/terasology/world/block/regions/BlockRegionComponent.java', 'engine-tests/src/test/java/org/terasology/math/Region3iTest.java', 'engine/src/main/java/org/terasology/world/chunks/internal/ChunkRelevanceRegion.java', 'engine/src/main/java/org/terasology/math/Region3i.java', 'engine/src/main/java/org/terasology/rendering/world/RenderableWorldImpl.java']

{'.java': 5}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3499/3010

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3010

https://github.com/MovingBlocks/Terasology/pull/3499

https://github.com/MovingBlocks/Terasology/pull/3499

fixes

Advanced chunk monitor prevents game from closing cleanly

### What you were trying to do Run and close the game cleanly with `monitoringEnabled` set to true (for example to test #3006) ### What actually happened Game windows (there are two with the monitor visible) closed, but the game didn't exit. Some thread triggered by the monitor isn't exiting on game exit ### How to reproduce * Toggle `"monitoringEnabled": false,` to `true` in `config.cfg` (run the game once to get one) * Run the game * Close the game * Protip: Trigger a thread dump in IntelliJ to inspect threads that are still alive after exiting (little camera looking icon near the bottom left, in the run window)

9118708ad3f34f0bc05572fe54ad47538c3164bb

d1c5439d855defae557458d6b0f5b5eefcd8377c

https://github.com/movingblocks/terasology/compare/9118708ad3f34f0bc05572fe54ad47538c3164bb...d1c5439d855defae557458d6b0f5b5eefcd8377c

diff --git a/engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java b/engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java index 2b02119e9..04e574d6a 100644 --- a/engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java +++ b/engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java @@ -21,9 +21,6 @@ import org.terasology.engine.subsystem.EngineSubsystem; import org.terasology.monitoring.gui.AdvancedMonitor; -/** - * - */ public class MonitoringSubsystem implements EngineSubsystem { private AdvancedMonitor advancedMonitor; @@ -44,7 +41,7 @@ public void initialise(GameEngine engine, Context rootContext) { @Override public void shutdown() { if (advancedMonitor != null) { - advancedMonitor.setVisible(false); + advancedMonitor.close(); } } } diff --git a/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java b/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java index 1b083560b..b9f0d7b3d 100644 --- a/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java +++ b/engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java @@ -15,17 +15,16 @@ */ package org.terasology.monitoring.gui; -import javax.swing.*; -import java.awt.*; +import javax.swing.JTabbedPane; +import javax.swing.JFrame; +import java.awt.BorderLayout; @SuppressWarnings("serial") public class AdvancedMonitor extends JFrame { - private final JTabbedPane tabs; - private final ThreadMonitorPanel threadMonitor; private final ChunkMonitorPanel chunkMonitor; - private final PerformanceMonitorPanel perfMonitor; + private final PerformanceMonitorPanel performanceMonitor; public AdvancedMonitor() { this("Advanced Monitoring Tool", 10, 10, 800, 600); @@ -36,7 +35,7 @@ public AdvancedMonitor(String title, int x, int y, int width, int height) { setBounds(x, y, width, height); setLayout(new BorderLayout()); - tabs = new JTabbedPane(); + JTabbedPane tabs = new JTabbedPane(); threadMonitor = new ThreadMonitorPanel(); threadMonitor.setVisible(true); @@ -44,13 +43,30 @@ public AdvancedMonitor(String title, int x, int y, int width, int height) { chunkMonitor = new ChunkMonitorPanel(); chunkMonitor.setVisible(true); - perfMonitor = new PerformanceMonitorPanel(); - perfMonitor.setVisible(true); + performanceMonitor = new PerformanceMonitorPanel(); + performanceMonitor.setVisible(true); tabs.add("Threads", threadMonitor); tabs.add("Chunks", chunkMonitor); - tabs.add("Performance", perfMonitor); + tabs.add("Performance", performanceMonitor); add(tabs, BorderLayout.CENTER); } + + /** + * Closes advanced monitor panel. + * + * This method goes through three steps: + * 1. Hides this windows. + * 2. Releases all of the native screen resources used by this windows. + * 3. Stops monitoring threads gracefully. + */ + public void close() { + setVisible(false); + dispose(); + + threadMonitor.stopThread(); + chunkMonitor.stopThread(); + performanceMonitor.stopThread(); + } } diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java index 01bae7f85..cf31f9098 100644 --- a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java +++ b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java @@ -62,16 +62,11 @@ @SuppressWarnings("serial") public class ChunkMonitorDisplay extends JPanel { - public static final Color COLOR_COMPLETE = new Color(0, 38, 28); - public static final Color COLOR_INTERNAL_LIGHT_GENERATION_PENDING = new Color(4, 76, 41); - public static final Color COLOR_ADJACENCY_GENERATION_PENDING = new Color(150, 237, 137); - - public static final Color COLOR_HIGHLIGHT_TESSELLATION = Color.blue.brighter().brighter(); - - public static final Color COLOR_SELECTED_CHUNK = new Color(255, 102, 0); - - public static final Color COLOR_DEAD = Color.lightGray; - public static final Color COLOR_INVALID = Color.red; + private static final Color COLOR_COMPLETE = new Color(0, 38, 28); + private static final Color COLOR_INTERNAL_LIGHT_GENERATION_PENDING = new Color(4, 76, 41); + private static final Color COLOR_HIGHLIGHT_TESSELLATION = Color.blue.brighter().brighter(); + private static final Color COLOR_SELECTED_CHUNK = new Color(255, 102, 0); + private static final Color COLOR_DEAD = Color.LIGHT_GRAY; private static final Logger logger = LoggerFactory.getLogger(ChunkMonitorDisplay.class); @@ -89,13 +84,15 @@ public class ChunkMonitorDisplay extends JPanel { private int renderY; private int minRenderY; private int maxRenderY; - private boolean followPlayer = true; + private boolean followPlayer; private Vector3i selectedChunk; - private final BlockingQueue<Request> queue = new LinkedBlockingQueue<>(); + private final BlockingQueue<Request> queue; private final transient ExecutorService executor; - private final transient Runnable renderTask; + + // If true, the active monitoring thread in executor service should stop. + private boolean stopThread; public ChunkMonitorDisplay(int refreshInterval, int chunkSize) { Preconditions.checkArgument(refreshInterval >= 500, "Parameter 'refreshInterval' has to be greater or equal 500 (" + refreshInterval + ")"); @@ -105,13 +102,18 @@ public ChunkMonitorDisplay(int refreshInterval, int chunkSize) { addMouseListener(ml); addMouseMotionListener(ml); addMouseWheelListener(ml); + this.followPlayer = true; this.refreshInterval = refreshInterval; this.chunkSize = chunkSize; this.executor = Executors.newSingleThreadExecutor(); - this.renderTask = new RenderTask(); ChunkMonitor.registerForEvents(this); - queue.offer(new InitialRequest()); - executor.execute(renderTask); + this.queue = new LinkedBlockingQueue<>(); + this.queue.offer(new InitialRequest()); + this.executor.execute(new RenderTask()); + } + + public void stopThread() { + stopThread = true; } private void fireChunkSelectedEvent(Vector3i pos) { @@ -165,26 +167,6 @@ private Vector3i calcPlayerChunkPos() { return null; } - public int getChunkSize() { - return chunkSize; - } - - public ChunkMonitorDisplay setChunkSize(int value) { - if (value != chunkSize) { - Preconditions.checkArgument(value >= 6, "Parameter 'value' has to be greater or equal 6 (" + value + ")"); - chunkSize = value; - updateDisplay(true); - } - return this; - } - - public Vector3i getSelectedChunk() { - if (selectedChunk == null) { - return null; - } - return new Vector3i(selectedChunk); - } - public ChunkMonitorDisplay setSelectedChunk(Vector3i chunk) { if (selectedChunk == null) { if (chunk != null) { @@ -202,18 +184,6 @@ public ChunkMonitorDisplay setSelectedChunk(Vector3i chunk) { return this; } - public int getRenderY() { - return renderY; - } - - public int getMinRenderY() { - return minRenderY; - } - - public int getMaxRenderY() { - return maxRenderY; - } - public ChunkMonitorDisplay setRenderY(int value) { int clampedValue = value; if (value < minRenderY) { @@ -237,6 +207,7 @@ public boolean getFollowPlayer() { return followPlayer; } + // TODO: Add a checkbox to toggle whether the chunk display will follow where the player goes or not. public ChunkMonitorDisplay setFollowPlayer(boolean value) { if (followPlayer != value) { followPlayer = value; @@ -259,24 +230,10 @@ public ChunkMonitorDisplay setOffset(int x, int y) { this.offsetY = y; updateDisplay(true); } - return this; - } - - public int getRefreshInterval() { - return refreshInterval; - } - public ChunkMonitorDisplay setRefreshInterval(int value) { - Preconditions.checkArgument(value >= 500, "Parameter 'value' has to be greater or equal 500 (" + value + ")"); - this.refreshInterval = value; return this; } - public void registerForEvents(Object object) { - Preconditions.checkNotNull(object, "The parameter 'object' must not be null"); - eventbus.register(object); - } - @Subscribe public void receiveChunkEvent(ChunkMonitorEvent event) { if (event != null) { @@ -299,10 +256,6 @@ private static class ImageBuffer { private BufferedImage imageA; private BufferedImage imageB; - ImageBuffer(int width, int height) { - resize(width, height); - } - ImageBuffer() { } @@ -694,12 +647,12 @@ private void renderSelectedChunk(Graphics2D g, int offsetx, int offsety, Vector3 } private void renderBox(Graphics2D g, int offsetx, int offsety, Rectangle box) { - g.setColor(Color.white); + g.setColor(Color.WHITE); g.drawRect(box.x * chunkSize + offsetx, box.y * chunkSize + offsety, box.width * chunkSize - 1, box.height * chunkSize - 1); } private void renderBackground(Graphics2D g, int width, int height) { - g.setColor(Color.black); + g.setColor(Color.BLACK); g.fillRect(0, 0, width, height); } @@ -761,7 +714,7 @@ public void run() { final List<Request> requests = new LinkedList<>(); try { - while (true) { + while (!stopThread) { final long slept = poll(requests); boolean needsRendering = false; @@ -772,7 +725,7 @@ public void run() { r.execute(); } catch (Exception e) { ThreadMonitor.addError(e); - logger.error("Thread error", e); + logger.error("Error executing chunk monitor update", e); } finally { needsRendering |= r.needsRendering(); fastResume |= r.fastResume(); @@ -790,13 +743,15 @@ public void run() { } if (!fastResume && (slept <= 400)) { - Thread.sleep(500 - slept); + Thread.sleep(refreshInterval - slept); } } } catch (Exception e) { ThreadMonitor.addError(e); - logger.error("Thread error", e); + logger.error("Error executing chunk monitor update", e); } + + executor.shutdownNow(); } } } diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java index 9f88215c2..c332fcc0f 100644 --- a/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java +++ b/engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java @@ -15,8 +15,8 @@ */ package org.terasology.monitoring.gui; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import java.awt.BorderLayout; @SuppressWarnings("serial") public class ChunkMonitorPanel extends JPanel { @@ -32,4 +32,7 @@ public ChunkMonitorPanel() { add(display, BorderLayout.CENTER); } + public void stopThread() { + display.stopThread(); + } } diff --git a/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java index 591a037e0..50dfc365b 100644 --- a/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java +++ b/engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java @@ -23,8 +23,18 @@ import org.terasology.monitoring.ThreadActivity; import org.terasology.monitoring.ThreadMonitor; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JList; +import javax.swing.JLabel; +import javax.swing.ListCellRenderer; +import javax.swing.SwingUtilities; +import javax.swing.AbstractListModel; +import javax.swing.SwingConstants; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Dimension; +import java.awt.Component; +import java.awt.Color; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; @@ -37,22 +47,25 @@ @SuppressWarnings("serial") public class PerformanceMonitorPanel extends JPanel { - private static final Logger logger = LoggerFactory.getLogger(PerformanceMonitorPanel.class); - - private final HeaderPanel header; - private final JList list; + private static final Logger LOGGER = LoggerFactory.getLogger(PerformanceMonitorPanel.class); + // If true, the active monitoring thread in executor service should stop. + private boolean stopThread; public PerformanceMonitorPanel() { setLayout(new BorderLayout()); - header = new HeaderPanel(); - list = new JList(new PerformanceListModel()); + HeaderPanel header = new HeaderPanel(); + JList list = new JList(new PerformanceListModel()); list.setCellRenderer(new PerformanceListRenderer(header)); list.setVisible(true); add(header, BorderLayout.PAGE_START); add(list, BorderLayout.CENTER); } + public void stopThread() { + stopThread = true; + } + private static class HeaderPanel extends JPanel { private final JLabel lName = new JLabel("Title"); @@ -137,15 +150,15 @@ private static class MyRenderer extends JPanel { MyRenderer(HeaderPanel header) { this.header = Preconditions.checkNotNull(header, "The parameter 'header' must not be null"); - setBackground(Color.white); + setBackground(Color.WHITE); setLayout(new FlowLayout(FlowLayout.LEFT, 4, 2)); lMean.setHorizontalAlignment(SwingConstants.RIGHT); - lMean.setForeground(Color.gray); + lMean.setForeground(Color.GRAY); lMean.setPreferredSize(header.lMean.getPreferredSize()); lSpike.setHorizontalAlignment(SwingConstants.RIGHT); - lSpike.setForeground(Color.gray); + lSpike.setForeground(Color.GRAY); lSpike.setPreferredSize(header.lSpike.getPreferredSize()); add(lName); @@ -156,7 +169,7 @@ private static class MyRenderer extends JPanel { public void setEntry(Entry entry) { if (entry != null) { lName.setPreferredSize(null); - lName.setForeground(entry.active ? Color.blue : Color.gray); + lName.setForeground(entry.active ? Color.BLUE : Color.GRAY); lName.setText(entry.name); Dimension tmp = lName.getPreferredSize(); if (tmp.width > dName.width || tmp.height > dName.height) { @@ -176,7 +189,7 @@ public void setEntry(Entry entry) { } } - private static final class PerformanceListModel extends AbstractListModel { + private final class PerformanceListModel extends AbstractListModel { private final List<Entry> list = new ArrayList<>(); private final Map<String, Entry> map = new HashMap<>(); @@ -186,7 +199,7 @@ private PerformanceListModel() { executor.execute(() -> { Thread.currentThread().setPriority(Thread.MIN_PRIORITY); try { - while (true) { + while (!stopThread) { Thread.sleep(1000); try (ThreadActivity ignored = ThreadMonitor.startThreadActivity("Poll")) { updateEntries(PerformanceMonitor.getRunningMean(), PerformanceMonitor.getDecayingSpikes()); @@ -194,8 +207,10 @@ private PerformanceListModel() { } } catch (Exception e) { ThreadMonitor.addError(e); - logger.error("Error executing performance monitor update", e); + LOGGER.error("Error executing performance monitor update", e); } + + executor.shutdownNow(); }); } @@ -204,11 +219,6 @@ private void invokeIntervalAdded(final int a, final int b) { SwingUtilities.invokeLater(() -> fireIntervalAdded(source, a, b)); } - private void invokeIntervalRemoved(final int a, final int b) { - final Object source = this; - SwingUtilities.invokeLater(() -> fireIntervalRemoved(source, a, b)); - } - private void invokeContentsChanged(final int a, final int b) { final Object source = this; SwingUtilities.invokeLater(() -> fireContentsChanged(source, a, b)); @@ -238,6 +248,7 @@ private void updateEntries(TObjectDoubleMap<String> means, TObjectDoubleMap<Stri } return true; }); + Collections.sort(list); invokeContentsChanged(0, list.size() - 1); } diff --git a/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java b/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java index 78b20fed5..49b7eff4e 100644 --- a/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java +++ b/engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java @@ -23,8 +23,18 @@ import org.terasology.monitoring.impl.SingleThreadMonitor; import org.terasology.monitoring.impl.ThreadMonitorEvent; -import javax.swing.*; -import java.awt.*; +import javax.swing.JPanel; +import javax.swing.JList; +import javax.swing.JLabel; +import javax.swing.ListCellRenderer; +import javax.swing.SwingUtilities; +import javax.swing.AbstractListModel; +import javax.swing.SwingConstants; +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Dimension; +import java.awt.Component; +import java.awt.Color; import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.BlockingQueue; @@ -36,24 +46,31 @@ @SuppressWarnings("serial") public class ThreadMonitorPanel extends JPanel { - private static final Color BACKGROUND = Color.white; - private static final Logger logger = LoggerFactory.getLogger(ThreadMonitorPanel.class); + private static final Color BACKGROUND = Color.WHITE; + private static final Logger LOGGER = LoggerFactory.getLogger(ThreadMonitorPanel.class); - private final JList list; + /** + * If true, the active monitoring thread in executor service should stop. + */ + private boolean stopThread; public ThreadMonitorPanel() { setLayout(new BorderLayout()); - list = new JList(new ThreadListModel()); + JList list = new JList(new ThreadListModel()); list.setCellRenderer(new ThreadListRenderer()); list.setVisible(true); add(list, BorderLayout.CENTER); } + public void stopThread() { + this.stopThread = true; + } + private abstract static class Task { private String name; - Task(String name) { + Task(String name) { this.name = name; } @@ -94,7 +111,7 @@ private static class MyRenderer extends JPanel { private Dimension dId = new Dimension(0, 0); private Dimension dName = new Dimension(0, 0); - MyRenderer() { + MyRenderer() { setBackground(BACKGROUND); setLayout(new BorderLayout()); @@ -105,8 +122,8 @@ private static class MyRenderer extends JPanel { pHead.add(pError, BorderLayout.PAGE_END); lId.setHorizontalAlignment(SwingConstants.RIGHT); - lName.setForeground(Color.blue); - lCounters.setForeground(Color.gray); + lName.setForeground(Color.BLUE); + lCounters.setForeground(Color.GRAY); pList.setLayout(new FlowLayout(FlowLayout.LEFT, 4, 2)); pList.setBackground(BACKGROUND); @@ -120,7 +137,7 @@ private static class MyRenderer extends JPanel { pError.add(lErrorSpacer); pError.add(lError); - lError.setForeground(Color.red); + lError.setForeground(Color.RED); add(pHead, BorderLayout.PAGE_START); } @@ -148,14 +165,14 @@ public void setMonitor(SingleThreadMonitor monitor) { if (monitor.isAlive()) { if (monitor.isActive()) { - lActive.setForeground(Color.green); + lActive.setForeground(Color.GREEN); lActive.setText("Active"); } else { - lActive.setForeground(Color.gray); + lActive.setForeground(Color.GRAY); lActive.setText("Inactive"); } } else { - lActive.setForeground(Color.red); + lActive.setForeground(Color.RED); lActive.setText("Disposed"); } @@ -175,7 +192,7 @@ public void setMonitor(SingleThreadMonitor monitor) { } } - private static final class ThreadListModel extends AbstractListModel { + private final class ThreadListModel extends AbstractListModel { private final java.util.List<SingleThreadMonitor> monitors = new ArrayList<>(); private final ExecutorService executor = Executors.newSingleThreadExecutor(); @@ -193,30 +210,29 @@ public void execute() { } } }); - executor.execute(new Runnable() { - @Override - public void run() { - Thread.currentThread().setPriority(Thread.MIN_PRIORITY); - try { - while (true) { - final Task task = queue.poll(500, TimeUnit.MILLISECONDS); - if (task != null) { - try (ThreadActivity ignored = ThreadMonitor.startThreadActivity(task.getName())) { - task.execute(); - } - } else { - try (ThreadActivity ignored = ThreadMonitor.startThreadActivity("Sort Monitors")) { - Collections.sort(monitors); - invokeContentsChanged(0, monitors.size() - 1); - } + + executor.execute(() -> { + Thread.currentThread().setPriority(Thread.MIN_PRIORITY); + try { + while (!stopThread) { + final Task task = queue.poll(500, TimeUnit.MILLISECONDS); + if (task != null) { + try (ThreadActivity ignored = ThreadMonitor.startThreadActivity(task.getName())) { + task.execute(); + } + } else { + try (ThreadActivity ignored = ThreadMonitor.startThreadActivity("Sort Monitors")) { + Collections.sort(monitors); + invokeContentsChanged(0, monitors.size() - 1); } } - } catch (Exception e) { - ThreadMonitor.addError(e); - logger.error("Error executing thread monitor update", e); } - invokeContentsChanged(0, monitors.size() - 1); + } catch (Exception e) { + ThreadMonitor.addError(e); + LOGGER.error("Error executing thread monitor update", e); } + + executor.shutdownNow(); }); } @@ -225,11 +241,6 @@ private void invokeIntervalAdded(final int a, final int b) { SwingUtilities.invokeLater(() -> fireIntervalAdded(source, a, b)); } - private void invokeIntervalRemoved(final int a, final int b) { - final Object source = this; - SwingUtilities.invokeLater(() -> fireIntervalRemoved(source, a, b)); - } - private void invokeContentsChanged(final int a, final int b) { final Object source = this; SwingUtilities.invokeLater(() -> fireContentsChanged(source, a, b));

['engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java', 'engine/src/main/java/org/terasology/monitoring/gui/PerformanceMonitorPanel.java', 'engine/src/main/java/org/terasology/engine/subsystem/common/MonitoringSubsystem.java', 'engine/src/main/java/org/terasology/monitoring/gui/ChunkMonitorPanel.java', 'engine/src/main/java/org/terasology/monitoring/gui/AdvancedMonitor.java', 'engine/src/main/java/org/terasology/monitoring/gui/ThreadMonitorPanel.java']

{'.java': 6}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3090/3066

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3066

https://github.com/MovingBlocks/Terasology/pull/3090

https://github.com/MovingBlocks/Terasology/pull/3090

fixes

Breaking blocks in SampleBuilderGameplay doesn't work right

### What you were trying to do Test Alpha 8 - SampleBuilderGameplay world * Left click should remove a block without any drops and "select" that block type * Right click should place a block of whatever selected type ### What actually happened Right click is fine. But Left click fails to remove a block and instead a physics-cube pops out and flies off to the side, one per click. Probably some change to how block drops are handled in the engine caused this? ### How to reproduce * Run the game and pick BuilderSampleGameplay plus its world * Try to break any block (left click) * See the block not disappear, yet a new physics-enabled cube pops out and bounces around High priority issue since it effectively breaks the BSG template.

12f44ace575177f4e84dd16031b9d5bfb66da8c3

ee0da21d523fd67ca951a1c600d80c3b85a17564

https://github.com/movingblocks/terasology/compare/12f44ace575177f4e84dd16031b9d5bfb66da8c3...ee0da21d523fd67ca951a1c600d80c3b85a17564

diff --git a/engine/src/main/java/org/terasology/world/block/entity/BlockEntitySystem.java b/engine/src/main/java/org/terasology/world/block/entity/BlockEntitySystem.java index 6e137b721..f77d0abd6 100644 --- a/engine/src/main/java/org/terasology/world/block/entity/BlockEntitySystem.java +++ b/engine/src/main/java/org/terasology/world/block/entity/BlockEntitySystem.java @@ -159,8 +159,11 @@ private void commonDestroyed(DoDestroyEvent event, EntityRef entity, Block block // dust particle effect if (entity.hasComponent(LocationComponent.class) && block.isDebrisOnDestroy()) { EntityBuilder dustBuilder = entityManager.newBuilder("core:dustEffect"); - dustBuilder.getComponent(LocationComponent.class).setWorldPosition(entity.getComponent(LocationComponent.class).getWorldPosition()); - dustBuilder.build(); + // TODO: particle system stuff should be split out better - this is effectively a stealth dependency on Core from the engine + if (dustBuilder.hasComponent(LocationComponent.class)) { + dustBuilder.getComponent(LocationComponent.class).setWorldPosition(entity.getComponent(LocationComponent.class).getWorldPosition()); + dustBuilder.build(); + } } // sound to play for destroyed block

['engine/src/main/java/org/terasology/world/block/entity/BlockEntitySystem.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3638/3464

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3464

https://github.com/MovingBlocks/Terasology/pull/3638

https://github.com/MovingBlocks/Terasology/pull/3638

fixes

Module details when a module exists with unresolved dependencies causes crash

### What you were trying to do View module details for GooeyDefence to figure out its dependencies and what might be missing ### What actually happened Game crashed when I clicked "FlexiblePathfinding" (the missing dependency) ### How to reproduce * Grab Omega zip 977 or comparable source dir. Or just remove any dependency * Run the game and go to module details under advanced game setup * Click a button representing a module that isn't present ### Log details and game version Omega 977 ``` 12:23:21.566 [main] WARN o.t.engine.internal.TimeBase - Delta too great (10474), capping to 1000 12:23:21.572 [main] INFO o.t.logic.console.ConsoleImpl - [NOTIFICATION] Identity storage service: No configuration data is present, staying logged out. 12:24:08.604 [main] ERROR o.terasology.engine.TerasologyEngine - Uncaught exception, attempting clean game shutdown java.lang.NullPointerException: null at org.terasology.rendering.nui.layers.mainMenu.moduleDetailsScreen.ModuleDetailsScreen$6.get(ModuleDetailsScreen.java:229) at org.terasology.rendering.nui.layers.mainMenu.moduleDetailsScreen.ModuleDetailsScreen$6.get(ModuleDetailsScreen.java:225) at org.terasology.rendering.nui.widgets.UILabel.getText(UILabel.java:68) at org.terasology.rendering.nui.widgets.UILabel.getPreferredContentSize(UILabel.java:101) at org.terasology.rendering.nui.internal.CanvasImpl.calculateRestrictedSize(CanvasImpl.java:347) at org.terasology.rendering.nui.layouts.ColumnLayout.calculateRowSize(ColumnLayout.java:212) at org.terasology.rendering.nui.layouts.ColumnLayout.lambda$onDraw$0(ColumnLayout.java:133) at java.util.stream.ReferencePipeline$3$1.accept(Unknown Source) at java.util.ArrayList$ArrayListSpliterator.forEachRemaining(Unknown Source) at java.util.stream.AbstractPipeline.copyInto(Unknown Source) at java.util.stream.AbstractPipeline.wrapAndCopyInto(Unknown Source) at java.util.stream.ReduceOps$ReduceOp.evaluateSequential(Unknown Source) at java.util.stream.AbstractPipeline.evaluate(Unknown Source) at java.util.stream.ReferencePipeline.collect(Unknown Source) at org.terasology.rendering.nui.layouts.ColumnLayout.onDraw(ColumnLayout.java:133) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.relative.RelativeLayout.onDraw(RelativeLayout.java:85) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.ColumnLayout.onDraw(ColumnLayout.java:191) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.relative.RelativeLayout.onDraw(RelativeLayout.java:85) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.relative.RelativeLayout.onDraw(RelativeLayout.java:85) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.ColumnLayout.onDraw(ColumnLayout.java:191) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.relative.RelativeLayout.onDraw(RelativeLayout.java:85) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.layouts.relative.RelativeLayout.onDraw(RelativeLayout.java:85) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.CoreScreenLayer.onDraw(CoreScreenLayer.java:115) at org.terasology.rendering.nui.internal.CanvasImpl.drawStyledWidget(CanvasImpl.java:406) at org.terasology.rendering.nui.internal.CanvasImpl.drawWidget(CanvasImpl.java:392) at org.terasology.rendering.nui.internal.NUIManagerInternal.render(NUIManagerInternal.java:475) at org.terasology.engine.modes.StateMainMenu.render(StateMainMenu.java:210) at org.terasology.engine.subsystem.lwjgl.LwjglGraphics.postUpdate(LwjglGraphics.java:166) at org.terasology.engine.TerasologyEngine.tick(TerasologyEngine.java:467) at org.terasology.engine.TerasologyEngine.mainLoop(TerasologyEngine.java:421) at org.terasology.engine.TerasologyEngine.run(TerasologyEngine.java:397) at org.terasology.engine.Terasology.main(Terasology.java:154) 12:24:08.610 [main] INFO o.terasology.engine.TerasologyEngine - Shutting down Terasology... 12:24:08.972 [main] WARN o.t.w.g.i.WorldGeneratorManager - Could not resolve dependencies for module: GooeyDefence-0.1.0-SNAPSHOT ``` Maybe of interest to @ar0ne. Probably not a very difficult bug.

12207a8a2265f44876cc8a94ef095fef404a0c8c

094217614c996d50627bc721b0faf5a3d8fed945

https://github.com/movingblocks/terasology/compare/12207a8a2265f44876cc8a94ef095fef404a0c8c...094217614c996d50627bc721b0faf5a3d8fed945

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java index 95a637ce6..8b4818f9c 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java @@ -228,7 +228,7 @@ public String get() { installedVersion.bindText(new ReadOnlyBinding<String>() { @Override public String get() { - if (dependencyInfoBinding.get() != null) { + if (dependencyInfoBinding.get() != null && moduleManager.getRegistry().getLatestModuleVersion(dependencyInfoBinding.get().getId()) != null) { return String.valueOf(moduleManager.getRegistry().getLatestModuleVersion(dependencyInfoBinding.get().getId()).getVersion()); } return ""; @@ -288,6 +288,11 @@ private String getString(DependencyInfo value) { @Override public void draw(DependencyInfo value, Canvas canvas) { + if (moduleManager.getRegistry().getLatestModuleVersion(value.getId()) == null) { + canvas.setMode("invalid"); + } else { + canvas.setMode("available"); + } canvas.drawText(getString(value), canvas.getRegion()); } @@ -316,7 +321,7 @@ private void setUpUpdateModuleButton() { public Boolean get() { final String online = onlineVersion.getText(); final String installed = installedVersion.getText(); - if (StringUtils.isNotBlank(online)) { + if (StringUtils.isNotBlank(online) && StringUtils.isNotBlank(installed)) { return new Version(online).compareTo(new Version(installed)) > 0; } return false;

['engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/moduleDetailsScreen/ModuleDetailsScreen.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3612/3610

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3610

https://github.com/MovingBlocks/Terasology/pull/3612

https://github.com/MovingBlocks/Terasology/pull/3612

fixes

Worldgen seed not unique

<!-- Thanks for taking the time to submit a thorough issue report for Terasology! :-) Please fill out whichever details below seem relevant to your issue. Note that suggestions, general questions & support should go in the forum: * http://forum.terasology.org/forum/suggestions.21 * http://forum.terasology.org/forum/support.20/ Bug reports and crashes likely resulting from bugs in the engine go here on GitHub. --> ### What you were trying to do I was using noise to generate my world based on the seed provided to my world generator. I assumed this was the seed shown in the world-setup screen. ### What actually happened Instead of the seed shown in the world-setup screen, the method `BaseFacetedWorldGenerator .setWorldSeed()` got called with parameter `LOTR World-00`. This is supposed to be unique according to docs at `WorldPreGenerationScreen.createSeed()`, but it appears that the integer which gets appended is only incremented when remaining in the menu-area. When starting a world or restarting the game, it gets reset to 0. This makes the world seed be dependant on only the world-generator name and as this stays constant, the generated noise will be the same. ### How to reproduce * Start the game and create a world using the Perlin generator from the Core module (I used my own generator but this seems to be the case for all generators). Don't touch the seed, maybe set some breakpoints in the setSeed() method of the FacetProviders or BaseFacetedWorldGenerator to check the integer or string you get passed. Let the world generate. * Generate a second world and use the same approach. This world (if the issue is an actual issue) should be the same as the first. Note that the seed which we saw in the menu was different. ### EDIT: clearer reproduction steps 1) Run the game (either from scratch or with additional modules) 2) Select a world generator (Perlin is a good choice because you immediately see the preview, allowing you to verify more easily) 3) Run and repeat.

5b874d87652e667c3f8db1b5eedc768bfcc43b38

0c8c17366e3d02fd8e781e52430d6ab2adcdd280

https://github.com/movingblocks/terasology/compare/5b874d87652e667c3f8db1b5eedc768bfcc43b38...0c8c17366e3d02fd8e781e52430d6ab2adcdd280

diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/GameManifestProvider.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/GameManifestProvider.java index 7e9bea2e7..fdaf9c33f 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/GameManifestProvider.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/GameManifestProvider.java @@ -78,7 +78,7 @@ public static GameManifest createGameManifest(final UniverseWrapper universeWrap String seed; if (universeWrapper.getTargetWorld() != null) { uri = universeWrapper.getTargetWorld().getWorldGenerator().getUri(); - seed = universeWrapper.getTargetWorld().getWorldName().toString() + 0; + seed = universeWrapper.getTargetWorld().getWorldGenerator().getWorldSeed(); gameManifest.setSeed(seed); } else { uri = config.getWorldGeneration().getDefaultGenerator(); diff --git a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java index 9b5edfcea..d0970ebe0 100644 --- a/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java +++ b/engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java @@ -267,7 +267,8 @@ private WorldSetupWrapper findWorldByName(String searchWorld) { * @return The seed as a string. */ private String createSeed(String world) { - return world + seedNumber++; + String seed = context.get(UniverseWrapper.class).getSeed(); + return seed + world + seedNumber++; } private void setWorldGenerators() {

['engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/WorldPreGenerationScreen.java', 'engine/src/main/java/org/terasology/rendering/nui/layers/mainMenu/GameManifestProvider.java']

{'.java': 2}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

movingblocks/terasology/3534/3582

movingblocks

terasology

https://github.com/MovingBlocks/Terasology/issues/3582

https://github.com/MovingBlocks/Terasology/pull/3534

https://github.com/MovingBlocks/Terasology/pull/3534#issuecomment-449671307

fixes

On restarting a headless server with an existing world no world is retrieved from the game manifest

### What you were trying to do Test something unrelated, by which I ended up restarting a headless server. ### What actually happened The restart failed to bring the game server back up ### How to reproduce * Start a headless server with any config (like just starting the headless run config in IntelliJ) * Stop the server (can potentially skip steps 1 & 2 if you can reproduce with an existing save) * Start the server again On `InitialiseWorld` line 100 the failure occurs. The `gameManifest` loads but has no entries in its `worlds` list ### Log details and game version Latest develop ``` 16:48:21.601 [main] INFO o.t.w.c.b.ExtraBlockDataManager - Extra data slots registered: 16:48:21.604 [main] ERROR o.terasology.engine.TerasologyEngine - Uncaught exception, attempting clean game shutdown java.lang.NullPointerException: null at org.terasology.engine.modes.loadProcesses.InitialiseWorld.step(InitialiseWorld.java:101) at org.terasology.engine.modes.StateLoading.update(StateLoading.java:243) at org.terasology.engine.TerasologyEngine.tick(TerasologyEngine.java:458) at org.terasology.engine.TerasologyEngine.mainLoop(TerasologyEngine.java:421) at org.terasology.engine.TerasologyEngine.run(TerasologyEngine.java:397) at org.terasology.engine.Terasology.main(Terasology.java:145) 16:48:21.604 [main] INFO o.terasology.engine.TerasologyEngine - Shutting down Terasology... ``` ### Theory Either the game isn't correctly saving the world in the first place or the game manifest isn't correctly figuring out where the actual world went so it can list it. Might relate to some of the multi-world changes, although that was a few months ago. Since it works fine the _first_ time you launch a headless server maybe we somehow missed it this long. Also works partially with a client/server hosting a fresh game, exiting, then re-hosting. No crash, although when I tried it the client loaded into a black screen with no world visible (did have toolbar items etc)

7cf495ee093ff7d3829498288660138d266761d8

648c9b1558a0bf73abbd5e6202621bc1392e4f3f

https://github.com/movingblocks/terasology/compare/7cf495ee093ff7d3829498288660138d266761d8...648c9b1558a0bf73abbd5e6202621bc1392e4f3f

diff --git a/engine/src/main/java/org/terasology/engine/subsystem/headless/mode/StateHeadlessSetup.java b/engine/src/main/java/org/terasology/engine/subsystem/headless/mode/StateHeadlessSetup.java index 6d53f56e4..25fee757e 100644 --- a/engine/src/main/java/org/terasology/engine/subsystem/headless/mode/StateHeadlessSetup.java +++ b/engine/src/main/java/org/terasology/engine/subsystem/headless/mode/StateHeadlessSetup.java @@ -106,6 +106,13 @@ public void init(GameEngine gameEngine) { } else { gameManifest = createGameManifest(); } + + Config config = context.get(Config.class); + WorldInfo worldInfo = gameManifest.getWorldInfo(TerasologyConstants.MAIN_WORLD); + config.getUniverseConfig().addWorldManager(worldInfo); + config.getUniverseConfig().setSpawnWorldTitle(worldInfo.getTitle()); + config.getUniverseConfig().setUniverseSeed(gameManifest.getSeed()); + gameEngine.changeState(new StateLoading(gameManifest, NetworkMode.LISTEN_SERVER)); }

['engine/src/main/java/org/terasology/engine/subsystem/headless/mode/StateHeadlessSetup.java']

{'.java': 1}

Java

{'Java': 7127511, 'Groovy': 55969, 'Kotlin': 49638, 'GLSL': 23786, 'Shell': 12152, 'Batchfile': 4149, 'Dockerfile': 292}

Apache License 2.0

spring-cloud/spring-cloud-kubernetes/440/402

spring-cloud

spring-cloud-kubernetes

https://github.com/spring-cloud/spring-cloud-kubernetes/issues/402

https://github.com/spring-cloud/spring-cloud-kubernetes/pull/440

https://github.com/spring-cloud/spring-cloud-kubernetes/pull/440

fixes

ConfigMap change does not trigger bean refresh

I am doing some training with spring-cloud-kubernetes on Red Hat minishift. I managed to define a ConfigMap which is correctly found and the configured message ${service.message} is shown.. However, when I change the value in the ConfigMap, the RestController in the @RefreshScope seems not to be refreshed and the message stays the same. Only a restart of the app updates the message. According to the documentation I assumed this should work. Did I miss some additional step or is this not working yet? ```java @Controller @RefreshScope public class RestController { private final String message; public RestController(@Value("${service.message}") String message) { this.message = message; } /** * Say hello to earth * * @return First word from the moon * */ @GetMapping("/hello") @ResponseBody public String hello() { return message + " (" + LocalDateTime.now().toString() + ")"; } } ``` The ConfigMap ```yaml apiVersion: v1 data: application.yml: |- service: message: Say hello to the world kind: ConfigMap metadata: creationTimestamp: '2019-06-02T17:35:24Z' name: openshift-spring-boot-service namespace: dsp-dev resourceVersion: '67065' selfLink: /api/v1/namespaces/dsp-dev/configmaps/openshift-spring-boot-service uid: cd7a8217-855c-11e9-8dc5-00155d010b07 ```

2d3b9c59019047b52f5f0dc91f4d7a7cb4a09024

6ae6a3b2bd91c6b25d77c464121f0b54a3a67831

https://github.com/spring-cloud/spring-cloud-kubernetes/compare/2d3b9c59019047b52f5f0dc91f4d7a7cb4a09024...6ae6a3b2bd91c6b25d77c464121f0b54a3a67831

diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java index b811f827..880319b6 100644 --- a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java +++ b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java @@ -38,6 +38,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.env.AbstractEnvironment; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.util.Assert; /** * Definition of beans needed for the automatic reload of configuration. @@ -110,9 +111,11 @@ public class ConfigReloadAutoConfiguration { @ConditionalOnMissingBean public ConfigurationUpdateStrategy configurationUpdateStrategy( ConfigReloadProperties properties, ConfigurableApplicationContext ctx, - RestartEndpoint restarter, ContextRefresher refresher) { + @Autowired(required = false) RestartEndpoint restarter, + ContextRefresher refresher) { switch (properties.getStrategy()) { case RESTART_CONTEXT: + Assert.notNull(restarter, "Restart endpoint is not enabled"); return new ConfigurationUpdateStrategy(properties.getStrategy().name(), restarter::restart); case REFRESH:

['spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfiguration.java']

{'.java': 1}

Java

{'Java': 3113351, 'Shell': 548}

Apache License 2.0

immutables/immutables/884/736

immutables

immutables

https://github.com/immutables/immutables/issues/736

https://github.com/immutables/immutables/pull/884

https://github.com/immutables/immutables/pull/884

fixes

Why declared immuables library style in package-info.java doesn't apply for subpackages in java 9 project?

Please see https://github.com/originalrusyn/java9_immutables for more details So, the following config works correctly with sourceCompatibility = 1.8 ``` p.package-info.java @Value.Style( defaults = @Value.Immutable(copy = false), strictBuilder = true, overshadowImplementation = true, implementationNestedInBuilder = true ) package p; import org.immutables.value.Value; ``` build.gradle ``` buildscript { ext { immutablesVersion = '2.5.6' } repositories { mavenCentral() maven { url "https://plugins.gradle.org/m2/" } } dependencies { classpath "net.ltgt.gradle:gradle-apt-plugin:0.13" } } group 'java9' version '1.0-SNAPSHOT' apply plugin: 'java' apply plugin: 'net.ltgt.apt' sourceCompatibility = 1.9 repositories { mavenCentral() } sourceSets { main generated test } compileJava { generatedSourcesDestinationDir = "$projectDir/src/generated/java" } task wrapper(type: Wrapper) { gradleVersion = '4.4' } dependencies { apt "org.immutables:value:${immutablesVersion}" compileOnly "org.immutables:value:${immutablesVersion}:annotations" testCompile group: 'junit', name: 'junit', version: '4.12' } ``` p.b.B.java ``` package p.b; import org.immutables.value.Value; @Value.Immutable public interface B { String getText(); } ``` Why does it produce p.b.ImmutableB.java rather than p.b.BBuilder.java for sourceCompatibility=1.9?

0e81280505a1261ea19c90d2169d47aab0a092eb

cfcae50bf4e379eeb99ae5c0635ca5d1b1fc3b66

https://github.com/immutables/immutables/compare/0e81280505a1261ea19c90d2169d47aab0a092eb...cfcae50bf4e379eeb99ae5c0635ca5d1b1fc3b66

diff --git a/value-processor/src/org/immutables/value/processor/meta/Proto.java b/value-processor/src/org/immutables/value/processor/meta/Proto.java index 3b07678b..7c55ab44 100644 --- a/value-processor/src/org/immutables/value/processor/meta/Proto.java +++ b/value-processor/src/org/immutables/value/processor/meta/Proto.java @@ -723,7 +723,7 @@ public class Proto { @Value.Lazy Optional<DeclaringPackage> namedParentPackage() { String parentPackageName = SourceNames.parentPackageName(element()); - if (!parentPackageName.isEmpty()) { + while (!parentPackageName.isEmpty()) { @Nullable PackageElement parentPackage = environment().processing() .getElementUtils() @@ -737,6 +737,11 @@ public class Proto { .element(parentPackage) .build())); } + + // With JDK 9+ package elements are only returned for packages with a + // `package-info.class` file. So although the parent may not be found, + // there may be "ancestor packages" further up the hierarchy. + parentPackageName = SourceNames.parentPackageName(parentPackageName); } return Optional.absent(); } diff --git a/value-processor/src/org/immutables/value/processor/meta/SourceNames.java b/value-processor/src/org/immutables/value/processor/meta/SourceNames.java index 6cc5ec4d..23bfb25b 100644 --- a/value-processor/src/org/immutables/value/processor/meta/SourceNames.java +++ b/value-processor/src/org/immutables/value/processor/meta/SourceNames.java @@ -46,7 +46,10 @@ final class SourceNames { } static String parentPackageName(PackageElement element) { - String qualifiedName = element.getQualifiedName().toString(); + return parentPackageName(element.getQualifiedName().toString()); + } + + static String parentPackageName(String qualifiedName) { int lastIndexOfDot = qualifiedName.lastIndexOf('.'); if (lastIndexOfDot > 0) { return qualifiedName.substring(0, lastIndexOfDot);

['value-processor/src/org/immutables/value/processor/meta/SourceNames.java', 'value-processor/src/org/immutables/value/processor/meta/Proto.java']

{'.java': 2}

Java

{'Java': 3671759}

Apache License 2.0

immutables/immutables/789/788

immutables

immutables

https://github.com/immutables/immutables/issues/788

https://github.com/immutables/immutables/pull/789

https://github.com/immutables/immutables/pull/789

resolves

Generation with javax.validation.NotNull annotation fails

Using immutables 2.6.1 (and 1.8.0_171 on macOS) , annotation processing of this code (using Validation API 2.0): ```java import javax.validation.constraints.NotNull; import org.immutables.value.Value; @Value.Immutable public interface Test { @NotNull String getTest(); } ``` Fails with this exception: ```java error: org.immutables.value.internal.$processor$.$Processor threw java.lang.IllegalArgumentException: Cannot parse type from input string '(@javax.validation.constraints.NotNull :: java.lang.String)'. unexpected term '(' at org.immutables.value.internal.$processor$.encode.$Type$Parser$1Reader.type($Type.java:767) at org.immutables.value.internal.$processor$.encode.$Type$Parser.doParse($Type.java:891) at org.immutables.value.internal.$processor$.encode.$Type$Parser.parse($Type.java:715) at org.immutables.value.internal.$processor$.meta.$FromSupertypesModel.isEligibleFromType($FromSupertypesModel.java:137) at org.immutables.value.internal.$processor$.meta.$FromSupertypesModel.<init>($FromSupertypesModel.java:78) at org.immutables.value.internal.$processor$.meta.$ValueType.getBuildFromTypes($ValueType.java:1358) at org.immutables.value.internal.$processor$.$Generator_Immutables._t18__generateBuilder($Generator_Immutables.java:5008) at org.immutables.value.internal.$processor$.$Generator_Immutables$FragmentDispatch.run($Generator_Immutables.java:19510) at org.immutables.value.internal.$generator$.$Templates$Fragment.invoke($Templates.java:248) at org.immutables.value.internal.$generator$.$Intrinsics.$($Intrinsics.java:96) at org.immutables.value.internal.$processor$.$Generator_Immutables._t4__generateImmutable($Generator_Immutables.java:601) at org.immutables.value.internal.$processor$.$Generator_Immutables$FragmentDispatch.run($Generator_Immutables.java:19496) at org.immutables.value.internal.$generator$.$Templates$Fragment.invoke($Templates.java:248) at org.immutables.value.internal.$generator$.$Intrinsics.$($Intrinsics.java:96) at org.immutables.value.internal.$processor$.$Generator_Immutables$1.run($Generator_Immutables.java:23) at org.immutables.value.internal.$generator$.$Templates$Fragment.invoke($Templates.java:248) at org.immutables.value.internal.$generator$.$Output$7.invoke($Output.java:174) at org.immutables.value.internal.$generator$.$Intrinsics.$($Intrinsics.java:96) at org.immutables.value.internal.$processor$.$Generator_Immutables._t0__generate($Generator_Immutables.java:20) at org.immutables.value.internal.$processor$.$Generator_Immutables$FragmentDispatch.run($Generator_Immutables.java:19492) at org.immutables.value.internal.$generator$.$Templates$Fragment.invoke($Templates.java:248) at org.immutables.value.internal.$generator$.$AbstractGenerator.invoke($AbstractGenerator.java:57) at org.immutables.value.internal.$processor$.$Processor.process($Processor.java:63) at org.immutables.value.internal.$generator$.$AbstractGenerator.process($AbstractGenerator.java:87) at org.immutables.processor.ProxyProcessor.process(ProxyProcessor.java:72) at com.sun.tools.javac.processing.JavacProcessingEnvironment.callProcessor(JavacProcessingEnvironment.java:794) at com.sun.tools.javac.processing.JavacProcessingEnvironment.discoverAndRunProcs(JavacProcessingEnvironment.java:705) at com.sun.tools.javac.processing.JavacProcessingEnvironment.access$1800(JavacProcessingEnvironment.java:91) at com.sun.tools.javac.processing.JavacProcessingEnvironment$Round.run(JavacProcessingEnvironment.java:1035) at com.sun.tools.javac.processing.JavacProcessingEnvironment.doProcessing(JavacProcessingEnvironment.java:1176) at com.sun.tools.javac.main.JavaCompiler.processAnnotations(JavaCompiler.java:1170) at com.sun.tools.javac.main.JavaCompiler.compile(JavaCompiler.java:856) at com.sun.tools.javac.main.Main.compile(Main.java:523) at com.sun.tools.javac.api.JavacTaskImpl.doCall(JavacTaskImpl.java:129) at com.sun.tools.javac.api.JavacTaskImpl.call(JavacTaskImpl.java:138) at org.gradle.api.internal.tasks.compile.JdkJavaCompiler.execute(JdkJavaCompiler.java:50) at org.gradle.api.internal.tasks.compile.JdkJavaCompiler.execute(JdkJavaCompiler.java:36) at org.gradle.api.internal.tasks.compile.daemon.AbstractDaemonCompiler$CompilerCallable.call(AbstractDaemonCompiler.java:88) at org.gradle.api.internal.tasks.compile.daemon.AbstractDaemonCompiler$CompilerCallable.call(AbstractDaemonCompiler.java:76) at org.gradle.workers.internal.DefaultWorkerServer.execute(DefaultWorkerServer.java:42) at org.gradle.workers.internal.WorkerDaemonServer.execute(WorkerDaemonServer.java:46) at org.gradle.workers.internal.WorkerDaemonServer.execute(WorkerDaemonServer.java:30) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.gradle.process.internal.worker.request.WorkerAction.run(WorkerAction.java:101) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:35) at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24) at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:155) at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:137) at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:404) at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:63) at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:46) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:55) at java.lang.Thread.run(Thread.java:748) 1 error ``` The Validation API 2.0 introduced `TYPE_USE` as a Annotation target for `NotNull`, annotating the return type for the method (instead of the method itself), which `Parser` can not handle.

0ded2d7abacb33d8b11de42b25046fb608c09a39

9bce0fd862569a749cbcc801608cc734da8ea7cc

https://github.com/immutables/immutables/compare/0ded2d7abacb33d8b11de42b25046fb608c09a39...9bce0fd862569a749cbcc801608cc734da8ea7cc

diff --git a/value-processor/src/org/immutables/value/processor/encode/Type.java b/value-processor/src/org/immutables/value/processor/encode/Type.java index 66bacb32..1d55d0a7 100644 --- a/value-processor/src/org/immutables/value/processor/encode/Type.java +++ b/value-processor/src/org/immutables/value/processor/encode/Type.java @@ -758,15 +758,25 @@ public interface Type { } else if (t.is("@")) { // just consume type annotation terms.poll(); - named(); - consumeAnnotationParameters(); - consumeErraticTrailingComma(); + consumeAnnotation(); // and try again, yep, recursively... return type(); + } else if (t.is("(")) { + return annotatedType(); } throw new IllegalStateException("unexpected term '" + t + "'"); } + Type annotatedType() { + terms.poll(); + consumeAnnotation(); + expect(terms.poll(), ":"); + expect(terms.poll(), ":"); + Type type = type(); + expect(terms.poll(), ")"); + return type; + } + Wildcard wildcard() { expect(terms.poll(), "?"); @@ -822,14 +832,12 @@ public interface Type { List<String> segments = new ArrayList<>(); for (;;) { - Term t = terms.poll(); - if (t.isWordOrNumber()) { - segments.add(t.toString()); - } else if (t.is("@")) { + if (terms.peek().isWordOrNumber()) { + segments.add(terms.poll().toString()); + } else if (terms.peek().is("@")) { + terms.poll(); // just consume type annotation - named(); - consumeAnnotationParameters(); - consumeErraticTrailingComma(); + consumeAnnotation(); continue; } else { break; @@ -853,6 +861,12 @@ public interface Type { return forName(JOINER.join(segments)); } + private void consumeAnnotation() { + named(); + consumeAnnotationParameters(); + consumeErraticTrailingComma(); + } + private void consumeAnnotationParameters() { consumeRecursiveUntil("(", ")"); } diff --git a/value-processor/test/org/immutables/value/processor/encode/TypeTest.java b/value-processor/test/org/immutables/value/processor/encode/TypeTest.java index 4175441d..c2e7e1db 100644 --- a/value-processor/test/org/immutables/value/processor/encode/TypeTest.java +++ b/value-processor/test/org/immutables/value/processor/encode/TypeTest.java @@ -64,6 +64,7 @@ public class TypeTest { check(parser.parse("java.lang.@javax.validation.constraints.Size(max = 10)String")).is(Reference.STRING); check(parser.parse("java.lang.@javax.validation.constraints.Size(max = 10, @A(a=@B(b=1))) String")).is(Reference.STRING); check(parser.parse("@Ann(\\"b\\") int")).is(Primitive.INT); + check(parser.parse("(@javax.validation.constraints.NotNull :: java.lang.String)")).is(Reference.STRING); } @Test

['value-processor/src/org/immutables/value/processor/encode/Type.java', 'value-processor/test/org/immutables/value/processor/encode/TypeTest.java']

{'.java': 2}

Java

{'Java': 3671759}

Apache License 2.0

immutables/immutables/785/784

immutables

immutables

https://github.com/immutables/immutables/issues/784

https://github.com/immutables/immutables/pull/785

https://github.com/immutables/immutables/pull/785

resolve

-Werror compiler warning for unchecked casts for java.util.Optional

Issue #723 still occurs for java.util.Optional with using the -Werror compiler option.

99256177286404c75bbfe56eed21fa3c469121f5

ceab34a7288c946844bb522c420c7f87c78a2e38

https://github.com/immutables/immutables/compare/99256177286404c75bbfe56eed21fa3c469121f5...ceab34a7288c946844bb522c420c7f87c78a2e38

diff --git a/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java b/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java index e061a57d..6eeaab53 100644 --- a/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java +++ b/value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java @@ -1050,7 +1050,6 @@ public final class ValueAttribute extends TypeIntrospectionBase implements HasSt public boolean isSafeUncheckedCovariantCast() { return isOptionalType() - && !isJdkOptional() && !getConsumedElementType().equals(getWrappedElementType()); }

['value-processor/src/org/immutables/value/processor/meta/ValueAttribute.java']

{'.java': 1}

Java

{'Java': 3671759}

Apache License 2.0

roaringbitmap/roaringbitmap/593/592

roaringbitmap

roaringbitmap

https://github.com/RoaringBitmap/RoaringBitmap/issues/592

https://github.com/RoaringBitmap/RoaringBitmap/pull/593

https://github.com/RoaringBitmap/RoaringBitmap/pull/593

fixes

Result of Roaring64Bitmap::or is not right

**Describe the bug** ```java public static void main(String[] args) throws IOException { String s1 = FileUtils.readFileToString(new File("D:\\\\Documents\\\\Pictures\\\\base64.txt"), StandardCharsets.UTF_8); byte[] decodedString = Base64.getDecoder().decode(new String(s1).getBytes(StandardCharsets.UTF_8)); Roaring64Bitmap b1 = BitMapUtil.toBitMap(decodedString); Roaring64Bitmap b2 = BitMapUtil.toBitMap(decodedString); System.out.println("b1 length " + b1.getLongCardinality() + ", and b1 contains 22110666752 " + b1.contains(22110666752L)); b1.or(b1); System.out.println("b1 length " + b1.getLongCardinality() + ", and b1 contains 22110666752 " + b1.contains(22110666752L)); } public static Roaring64Bitmap toBitMap(byte[] array){ if (array == null){ return new Roaring64Bitmap(); } Roaring64Bitmap ret = new Roaring64Bitmap(); try { ret.deserialize(ByteBuffer.wrap(array)); } catch(IOException ioe) { ioe.printStackTrace(); // should not happen } return ret; } ``` result is : ``` b1 length 85243, and b1 contains 22110666752 false b1 length 85297, and b1 contains 22110666752 true ``` base64.txt file is [base64.txt](https://github.com/RoaringBitmap/RoaringBitmap/files/9961308/base64.txt)

0e5734418719cacdf57e316ab509284b54e23420

6764dde246987d60c9665e911cc7b01ada8cacf0

https://github.com/roaringbitmap/roaringbitmap/compare/0e5734418719cacdf57e316ab509284b54e23420...6764dde246987d60c9665e911cc7b01ada8cacf0

diff --git a/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java index 27af9afe..a9e93eec 100644 --- a/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java +++ b/RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java @@ -1212,6 +1212,7 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> * @param x2 other bitmap */ public void and(final RoaringBitmap x2) { + if(x2 == this) { return; } int pos1 = 0, pos2 = 0, intersectionSize = 0; final int length1 = highLowContainer.size(), length2 = x2.highLowContainer.size(); @@ -1285,6 +1286,10 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> * @param x2 other bitmap */ public void andNot(final RoaringBitmap x2) { + if(x2 == this) { + clear(); + return; + } int pos1 = 0, pos2 = 0, intersectionSize = 0; final int length1 = highLowContainer.size(), length2 = x2.highLowContainer.size(); @@ -1366,6 +1371,9 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> * @param rangeEnd end point of the range (exclusive). */ public void orNot(final RoaringBitmap other, long rangeEnd) { + if(other == this) { + throw new UnsupportedOperationException("orNot between a bitmap and itself?"); + } rangeSanityCheck(0, rangeEnd); int maxKey = (int)((rangeEnd - 1) >>> 16); int lastRun = (rangeEnd & 0xFFFF) == 0 ? 0x10000 : (int)(rangeEnd & 0xFFFF); @@ -2211,6 +2219,7 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> // don't forget to call repairAfterLazy() afterward // important: x2 should not have been computed lazily protected void lazyor(final RoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -2258,6 +2267,7 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> // this method is like lazyor except that it will convert // the current container to a bitset protected void naivelazyor(RoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -2333,6 +2343,7 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> * @param x2 other bitmap */ public void or(final RoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -3089,6 +3100,10 @@ public class RoaringBitmap implements Cloneable, Serializable, Iterable<Integer> * @param x2 other bitmap */ public void xor(final RoaringBitmap x2) { + if(x2 == this) { + clear(); + return; + } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); diff --git a/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java index 878a0c42..7ef2ce04 100644 --- a/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java +++ b/RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java @@ -850,6 +850,7 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap * @param array other bitmap */ public void and(final ImmutableRoaringBitmap array) { + if(array == this) { return; } int pos1 = 0, pos2 = 0, intersectionSize = 0; final int length1 = highLowContainer.size(), length2 = array.highLowContainer.size(); @@ -881,6 +882,10 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap * @param x2 other bitmap */ public void andNot(final ImmutableRoaringBitmap x2) { + if(x2 == this) { + clear(); + return; + } int pos1 = 0, pos2 = 0, intersectionSize = 0; final int length1 = highLowContainer.size(), length2 = x2.highLowContainer.size(); @@ -921,6 +926,9 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap * @param rangeEnd end point of the range (exclusive). */ public void orNot(ImmutableRoaringBitmap other, long rangeEnd) { + if(other == this) { + throw new UnsupportedOperationException("orNot between a bitmap and itself?"); + } rangeSanityCheck(0, rangeEnd); int maxKey = (int)((rangeEnd - 1) >>> 16); int lastRun = (rangeEnd & 0xFFFF) == 0 ? 0x10000 : (int)(rangeEnd & 0xFFFF); @@ -1254,6 +1262,7 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap // call repairAfterLazy on result, eventually // important: x2 should not have been computed lazily protected void lazyor(final ImmutableRoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -1301,6 +1310,7 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap // this method is like lazyor except that it will convert // the current container to a bitset protected void naivelazyor(final ImmutableRoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -1354,6 +1364,7 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap * @param x2 other bitmap */ public void or(final ImmutableRoaringBitmap x2) { + if(this == x2) { return; } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); @@ -1617,6 +1628,10 @@ public class MutableRoaringBitmap extends ImmutableRoaringBitmap * @param x2 other bitmap */ public void xor(final ImmutableRoaringBitmap x2) { + if(x2 == this) { + clear(); + return; + } int pos1 = 0, pos2 = 0; int length1 = highLowContainer.size(); final int length2 = x2.highLowContainer.size(); diff --git a/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java index 6f036d7f..36883093 100644 --- a/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java +++ b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java @@ -294,6 +294,7 @@ public class Roaring64Bitmap implements Externalizable, LongBitmapDataProvider { * @param x2 other bitmap */ public void or(final Roaring64Bitmap x2) { + if(this == x2) { return; } KeyIterator highIte2 = x2.highLowContainer.highKeyIterator(); while (highIte2.hasNext()) { byte[] high = highIte2.next(); @@ -316,6 +317,10 @@ public class Roaring64Bitmap implements Externalizable, LongBitmapDataProvider { * @param x2 other bitmap */ public void xor(final Roaring64Bitmap x2) { + if(x2 == this) { + clear(); + return; + } KeyIterator keyIterator = x2.highLowContainer.highKeyIterator(); while (keyIterator.hasNext()) { byte[] high = keyIterator.next(); @@ -338,6 +343,7 @@ public class Roaring64Bitmap implements Externalizable, LongBitmapDataProvider { * @param x2 other bitmap */ public void and(final Roaring64Bitmap x2) { + if(x2 == this) { return; } KeyIterator thisIterator = highLowContainer.highKeyIterator(); while (thisIterator.hasNext()) { byte[] highKey = thisIterator.next(); @@ -364,6 +370,10 @@ public class Roaring64Bitmap implements Externalizable, LongBitmapDataProvider { * @param x2 other bitmap */ public void andNot(final Roaring64Bitmap x2) { + if(x2 == this) { + clear(); + return; + } KeyIterator thisKeyIterator = highLowContainer.highKeyIterator(); while (thisKeyIterator.hasNext()) { byte[] high = thisKeyIterator.next(); diff --git a/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java index 187c9c13..0461576e 100644 --- a/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java +++ b/RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java @@ -708,6 +708,7 @@ public class Roaring64NavigableMap implements Externalizable, LongBitmapDataProv * @param x2 other bitmap */ public void naivelazyor(final Roaring64NavigableMap x2) { + if(this == x2) { return; } for (Entry<Integer, BitmapDataProvider> e2 : x2.highToBitmap.entrySet()) { // Keep object to prevent auto-boxing Integer high = e2.getKey(); @@ -750,6 +751,7 @@ public class Roaring64NavigableMap implements Externalizable, LongBitmapDataProv * @param x2 other bitmap */ public void or(final Roaring64NavigableMap x2) { + if(this == x2) { return; } boolean firstBucket = true; for (Entry<Integer, BitmapDataProvider> e2 : x2.highToBitmap.entrySet()) { @@ -806,6 +808,10 @@ public class Roaring64NavigableMap implements Externalizable, LongBitmapDataProv * @param x2 other bitmap */ public void xor(final Roaring64NavigableMap x2) { + if(x2 == this) { + clear(); + return; + } boolean firstBucket = true; for (Entry<Integer, BitmapDataProvider> e2 : x2.highToBitmap.entrySet()) { @@ -861,6 +867,7 @@ public class Roaring64NavigableMap implements Externalizable, LongBitmapDataProv * @param x2 other bitmap */ public void and(final Roaring64NavigableMap x2) { + if(x2 == this) { return; } boolean firstBucket = true; Iterator<Entry<Integer, BitmapDataProvider>> thisIterator = highToBitmap.entrySet().iterator(); @@ -906,6 +913,10 @@ public class Roaring64NavigableMap implements Externalizable, LongBitmapDataProv * @param x2 other bitmap */ public void andNot(final Roaring64NavigableMap x2) { + if(x2 == this) { + clear(); + return; + } boolean firstBucket = true; Iterator<Entry<Integer, BitmapDataProvider>> thisIterator = highToBitmap.entrySet().iterator(); diff --git a/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java index 59e01b17..a1327195 100644 --- a/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java @@ -5406,6 +5406,22 @@ public class TestRoaringBitmap { assertTrue(bitmap.cardinalityExceeds(runLength - 1)); } + + @Test + public void testWithYourself() { + RoaringBitmap b1 = RoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.runOptimize(); + b1.or(b1); + assertTrue(b1.equals(RoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.xor(b1); + assertTrue(b1.isEmpty()); + b1 = RoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.and(b1); + assertTrue(b1.equals(RoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.andNot(b1); + assertTrue(b1.isEmpty()); + } + @Test public void testIssue566() { RoaringBitmap roaringBitMap = new RoaringBitmap(); diff --git a/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java index 50cb2b22..f1371599 100644 --- a/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java @@ -3916,6 +3916,21 @@ public class TestRoaringBitmap { assertTrue(bitmap.cardinalityExceeds(runLength - 1)); } + @Test + public void testWithYourself() { + MutableRoaringBitmap b1 = MutableRoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.runOptimize(); + b1.or(b1); + assertTrue(b1.equals(MutableRoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.xor(b1); + assertTrue(b1.isEmpty()); + b1 = MutableRoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.and(b1); + assertTrue(b1.equals(MutableRoaringBitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.andNot(b1); + assertTrue(b1.isEmpty()); + } + @Test public void testPreviousValueRegression() { // see https://github.com/RoaringBitmap/RoaringBitmap/issues/564 diff --git a/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64Bitmap.java b/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64Bitmap.java index f0d0d52c..eeff115f 100644 --- a/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64Bitmap.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64Bitmap.java @@ -2172,6 +2172,20 @@ public class TestRoaring64Bitmap { } + @Test + public void testWithYourself() { + Roaring64Bitmap b1 = Roaring64Bitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.runOptimize(); + b1.or(b1); + assertTrue(b1.equals(Roaring64Bitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.xor(b1); + assertTrue(b1.isEmpty()); + b1 = Roaring64Bitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10); + b1.and(b1); + assertTrue(b1.equals(Roaring64Bitmap.bitmapOf(1,2,3,4,5,6,7,8,9,10))); + b1.andNot(b1); + assertTrue(b1.isEmpty()); + } @Test public void testIssue580() {

['RoaringBitmap/src/test/java/org/roaringbitmap/buffer/TestRoaringBitmap.java', 'RoaringBitmap/src/main/java/org/roaringbitmap/RoaringBitmap.java', 'RoaringBitmap/src/test/java/org/roaringbitmap/TestRoaringBitmap.java', 'RoaringBitmap/src/main/java/org/roaringbitmap/buffer/MutableRoaringBitmap.java', 'RoaringBitmap/src/test/java/org/roaringbitmap/longlong/TestRoaring64Bitmap.java', 'RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64NavigableMap.java', 'RoaringBitmap/src/main/java/org/roaringbitmap/longlong/Roaring64Bitmap.java']

{'.java': 7}

Java

{'Java': 3366271, 'Kotlin': 14705, 'Python': 2509, 'Shell': 1485}

Apache License 2.0

roaringbitmap/roaringbitmap/587/586

roaringbitmap

roaringbitmap

https://github.com/RoaringBitmap/RoaringBitmap/issues/586

https://github.com/RoaringBitmap/RoaringBitmap/pull/587

https://github.com/RoaringBitmap/RoaringBitmap/pull/587

fixes

RangeBitmap can give wrong result when computing between on 2 values with different highest bit

**Describe the bug** When setting the RangeBitmap to full range (`0xFFFFFFFFFFFFFFFFL`, used for computing double range), computing a between for 2 values with different highest bit won't return the expected matching value. **To Reproduce** ``` public static void main(String[] args) { RangeBitmap.Appender appender = RangeBitmap.appender(0xFFFFFFFFFFFFFFFFL); appender.add(0xFFFFFFFFFFFFFFF0L); RangeBitmap rangeBitmap = appender.build(); System.out.println(rangeBitmap.between(0x0FFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFF0L)); System.out.println(rangeBitmap.between(0x0FFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFF1L)); } ``` It returns empty bitmap in both operations. **RoaringBitmap version:** 0.9.28 **Java version:** 11

a307727d3a87fe89aa3d1a7328821b057717d4bf

f2b22f2c26588cb6228d67153728ab30f5a75411

https://github.com/roaringbitmap/roaringbitmap/compare/a307727d3a87fe89aa3d1a7328821b057717d4bf...f2b22f2c26588cb6228d67153728ab30f5a75411

diff --git a/RoaringBitmap/src/main/java/org/roaringbitmap/RangeBitmap.java b/RoaringBitmap/src/main/java/org/roaringbitmap/RangeBitmap.java index b8e4320d..3b95471c 100644 --- a/RoaringBitmap/src/main/java/org/roaringbitmap/RangeBitmap.java +++ b/RoaringBitmap/src/main/java/org/roaringbitmap/RangeBitmap.java @@ -729,11 +729,15 @@ public final class RangeBitmap { // most significant absent bit in the threshold for which there is no container; // everything before this is wasted work, so we just skip over the containers int skipLow = 64 - Long.numberOfLeadingZeros(((~lower & ~containerMask) & mask)); - if (skipLow > 0) { + if (skipLow == 64) { + lower = 0L; + } else if (skipLow > 0) { lower &= -(1L << skipLow); } int skipHigh = 64 - Long.numberOfLeadingZeros(((~upper & ~containerMask) & mask)); - if (skipHigh > 0) { + if (skipHigh == 64) { + upper = 0L; + } else if (skipHigh > 0) { upper &= -(1L << skipHigh); } setupFirstSlice(upper, high, (int) remaining, skipHigh == 0); @@ -741,9 +745,12 @@ public final class RangeBitmap { if ((containerMask & 1) == 1) { skipContainer(); } - for (int slice = 1; slice < Long.bitCount(mask); ++slice) { - if ((containerMask >>> slice & 1) == 1) { - int flags = (int) (((upper >>> slice) & 1) | (((lower >>> slice) & 1) << 1)); + containerMask >>>= 1; + upper >>>= 1; + lower >>>= 1; + for (; containerMask != 0; containerMask >>>= 1, upper >>>= 1, lower >>>= 1) { + if ((containerMask & 1) == 1) { + int flags = (int) ((upper & 1) | ((lower & 1) << 1)); switch (flags) { case 0: // both absent andLowAndHigh(); diff --git a/RoaringBitmap/src/test/java/org/roaringbitmap/RangeBitmapTest.java b/RoaringBitmap/src/test/java/org/roaringbitmap/RangeBitmapTest.java index 6a508ef8..e3120fd8 100644 --- a/RoaringBitmap/src/test/java/org/roaringbitmap/RangeBitmapTest.java +++ b/RoaringBitmap/src/test/java/org/roaringbitmap/RangeBitmapTest.java @@ -736,6 +736,25 @@ public class RangeBitmapTest { assertEquals(accumulator.build().betweenCardinality(value, value), count); } + @Test + public void regressionTestIssue586() { + // see https://github.com/RoaringBitmap/RoaringBitmap/issues/586 + assertAll( + () -> regresssionTestIssue586(0x0FFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFF0L, 0xFFFFFFFFFFFFFF0L), + () -> regresssionTestIssue586(0x0FFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFF0L, 0xFFFFFFFFFFFFFFF0L), + () -> regresssionTestIssue586(0x0FFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFF1L, 0xFFFFFFFFFFFFFFF0L), + () -> regresssionTestIssue586(0, 10_000_000_000L, 10_000_000L) + ); + } + + private static void regresssionTestIssue586(long low, long high, long value) { + RangeBitmap.Appender appender = RangeBitmap.appender(0xFFFFFFFFFFFFFFFFL); + appender.add(value); + RangeBitmap rangeBitmap = appender.build(); + assertEquals(rangeBitmap.gte(low, rangeBitmap.lte(high)), rangeBitmap.between(low, high)); + assertEquals(1, rangeBitmap.between(low, high).getCardinality()); + } + public static class ReferenceImplementation { public static Builder builder() {

['RoaringBitmap/src/main/java/org/roaringbitmap/RangeBitmap.java', 'RoaringBitmap/src/test/java/org/roaringbitmap/RangeBitmapTest.java']

{'.java': 2}

Java

{'Java': 3366271, 'Kotlin': 14705, 'Python': 2509, 'Shell': 1485}

Apache License 2.0

helidon-io/helidon/502/477

helidon-io

helidon

https://github.com/helidon-io/helidon/issues/477

https://github.com/helidon-io/helidon/pull/502

https://github.com/helidon-io/helidon/pull/502

fixes

Config: Refactor usage of exceptions in optional sources

When we start Helidon SE and have logging set to "FINE", config logs a number of exceptions that should not be thrown, related to optional config sources. When a config source is optional, there should be no exception thrown, instead we should gracefully ignore it. Reasons: 1. Log is polluted with useless information 2. Debugging using Exception breakpoints is more complicated, as it stops on "false" positives ## Environment Details * Helidon Version: 1.0.0 * Helidon SE ---------- Log output: ``` Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource loadDataChangedSinceLastLoad FINE: Source ClasspathConfig[meta-config.yaml]? has changed to Optional[1970-01-01T00:00:00Z] from Optional.empty. Mar 06, 2019 7:22:19 PM io.helidon.config.internal.ClasspathConfigSource content FINE: Error to get ClasspathConfig[meta-config.yaml]? using java.lang.ClassLoader@1043d64e8 CONTEXT ClassLoader. Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData CONFIG: Cannot load data from optional source ClasspathConfig[meta-config.yaml]?. Will not be used to load from. ClasspathConfig[meta-config.yaml]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData FINE: Load of 'ClasspathConfig[meta-config.yaml]?' source failed with an exception. io.helidon.config.ConfigException: ClasspathConfig[meta-config.yaml]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 at io.helidon.config.internal.ClasspathConfigSource.content(ClasspathConfigSource.java:115) at io.helidon.config.spi.AbstractParsableConfigSource.loadData(AbstractParsableConfigSource.java:58) at io.helidon.config.RetryPolicies$JustCallRetryPolicyHolder$1.execute(RetryPolicies.java:77) at io.helidon.config.spi.AbstractSource.loadDataChangedSinceLastLoad(AbstractSource.java:197) at io.helidon.config.spi.AbstractSource.load(AbstractSource.java:177) at io.helidon.config.UseFirstAvailableConfigSource.load(UseFirstAvailableConfigSource.java:58) at io.helidon.config.ProviderImpl.newConfig(ProviderImpl.java:103) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.ConfigSources.load(ConfigSources.java:345) at io.helidon.config.BuilderImpl.defaultConfigSource(BuilderImpl.java:348) at io.helidon.config.BuilderImpl.targetConfigSource(BuilderImpl.java:309) at io.helidon.config.BuilderImpl.buildProvider(BuilderImpl.java:278) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.Config.create(Config.java:358) at io.helidon.examples.graalvm.GraalVMNativeImageMain.main(GraalVMNativeImageMain.java:76) Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource loadDataChangedSinceLastLoad FINE: Source ClasspathConfig[meta-config.conf]? has changed to Optional[1970-01-01T00:00:00Z] from Optional.empty. Mar 06, 2019 7:22:19 PM io.helidon.config.internal.ClasspathConfigSource content FINE: Error to get ClasspathConfig[meta-config.conf]? using java.lang.ClassLoader@1043d64e8 CONTEXT ClassLoader. Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData CONFIG: Cannot load data from optional source ClasspathConfig[meta-config.conf]?. Will not be used to load from. ClasspathConfig[meta-config.conf]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData FINE: Load of 'ClasspathConfig[meta-config.conf]?' source failed with an exception. io.helidon.config.ConfigException: ClasspathConfig[meta-config.conf]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 at io.helidon.config.internal.ClasspathConfigSource.content(ClasspathConfigSource.java:115) at io.helidon.config.spi.AbstractParsableConfigSource.loadData(AbstractParsableConfigSource.java:58) at io.helidon.config.RetryPolicies$JustCallRetryPolicyHolder$1.execute(RetryPolicies.java:77) at io.helidon.config.spi.AbstractSource.loadDataChangedSinceLastLoad(AbstractSource.java:197) at io.helidon.config.spi.AbstractSource.load(AbstractSource.java:177) at io.helidon.config.UseFirstAvailableConfigSource.load(UseFirstAvailableConfigSource.java:58) at io.helidon.config.ProviderImpl.newConfig(ProviderImpl.java:103) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.ConfigSources.load(ConfigSources.java:345) at io.helidon.config.BuilderImpl.defaultConfigSource(BuilderImpl.java:348) at io.helidon.config.BuilderImpl.targetConfigSource(BuilderImpl.java:309) at io.helidon.config.BuilderImpl.buildProvider(BuilderImpl.java:278) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.Config.create(Config.java:358) at io.helidon.examples.graalvm.GraalVMNativeImageMain.main(GraalVMNativeImageMain.java:76) Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource loadDataChangedSinceLastLoad FINE: Source ClasspathConfig[meta-config.json]? has changed to Optional[1970-01-01T00:00:00Z] from Optional.empty. Mar 06, 2019 7:22:19 PM io.helidon.config.internal.ClasspathConfigSource content FINE: Error to get ClasspathConfig[meta-config.json]? using java.lang.ClassLoader@1043d64e8 CONTEXT ClassLoader. Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData CONFIG: Cannot load data from optional source ClasspathConfig[meta-config.json]?. Will not be used to load from. ClasspathConfig[meta-config.json]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData FINE: Load of 'ClasspathConfig[meta-config.json]?' source failed with an exception. io.helidon.config.ConfigException: ClasspathConfig[meta-config.json]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 at io.helidon.config.internal.ClasspathConfigSource.content(ClasspathConfigSource.java:115) at io.helidon.config.spi.AbstractParsableConfigSource.loadData(AbstractParsableConfigSource.java:58) at io.helidon.config.RetryPolicies$JustCallRetryPolicyHolder$1.execute(RetryPolicies.java:77) at io.helidon.config.spi.AbstractSource.loadDataChangedSinceLastLoad(AbstractSource.java:197) at io.helidon.config.spi.AbstractSource.load(AbstractSource.java:177) at io.helidon.config.UseFirstAvailableConfigSource.load(UseFirstAvailableConfigSource.java:58) at io.helidon.config.ProviderImpl.newConfig(ProviderImpl.java:103) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.ConfigSources.load(ConfigSources.java:345) at io.helidon.config.BuilderImpl.defaultConfigSource(BuilderImpl.java:348) at io.helidon.config.BuilderImpl.targetConfigSource(BuilderImpl.java:309) at io.helidon.config.BuilderImpl.buildProvider(BuilderImpl.java:278) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.Config.create(Config.java:358) at io.helidon.examples.graalvm.GraalVMNativeImageMain.main(GraalVMNativeImageMain.java:76) Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource loadDataChangedSinceLastLoad FINE: Source ClasspathConfig[meta-config.properties]? has changed to Optional[1970-01-01T00:00:00Z] from Optional.empty. Mar 06, 2019 7:22:19 PM io.helidon.config.internal.ClasspathConfigSource content FINE: Error to get ClasspathConfig[meta-config.properties]? using java.lang.ClassLoader@1043d64e8 CONTEXT ClassLoader. Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData CONFIG: Cannot load data from optional source ClasspathConfig[meta-config.properties]?. Will not be used to load from. ClasspathConfig[meta-config.properties]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 Mar 06, 2019 7:22:19 PM io.helidon.config.spi.AbstractSource processMissingData FINE: Load of 'ClasspathConfig[meta-config.properties]?' source failed with an exception. io.helidon.config.ConfigException: ClasspathConfig[meta-config.properties]? does not exist. Used ClassLoader: java.lang.ClassLoader@1043d64e8 at io.helidon.config.internal.ClasspathConfigSource.content(ClasspathConfigSource.java:115) at io.helidon.config.spi.AbstractParsableConfigSource.loadData(AbstractParsableConfigSource.java:58) at io.helidon.config.RetryPolicies$JustCallRetryPolicyHolder$1.execute(RetryPolicies.java:77) at io.helidon.config.spi.AbstractSource.loadDataChangedSinceLastLoad(AbstractSource.java:197) at io.helidon.config.spi.AbstractSource.load(AbstractSource.java:177) at io.helidon.config.UseFirstAvailableConfigSource.load(UseFirstAvailableConfigSource.java:58) at io.helidon.config.ProviderImpl.newConfig(ProviderImpl.java:103) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.ConfigSources.load(ConfigSources.java:345) at io.helidon.config.BuilderImpl.defaultConfigSource(BuilderImpl.java:348) at io.helidon.config.BuilderImpl.targetConfigSource(BuilderImpl.java:309) at io.helidon.config.BuilderImpl.buildProvider(BuilderImpl.java:278) at io.helidon.config.BuilderImpl.build(BuilderImpl.java:245) at io.helidon.config.Config.create(Config.java:358) at io.helidon.examples.graalvm.GraalVMNativeImageMain.main(GraalVMNativeImageMain.java:76) ```

01a88710f83e9293ee33fc411b0607aa83e09cb6

36aca6ba087c6a18a19920ba7259401956a744ff

https://github.com/helidon-io/helidon/compare/01a88710f83e9293ee33fc411b0607aa83e09cb6...36aca6ba087c6a18a19920ba7259401956a744ff

diff --git a/config/config/src/main/java/io/helidon/config/BuilderImpl.java b/config/config/src/main/java/io/helidon/config/BuilderImpl.java index 33e7761d4d..a2f8b7762f 100644 --- a/config/config/src/main/java/io/helidon/config/BuilderImpl.java +++ b/config/config/src/main/java/io/helidon/config/BuilderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package io.helidon.config; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -54,6 +55,7 @@ import static io.helidon.config.ConfigSources.classpath; class BuilderImpl implements Config.Builder { static final Executor DEFAULT_CHANGES_EXECUTOR = Executors.newCachedThreadPool(new ConfigThreadFactory("config")); + private static final List<String> DEFAULT_FILE_EXTENSIONS = Arrays.asList("yaml", "conf", "json", "properties"); private List<ConfigSource> sources; private final MapperProviders mapperProviders; @@ -342,21 +344,36 @@ class BuilderImpl implements Config.Builder { // utils // - static ConfigSource defaultConfigSource() { - return ConfigSources.create( - new UseFirstAvailableConfigSource( - ConfigSources.load( - new UseFirstAvailableConfigSource( - classpath("meta-config.yaml").optional().build(), - classpath("meta-config.conf").optional().build(), - classpath("meta-config.json").optional().build(), - classpath("meta-config.properties").optional().build() - )).build(), - classpath("application.yaml").optional().build(), - classpath("application.conf").optional().build(), - classpath("application.json").optional().build(), - classpath("application.properties").optional().build() - )).build(); + private static ConfigSource defaultConfigSource() { + final List<ConfigSource> sources = new ArrayList<>(); + final ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + final List<ConfigSource> meta = defaultConfigSources(classLoader, "meta-config"); + if (!meta.isEmpty()) { + sources.add(ConfigSources.load(toDefaultConfigSource(meta)).build()); + } + sources.addAll(defaultConfigSources(classLoader, "application")); + return ConfigSources.create(toDefaultConfigSource(sources)).build(); + } + + private static List<ConfigSource> defaultConfigSources(final ClassLoader classLoader, final String baseResourceName) { + final List<ConfigSource> sources = new ArrayList<>(); + for (final String extension : DEFAULT_FILE_EXTENSIONS) { + final String resource = baseResourceName + "." + extension; + if (classLoader.getResource(resource) != null) { + sources.add(classpath(resource).optional().build()); + } + } + return sources; + } + + private static ConfigSource toDefaultConfigSource(final List<ConfigSource> sources) { + if (sources.isEmpty()) { + return ConfigSources.empty(); + } else if (sources.size() == 1) { + return sources.get(0); + } else { + return new UseFirstAvailableConfigSource(sources); + } } static List<ConfigParser> buildParsers(boolean servicesEnabled, List<ConfigParser> userDefinedParsers) {

['config/config/src/main/java/io/helidon/config/BuilderImpl.java']

{'.java': 1}

Java

{'Java': 20926867, 'Mustache': 144743, 'Shell': 96781, 'Lua': 6617, 'Dockerfile': 1874, 'CSS': 1413, 'HTML': 15}

Apache License 2.0

helidon-io/helidon/393/392

helidon-io

helidon

https://github.com/helidon-io/helidon/issues/392

https://github.com/helidon-io/helidon/pull/393

https://github.com/helidon-io/helidon/pull/393

fixes

Regression in JsonSupport

Reading content as JsonObject fails in 0.11.1, works in 0.11.0 ``` request.content() .as(JsonObject.class) .thenAccept(json -> { // this line is never reached greeting.set(json.getString("greeting")); sendGreeting(response); }); ``` ## Environment Details * Helidon Version: 0.11.1 * Helidon SE * JDK version: 1.8 * OS: Mac ---------- When I upgrade to 0.11.1 (and change JsonSupport to new package), the PUT request never reaches the line that processes the JsonObject. Downgrading to 0.11.0 (and changing the JsonSupport to old package), the PUT request works just fine. Registration: ``` return Routing.builder() .register(JsonSupport.create()) //.register("/greet", new GreetService(greeting, config)) .register("/greeting", new GreetingService(greeting)) .build(); ``` GreetingService: ``` /* * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved. */ package io.helidon.examples.screencast.se; import java.util.Collections; import java.util.concurrent.atomic.AtomicReference; import javax.json.Json; import javax.json.JsonBuilderFactory; import javax.json.JsonObject; import io.helidon.webserver.Routing; import io.helidon.webserver.ServerRequest; import io.helidon.webserver.ServerResponse; import io.helidon.webserver.Service; /** * Greeting management. */ public class GreetingService implements Service { private static final JsonBuilderFactory JSON = Json.createBuilderFactory(Collections.emptyMap()); private final AtomicReference<String> greeting; public GreetingService(AtomicReference<String> greeting) { this.greeting = greeting; } @Override public void update(Routing.Rules rules) { rules.put("/", this::updateGreetingHandler); } private void greetingHandler(ServerRequest request, ServerResponse response) { sendGreeting(response); } private void updateGreetingHandler(ServerRequest request, ServerResponse response) { request.content() .as(JsonObject.class) .thenAccept(json -> { greeting.set(json.getString("greeting")); sendGreeting(response); }); } private void sendGreeting(ServerResponse response) { response.send(JSON.createObjectBuilder() .add("greeting", greeting.get()) .build()); } } ```

7e7e09b8ab5e0b45e9d8ebf31567b0002df2d49b

f75a7beb6af4410d1059e8d2af3d08170d24858f

https://github.com/helidon-io/helidon/compare/7e7e09b8ab5e0b45e9d8ebf31567b0002df2d49b...f75a7beb6af4410d1059e8d2af3d08170d24858f

diff --git a/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java b/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java index 2d9bd36777..a0d2f69d43 100644 --- a/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java +++ b/media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java @@ -18,6 +18,7 @@ package io.helidon.media.jsonp.server; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Objects; import java.util.function.Function; @@ -185,7 +186,7 @@ public final class JsonSupport implements Service, Handler { * Returns a charset from {@code Content-Type} header parameter or {@code null} if not defined. * * @param headers parameters representing request or response headers - * @return a charset or {@code null} + * @return a charset or {@code UTF-8} as default * @throws RuntimeException if charset is not supported */ private Charset determineCharset(Parameters headers) { @@ -199,7 +200,7 @@ public final class JsonSupport implements Service, Handler { return null; // Do not need default charset. Can use JSON specification. } }) - .orElse(null); + .orElse(StandardCharsets.UTF_8); } /**

['media/jsonp/server/src/main/java/io/helidon/media/jsonp/server/JsonSupport.java']

{'.java': 1}

Java

{'Java': 20926867, 'Mustache': 144743, 'Shell': 96781, 'Lua': 6617, 'Dockerfile': 1874, 'CSS': 1413, 'HTML': 15}

Apache License 2.0

helidon-io/helidon/431/430

helidon-io

helidon

https://github.com/helidon-io/helidon/issues/430

https://github.com/helidon-io/helidon/pull/431

https://github.com/helidon-io/helidon/pull/431

fix

NPE in ForwardingHandler

## Environment Details * Helidon Version: 1.0.1-SNAPSHOT * Helidon SE or Helidon MP * JDK version: 1.8 * OS: n/a * Docker version (if applicable): n/a ---------- ## Problem Description In `channelRead0()` the response completion handler accesses the requestContent field which will normally be `null` unless the response was completed without reading all of the request. ``` bareResponse.whenCompleted() .thenRun(() -> { RequestContext requestContext = this.requestContext; requestContext.responseCompleted(true); // <<== NPE ``` This field is set to `null` in the same method when handling a `LastHttpContent` message. ## Steps to reproduce Make any request that reads all of the content before responding.

b11767fe9b4ade402eb66956f2dcb4aa8dceaf90

0bac1f75e65bb0310d1698216ec42e950770badd

https://github.com/helidon-io/helidon/compare/b11767fe9b4ade402eb66956f2dcb4aa8dceaf90...0bac1f75e65bb0310d1698216ec42e950770badd

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ForwardingHandler.java b/webserver/webserver/src/main/java/io/helidon/webserver/ForwardingHandler.java index 49510d73d0..b5a4e83e41 100644 --- a/webserver/webserver/src/main/java/io/helidon/webserver/ForwardingHandler.java +++ b/webserver/webserver/src/main/java/io/helidon/webserver/ForwardingHandler.java @@ -98,14 +98,16 @@ public class ForwardingHandler extends SimpleChannelInboundHandler<Object> { long requestId = REQUEST_ID_GENERATOR.incrementAndGet(); BareRequestImpl bareRequest = - new BareRequestImpl((HttpRequest) msg, requestContext.publisher(), webServer, ctx, sslEngine, requestId); + new BareRequestImpl((HttpRequest) msg, requestContext.publisher(), webServer, ctx, sslEngine, requestId); BareResponseImpl bareResponse = - new BareResponseImpl(ctx, request, publisherRef::isCompleted, Thread.currentThread(), requestId); + new BareResponseImpl(ctx, request, publisherRef::isCompleted, Thread.currentThread(), requestId); bareResponse.whenCompleted() .thenRun(() -> { RequestContext requestContext = this.requestContext; - requestContext.responseCompleted(true); + if (requestContext != null) { + requestContext.responseCompleted(true); + } /* * Cleanup for these queues is done in HttpInitializer. However, * it may take a while for the event loop on the channel to @@ -128,7 +130,7 @@ public class ForwardingHandler extends SimpleChannelInboundHandler<Object> { if (msg instanceof HttpContent) { if (requestContext == null) { throw new IllegalStateException("There is no request context associated with this http content. " - + "This is never expected to happen!"); + + "This is never expected to happen!"); } HttpContent httpContent = (HttpContent) msg;

['webserver/webserver/src/main/java/io/helidon/webserver/ForwardingHandler.java']

{'.java': 1}

Java

{'Java': 20926867, 'Mustache': 144743, 'Shell': 96781, 'Lua': 6617, 'Dockerfile': 1874, 'CSS': 1413, 'HTML': 15}

Apache License 2.0

axonframework/axonframework/2756/2751

axonframework

axonframework

https://github.com/AxonFramework/AxonFramework/issues/2751

https://github.com/AxonFramework/AxonFramework/pull/2756

https://github.com/AxonFramework/AxonFramework/pull/2756

resolves

Duplicate initialization of TrackingEventProcessor worker threads

<!-- Please use markdown (https://guides.github.com/features/mastering-markdown/) semantics throughout the bug description. --> ### Basic information * Axon Framework version: 4.7.1 * JDK version: Amazon Coretto 17 ### Steps to reproduce We build our applications using Spring Boot and we recently introduced a spring actuator `HealthIndicator` to monitor the health of all axon event processors. The health indicator starts as a spring component and injects the axon `EventProcessingConfiguration` to access the `.eventProcessors()` method to loop over all event processors checking their status. After the introduction of our new `HealthIndicator` we started seeing random occurrences of duplicated events in our event processors. We spent the last few days tracking down the error and finally found a race condition in the initialization of the axon event processors. After looking at the axon source code we found that calling the `.eventProcessors()` was not a simple get operation (as we expected) but it actually initialized the event processors. In some rare occasions the `HealthIndicator` will call the `.eventProcessors()` method at the same time as it is being initialized by axon during startup. Since the `EventProcessingModule.initializeProcessors()` is not thread safe this will causes duplicate event processor threads being created for the same event processor and segment. ### Expected behaviour The `.eventProcessors()` method looks like a simple getter, and should not have side effects. If the initialization side effects are unavoidable it should be thread safe. ### Actual behaviour Race condition when calling `.eventProcessors()` from multiple locations simultaneously during startup.

62bae3f17614e66d919afbbda08da4cbd6235346

61efd48c72f49feaaecea2c8c01c120889b5aaf8

https://github.com/axonframework/axonframework/compare/62bae3f17614e66d919afbbda08da4cbd6235346...61efd48c72f49feaaecea2c8c01c120889b5aaf8

diff --git a/config/src/main/java/org/axonframework/config/EventProcessingModule.java b/config/src/main/java/org/axonframework/config/EventProcessingModule.java index 092a993e6..535b70ac5 100644 --- a/config/src/main/java/org/axonframework/config/EventProcessingModule.java +++ b/config/src/main/java/org/axonframework/config/EventProcessingModule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2022. Axon Framework + * Copyright (c) 2010-2023. Axon Framework * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,6 +65,7 @@ import java.util.Optional; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; @@ -129,6 +130,7 @@ protected final Map<String, PooledStreamingProcessorConfiguration> psepConfigs = new HashMap<>(); protected final Map<String, DeadLetteringInvokerConfiguration> deadLetteringInvokerConfigs = new HashMap<>(); + private final AtomicBoolean initialized = new AtomicBoolean(false); private Configuration configuration; private final Component<ListenerInvocationErrorHandler> defaultListenerInvocationErrorHandler = new Component<>( @@ -209,7 +211,15 @@ public void initialize(Configuration configuration) { * processors have already been initialized, this method does nothing. */ private void initializeProcessors() { - if (eventProcessors.isEmpty()) { + if (initialized.get()) { + return; + } + + synchronized (initialized) { + if (initialized.get()) { + return; + } + instanceSelectors.sort(comparing(InstanceProcessingGroupSelector::getPriority).reversed()); Map<String, List<Function<Configuration, EventHandlerInvoker>>> handlerInvokers = new HashMap<>(); @@ -217,12 +227,14 @@ private void initializeProcessors() { registerSagaManagers(handlerInvokers); handlerInvokers.forEach((processorName, invokers) -> { - Component<EventProcessor> eventProcessorComponent = - new Component<>(configuration, processorName, c -> buildEventProcessor(invokers, processorName)); + Component<EventProcessor> eventProcessorComponent = new Component<>( + configuration, processorName, c -> buildEventProcessor(invokers, processorName) + ); eventProcessors.put(processorName, eventProcessorComponent); }); eventProcessors.values().forEach(Component::get); + initialized.set(true); } }

['config/src/main/java/org/axonframework/config/EventProcessingModule.java']

{'.java': 1}

Java

{'Java': 10919624}

Apache License 2.0

jabref/jabref/6511/6507

jabref

jabref

https://github.com/JabRef/jabref/issues/6507

https://github.com/JabRef/jabref/pull/6511

https://github.com/JabRef/jabref/pull/6511

fixes

InvalidPathException after right-click on entry with an eprint via arXiv fetcher

JabRef version JabRef 5.1--2020-05-21--950d9c0 on Windows 10 - [X] **Mandatory**: I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists <!-- Add a clear and concise description of what the bug is. --> Steps to reproduce the behavior: 1. Go to the web search pane 2. Enter search keywords in the text field 3. Import entry 4. Right-click on the entry in the main table <!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) --> <details> <summary>Log File</summary> ``` java.nio.file.InvalidPathException: Illegal char <:> at index 4: http://arxiv.org/pdf/1911.01235v1 at java.base/sun.nio.fs.WindowsPathParser.normalize(Unknown Source) at java.base/sun.nio.fs.WindowsPathParser.parse(Unknown Source) at java.base/sun.nio.fs.WindowsPathParser.parse(Unknown Source) at java.base/sun.nio.fs.WindowsPath.parse(Unknown Source) at java.base/sun.nio.fs.WindowsFileSystem.getPath(Unknown Source) at java.base/java.nio.file.Path.resolve(Unknown Source) at org.jabref/org.jabref.model.util.FileHelper.find(Unknown Source) at org.jabref/org.jabref.model.util.FileHelper.lambda$find$0(Unknown Source) at java.base/java.util.stream.ReferencePipeline$7$1.accept(Unknown Source) at java.base/java.util.ArrayList$ArrayListSpliterator.tryAdvance(Unknown Source) at java.base/java.util.stream.ReferencePipeline.forEachWithCancel(Unknown Source) at java.base/java.util.stream.AbstractPipeline.copyIntoWithCancel(Unknown Source) at java.base/java.util.stream.AbstractPipeline.copyInto(Unknown Source) at java.base/java.util.stream.AbstractPipeline.wrapAndCopyInto(Unknown Source) at java.base/java.util.stream.FindOps$FindOp.evaluateSequential(Unknown Source) at java.base/java.util.stream.AbstractPipeline.evaluate(Unknown Source) at java.base/java.util.stream.ReferencePipeline.findFirst(Unknown Source) at org.jabref/org.jabref.model.util.FileHelper.find(Unknown Source) at org.jabref/org.jabref.model.util.FileHelper.find(Unknown Source) at org.jabref/org.jabref.gui.actions.ActionHelper.lambda$isFilePresentForSelectedEntry$3(Unknown Source) at java.base/java.util.Optional.map(Unknown Source) at com.tobiasdiez.easybind/com.tobiasdiez.easybind.optional.PreboundOptionalBinding$1.computeValue(Unknown Source) at com.tobiasdiez.easybind/com.tobiasdiez.easybind.optional.PreboundOptionalBinding$1.computeValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectBinding.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectExpression.getValue(Unknown Source) at com.tobiasdiez.easybind/com.tobiasdiez.easybind.optional.PreboundOptionalBinding$3.computeValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectBinding.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectExpression.getValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanExpression$2.computeValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.Bindings$BooleanAndBinding.computeValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.ReadOnlyBooleanWrapper$ReadOnlyPropertyImpl.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.Bindings$52.computeValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.get(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanExpression.getValue(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanExpression.getValue(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleChange.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.markInvalid(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase$Listener.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.markInvalid(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase$Listener.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.invalidate(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.BindingHelperObserver.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.ReadOnlyBooleanPropertyBase.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.ReadOnlyBooleanWrapper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase.markInvalid(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.property.BooleanPropertyBase$Listener.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.invalidate(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.Bindings$ShortCircuitAndInvalidator.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.BooleanBinding.invalidate(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.BindingHelperObserver.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectBinding.invalidate(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.BindingHelperObserver.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper$Generic.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.beans.binding.ObjectBinding.invalidate(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.binding.BindingHelperObserver.invalidated(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper$Generic.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.fireChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.commit(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ModifiableObservableListBase.setAll(Unknown Source) at org.jabref/org.jabref.gui.StateManager.setSelectedEntries(Unknown Source) at org.jabref/org.jabref.gui.BasePanel.lambda$createMainTable$1(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper$Generic.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.fireChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.commit(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.SelectedItemsReadOnlyObservableList.lambda$new$1(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper$Generic.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.collections.ListListenerHelper.fireValueChangedEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.fireChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.commit(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ListChangeBuilder.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.collections.ObservableListBase.endChange(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList._endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.control.MultipleSelectionModelBase$SelectedIndicesList._endChange(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.control.ControlUtils.updateSelectedIndices(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.control.TableView$TableViewArrayListSelectionModel.fireCustomSelectedCellsListChangeEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.control.TableView$TableViewArrayListSelectionModel.clearAndSelect(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.control.TableView$TableViewSelectionModel.clearAndSelect(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.behavior.TableCellBehaviorBase.simpleSelect(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.behavior.TableCellBehaviorBase.doSelect(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.behavior.CellBehaviorBase.mousePressed(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.scene.control.inputmap.InputMap.handle(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.CompositeEventHandler$NormalEventHandlerRecord.handleBubblingEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.CompositeEventDispatcher.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventUtil.fireEventImpl(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.event.EventUtil.fireEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.event.Event.fireEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.Scene$MouseHandler.process(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.Scene.processMouseEvent(Unknown Source) at org.jabref.merged.module@5.1.423/javafx.scene.Scene$ScenePeerListener.mouseEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(Unknown Source) at java.base/java.security.AccessController.doPrivileged(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.tk.quantum.GlassViewEventHandler.lambda$handleMouseEvent$2(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.tk.quantum.QuantumToolkit.runWithoutRenderLock(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.javafx.tk.quantum.GlassViewEventHandler.handleMouseEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.glass.ui.View.handleMouseEvent(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.glass.ui.View.notifyMouse(Unknown Source) at org.jabref.merged.module@5.1.423/com.sun.glass.ui.win.WinApplication._runLoop(Native Method) at org.jabref.merged.module@5.1.423/com.sun.glass.ui.win.WinApplication.lambda$runLoop$3(Unknown Source) at java.base/java.lang.Thread.run(Unknown Source) ``` </details>

ef2a31c91b052693550b29254aab6a94471b637e

77489409d92abfeb4bbbb360172e12fb6f294b63

https://github.com/jabref/jabref/compare/ef2a31c91b052693550b29254aab6a94471b637e...77489409d92abfeb4bbbb360172e12fb6f294b63

diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java index bbb22b6022..dfad438f8c 100644 --- a/src/main/java/org/jabref/gui/actions/ActionHelper.java +++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java @@ -55,6 +55,10 @@ public class ActionHelper { List<LinkedFile> files = entry.getFiles(); if ((entry.getFiles().size() > 0) && stateManager.getActiveDatabase().isPresent()) { + if (files.get(0).isOnlineLink()) { + return true; + } + Optional<Path> filename = FileHelper.find( stateManager.getActiveDatabase().get(), files.get(0).getLink(),

['src/main/java/org/jabref/gui/actions/ActionHelper.java']

{'.java': 1}

Java

{'Java': 8932171, 'TeX': 710947, 'XSLT': 151896, 'CSS': 54744, 'Ruby': 20199, 'Shell': 9437, 'Python': 9240, 'Groovy': 5264, 'ANTLR': 3775, 'PowerShell': 2028, 'AppleScript': 1622, 'GAP': 1470, 'Batchfile': 637}

MIT License

jabref/jabref/5048/5043

jabref

jabref

https://github.com/JabRef/jabref/issues/5043

https://github.com/JabRef/jabref/pull/5048

https://github.com/JabRef/jabref/pull/5048

fixes

Handling of umlaut while copy and paste of entries

Using `JabRef 5.0-dev--snapshot--2019-05-30--master--ef2ebe165` on Windows 10. The bib-file is UTF-8 encoded (double checked! with extern editor) and in biblatex style. There are entries with umlauts in the abstract, title, etc. - On entry has well formated umlauts and they are correctly displayed in JabRef editor and preview window. - Copy such an entry (Ctrl+C) - Paste it (Ctrl+V) - All Umlauts are converted into `�` Example of such a result (copied from the bib-file) ``` @Misc{Nordhausen2019c, author = {Nordhausen, Thomas and Hirt, Julian}, title = {One size does not fit all-systematische Literaturrecherche in Fachdatenbanken. Schritt 6: Entwicklung des Suchstrings}, date = {2019}, language = {ger}, doi = {10.6094/KlinPfleg.5.21}, abstract = {In diesem Schritt werden die identifizierten Synonyme und Schlagw�rter entsprechend der Suchkomponenten mithilfe von Booleschen Operatoren miteinander verkn�pft. Diese Verkn�pfung wird als Suchstring bezeichnet und muss f�r jede Datenbank gesondert vorgenommen werden. Bei der Entwicklung ist auch der Einsatz von Wortabstandsoperatoren und/oder Platzhaltern f�r eines oder mehrere Zeichen zu ber�cksichtigen. Neben der Verwendung von Schlagw�rtern stellen die Suchbefehle f�r Suchbegriffe und Synonyme eine M�glichkeit dar, um die Suche einzugrenzen. Bei der Verwendung von Suchbefehlen ist deren Schreibweise (Syntax) in der jeweiligen Fachdatenbank zu beachten.}, file = {:1015-2668-1-PB.pdf:PDF}, groups = {Review, 2019-06}, keywords = {lesen, hirt}, publisher = {Albert-Ludwigs-Universit�t Freiburg}, year = {2019}, } ```

eb42850f7853aff1f98459e533bc254217a2fa8d

63e490ca7d11e68b0735f1360351e81d1d444820

https://github.com/jabref/jabref/compare/eb42850f7853aff1f98459e533bc254217a2fa8d...63e490ca7d11e68b0735f1360351e81d1d444820

diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java index c7c6ce2b9d..26bc331fbb 100644 --- a/src/main/java/org/jabref/gui/ClipBoardManager.java +++ b/src/main/java/org/jabref/gui/ClipBoardManager.java @@ -1,6 +1,8 @@ package org.jabref.gui; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -28,13 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ClipBoardManager { - public static final DataFormat XML = new DataFormat("application/xml"); - + private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class); private final Clipboard clipboard; - private final ImportFormatReader importFormatReader; public ClipBoardManager() { @@ -63,9 +63,8 @@ public class ClipBoardManager { String result = clipboard.getString(); if (result == null) { return ""; - } else { - return result; } + return result; } public void setHtmlContent(String html) { @@ -89,40 +88,55 @@ public class ClipBoardManager { clipboard.setContent(content); } - public List<BibEntry> extractEntries() { + public List<BibEntry> extractData() { Object entries = clipboard.getContent(DragAndDropDataFormats.ENTRIES); + if (entries == null) { + return handleStringData(clipboard.getString()); + } + return handleBibTeXData((String) entries); + } + + private List<BibEntry> handleBibTeXData(String entries) { BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor()); - if (entries != null) { - // We have determined that the clipboard data is a set of entries (serialized as a string). - try { - return parser.parseEntries((String) entries); - } catch (ParseException ex) { - LOGGER.error("Could not paste", ex); - } - } else { - String data = clipboard.getString(); - if (data != null) { - try { - // fetch from doi - Optional<DOI> doi = DOI.parse(data); - if (doi.isPresent()) { - LOGGER.info("Found DOI in clipboard"); - Optional<BibEntry> entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.get().getDOI()); - return OptionalUtil.toList(entry); - } else { - try { - UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data); - return unknownFormatImport.parserResult.getDatabase().getEntries(); - } catch (ImportException e) { - // import failed and result will be empty - } - } - } catch (FetcherException ex) { - LOGGER.error("Error while fetching", ex); - } - } + try { + return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8))); + } catch (ParseException ex) { + LOGGER.error("Could not paste", ex); + return Collections.emptyList(); + } + } + + private List<BibEntry> handleStringData(String data) { + if (data == null || data.isEmpty()) { + return Collections.emptyList(); + } + + Optional<DOI> doi = DOI.parse(data); + if (doi.isPresent()) { + return fetchByDOI(doi.get()); + } + + return tryImportFormats(data); + } + + private List<BibEntry> tryImportFormats(String data) { + try { + UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data); + return unknownFormatImport.parserResult.getDatabase().getEntries(); + } catch (ImportException ignored) { + return Collections.emptyList(); + } + } + + private List<BibEntry> fetchByDOI(DOI doi) { + LOGGER.info("Found DOI in clipboard"); + try { + Optional<BibEntry> entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.getDOI()); + return OptionalUtil.toList(entry); + } catch (FetcherException ex) { + LOGGER.error("Error while fetching", ex); + return Collections.emptyList(); } - return Collections.emptyList(); } } diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java index 892116fb33..6232d33a96 100644 --- a/src/main/java/org/jabref/gui/maintable/MainTable.java +++ b/src/main/java/org/jabref/gui/maintable/MainTable.java @@ -209,7 +209,7 @@ public class MainTable extends TableView<BibEntryTableViewModel> { public void paste() { // Find entries in clipboard - List<BibEntry> entriesToAdd = Globals.clipboardManager.extractEntries(); + List<BibEntry> entriesToAdd = Globals.clipboardManager.extractData(); if (!entriesToAdd.isEmpty()) { // Add new entries

['src/main/java/org/jabref/gui/ClipBoardManager.java', 'src/main/java/org/jabref/gui/maintable/MainTable.java']

{'.java': 2}

Java

{'Java': 8932171, 'TeX': 710947, 'XSLT': 151896, 'CSS': 54744, 'Ruby': 20199, 'Shell': 9437, 'Python': 9240, 'Groovy': 5264, 'ANTLR': 3775, 'PowerShell': 2028, 'AppleScript': 1622, 'GAP': 1470, 'Batchfile': 637}

MIT License

jabref/jabref/5224/5220

jabref

jabref

https://github.com/JabRef/jabref/issues/5220

https://github.com/JabRef/jabref/pull/5224

https://github.com/JabRef/jabref/pull/5224

fixes

Exception when adding field formatter in cleanup entries dialog

<!-- Note: Please use the GitHub issue tracker only for bug reports. Feature requests, questions and general feedback is now handled at http://discourse.jabref.org. Thanks! --> JabRef version **JabRef 5.0-dev (8f463e4)** on **Windows 10 10.0 amd64, Java 1.8.0_221** <!-- IMPORTANT NOTE -> <!-- Please always test if the bug is still reproducible in the latest development version. We are constantly improving JabRef and some bugs may already be fixed. You can download the development version at: http://builds.jabref.org/master/ Please make a backup of your library before you try out this version. If you already use a development version, ensure that you use the latest one. --> - [x] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists <!-- Add a clear and concise description of what the bug is. --> Steps to reproduce the behavior: 1. Select an entry 2. Open *Quality->Cleanup entries* 3. Try to add new field formatter by selecting field and field formatter via combo boxes This results with uncaught exception. I checked that the bug was introduced in 4b39b78. Before that commit the bug was not present. <!-- If applicable, add excerpt of the bibliography file, screenshot, and excerpt of log (available in the error console) --> <details> <summary>Log File</summary> ``` 22:41:59.563 [JavaFX Application Thread] ERROR org.jabref.FallbackExceptionHandler - Uncaught exception occurred in Thread[JavaFX Application Thread,5,main] java.lang.ClassCastException: java.lang.String cannot be cast to org.jabref.model.entry.field.Field at org.jabref.gui.cleanup.FieldFormatterCleanupsPanel.getFieldFormatterCleanup(FieldFormatterCleanupsPanel.java:220) ~[main/:?] at org.jabref.gui.cleanup.FieldFormatterCleanupsPanel.updateDescription(FieldFormatterCleanupsPanel.java:147) ~[main/:?] at org.jabref.gui.cleanup.FieldFormatterCleanupsPanel.lambda$getSelectorPanel$276(FieldFormatterCleanupsPanel.java:176) ~[main/:?] at org.fxmisc.easybind.EasyBind.lambda$subscribe$12(EasyBind.java:263) ~[easybind-1.0.3.jar:?] at com.sun.javafx.binding.ExpressionHelper$Generic.fireValueChangedEvent(ExpressionHelper.java:361) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(ExpressionHelper.java:81) ~[jfxrt.jar:?] at javafx.beans.property.ObjectPropertyBase.fireValueChangedEvent(ObjectPropertyBase.java:105) ~[jfxrt.jar:?] at javafx.beans.property.ObjectPropertyBase.markInvalid(ObjectPropertyBase.java:112) ~[jfxrt.jar:?] at javafx.beans.property.ObjectPropertyBase.set(ObjectPropertyBase.java:146) ~[jfxrt.jar:?] at javafx.scene.control.ComboBoxBase.setValue(ComboBoxBase.java:150) ~[jfxrt.jar:?] at javafx.scene.control.ComboBox.updateValue(ComboBox.java:463) ~[jfxrt.jar:?] at javafx.scene.control.ComboBox.access$200(ComboBox.java:192) ~[jfxrt.jar:?] at javafx.scene.control.ComboBox$3.changed(ComboBox.java:446) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper$Generic.fireValueChangedEvent(ExpressionHelper.java:361) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(ExpressionHelper.java:81) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyObjectPropertyBase.fireValueChangedEvent(ReadOnlyObjectPropertyBase.java:74) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyObjectWrapper.fireValueChangedEvent(ReadOnlyObjectWrapper.java:102) ~[jfxrt.jar:?] at javafx.beans.property.ObjectPropertyBase.markInvalid(ObjectPropertyBase.java:112) ~[jfxrt.jar:?] at javafx.beans.property.ObjectPropertyBase.set(ObjectPropertyBase.java:146) ~[jfxrt.jar:?] at javafx.scene.control.SelectionModel.setSelectedItem(SelectionModel.java:102) ~[jfxrt.jar:?] at javafx.scene.control.ComboBox$ComboBoxSelectionModel.lambda$new$0(ComboBox.java:494) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper$SingleInvalidation.fireValueChangedEvent(ExpressionHelper.java:137) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(ExpressionHelper.java:81) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyIntegerPropertyBase.fireValueChangedEvent(ReadOnlyIntegerPropertyBase.java:72) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyIntegerWrapper.fireValueChangedEvent(ReadOnlyIntegerWrapper.java:102) ~[jfxrt.jar:?] at javafx.beans.property.IntegerPropertyBase.markInvalid(IntegerPropertyBase.java:113) ~[jfxrt.jar:?] at javafx.beans.property.IntegerPropertyBase.set(IntegerPropertyBase.java:147) ~[jfxrt.jar:?] at javafx.scene.control.SelectionModel.setSelectedIndex(SelectionModel.java:68) ~[jfxrt.jar:?] at javafx.scene.control.SingleSelectionModel.updateSelectedIndex(SingleSelectionModel.java:215) ~[jfxrt.jar:?] at javafx.scene.control.SingleSelectionModel.select(SingleSelectionModel.java:149) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.skin.ComboBoxListViewSkin.lambda$createListView$1(ComboBoxListViewSkin.java:484) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper$Generic.fireValueChangedEvent(ExpressionHelper.java:349) ~[jfxrt.jar:?] at com.sun.javafx.binding.ExpressionHelper.fireValueChangedEvent(ExpressionHelper.java:81) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyIntegerPropertyBase.fireValueChangedEvent(ReadOnlyIntegerPropertyBase.java:72) ~[jfxrt.jar:?] at javafx.beans.property.ReadOnlyIntegerWrapper.fireValueChangedEvent(ReadOnlyIntegerWrapper.java:102) ~[jfxrt.jar:?] at javafx.beans.property.IntegerPropertyBase.markInvalid(IntegerPropertyBase.java:113) ~[jfxrt.jar:?] at javafx.beans.property.IntegerPropertyBase.set(IntegerPropertyBase.java:147) ~[jfxrt.jar:?] at javafx.scene.control.SelectionModel.setSelectedIndex(SelectionModel.java:68) ~[jfxrt.jar:?] at javafx.scene.control.MultipleSelectionModelBase.select(MultipleSelectionModelBase.java:404) ~[jfxrt.jar:?] at javafx.scene.control.MultipleSelectionModelBase.clearAndSelect(MultipleSelectionModelBase.java:356) ~[jfxrt.jar:?] at javafx.scene.control.ListView$ListViewBitSetSelectionModel.clearAndSelect(ListView.java:1403) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.behavior.CellBehaviorBase.simpleSelect(CellBehaviorBase.java:256) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.behavior.CellBehaviorBase.doSelect(CellBehaviorBase.java:220) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.behavior.CellBehaviorBase.mousePressed(CellBehaviorBase.java:150) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.skin.BehaviorSkinBase$1.handle(BehaviorSkinBase.java:95) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.skin.BehaviorSkinBase$1.handle(BehaviorSkinBase.java:89) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventHandler$NormalEventHandlerRecord.handleBubblingEvent(CompositeEventHandler.java:218) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:80) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:238) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:191) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventDispatcher.dispatchBubblingEvent(CompositeEventDispatcher.java:59) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:49) ~[jfxrt.jar:?] at javafx.event.Event.fireEvent(Event.java:198) ~[jfxrt.jar:?] at javafx.scene.Scene$MouseHandler.process(Scene.java:3757) ~[jfxrt.jar:?] at javafx.scene.Scene$MouseHandler.access$1500(Scene.java:3485) ~[jfxrt.jar:?] at javafx.scene.Scene.impl_processMouseEvent(Scene.java:1762) ~[jfxrt.jar:?] at javafx.scene.Scene$ScenePeerListener.mouseEvent(Scene.java:2494) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(GlassViewEventHandler.java:394) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(GlassViewEventHandler.java:295) ~[jfxrt.jar:?] at java.security.AccessController.doPrivileged(Native Method) ~[?:1.8.0_221] at com.sun.javafx.tk.quantum.GlassViewEventHandler.lambda$handleMouseEvent$2(GlassViewEventHandler.java:432) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.QuantumToolkit.runWithoutRenderLock(QuantumToolkit.java:410) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler.handleMouseEvent(GlassViewEventHandler.java:431) ~[jfxrt.jar:?] at com.sun.glass.ui.View.handleMouseEvent(View.java:555) ~[jfxrt.jar:?] at com.sun.glass.ui.View.notifyMouse(View.java:937) ~[jfxrt.jar:?] at com.sun.glass.ui.win.WinApplication._enterNestedEventLoopImpl(Native Method) ~[jfxrt.jar:?] at com.sun.glass.ui.win.WinApplication._enterNestedEventLoop(WinApplication.java:204) ~[jfxrt.jar:?] at com.sun.glass.ui.Application.enterNestedEventLoop(Application.java:511) ~[jfxrt.jar:?] at com.sun.glass.ui.EventLoop.enter(EventLoop.java:107) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.QuantumToolkit.enterNestedEventLoop(QuantumToolkit.java:633) ~[jfxrt.jar:?] at javafx.stage.Stage.showAndWait(Stage.java:474) ~[jfxrt.jar:?] at javafx.scene.control.HeavyweightDialog.showAndWait(HeavyweightDialog.java:162) ~[jfxrt.jar:?] at javafx.scene.control.Dialog.showAndWait(Dialog.java:341) ~[jfxrt.jar:?] at org.jabref.gui.cleanup.CleanupAction.action(CleanupAction.java:46) ~[main/:?] at org.jabref.gui.BasePanel.runCommand(BasePanel.java:609) ~[main/:?] at org.jabref.gui.actions.OldDatabaseCommandWrapper.execute(OldDatabaseCommandWrapper.java:40) ~[main/:?] at org.jabref.gui.actions.JabRefAction.lambda$new$110(JabRefAction.java:29) ~[main/:?] at org.controlsfx.control.action.Action.handle(Action.java:419) ~[controlsfx-8.40.16-SNAPSHOT.jar:8.40.16.SNAPSHOT] at org.controlsfx.control.action.Action.handle(Action.java:64) ~[controlsfx-8.40.16-SNAPSHOT.jar:8.40.16.SNAPSHOT] at com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:86) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:238) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:191) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:49) ~[jfxrt.jar:?] at javafx.event.Event.fireEvent(Event.java:198) ~[jfxrt.jar:?] at javafx.scene.control.MenuItem.fire(MenuItem.java:462) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.skin.ContextMenuContent$MenuItemContainer.doSelect(ContextMenuContent.java:1405) ~[jfxrt.jar:?] at com.sun.javafx.scene.control.skin.ContextMenuContent$MenuItemContainer.lambda$createChildren$6(ContextMenuContent.java:1358) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventHandler$NormalEventHandlerRecord.handleBubblingEvent(CompositeEventHandler.java:218) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(CompositeEventHandler.java:80) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:238) ~[jfxrt.jar:?] at com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(EventHandlerManager.java:191) ~[jfxrt.jar:?] at com.sun.javafx.event.CompositeEventDispatcher.dispatchBubblingEvent(CompositeEventDispatcher.java:59) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:58) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(BasicEventDispatcher.java:56) ~[jfxrt.jar:?] at com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(EventDispatchChainImpl.java:114) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEventImpl(EventUtil.java:74) ~[jfxrt.jar:?] at com.sun.javafx.event.EventUtil.fireEvent(EventUtil.java:54) ~[jfxrt.jar:?] at javafx.event.Event.fireEvent(Event.java:198) ~[jfxrt.jar:?] at javafx.scene.Scene$MouseHandler.process(Scene.java:3757) ~[jfxrt.jar:?] at javafx.scene.Scene$MouseHandler.access$1500(Scene.java:3485) ~[jfxrt.jar:?] at javafx.scene.Scene.impl_processMouseEvent(Scene.java:1762) ~[jfxrt.jar:?] at javafx.scene.Scene$ScenePeerListener.mouseEvent(Scene.java:2494) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(GlassViewEventHandler.java:394) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(GlassViewEventHandler.java:295) ~[jfxrt.jar:?] at java.security.AccessController.doPrivileged(Native Method) ~[?:1.8.0_221] at com.sun.javafx.tk.quantum.GlassViewEventHandler.lambda$handleMouseEvent$2(GlassViewEventHandler.java:432) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.QuantumToolkit.runWithoutRenderLock(QuantumToolkit.java:410) ~[jfxrt.jar:?] at com.sun.javafx.tk.quantum.GlassViewEventHandler.handleMouseEvent(GlassViewEventHandler.java:431) ~[jfxrt.jar:?] at com.sun.glass.ui.View.handleMouseEvent(View.java:555) ~[jfxrt.jar:?] at com.sun.glass.ui.View.notifyMouse(View.java:937) ~[jfxrt.jar:?] at com.sun.glass.ui.win.WinApplication._runLoop(Native Method) ~[jfxrt.jar:?] at com.sun.glass.ui.win.WinApplication.lambda$null$3(WinApplication.java:177) ~[jfxrt.jar:?] at java.lang.Thread.run(Thread.java:748) [?:1.8.0_221] ``` </details>

46565336109deb8e0e3fc96335f20838a1bb9c24

a0af540d7d0c6bbe8d855da157febce18a019642

https://github.com/jabref/jabref/compare/46565336109deb8e0e3fc96335f20838a1bb9c24...a0af540d7d0c6bbe8d855da157febce18a019642

diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java index 12cd47ccf9..23917990eb 100644 --- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java +++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; @@ -40,18 +42,17 @@ public class FieldFormatterCleanupsPanel extends GridPane { private static final String DESCRIPTION = Localization.lang("Description") + ": "; private final CheckBox cleanupEnabled; + private final FieldFormatterCleanups defaultFormatters; + private final List<Formatter> availableFormatters; private FieldFormatterCleanups fieldFormatterCleanups; private ListView<FieldFormatterCleanup> actionsList; private ComboBox<Formatter> formattersCombobox; - private ComboBox<Field> selectFieldCombobox; + private ComboBox<String> selectFieldCombobox; private Button addButton; private Label descriptionAreaText; private Button removeButton; private Button resetButton; private Button recommendButton; - - private final FieldFormatterCleanups defaultFormatters; - private final List<Formatter> availableFormatters; private ObservableList<FieldFormatterCleanup> actions; public FieldFormatterCleanupsPanel(String description, FieldFormatterCleanups defaultFormatters) { @@ -104,7 +105,7 @@ public class FieldFormatterCleanupsPanel extends GridPane { actionsList = new ListView<>(actions); actionsList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE); new ViewModelListCellFactory<FieldFormatterCleanup>() - .withText(action -> action.getField() + ": " + action.getFormatter().getName()) + .withText(action -> action.getField().getDisplayName() + ": " + action.getFormatter().getName()) .withStringTooltip(action -> action.getFormatter().getDescription()) .install(actionsList); add(actionsList, 1, 1, 3, 1); @@ -164,7 +165,8 @@ public class FieldFormatterCleanupsPanel extends GridPane { GridPane builder = new GridPane(); Set<Field> fields = FieldFactory.getCommonFields(); fields.add(InternalField.KEY_FIELD); - selectFieldCombobox = new ComboBox<>(FXCollections.observableArrayList(fields)); + Set<String> fieldsString = fields.stream().map(Field::getDisplayName).sorted().collect(Collectors.toCollection(TreeSet::new)); + selectFieldCombobox = new ComboBox<>(FXCollections.observableArrayList(fieldsString)); selectFieldCombobox.setEditable(true); builder.add(selectFieldCombobox, 1, 1); @@ -217,7 +219,7 @@ public class FieldFormatterCleanupsPanel extends GridPane { private FieldFormatterCleanup getFieldFormatterCleanup() { Formatter selectedFormatter = formattersCombobox.getValue(); - Field field = selectFieldCombobox.getValue(); + Field field = FieldFactory.parseField(selectFieldCombobox.getSelectionModel().getSelectedItem()); return new FieldFormatterCleanup(field, selectedFormatter); } @@ -242,5 +244,4 @@ public class FieldFormatterCleanupsPanel extends GridPane { setStatus(cleanupEnabled.isSelected()); } } - }

['src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java']

{'.java': 1}

Java

{'Java': 8932171, 'TeX': 710947, 'XSLT': 151896, 'CSS': 54744, 'Ruby': 20199, 'Shell': 9437, 'Python': 9240, 'Groovy': 5264, 'ANTLR': 3775, 'PowerShell': 2028, 'AppleScript': 1622, 'GAP': 1470, 'Batchfile': 637}

MIT License

jabref/jabref/6402/6430

jabref

jabref

https://github.com/JabRef/jabref/issues/6430

https://github.com/JabRef/jabref/pull/6402

https://github.com/JabRef/jabref/pull/6402

fixes

Menu View on empty file => Uncaught exception

JabRef 5.1--2020-05-04--b5599c9 Linux 4.9.0-12-amd64 amd64 Java 14.0.1 - [X] I have tested the latest development version from http://builds.jabref.org/master/ and the problem persists When clicking on the menu item "View" with an empty library on focus, a message "Uncaught exception" is displayed. Steps to reproduce the behavior: 1. Create a new BibTeX library 2. Click on menu View A window pops-up, displaying the message "Uncaught exception occurred in Thread[JavaFX Application Thread,5,main] Afterwards, To be able to display the menu View on another file, JabRef needs to be re-opened. Note: All the other menus are working as expected. <details> java.lang.IndexOutOfBoundsException: Index 0 out of bounds for length 0 at java.base/jdk.internal.util.Preconditions.outOfBounds(Unknown Source) at java.base/jdk.internal.util.Preconditions.outOfBoundsCheckIndex(Unknown Source) at java.base/jdk.internal.util.Preconditions.checkIndex(Unknown Source) at java.base/java.util.Objects.checkIndex(Unknown Source) at java.base/java.util.ArrayList.get(Unknown Source) at org.jabref.merged.module/com.sun.javafx.collections.ObservableListWrapper.get(Unknown Source) at org.jabref/org.jabref.gui.actions.ActionHelper.isFilePresentForSelectedEntry(Unknown Source) at org.jabref/org.jabref.gui.documentviewer.ShowDocumentViewerAction.<init>(Unknown Source) at org.jabref/org.jabref.gui.JabRefFrame.lambda$createMenu$13(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventUtil.fireEventImpl(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventUtil.fireEvent(Unknown Source) at org.jabref.merged.module/javafx.event.Event.fireEvent(Unknown Source) at org.jabref.merged.module/javafx.scene.control.Menu.setShowing(Unknown Source) at org.jabref.merged.module/javafx.scene.control.Menu.show(Unknown Source) at org.jabref.merged.module/javafx.scene.control.skin.MenuBarSkin.showMenu(Unknown Source) at org.jabref.merged.module/javafx.scene.control.skin.MenuBarSkin.showMenu(Unknown Source) at org.jabref.merged.module/javafx.scene.control.skin.MenuBarSkin.lambda$rebuildUI$27(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.CompositeEventHandler.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventHandlerManager.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.CompositeEventDispatcher.dispatchBubblingEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.BasicEventDispatcher.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventDispatchChainImpl.dispatchEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventUtil.fireEventImpl(Unknown Source) at org.jabref.merged.module/com.sun.javafx.event.EventUtil.fireEvent(Unknown Source) at org.jabref.merged.module/javafx.event.Event.fireEvent(Unknown Source) at org.jabref.merged.module/javafx.scene.Scene$MouseHandler.process(Unknown Source) at org.jabref.merged.module/javafx.scene.Scene.processMouseEvent(Unknown Source) at org.jabref.merged.module/javafx.scene.Scene$ScenePeerListener.mouseEvent(Unknown Source) at org.jabref.merged.module/com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(Unknown Source) at org.jabref.merged.module/com.sun.javafx.tk.quantum.GlassViewEventHandler$MouseEventNotification.run(Unknown Source) at java.base/java.security.AccessController.doPrivileged(Unknown Source) at org.jabref.merged.module/com.sun.javafx.tk.quantum.GlassViewEventHandler.lambda$handleMouseEvent$2(Unknown Source) at org.jabref.merged.module/com.sun.javafx.tk.quantum.QuantumToolkit.runWithoutRenderLock(Unknown Source) at org.jabref.merged.module/com.sun.javafx.tk.quantum.GlassViewEventHandler.handleMouseEvent(Unknown Source) at org.jabref.merged.module/com.sun.glass.ui.View.handleMouseEvent(Unknown Source) at org.jabref.merged.module/com.sun.glass.ui.View.notifyMouse(Unknown Source) at org.jabref.merged.module/com.sun.glass.ui.gtk.GtkApplication._runLoop(Native Method) at org.jabref.merged.module/com.sun.glass.ui.gtk.GtkApplication.lambda$runLoop$11(Unknown Source) at java.base/java.lang.Thread.run(Unknown Source) </details>

e0baa6d2a5130097c33ecfe67df548075d850ca8

a3eff0c49c0c63c626f2a6a324b4459000fc7fca

https://github.com/jabref/jabref/compare/e0baa6d2a5130097c33ecfe67df548075d850ca8...a3eff0c49c0c63c626f2a6a324b4459000fc7fca

diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java index 494c64f2fc..b6b0415f59 100644 --- a/src/main/java/org/jabref/gui/actions/ActionHelper.java +++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java @@ -13,14 +13,15 @@ import org.jabref.gui.StateManager; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.LinkedFile; import org.jabref.model.entry.field.Field; -import org.jabref.model.entry.field.StandardField; import org.jabref.model.util.FileHelper; import org.jabref.preferences.PreferencesService; import org.fxmisc.easybind.EasyBind; import org.fxmisc.easybind.monadic.MonadicBinding; +import org.fxmisc.easybind.monadic.MonadicObservableValue; public class ActionHelper { + public static BooleanExpression needsDatabase(StateManager stateManager) { return stateManager.activeDatabaseProperty().isPresent(); } @@ -30,9 +31,8 @@ public class ActionHelper { } public static BooleanExpression needsEntriesSelected(int numberOfEntries, StateManager stateManager) { - return Bindings.createBooleanBinding( - () -> stateManager.getSelectedEntries().size() == numberOfEntries, - stateManager.getSelectedEntries()); + return Bindings.createBooleanBinding(() -> stateManager.getSelectedEntries().size() == numberOfEntries, + stateManager.getSelectedEntries()); } public static BooleanExpression isFieldSetForSelectedEntry(Field field, StateManager stateManager) { @@ -50,18 +50,23 @@ public class ActionHelper { } public static BooleanExpression isFilePresentForSelectedEntry(StateManager stateManager, PreferencesService preferencesService) { - return Bindings.createBooleanBinding(() -> { - List<LinkedFile> files = stateManager.getSelectedEntries().get(0).getFiles(); - if ((files.size() > 0) && stateManager.getActiveDatabase().isPresent()) { - Optional<Path> filename = FileHelper.find( - stateManager.getActiveDatabase().get(), - files.get(0).getLink(), - preferencesService.getFilePreferences()); - return filename.isPresent(); - } else { - return false; - } - }, stateManager.getSelectedEntries(), - stateManager.getSelectedEntries().get(0).getFieldBinding(StandardField.FILE)); + + ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries(); + MonadicObservableValue<Boolean> fileIsPresent = EasyBind.monadic(Bindings.valueAt(selectedEntries, 0)).map(entry -> { + List<LinkedFile> files = entry.getFiles(); + + if ((entry.getFiles().size() > 0) && stateManager.getActiveDatabase().isPresent()) { + Optional<Path> filename = FileHelper.find( + stateManager.getActiveDatabase().get(), + files.get(0).getLink(), + preferencesService.getFilePreferences()); + return filename.isPresent(); + } else { + return false; + } + + }).orElse(false); + + return BooleanExpression.booleanExpression(fileIsPresent); } } diff --git a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java index 444bf3840e..a9a94d52b1 100644 --- a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java +++ b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java @@ -5,10 +5,12 @@ import org.jabref.gui.actions.ActionHelper; import org.jabref.gui.actions.SimpleCommand; import org.jabref.preferences.PreferencesService; +import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected; + public class ShowDocumentViewerAction extends SimpleCommand { public ShowDocumentViewerAction(StateManager stateManager, PreferencesService preferences) { - this.executable.bind(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences)); + this.executable.bind(needsEntriesSelected(stateManager).and(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences))); } @Override

['src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java', 'src/main/java/org/jabref/gui/actions/ActionHelper.java']

{'.java': 2}