Skip to content

Commit

Permalink
Merge branch 'document-fix' of https://github.com/polypheny/Polypheny-DB
Browse files Browse the repository at this point in the history
 into document-fix
  • Loading branch information
datomo committed Apr 8, 2024
2 parents 9b31286 + e153166 commit 5a52cc2
Show file tree
Hide file tree
Showing 82 changed files with 73 additions and 111 deletions.
2 changes: 1 addition & 1 deletion config/src/main/java/org/polypheny/db/config/Config.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion config/src/main/java/org/polypheny/db/config/Feedback.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public AlgNode getDocumentScan( long allocId, AlgBuilder builder ) {
return Scannable.getDocumentScanSubstitute( scannable, allocId, builder );
}


@Override
public List<PhysicalEntity> createTable( Context context, LogicalTableWrapper logical, AllocationTableWrapper allocation ) {
return scannable.createTable( context, logical, allocation );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class AdapterTemplate {
public long id;
public String description;


public AdapterTemplate( long id, Class<?> clazz, String adapterName, List<AbstractAdapterSetting> settings, List<DeployMode> modes, String description, Function4<Long, String, Map<String, String>, Adapter<?>> deployer ) {
this.id = id;
this.adapterName = adapterName;
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/org/polypheny/db/algebra/core/Join.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ public boolean isSemiJoinDone() {
}



@Override
public final Join copy( AlgTraitSet traitSet, List<AlgNode> inputs ) {
assert inputs.size() == 2;
Expand Down Expand Up @@ -249,4 +248,3 @@ public String algCompareString() {


}

Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@
import org.polypheny.db.type.PolyTypeUtil;
import org.polypheny.db.type.entity.PolyBoolean;
import org.polypheny.db.type.entity.PolyList;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.category.PolyNumber;
import org.polypheny.db.type.entity.category.PolyTemporal;
import org.polypheny.db.type.entity.document.PolyDocument;
import org.polypheny.db.type.entity.numerical.PolyBigDecimal;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.temporal.PolyDate;
import org.polypheny.db.type.entity.temporal.PolyTime;
import org.polypheny.db.type.entity.temporal.PolyTimestamp;
Expand Down Expand Up @@ -1046,4 +1046,3 @@ private AlwaysNull() {
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ public static LogicalRelFilter create( final AlgNode input, RexNode condition, I
}



@Override
public LogicalRelFilter copy( AlgTraitSet traitSet, AlgNode input, RexNode condition ) {
assert traitSet.containsIfApplicable( Convention.NONE );
Expand All @@ -122,4 +121,3 @@ public AlgWriter explainTerms( AlgWriter pw ) {
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public final class LogicalRelJoin extends Join implements RelAlg {
private final boolean semiJoinDone;



/**
* Creates a LogicalJoin.
*
Expand Down Expand Up @@ -144,4 +143,3 @@ public boolean isSemiJoinDone() {


}

Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ private static AlgMetadataProvider reflectiveSource( final MetadataHandler<?> ta
return new ReflectiveAlgMetadataProvider( methodsMap, space.metadataClass0, space.providers );
}


@Override
public <M extends Metadata> Multimap<Method, MetadataHandler<M>> handlers( MetadataDef<M> def ) {
final ImmutableMultimap.Builder<Method, MetadataHandler<M>> builder = ImmutableMultimap.builder();
Expand Down Expand Up @@ -229,7 +230,6 @@ public <M extends Metadata> UnboundMetadata<M> apply( Class<? extends AlgNode> a
}



@SuppressWarnings({ "unchecked" })
public <M extends Metadata> UnboundMetadata<M> apply( Class<? extends AlgNode> algClass ) {
List<Class<? extends AlgNode>> newSources = new ArrayList<>();
Expand Down Expand Up @@ -354,4 +354,3 @@ public static Space2 create( MetadataHandler<?> target, ImmutableList<Method> me
}

}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -93,4 +93,3 @@ public void onMatch( AlgOptRuleCall call ) {
}

}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
import org.polypheny.db.catalog.entity.PolyObject;
import org.polypheny.db.catalog.logistic.IndexType;
import org.polypheny.db.type.entity.PolyBoolean;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.numerical.PolyInteger;
import org.polypheny.db.type.entity.numerical.PolyLong;


@EqualsAndHashCode(callSuper = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import org.polypheny.db.catalog.Catalog;
import org.polypheny.db.catalog.entity.PolyObject;
import org.polypheny.db.catalog.snapshot.Snapshot;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.numerical.PolyLong;


@Value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.polypheny.db.algebra.type.GraphType;
import org.polypheny.db.type.PolyType;
import org.polypheny.db.type.entity.PolyList;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.document.PolyDocument;
Expand All @@ -49,6 +48,7 @@
import org.polypheny.db.type.entity.graph.PolyGraph;
import org.polypheny.db.type.entity.graph.PolyNode;
import org.polypheny.db.type.entity.numerical.PolyInteger;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.relational.PolyMap;

public class CrossModelFunctions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2840,4 +2840,3 @@ public enum FlatProductInputType {
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import org.polypheny.db.adapter.DataContext;
import org.polypheny.db.nodes.TimeUnitRange;
import org.polypheny.db.type.entity.PolyInterval;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.category.PolyNumber;
import org.polypheny.db.type.entity.category.PolyTemporal;
import org.polypheny.db.type.entity.numerical.PolyInteger;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.temporal.PolyDate;
import org.polypheny.db.type.entity.temporal.PolyTime;
import org.polypheny.db.type.entity.temporal.PolyTimestamp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
import org.polypheny.db.rex.RexNode;
import org.polypheny.db.schema.impl.AggregateFunctionImpl;
import org.polypheny.db.type.entity.PolyBoolean;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.util.Conformance;
import org.polypheny.db.util.ImmutableBitSet;
import org.polypheny.db.util.Pair;
Expand Down Expand Up @@ -816,4 +816,3 @@ public PolyValue end() {
}

}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,5 @@ PolyImplementation getImplementation( Statement statement, ExecutableStatement n
public abstract AlgDataType getParameterRowType( Node left );

public abstract List<String> splitStatements( String statements );

}
2 changes: 0 additions & 2 deletions core/src/main/java/org/polypheny/db/rex/RexBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,6 @@ public RexLiteral makeTimeLiteral( PolyTime time, int precision ) {
}



/**
* Creates a Timestamp literal.
*/
Expand Down Expand Up @@ -1507,4 +1506,3 @@ public RexCall makeToJson( RexNode node ) {
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@
import org.polypheny.db.type.entity.PolyBinary;
import org.polypheny.db.type.entity.PolyBoolean;
import org.polypheny.db.type.entity.PolyList;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.document.PolyDocument;
import org.polypheny.db.type.entity.numerical.PolyBigDecimal;
import org.polypheny.db.type.entity.numerical.PolyDouble;
import org.polypheny.db.type.entity.numerical.PolyInteger;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.temporal.PolyDate;
import org.polypheny.db.type.entity.temporal.PolyTimestamp;
import org.polypheny.db.util.Pair;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/org/polypheny/db/tools/AlgBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ public int stackSize() {
}



public static AlgBuilder create( Statement statement ) {
final RexBuilder rexBuilder = new RexBuilder( statement.getTransaction().getTypeFactory() );
final AlgCluster cluster = AlgCluster.create( statement.getQueryProcessor().getPlanner(), rexBuilder, null, statement.getTransaction().getSnapshot() );
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -173,4 +173,3 @@ public int getScale() {
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import org.polypheny.db.type.entity.PolyBinary;
import org.polypheny.db.type.entity.PolyBoolean;
import org.polypheny.db.type.entity.PolyList;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.graph.PolyEdge;
import org.polypheny.db.type.entity.graph.PolyGraph;
Expand All @@ -56,6 +55,7 @@
import org.polypheny.db.type.entity.numerical.PolyDouble;
import org.polypheny.db.type.entity.numerical.PolyFloat;
import org.polypheny.db.type.entity.numerical.PolyInteger;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.relational.PolyMap;
import org.polypheny.db.type.entity.temporal.PolyDate;
import org.polypheny.db.type.entity.temporal.PolyTime;
Expand Down Expand Up @@ -152,4 +152,3 @@ private interface ColumnList extends List {
}

}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2023 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -167,4 +167,3 @@ static AlgDataTypePrecedenceList getListForType( AlgDataType type ) {
}

}

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -88,4 +88,3 @@ public boolean checkSingleOperandType( CallBinding callBinding, Node node, int i
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
@NonFinal
public class PolyInterval extends PolyValue {


@NotNull
public Long millis;

Expand Down Expand Up @@ -80,9 +79,7 @@ private static MonthsMilliseconds normalize( Long value, TimeUnit unit ) {
return new MonthsMilliseconds( 0, value );
} else {
throw new GenericRuntimeException( "Normalization is not supported" );

}

}


Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/org/polypheny/db/type/entity/PolyList.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public PolyList( @JsonProperty("value") @Deserialize("value") List<E> value ) {
this.value = new ArrayList<>( value );
}


public static <E extends PolyValue> PolyList<E> copyOf( List<E> value ) {
return new PolyList<>( value );
}
Expand All @@ -106,6 +107,7 @@ public static <E extends PolyValue> PolyList<E> copyOf( Iterator<E> iterator ) {
return copyOf( Lists.newArrayList( iterator ) );
}


@SafeVarargs
public PolyList( E... value ) {
this( Arrays.asList( value ) );
Expand All @@ -123,6 +125,7 @@ public PolyList( E... value ) {
}
}


public static PolyList<?> convert( @Nullable Object object ) {
if ( object == null ) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.apache.calcite.linq4j.tree.Expression;
import org.jetbrains.annotations.NotNull;
import org.polypheny.db.type.PolyType;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.numerical.PolyBigDecimal;
import org.polypheny.db.type.entity.numerical.PolyLong;

@NonFinal
public abstract class PolyTemporal extends PolyNumber {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
import org.polypheny.db.type.PolySerializable;
import org.polypheny.db.type.PolyType;
import org.polypheny.db.type.entity.PolyList;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.PolyString;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.numerical.PolyLong;
import org.polypheny.db.type.entity.relational.PolyMap;
import org.polypheny.db.util.BuiltInMethod;
import org.polypheny.db.util.Pair;
Expand Down
Loading

0 comments on commit 5a52cc2

Please sign in to comment.