Merge pull request #797 from FgForrest/master-hotfix

Master hotfix

Author: novoj

evita_external_api/evita_external_api_grpc/server/src/main/java/io/evitadb/externalApi/grpc/services/EvitaSessionService.java

@@ -30,6 +30,7 @@
 import io.evitadb.api.EvitaSessionContract;
 import io.evitadb.api.exception.SessionNotFoundException;
 import io.evitadb.api.file.FileForFetch;
+import io.evitadb.api.query.Constraint;
 import io.evitadb.api.query.HeadConstraint;
 import io.evitadb.api.query.Query;
 import io.evitadb.api.query.head.Head;
@@ -1519,23 +1520,26 @@ public void getTransactionId(Empty request, StreamObserver<GrpcTransactionRespon
 	 * the first time the apply method is called. Subsequent calls with the same instance will return
 	 * the original HeadConstraint without modification.
 	 */
+	@SuppressWarnings("rawtypes")
 	@RequiredArgsConstructor
-	private static class LabelAppender implements UnaryOperator<HeadConstraint> {
+	private static class LabelAppender implements UnaryOperator<Constraint> {
 		private final Label[] labels;
 		private boolean appended = false;
 
 		@Override
-		public HeadConstraint apply(HeadConstraint constraint) {
+		public Constraint apply(Constraint constraint) {
 			if (this.appended) {
 				return constraint;
-			} else {
+			} else if (constraint instanceof HeadConstraint headConstraint) {
 				this.appended = true;
 				final List<HeadConstraint> constraints = new ArrayList<>(labels.length + 1);
-				constraints.add(constraint);
+				constraints.add(headConstraint);
 				Arrays.stream(this.labels).filter(Objects::nonNull).forEach(constraints::add);
 
 				//noinspection DataFlowIssue
 				return head(constraints.toArray(HeadConstraint[]::new));
+			} else {
+				throw new UnsupportedOperationException("Cannot append labels to a non-head constraint.");
 			}
 		}
 

evita_query/src/main/java/io/evitadb/api/query/Query.java

@@ -6,7 +6,7 @@
  *             |  __/\ V /| | || (_| | |_| | |_) |
  *              \___| \_/ |_|\__\__,_|____/|____/
  *
- *   Copyright (c) 2023-2024
+ *   Copyright (c) 2023-2025
  *
  *   Licensed under the Business Source License, Version 1.1 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -197,12 +197,13 @@ public Query normalizeQuery() {
 	 * @deprecated use {@link #normalizeQuery(UnaryOperator, UnaryOperator, UnaryOperator, UnaryOperator)}, this method
 	 * is here only to maintain backward compatibility
 	 */
+	@SuppressWarnings("rawtypes")
 	@Deprecated
 	@Nonnull
 	public Query normalizeQuery(
-		@Nullable UnaryOperator<FilterConstraint> filterConstraintTranslator,
-		@Nullable UnaryOperator<OrderConstraint> orderConstraintTranslator,
-		@Nullable UnaryOperator<RequireConstraint> requireConstraintTranslator
+		@Nullable UnaryOperator<Constraint> filterConstraintTranslator,
+		@Nullable UnaryOperator<Constraint> orderConstraintTranslator,
+		@Nullable UnaryOperator<Constraint> requireConstraintTranslator
 	) {
 		return normalizeQuery(
 			null,
@@ -218,19 +219,22 @@ public Query normalizeQuery(
 	 * from the query, all query containers that are {@link ConstraintContainer#isNecessary()} are removed
 	 * and their contents are propagated to their parent.
 	 */
+	/* we need to use raw types because constraint of type A might contain constraints of type B */
+	/* i.e. require constraint might contain filtering constraints etc. */
+	@SuppressWarnings("rawtypes")
 	@Nonnull
 	public Query normalizeQuery(
-		@Nullable UnaryOperator<HeadConstraint> headConstraintTranslator,
-		@Nullable UnaryOperator<FilterConstraint> filterConstraintTranslator,
-		@Nullable UnaryOperator<OrderConstraint> orderConstraintTranslator,
-		@Nullable UnaryOperator<RequireConstraint> requireConstraintTranslator
+		@Nullable UnaryOperator<Constraint> headConstraintTranslator,
+		@Nullable UnaryOperator<Constraint> filterConstraintTranslator,
+		@Nullable UnaryOperator<Constraint> orderConstraintTranslator,
+		@Nullable UnaryOperator<Constraint> requireConstraintTranslator
 	) {
 		// avoid costly normalization on already normalized query
 		if (normalized) {
 			return this;
 		}
 
-		final HeadConstraint normalizedHead = this.head == null ? null : purify(this.head, headConstraintTranslator);
+		final HeadConstraint normalizedHead = this.head == null ? null : (HeadConstraint) purify(this.head, headConstraintTranslator);
 		final FilterBy normalizedFilter = this.filterBy == null ? null : (FilterBy) purify(this.filterBy, filterConstraintTranslator);
 		final OrderBy normalizedOrder = this.orderBy == null ? null : (OrderBy) purify(this.orderBy, orderConstraintTranslator);
 		final Require normalizedRequire = this.require == null ? null : (Require) purify(this.require, requireConstraintTranslator);
@@ -263,8 +267,11 @@ public StringWithParameters toStringWithParameterExtraction() {
 		return PrettyPrintingVisitor.toStringWithParameterExtraction(this);
 	}
 
+	/* we need to use raw types because constraint of type A might contain constraints of type B */
+	/* i.e. require constraint might contain filtering constraints etc. */
 	@Nullable
-	private static <T extends Constraint<T>> T purify(@Nonnull T constraint, @Nullable UnaryOperator<T> translator) {
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	private static Constraint purify(@Nonnull Constraint constraint, @Nullable UnaryOperator<Constraint> translator) {
 		return QueryPurifierVisitor.purify(constraint, translator);
 	}
 

evita_query/src/main/java/io/evitadb/api/query/parser/visitor/EvitaQLQueryVisitor.java

@@ -6,7 +6,7 @@
  *             |  __/\ V /| | || (_| | |_| | |_) |
  *              \___| \_/ |_|\__\__,_|____/|____/
  *
- *   Copyright (c) 2023
+ *   Copyright (c) 2023-2025
  *
  *   Licensed under the Business Source License, Version 1.1 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -65,13 +65,13 @@ public Query visitQuery(@Nonnull EvitaQLParser.QueryContext ctx) {
                     .map(con -> con.accept(constraintVisitor))
                     .collect(Collectors.toList());
 
-                final Collection collectionConstraint = findCollectionConstraint(ctx, constraints);
+                final HeadConstraint headConstraint = findHeadConstraint(ctx, constraints);
                 final FilterBy filterByConstraint = findFilterByConstraint(ctx, constraints);
                 final OrderBy orderByConstraint = findOrderByConstraint(ctx, constraints);
                 final Require requireConstraint = findRequireConstraint(ctx, constraints);
 
                 return Query.query(
-                    collectionConstraint,
+                    headConstraint,
                     filterByConstraint,
                     orderByConstraint,
                     requireConstraint
@@ -88,7 +88,7 @@ public Query visitQuery(@Nonnull EvitaQLParser.QueryContext ctx) {
      * @throws EvitaSyntaxException if no appropriated constraint found
      */
     @Nullable
-    protected Collection findCollectionConstraint(@Nonnull ParserRuleContext ctx, @Nonnull List<Constraint<?>> topLevelConstraints) {
+    protected HeadConstraint findHeadConstraint(@Nonnull ParserRuleContext ctx, @Nonnull List<Constraint<?>> topLevelConstraints) {
         final List<Constraint<?>> headConstraints = topLevelConstraints.stream()
                 .filter(HeadConstraint.class::isInstance)
                 .toList();
@@ -99,10 +99,10 @@ protected Collection findCollectionConstraint(@Nonnull ParserRuleContext ctx, @N
         if ((headConstraints.size() > 1) || !(headConstraints.get(0) instanceof Collection)) {
             throw new EvitaSyntaxException(
                 ctx,
-                "Query can have only one top level head constraint -> `collection`."
+                "Query can have only one top level head constraint."
             );
         }
-        return (Collection) headConstraints.get(0);
+        return (HeadConstraint) headConstraints.get(0);
     }
 
     /**

evita_store/evita_store_server/src/main/java/io/evitadb/store/traffic/DiskRingBuffer.java

@@ -666,6 +666,10 @@ private void writeDataToFileChannel(@Nonnull ByteBuffer memoryByteBuffer, int to
 	 *                          used to adjust the position of the ring buffer tail.
 	 */
 	private void updateSessionLocations(int totalBytesToWrite) throws IOException {
+		if (totalBytesToWrite == 0) {
+			// no bytes to write, nothing to update
+			return;
+		}
 		final long newTail = this.ringBufferTail + totalBytesToWrite;
 		SessionLocation head = this.sessionLocations.peekFirst();
 		while (head != null) {