Skip to content

Commit

Permalink
Adding rules for document ids
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Hafner committed Dec 14, 2024
1 parent 56ac242 commit 1a6f0a3
Show file tree
Hide file tree
Showing 6 changed files with 320 additions and 291 deletions.
4 changes: 3 additions & 1 deletion core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableRules.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ public class EnumerableRules {
private EnumerableRules() {
}

public static final EnumerableIdentifierRule ENUMERABLE_IDENTIFIER_RULE = EnumerableIdentifierRule.REL_INSTANCE;
public static final EnumerableIdentifierRule ENUMERABLE_REL_IDENTIFIER_RULE = EnumerableIdentifierRule.REL_INSTANCE;

public static final EnumerableIdentifierRule ENUMERABLE_DOC_IDENTIFIER_RULE = EnumerableIdentifierRule.DOC_INSTANCE;

public static final EnumerableConditionalExecuteRule ENUMERABLE_CONDITIONAL_EXECUTE_RULE = new EnumerableConditionalExecuteRule();

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/org/polypheny/db/algebra/enumerable/common/EnumerableIdentifierRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public class EnumerableIdentifierRule extends ConverterRule {

public static final EnumerableIdentifierRule REL_INSTANCE = new EnumerableIdentifierRule( LogicalRelIdentifier.class );

public static final EnumerableIdentifierRule DOC_INSTANCE = new EnumerableIdentifierRule( LogicalRelIdentifier.class );


private EnumerableIdentifierRule( Class<? extends Identifier> identifier ) {
super( identifier, Convention.NONE, EnumerableConvention.INSTANCE, "EnumerableIdentifierRule" );
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/polypheny/db/tools/Programs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ public class Programs {
EnumerableRules.ENUMERABLE_SEMI_JOIN_RULE,
EnumerableRules.ENUMERABLE_CORRELATE_RULE,
EnumerableRules.ENUMERABLE_CONDITIONAL_EXECUTE_RULE,
EnumerableRules.ENUMERABLE_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_REL_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_DOC_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_CONDITIONAL_EXECUTE_TRUE_RULE,
EnumerableRules.ENUMERABLE_CONDITIONAL_EXECUTE_FALSE_RULE,
EnumerableRules.ENUMERABLE_STREAMER_RULE,
Expand Down
90 changes: 47 additions & 43 deletions core/src/main/java/org/polypheny/db/transaction/locking/AlgTreeRewriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@

package org.polypheny.db.transaction.locking;

import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;
import org.polypheny.db.algebra.AlgNode;
import org.polypheny.db.algebra.AlgRoot;
import org.polypheny.db.algebra.AlgShuttleImpl;
Expand All @@ -29,6 +26,7 @@
import org.polypheny.db.algebra.logical.common.LogicalConstraintEnforcer;
import org.polypheny.db.algebra.logical.document.LogicalDocumentAggregate;
import org.polypheny.db.algebra.logical.document.LogicalDocumentFilter;
import org.polypheny.db.algebra.logical.document.LogicalDocumentIdentifier;
import org.polypheny.db.algebra.logical.document.LogicalDocumentModify;
import org.polypheny.db.algebra.logical.document.LogicalDocumentProject;
import org.polypheny.db.algebra.logical.document.LogicalDocumentScan;
Expand All @@ -49,6 +47,7 @@
import org.polypheny.db.algebra.logical.relational.LogicalRelCorrelate;
import org.polypheny.db.algebra.logical.relational.LogicalRelExchange;
import org.polypheny.db.algebra.logical.relational.LogicalRelFilter;
import org.polypheny.db.algebra.logical.relational.LogicalRelIdentifier;
import org.polypheny.db.algebra.logical.relational.LogicalRelIntersect;
import org.polypheny.db.algebra.logical.relational.LogicalRelJoin;
import org.polypheny.db.algebra.logical.relational.LogicalRelMatch;
Expand All @@ -60,21 +59,9 @@
import org.polypheny.db.algebra.logical.relational.LogicalRelTableFunctionScan;
import org.polypheny.db.algebra.logical.relational.LogicalRelUnion;
import org.polypheny.db.algebra.logical.relational.LogicalRelValues;
import org.polypheny.db.algebra.type.AlgDataType;
import org.polypheny.db.algebra.type.AlgDataTypeFactoryImpl;
import org.polypheny.db.algebra.type.AlgDataTypeField;
import org.polypheny.db.algebra.type.AlgDataTypeFieldImpl;
import org.polypheny.db.algebra.type.AlgRecordType;
import org.polypheny.db.algebra.type.StructKind;
import org.polypheny.db.plan.AlgOptUtil;
import org.polypheny.db.rex.RexBuilder;
import org.polypheny.db.rex.RexIndexRef;
import org.polypheny.db.rex.RexLiteral;
import org.polypheny.db.rex.RexNode;
import org.polypheny.db.rex.RexUtil;
import org.polypheny.db.type.PolyType;
import org.polypheny.db.type.entity.PolyValue;
import org.polypheny.db.type.entity.numerical.PolyLong;

public class AlgTreeRewriter extends AlgShuttleImpl {

Expand Down Expand Up @@ -110,14 +97,15 @@ public AlgNode visit( LogicalRelTableFunctionScan scan ) {

@Override
public AlgNode visit( LogicalRelValues values ) {
return values;
/*
Inserts can be divided into two categories according to the nature of their input:
1) Values as input
2) Inputs that are not values.
In case 1, we already add the identifiers here by modifying the values.
Case 2 is handled using rules in the planner.
*/
ImmutableList<ImmutableList<RexLiteral>> newValues = values.tuples.stream()
.map(row -> ImmutableList.<RexLiteral>builder()
.add(IdentifierUtils.getIdentifierAsLiteral())
Expand All @@ -134,8 +122,11 @@ public AlgNode visit( LogicalRelValues values ) {
AlgDataType newRowType = new AlgRecordType( StructKind.FULLY_QUALIFIED, newFields );
return LogicalRelValues.create( values.getCluster(), newRowType, newValues );
*/

}


@Override
public AlgNode visit( LogicalRelFilter filter ) {
return visitChild( filter, 0, filter.getInput() );
Expand All @@ -144,36 +135,40 @@ public AlgNode visit( LogicalRelFilter filter ) {

@Override
public AlgNode visit( LogicalRelProject project ) {
AlgNode input = project.getInput();
if (! (input instanceof LogicalRelValues oldValues)) {
return project;
}
return visitChildren( project );

//AlgNode input = project.getInput();
//if (! (input instanceof LogicalRelValues oldValues)) {
// return project;
//}
/*
When values are used for an insert, they are modified.
The project has to be adjusted accordingly.
*/
LogicalRelValues newValues = (LogicalRelValues) visit(oldValues);
List<RexNode> newProjects = createNewProjects(project, newValues);
return project.copy(project.getTraitSet(), newValues, newProjects, project.getRowType());
//LogicalRelValues newValues = (LogicalRelValues) visit(oldValues);
//List<RexNode> newProjects = createNewProjects(project, newValues);
//return project.copy(project.getTraitSet(), newValues, newProjects, project.getRowType());

}

private List<RexNode> createNewProjects(LogicalRelProject project, LogicalRelValues inputValues) {

private List<RexNode> createNewProjects( LogicalRelProject project, LogicalRelValues inputValues ) {
List<RexNode> newProjects = new LinkedList<>();
long fieldCount = project.getRowType().getFieldCount();
long inputFieldCount = inputValues.tuples.get(0).size();
long inputFieldCount = inputValues.tuples.get( 0 ).size();

for (int position = 0; position < fieldCount; position++) {
if (position < inputFieldCount) {
newProjects.add(new RexIndexRef(
for ( int position = 0; position < fieldCount; position++ ) {
if ( position < inputFieldCount ) {
newProjects.add( new RexIndexRef(
position,
project.getRowType().getFields().get(position).getType()
));
project.getRowType().getFields().get( position ).getType()
) );
} else {
newProjects.add(new RexLiteral(
newProjects.add( new RexLiteral(
null,
project.getRowType().getFields().get(position).getType(),
project.getRowType().getFields().get(position).getType().getPolyType()
));
project.getRowType().getFields().get( position ).getType(),
project.getRowType().getFields().get( position ).getType().getPolyType()
) );
}
}

Expand Down Expand Up @@ -231,15 +226,16 @@ public AlgNode visit( LogicalConditionalExecute lce ) {

@Override
public AlgNode visit( LogicalRelModify modify ) {
if ( modify.getOperation() != Operation.INSERT ) {
return visitChildren( modify );
}


private List<RexNode> getProjects( AlgDataType rowType ) {
return rowType.getFields().stream()
.filter( f -> !f.getName().equals( IdentifierUtils.IDENTIFIER_KEY ) )
.map( f -> new RexIndexRef( f.getIndex(), f.getType() ) )
.collect( Collectors.toCollection( LinkedList::new ) );
}
AlgNode input = modify.getInput();
LogicalRelIdentifier identifier = LogicalRelIdentifier.create(
modify.getEntity(),
input,
input.getTupleType()
);
return modify.copy( modify.getTraitSet(), List.of( identifier ) );
}


Expand Down Expand Up @@ -311,7 +307,15 @@ public AlgNode visit( LogicalLpgTransformer transformer ) {

@Override
public AlgNode visit( LogicalDocumentModify modify ) {
return visitChildren( modify );
if ( modify.getOperation() != Operation.INSERT ) {
return visitChildren( modify );
}
AlgNode input = modify.getInput();
LogicalDocumentIdentifier identifier = LogicalDocumentIdentifier.create(
modify.getEntity(),
input
);
return modify.copy( modify.getTraitSet(), List.of( identifier ) );
}


Expand Down
3 changes: 2 additions & 1 deletion dbms/src/main/java/org/polypheny/db/processing/VolcanoQueryProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public class VolcanoQueryProcessor extends AbstractQueryProcessor {

public static final List<AlgOptRule> ENUMERABLE_RULES =
ImmutableList.of(
EnumerableRules.ENUMERABLE_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_REL_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_DOC_IDENTIFIER_RULE,
EnumerableRules.ENUMERABLE_JOIN_RULE,
EnumerableRules.ENUMERABLE_MERGE_JOIN_RULE,
EnumerableRules.ENUMERABLE_SEMI_JOIN_RULE,
Expand Down
Loading

0 comments on commit 1a6f0a3

Please sign in to comment.