Rename entrypoint into endpoint, prepare column searching API

Author: blacelle

adhoc/src/main/java/eu/solven/adhoc/beta/schema/AdhocSchemaForApi.java adhoc/src/main/java/eu/solven/adhoc/beta/schema/AdhocSchema.java

@@ -37,7 +37,6 @@
 import eu.solven.adhoc.measure.AdhocMeasureBag;
 import eu.solven.adhoc.measure.IAdhocMeasureBag;
 import eu.solven.adhoc.measure.model.IMeasure;
-import eu.solven.adhoc.query.AdhocQuery;
 import eu.solven.adhoc.query.IQueryOption;
 import eu.solven.adhoc.query.cube.IAdhocQuery;
 import eu.solven.adhoc.storage.ITabularView;
@@ -53,7 +52,7 @@
  */
 @Value
 @Builder
-public class AdhocSchemaForApi {
+public class AdhocSchema implements IAdhocSchema {
 	@Builder.Default
 	final IAdhocQueryEngine engine = AdhocQueryEngine.builder().build();
 
@@ -63,7 +62,7 @@ public class AdhocSchemaForApi {
 
 	final Map<String, IAdhocCubeWrapper> nameToCube = new ConcurrentHashMap<>();
 
-	final Map<String, IAdhocQuery> nameToQuery = new ConcurrentHashMap<>();
+	// final Map<String, IAdhocQuery> nameToQuery = new ConcurrentHashMap<>();
 
 	public void registerCube(String cubeName, String tableName, String measuresName) {
 		AdhocCubeWrapper cube = AdhocCubeWrapper.builder()
@@ -76,8 +75,9 @@ public void registerCube(String cubeName, String tableName, String measuresName)
 		nameToCube.put(cubeName, cube);
 	}
 
-	public EntrypointSchemaMetadata getMetadata() {
-		EntrypointSchemaMetadata.EntrypointSchemaMetadataBuilder metadata = EntrypointSchemaMetadata.builder();
+	@Override
+	public EndpointSchemaMetadata getMetadata() {
+		EndpointSchemaMetadata.EndpointSchemaMetadataBuilder metadata = EndpointSchemaMetadata.builder();
 
 		nameToCube.forEach((name, cube) -> {
 			CubeSchemaMetadataBuilder cubeSchema = CubeSchemaMetadata.builder();
@@ -97,13 +97,14 @@ public EntrypointSchemaMetadata getMetadata() {
 			metadata.table(name, ColumnarMetadata.from(table.getColumns()));
 		});
 
-		nameToQuery.forEach((name, query) -> {
-			metadata.query(name, AdhocQuery.edit(query).build());
-		});
+		// nameToQuery.forEach((name, query) -> {
+		// metadata.query(name, AdhocQuery.edit(query).build());
+		// });
 
 		return metadata.build();
 	}
 
+	@Override
 	public ITabularView execute(String cube, IAdhocQuery query, Set<? extends IQueryOption> options) {
 		return nameToCube.get(cube).execute(query, options);
 	}
@@ -122,7 +123,16 @@ public void registerMeasure(String measureBagName, IMeasure measure) {
 		measureBag.addMeasure(measure);
 	}
 
-	public void registerQuery(String name, IAdhocQuery query) {
-		nameToQuery.put(name, query);
+	public Set<?> getCoordinates(ColumnIdentifier columnId) {
+		if (columnId.isCubeElseTable()) {
+			nameToCube.get(columnId.getHolder()).getCoordinates(columnId.getColumn());
+		} else {
+
+		}
+		return Set.of();
 	}
+
+	// public void registerQuery(String name, IAdhocQuery query) {
+	// nameToQuery.put(name, query);
+	// }
 }

adhoc/src/main/java/eu/solven/adhoc/beta/schema/ColumnIdentifier.java

@@ -0,0 +1,42 @@
+/**
+ * The MIT License
+ * Copyright (c) 2025 Benoit Chatain Lacelle - SOLVEN
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package eu.solven.adhoc.beta.schema;
+
+import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.NonNull;
+import lombok.Value;
+
+@Value
+@Builder(toBuilder = true)
+public class ColumnIdentifier {
+	// Is this a cube (else a table) column
+	@Default
+	boolean isCubeElseTable = true;
+
+	// The name of the cube/table
+	@NonNull
+	String holder;
+
+	String column;
+}

adhoc/src/main/java/eu/solven/adhoc/beta/schema/ColumnMetadata.java

@@ -0,0 +1,63 @@
+/**
+ * The MIT License
+ * Copyright (c) 2025 Benoit Chatain Lacelle - SOLVEN
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package eu.solven.adhoc.beta.schema;
+
+import java.util.Set;
+import java.util.UUID;
+
+import lombok.Builder;
+import lombok.Builder.Default;
+import lombok.NonNull;
+import lombok.Singular;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+import lombok.extern.slf4j.Slf4j;
+
+@Value
+@Builder
+@Jacksonized
+@Slf4j
+public class ColumnMetadata {
+	// May be null, in context where there is no entrypoint
+	UUID entrypointId;
+
+	// Typically a cube or a table
+	@NonNull
+	String holder;
+
+	@NonNull
+	String column;
+
+	@NonNull
+	String type;
+
+	// The number of different coordinates. This is contextual to a cube/table.
+	// -1 means the cardinality has not been estimated
+	@Default
+	long estimatedCardinality = -1;
+
+	// A subset of matching coordinates. Typically not exhaustive.
+	@Singular
+	Set<?> coordinates;
+
+}

adhoc/src/main/java/eu/solven/adhoc/beta/schema/EntrypointSchemaMetadata.java adhoc/src/main/java/eu/solven/adhoc/beta/schema/EndpointSchemaMetadata.java

@@ -45,7 +45,7 @@
 @Value
 @Builder
 @Jacksonized
-public class EntrypointSchemaMetadata {
+public class EndpointSchemaMetadata {
 
 	@Singular
 	Map<String, ColumnarMetadata> tables;

adhoc/src/main/java/eu/solven/adhoc/beta/schema/IAdhocSchema.java

@@ -0,0 +1,42 @@
+/**
+ * The MIT License
+ * Copyright (c) 2025 Benoit Chatain Lacelle - SOLVEN
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package eu.solven.adhoc.beta.schema;
+
+import java.util.Set;
+
+import eu.solven.adhoc.query.IQueryOption;
+import eu.solven.adhoc.query.cube.IAdhocQuery;
+import eu.solven.adhoc.storage.ITabularView;
+
+/**
+ * Wraps together the core structures of Adhoc
+ * 
+ * @author Benoit Lacelle
+ */
+public interface IAdhocSchema {
+
+	EndpointSchemaMetadata getMetadata();
+
+	ITabularView execute(String cube, IAdhocQuery query, Set<? extends IQueryOption> options);
+
+}

adhoc/src/main/java/eu/solven/adhoc/beta/schema/TargetedAdhocQuery.java

@@ -23,6 +23,7 @@
 package eu.solven.adhoc.beta.schema;
 
 import java.util.Set;
+import java.util.UUID;
 
 import eu.solven.adhoc.query.AdhocQuery;
 import eu.solven.adhoc.query.IQueryOption;
@@ -43,7 +44,7 @@
 @Jacksonized
 public class TargetedAdhocQuery {
 	@NonNull
-	String entrypointId;
+	UUID endpointId;
 
 	@NonNull
 	String cube;

adhoc/src/main/java/eu/solven/adhoc/cube/AdhocCubeWrapper.java

@@ -68,7 +68,7 @@ public class AdhocCubeWrapper implements IAdhocCubeWrapper {
 	@NonNull
 	@Default
 	final IAdhocColumnsManager columnsManager = AdhocColumnsManager.builder().build();
-	
+
 	@Override
 	public Map<String, IMeasure> getNameToMeasure() {
 		return measures.getNameToMeasure();

adhoc/src/main/java/eu/solven/adhoc/cube/IAdhocCubeWrapper.java

@@ -23,8 +23,10 @@
 package eu.solven.adhoc.cube;
 
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import eu.solven.adhoc.measure.IHasMeasures;
+import eu.solven.adhoc.query.AdhocQuery;
 import eu.solven.adhoc.query.IQueryOption;
 import eu.solven.adhoc.query.StandardQueryOptions;
 import eu.solven.adhoc.query.cube.IAdhocQuery;
@@ -52,4 +54,10 @@ default ITabularView execute(IAdhocQuery query) {
 	 */
 	ITabularView execute(IAdhocQuery query, Set<? extends IQueryOption> options);
 
+	default Set<Object> getCoordinates(String column) {
+		ITabularView view = this.execute(AdhocQuery.builder().groupByAlso(column).build());
+
+		return view.slices().map(slice -> slice.getRawSliced(column)).collect(Collectors.toSet());
+	}
+
 }

adhoc/src/main/java/eu/solven/adhoc/dag/AdhocQueryEngine.java

@@ -549,12 +549,12 @@ protected void forEachStreamedRow(ExecutingQueryContext executingQueryContext,
 					Optional<Aggregator> optAgg = isAggregator(columnToAggregators, aggregatedColumn);
 
 					optAgg.ifPresent(agg -> {
-						coordinatesToAgg.contribute(agg, coordinates, v);
+						coordinatesToAgg.contributeAggregate(agg, coordinates, v);
 					});
 				} else {
 					// The DB provides the column raw value, and not an aggregated value
 					// So we aggregate row values ourselves (e.g. InMemoryTable)
-					aggs.forEach(agg -> coordinatesToAgg.contribute(agg, coordinates, v));
+					aggs.forEach(agg -> coordinatesToAgg.contributeRaw(agg, coordinates, v));
 				}
 			}
 		}

adhoc/src/main/java/eu/solven/adhoc/measure/sum/CountAggregation.java

@@ -23,14 +23,15 @@
 package eu.solven.adhoc.measure.sum;
 
 import eu.solven.adhoc.measure.aggregation.IAggregation;
+import eu.solven.adhoc.measure.sum.IAggregationCarrier.IHasCarriers;
 import eu.solven.adhoc.storage.IValueConsumer;
 import lombok.Builder;
 import lombok.Value;
 
 /**
  * Keep the highest value amongst encountered values
  */
-public class CountAggregation implements IAggregation {
+public class CountAggregation implements IAggregation, IHasCarriers {
 
 	public static final String KEY = "COUNT";
 
@@ -95,6 +96,11 @@ protected Object aggregateOne(Object one) {
 		}
 	}
 
+	@Override
+	public CountHolder wrap(Object v) {
+		return CountHolder.builder().count(((Number) v).longValue()).build();
+	}
+
 	// @Override
 	// public double aggregateDoubles(double left, double right) {
 	// throw new UnsupportedOperationException("COUNT does not fit into a double");

adhoc/src/main/java/eu/solven/adhoc/measure/sum/IAggregationCarrier.java

@@ -24,6 +24,7 @@
 
 import eu.solven.adhoc.measure.aggregation.IAggregation;
 import eu.solven.adhoc.storage.IValueConsumer;
+import eu.solven.adhoc.table.IAdhocTableWrapper;
 
 /**
  * This is used by {@link IAggregation} which need to differentiate clearly from inputs and a stateful-but-intermediate
@@ -32,5 +33,18 @@
  * @author Benoit Lacelle
  */
 public interface IAggregationCarrier {
+
+	interface IHasCarriers {
+
+		/**
+		 * 
+		 * @param v
+		 *            some pre-aggregated value, typically computed by the {@link IAdhocTableWrapper}.
+		 * @return an {@link IAggregationCarrier}
+		 */
+		IAggregationCarrier wrap(Object v);
+
+	}
+
 	void acceptValueConsumer(IValueConsumer valueConsumer);
 }