From e1531660238d92b3bf22db38909eabcd1a728dea Mon Sep 17 00:00:00 2001 From: Marco Vogt Date: Mon, 8 Apr 2024 15:05:41 +0200 Subject: [PATCH] Minor formatting adjustments and adjust year in copyright --- config/src/main/java/org/polypheny/db/config/Config.java | 2 +- .../src/main/java/org/polypheny/db/config/Feedback.java | 2 +- .../java/org/polypheny/db/adapter/GraphScanDelegate.java | 1 + .../org/polypheny/db/adapter/java/AdapterTemplate.java | 1 + .../main/java/org/polypheny/db/algebra/core/Join.java | 2 -- .../db/algebra/enumerable/RexToLixTranslator.java | 3 +-- .../db/algebra/logical/relational/LogicalRelFilter.java | 2 -- .../db/algebra/logical/relational/LogicalRelJoin.java | 2 -- .../algebra/metadata/ReflectiveAlgMetadataProvider.java | 3 +-- .../db/algebra/rules/AbstractJoinExtractFilterRule.java | 3 +-- .../polypheny/db/algebra/type/AlgDataTypeSystemImpl.java | 2 +- .../db/catalog/entity/MaterializedCriteria.java | 2 +- .../db/catalog/entity/logical/LogicalIndex.java | 2 +- .../polypheny/db/catalog/entity/logical/LogicalKey.java | 2 +- .../org/polypheny/db/functions/CrossModelFunctions.java | 2 +- .../main/java/org/polypheny/db/functions/Functions.java | 3 +-- .../org/polypheny/db/functions/TemporalFunctions.java | 2 +- .../java/org/polypheny/db/interpreter/AggregateNode.java | 3 +-- .../org/polypheny/db/languages/NodeParseException.java | 2 +- .../main/java/org/polypheny/db/processing/Processor.java | 1 + core/src/main/java/org/polypheny/db/rex/RexBuilder.java | 2 -- .../org/polypheny/db/schema/document/DocumentUtil.java | 2 +- .../src/main/java/org/polypheny/db/tools/AlgBuilder.java | 1 - .../java/org/polypheny/db/type/IntervalPolyType.java | 3 +-- .../polypheny/db/type/JavaToPolyTypeConversionRules.java | 3 +-- .../org/polypheny/db/type/PolyIntervalQualifier.java | 2 +- .../db/type/PolyTypeExplicitPrecedenceList.java | 3 +-- .../db/type/checker/CompositeOperandTypeChecker.java | 2 +- .../type/checker/CompositeSingleOperandTypeChecker.java | 3 +-- .../java/org/polypheny/db/type/entity/PolyInterval.java | 3 --- .../main/java/org/polypheny/db/type/entity/PolyList.java | 3 +++ .../polypheny/db/type/entity/category/PolyTemporal.java | 2 +- .../org/polypheny/db/type/entity/graph/PolyEdge.java | 2 +- .../polypheny/db/type/entity/numerical/PolyDouble.java | 2 +- .../polypheny/db/type/entity/numerical/PolyFloat.java | 2 +- .../polypheny/db/type/entity/numerical/PolyInteger.java | 2 ++ .../org/polypheny/db/type/entity/numerical/PolyLong.java | 2 +- core/src/main/java/org/polypheny/db/util/BsonUtil.java | 3 +-- .../test/java/org/polypheny/db/rex/RexBuilderTest.java | 1 - .../db/polyvalue/PolyValueSerializationTest.java | 2 +- .../src/main/java/org/polypheny/db/avatica/DbmsMeta.java | 4 ++-- .../enumberable/CottontailBatchInsertEnumerable.java | 2 +- .../enumberable/CottontailDeleteEnumerable.java | 2 +- .../enumberable/CottontailInsertEnumerable.java | 2 +- .../enumberable/CottontailQueryEnumerable.java | 2 +- .../enumberable/CottontailUpdateEnumerable.java | 2 +- .../db/adapter/cottontail/util/Linq4JFixer.java | 4 ++-- .../java/org/polypheny/db/adapter/csv/CsvEnumerator.java | 2 +- .../java/org/polypheny/db/adapter/csv/CsvFieldType.java | 2 +- .../db/adapter/ethereum/EthereumEnumerator.java | 2 +- .../org/polypheny/db/adapter/excel/ExcelEnumerator.java | 2 +- .../org/polypheny/db/adapter/excel/ExcelFieldType.java | 2 +- .../java/org/polypheny/db/adapter/file/Condition.java | 2 +- .../org/polypheny/db/adapter/file/FileEnumerator.java | 2 +- .../java/org/polypheny/db/adapter/file/FileModifier.java | 2 +- .../org/polypheny/db/monitoring/InMemoryRepository.java | 1 - .../db/monitoring/core/MonitoringQueueImplTest.java | 1 + .../db/adapter/jdbc/JdbcToEnumerableConverter.java | 2 +- .../polypheny/db/adapter/jdbc/ResultSetEnumerable.java | 3 +-- .../org/polypheny/db/adapter/mongodb/MongoEntity.java | 2 +- .../polypheny/db/adapter/mongodb/MongoEnumerator.java | 4 +--- .../db/languages/mql/MqlCollectionStatement.java | 2 +- .../polypheny/db/languages/mql/MqlDeletePlacement.java | 2 +- .../polypheny/db/languages/mql/MqlFindOneAndDelete.java | 2 +- .../org/polypheny/db/languages/mql/MqlShowDatabase.java | 2 +- .../org/polypheny/db/languages/mql/parser/MqlParser.java | 3 --- .../java/org/polypheny/db/restapi/RequestParser.java | 2 +- .../polypheny/db/sql/language/SqlIntervalQualifier.java | 3 +-- .../polypheny/db/sql/language/SqlJdbcDataTypeName.java | 3 +-- .../db/sql/language/fun/SqlDatePartFunction.java | 3 +-- .../org/polypheny/db/sql/sql2alg/SqlToAlgConverter.java | 2 -- .../db/sql/sql2alg/StandardConvertletTable.java | 2 -- .../java/org/polypheny/db/sql/DateRangeRulesTest.java | 2 +- .../test/java/org/polypheny/db/sql/RexExecutorTest.java | 3 +-- .../src/test/java/org/polypheny/db/sql/TestFixture.java | 2 +- .../org/polypheny/db/sql/language/FunctionsTest.java | 3 +-- .../polypheny/db/sql/language/parser/SqlParserTest.java | 1 - .../db/sql/language/test/SqlOperatorBaseTest.java | 9 --------- .../org/polypheny/db/webui/models/TableConstraint.java | 1 + .../java/org/polypheny/db/webui/models/UIAlgNode.java | 1 - .../db/webui/models/requests/ConstraintRequest.java | 3 ++- .../polypheny/db/webui/models/results/GraphResult.java | 1 + 82 files changed, 74 insertions(+), 112 deletions(-) diff --git a/config/src/main/java/org/polypheny/db/config/Config.java b/config/src/main/java/org/polypheny/db/config/Config.java index 63dd3f1b62..b33ccfe763 100644 --- a/config/src/main/java/org/polypheny/db/config/Config.java +++ b/config/src/main/java/org/polypheny/db/config/Config.java @@ -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. diff --git a/config/src/main/java/org/polypheny/db/config/Feedback.java b/config/src/main/java/org/polypheny/db/config/Feedback.java index 7b3709820e..f264723bd3 100644 --- a/config/src/main/java/org/polypheny/db/config/Feedback.java +++ b/config/src/main/java/org/polypheny/db/config/Feedback.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/adapter/GraphScanDelegate.java b/core/src/main/java/org/polypheny/db/adapter/GraphScanDelegate.java index ba647dc237..0ca0d577cb 100644 --- a/core/src/main/java/org/polypheny/db/adapter/GraphScanDelegate.java +++ b/core/src/main/java/org/polypheny/db/adapter/GraphScanDelegate.java @@ -49,6 +49,7 @@ public AlgNode getDocumentScan( long allocId, AlgBuilder builder ) { return Scannable.getDocumentScanSubstitute( scannable, allocId, builder ); } + @Override public List createTable( Context context, LogicalTableWrapper logical, AllocationTableWrapper allocation ) { return scannable.createTable( context, logical, allocation ); diff --git a/core/src/main/java/org/polypheny/db/adapter/java/AdapterTemplate.java b/core/src/main/java/org/polypheny/db/adapter/java/AdapterTemplate.java index 840ac8d402..77ea7c8f5d 100644 --- a/core/src/main/java/org/polypheny/db/adapter/java/AdapterTemplate.java +++ b/core/src/main/java/org/polypheny/db/adapter/java/AdapterTemplate.java @@ -47,6 +47,7 @@ public class AdapterTemplate { public long id; public String description; + public AdapterTemplate( long id, Class clazz, String adapterName, List settings, List modes, String description, Function4, Adapter> deployer ) { this.id = id; this.adapterName = adapterName; diff --git a/core/src/main/java/org/polypheny/db/algebra/core/Join.java b/core/src/main/java/org/polypheny/db/algebra/core/Join.java index 175496163d..fe65121e41 100644 --- a/core/src/main/java/org/polypheny/db/algebra/core/Join.java +++ b/core/src/main/java/org/polypheny/db/algebra/core/Join.java @@ -197,7 +197,6 @@ public boolean isSemiJoinDone() { } - @Override public final Join copy( AlgTraitSet traitSet, List inputs ) { assert inputs.size() == 2; @@ -249,4 +248,3 @@ public String algCompareString() { } - diff --git a/core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java b/core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java index e71f8edc1b..08ce211281 100644 --- a/core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java +++ b/core/src/main/java/org/polypheny/db/algebra/enumerable/RexToLixTranslator.java @@ -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; @@ -1046,4 +1046,3 @@ private AlwaysNull() { } } - diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java index e31513a9a4..3d6b1e821e 100644 --- a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java +++ b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelFilter.java @@ -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 ); @@ -122,4 +121,3 @@ public AlgWriter explainTerms( AlgWriter pw ) { } } - diff --git a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java index b51bea8da7..7982b873e7 100644 --- a/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java +++ b/core/src/main/java/org/polypheny/db/algebra/logical/relational/LogicalRelJoin.java @@ -65,7 +65,6 @@ public final class LogicalRelJoin extends Join implements RelAlg { private final boolean semiJoinDone; - /** * Creates a LogicalJoin. * @@ -144,4 +143,3 @@ public boolean isSemiJoinDone() { } - diff --git a/core/src/main/java/org/polypheny/db/algebra/metadata/ReflectiveAlgMetadataProvider.java b/core/src/main/java/org/polypheny/db/algebra/metadata/ReflectiveAlgMetadataProvider.java index d5e702a410..6a4382a5d6 100644 --- a/core/src/main/java/org/polypheny/db/algebra/metadata/ReflectiveAlgMetadataProvider.java +++ b/core/src/main/java/org/polypheny/db/algebra/metadata/ReflectiveAlgMetadataProvider.java @@ -190,6 +190,7 @@ private static AlgMetadataProvider reflectiveSource( final MetadataHandler ta return new ReflectiveAlgMetadataProvider( methodsMap, space.metadataClass0, space.providers ); } + @Override public Multimap> handlers( MetadataDef def ) { final ImmutableMultimap.Builder> builder = ImmutableMultimap.builder(); @@ -229,7 +230,6 @@ public UnboundMetadata apply( Class a } - @SuppressWarnings({ "unchecked" }) public UnboundMetadata apply( Class algClass ) { List> newSources = new ArrayList<>(); @@ -354,4 +354,3 @@ public static Space2 create( MetadataHandler target, ImmutableList me } } - diff --git a/core/src/main/java/org/polypheny/db/algebra/rules/AbstractJoinExtractFilterRule.java b/core/src/main/java/org/polypheny/db/algebra/rules/AbstractJoinExtractFilterRule.java index df32f9ab4b..9ffed0750d 100644 --- a/core/src/main/java/org/polypheny/db/algebra/rules/AbstractJoinExtractFilterRule.java +++ b/core/src/main/java/org/polypheny/db/algebra/rules/AbstractJoinExtractFilterRule.java @@ -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. @@ -93,4 +93,3 @@ public void onMatch( AlgOptRuleCall call ) { } } - diff --git a/core/src/main/java/org/polypheny/db/algebra/type/AlgDataTypeSystemImpl.java b/core/src/main/java/org/polypheny/db/algebra/type/AlgDataTypeSystemImpl.java index 9d197e25d1..7375934354 100644 --- a/core/src/main/java/org/polypheny/db/algebra/type/AlgDataTypeSystemImpl.java +++ b/core/src/main/java/org/polypheny/db/algebra/type/AlgDataTypeSystemImpl.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/catalog/entity/MaterializedCriteria.java b/core/src/main/java/org/polypheny/db/catalog/entity/MaterializedCriteria.java index 63ddfc5240..45df867826 100644 --- a/core/src/main/java/org/polypheny/db/catalog/entity/MaterializedCriteria.java +++ b/core/src/main/java/org/polypheny/db/catalog/entity/MaterializedCriteria.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalIndex.java b/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalIndex.java index 09d67f6c19..5a3d1700e7 100644 --- a/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalIndex.java +++ b/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalIndex.java @@ -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) diff --git a/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalKey.java b/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalKey.java index 1aeef4c588..76775b31f2 100644 --- a/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalKey.java +++ b/core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalKey.java @@ -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 diff --git a/core/src/main/java/org/polypheny/db/functions/CrossModelFunctions.java b/core/src/main/java/org/polypheny/db/functions/CrossModelFunctions.java index 79f6cd9af3..08ec7872c6 100644 --- a/core/src/main/java/org/polypheny/db/functions/CrossModelFunctions.java +++ b/core/src/main/java/org/polypheny/db/functions/CrossModelFunctions.java @@ -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; @@ -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 { diff --git a/core/src/main/java/org/polypheny/db/functions/Functions.java b/core/src/main/java/org/polypheny/db/functions/Functions.java index 5ad551ab7c..21e170f2ed 100644 --- a/core/src/main/java/org/polypheny/db/functions/Functions.java +++ b/core/src/main/java/org/polypheny/db/functions/Functions.java @@ -107,7 +107,6 @@ import org.polypheny.db.type.entity.PolyBoolean; import org.polypheny.db.type.entity.PolyInterval; 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; @@ -116,6 +115,7 @@ 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.relational.PolyMap; import org.polypheny.db.util.BsonUtil; import org.polypheny.db.util.Static; @@ -2829,4 +2829,3 @@ public enum FlatProductInputType { } } - diff --git a/core/src/main/java/org/polypheny/db/functions/TemporalFunctions.java b/core/src/main/java/org/polypheny/db/functions/TemporalFunctions.java index 2f7b431cd5..6115e73038 100644 --- a/core/src/main/java/org/polypheny/db/functions/TemporalFunctions.java +++ b/core/src/main/java/org/polypheny/db/functions/TemporalFunctions.java @@ -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; diff --git a/core/src/main/java/org/polypheny/db/interpreter/AggregateNode.java b/core/src/main/java/org/polypheny/db/interpreter/AggregateNode.java index 7a57950eb6..c26a20f7a7 100644 --- a/core/src/main/java/org/polypheny/db/interpreter/AggregateNode.java +++ b/core/src/main/java/org/polypheny/db/interpreter/AggregateNode.java @@ -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; @@ -816,4 +816,3 @@ public PolyValue end() { } } - diff --git a/core/src/main/java/org/polypheny/db/languages/NodeParseException.java b/core/src/main/java/org/polypheny/db/languages/NodeParseException.java index 3aad0e39c4..8863f1c7d5 100644 --- a/core/src/main/java/org/polypheny/db/languages/NodeParseException.java +++ b/core/src/main/java/org/polypheny/db/languages/NodeParseException.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/processing/Processor.java b/core/src/main/java/org/polypheny/db/processing/Processor.java index 93c84b7c26..8dabc4c4eb 100644 --- a/core/src/main/java/org/polypheny/db/processing/Processor.java +++ b/core/src/main/java/org/polypheny/db/processing/Processor.java @@ -87,4 +87,5 @@ PolyImplementation getImplementation( Statement statement, ExecutableStatement n public abstract AlgDataType getParameterRowType( Node left ); public abstract List splitStatements( String statements ); + } diff --git a/core/src/main/java/org/polypheny/db/rex/RexBuilder.java b/core/src/main/java/org/polypheny/db/rex/RexBuilder.java index 006688393a..154469ecea 100644 --- a/core/src/main/java/org/polypheny/db/rex/RexBuilder.java +++ b/core/src/main/java/org/polypheny/db/rex/RexBuilder.java @@ -1014,7 +1014,6 @@ public RexLiteral makeTimeLiteral( PolyTime time, int precision ) { } - /** * Creates a Timestamp literal. */ @@ -1507,4 +1506,3 @@ public RexCall makeToJson( RexNode node ) { } } - diff --git a/core/src/main/java/org/polypheny/db/schema/document/DocumentUtil.java b/core/src/main/java/org/polypheny/db/schema/document/DocumentUtil.java index fb352ebe92..a847f1f1ba 100644 --- a/core/src/main/java/org/polypheny/db/schema/document/DocumentUtil.java +++ b/core/src/main/java/org/polypheny/db/schema/document/DocumentUtil.java @@ -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; diff --git a/core/src/main/java/org/polypheny/db/tools/AlgBuilder.java b/core/src/main/java/org/polypheny/db/tools/AlgBuilder.java index 5d547d8447..c17b21c71a 100644 --- a/core/src/main/java/org/polypheny/db/tools/AlgBuilder.java +++ b/core/src/main/java/org/polypheny/db/tools/AlgBuilder.java @@ -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() ); diff --git a/core/src/main/java/org/polypheny/db/type/IntervalPolyType.java b/core/src/main/java/org/polypheny/db/type/IntervalPolyType.java index c99fb0a1a9..e1759a09f6 100644 --- a/core/src/main/java/org/polypheny/db/type/IntervalPolyType.java +++ b/core/src/main/java/org/polypheny/db/type/IntervalPolyType.java @@ -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. @@ -173,4 +173,3 @@ public int getScale() { } } - diff --git a/core/src/main/java/org/polypheny/db/type/JavaToPolyTypeConversionRules.java b/core/src/main/java/org/polypheny/db/type/JavaToPolyTypeConversionRules.java index f7c3d15b3b..a2e1f1bd0d 100644 --- a/core/src/main/java/org/polypheny/db/type/JavaToPolyTypeConversionRules.java +++ b/core/src/main/java/org/polypheny/db/type/JavaToPolyTypeConversionRules.java @@ -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; @@ -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; @@ -152,4 +152,3 @@ private interface ColumnList extends List { } } - diff --git a/core/src/main/java/org/polypheny/db/type/PolyIntervalQualifier.java b/core/src/main/java/org/polypheny/db/type/PolyIntervalQualifier.java index 0fe32f22fb..5ee4b0e1df 100644 --- a/core/src/main/java/org/polypheny/db/type/PolyIntervalQualifier.java +++ b/core/src/main/java/org/polypheny/db/type/PolyIntervalQualifier.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/type/PolyTypeExplicitPrecedenceList.java b/core/src/main/java/org/polypheny/db/type/PolyTypeExplicitPrecedenceList.java index d5b051b1d8..9ef2b144bb 100644 --- a/core/src/main/java/org/polypheny/db/type/PolyTypeExplicitPrecedenceList.java +++ b/core/src/main/java/org/polypheny/db/type/PolyTypeExplicitPrecedenceList.java @@ -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. @@ -167,4 +167,3 @@ static AlgDataTypePrecedenceList getListForType( AlgDataType type ) { } } - diff --git a/core/src/main/java/org/polypheny/db/type/checker/CompositeOperandTypeChecker.java b/core/src/main/java/org/polypheny/db/type/checker/CompositeOperandTypeChecker.java index 043e9bef57..d6da253945 100644 --- a/core/src/main/java/org/polypheny/db/type/checker/CompositeOperandTypeChecker.java +++ b/core/src/main/java/org/polypheny/db/type/checker/CompositeOperandTypeChecker.java @@ -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. diff --git a/core/src/main/java/org/polypheny/db/type/checker/CompositeSingleOperandTypeChecker.java b/core/src/main/java/org/polypheny/db/type/checker/CompositeSingleOperandTypeChecker.java index edc33af857..d7dea505fa 100644 --- a/core/src/main/java/org/polypheny/db/type/checker/CompositeSingleOperandTypeChecker.java +++ b/core/src/main/java/org/polypheny/db/type/checker/CompositeSingleOperandTypeChecker.java @@ -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. @@ -88,4 +88,3 @@ public boolean checkSingleOperandType( CallBinding callBinding, Node node, int i } } - diff --git a/core/src/main/java/org/polypheny/db/type/entity/PolyInterval.java b/core/src/main/java/org/polypheny/db/type/entity/PolyInterval.java index 92a93bda61..534f9261db 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/PolyInterval.java +++ b/core/src/main/java/org/polypheny/db/type/entity/PolyInterval.java @@ -40,7 +40,6 @@ @NonFinal public class PolyInterval extends PolyValue { - @NotNull public Long millis; @@ -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" ); - } - } diff --git a/core/src/main/java/org/polypheny/db/type/entity/PolyList.java b/core/src/main/java/org/polypheny/db/type/entity/PolyList.java index a89cd27c5e..8cd9d9e67d 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/PolyList.java +++ b/core/src/main/java/org/polypheny/db/type/entity/PolyList.java @@ -92,6 +92,7 @@ public PolyList( @JsonProperty("value") @Deserialize("value") List value ) { this.value = new ArrayList<>( value ); } + public static PolyList copyOf( List value ) { return new PolyList<>( value ); } @@ -106,6 +107,7 @@ public static PolyList copyOf( Iterator iterator ) { return copyOf( Lists.newArrayList( iterator ) ); } + @SafeVarargs public PolyList( E... value ) { this( Arrays.asList( value ) ); @@ -123,6 +125,7 @@ public PolyList( E... value ) { } } + public static PolyList convert( @Nullable Object object ) { if ( object == null ) { return null; diff --git a/core/src/main/java/org/polypheny/db/type/entity/category/PolyTemporal.java b/core/src/main/java/org/polypheny/db/type/entity/category/PolyTemporal.java index c653b04b16..19196675f2 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/category/PolyTemporal.java +++ b/core/src/main/java/org/polypheny/db/type/entity/category/PolyTemporal.java @@ -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 { diff --git a/core/src/main/java/org/polypheny/db/type/entity/graph/PolyEdge.java b/core/src/main/java/org/polypheny/db/type/entity/graph/PolyEdge.java index 98da14eec7..b38579fad0 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/graph/PolyEdge.java +++ b/core/src/main/java/org/polypheny/db/type/entity/graph/PolyEdge.java @@ -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; diff --git a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyDouble.java b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyDouble.java index 0d934365e6..a4d3c151f9 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyDouble.java +++ b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyDouble.java @@ -29,7 +29,6 @@ import io.activej.serializer.def.SimpleSerializerDef; import java.math.BigDecimal; import java.util.Objects; -import lombok.EqualsAndHashCode; import lombok.Value; import org.apache.calcite.linq4j.tree.Expression; import org.apache.calcite.linq4j.tree.Expressions; @@ -88,6 +87,7 @@ public int compareTo( @NotNull PolyValue o ) { return ObjectUtils.compare( value, o.asNumber().DoubleValue() ); } + @Override public int hashCode() { return Objects.hash( super.hashCode(), value ); diff --git a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyFloat.java b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyFloat.java index c040a99f16..d6676ae054 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyFloat.java +++ b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyFloat.java @@ -29,7 +29,6 @@ import io.activej.serializer.def.SimpleSerializerDef; import java.math.BigDecimal; import java.util.Objects; -import lombok.EqualsAndHashCode; import lombok.Value; import org.apache.calcite.linq4j.tree.Expression; import org.apache.calcite.linq4j.tree.Expressions; @@ -106,6 +105,7 @@ public int compareTo( @NotNull PolyValue o ) { return ObjectUtils.compare( value, o.asFloat().value ); } + @Override public int hashCode() { return Objects.hash( super.hashCode(), value ); diff --git a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyInteger.java b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyInteger.java index fdd89b4a9a..93315440d4 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyInteger.java +++ b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyInteger.java @@ -113,11 +113,13 @@ public static PolyInteger ofNullable( Number value ) { return value == null ? null : of( value ); } + @Override public int hashCode() { return Objects.hash( super.hashCode(), value ); } + @Override public Expression asExpression() { return Expressions.new_( PolyInteger.class, Expressions.constant( value ) ); diff --git a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyLong.java b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyLong.java index 4737a26cc1..a3a26a41ca 100644 --- a/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyLong.java +++ b/core/src/main/java/org/polypheny/db/type/entity/numerical/PolyLong.java @@ -63,7 +63,6 @@ public PolyLong( @JsonProperty("value") @Deserialize("value") @Nullable Long val } - public static PolyLong of( long value ) { return new PolyLong( value ); } @@ -98,6 +97,7 @@ public int compareTo( @NotNull PolyValue o ) { return ObjectUtils.compare( value, o.asNumber().LongValue() ); } + @Override public int hashCode() { return Objects.hash( super.hashCode(), value ); diff --git a/core/src/main/java/org/polypheny/db/util/BsonUtil.java b/core/src/main/java/org/polypheny/db/util/BsonUtil.java index 7b843f2676..11743dc983 100644 --- a/core/src/main/java/org/polypheny/db/util/BsonUtil.java +++ b/core/src/main/java/org/polypheny/db/util/BsonUtil.java @@ -67,7 +67,6 @@ import org.polypheny.db.type.PolyType; 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.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; @@ -75,6 +74,7 @@ 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; public class BsonUtil { @@ -326,7 +326,6 @@ private static BsonValue handleInterval( PolyValue obj ) { } - private static BsonValue handleDecimal( PolyValue obj ) { return new BsonDecimal128( new Decimal128( obj.asNumber().BigDecimalValue() ) ); } diff --git a/core/src/test/java/org/polypheny/db/rex/RexBuilderTest.java b/core/src/test/java/org/polypheny/db/rex/RexBuilderTest.java index 0edf8b7229..d82882e2c8 100644 --- a/core/src/test/java/org/polypheny/db/rex/RexBuilderTest.java +++ b/core/src/test/java/org/polypheny/db/rex/RexBuilderTest.java @@ -198,7 +198,6 @@ private void checkTimestamp( RexNode node ) { } - /** * Tests {@link RexBuilder#makeTimeLiteral(TimeString, int)}. */ diff --git a/dbms/src/test/java/org/polypheny/db/polyvalue/PolyValueSerializationTest.java b/dbms/src/test/java/org/polypheny/db/polyvalue/PolyValueSerializationTest.java index f509cdd54d..b7be865e89 100644 --- a/dbms/src/test/java/org/polypheny/db/polyvalue/PolyValueSerializationTest.java +++ b/dbms/src/test/java/org/polypheny/db/polyvalue/PolyValueSerializationTest.java @@ -26,7 +26,6 @@ import org.polypheny.db.TestHelper; import org.polypheny.db.type.PolySerializable; 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; @@ -38,6 +37,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; @DisplayName("Binary/Typed-json Serialization") diff --git a/plugins/avatica-interface/src/main/java/org/polypheny/db/avatica/DbmsMeta.java b/plugins/avatica-interface/src/main/java/org/polypheny/db/avatica/DbmsMeta.java index 2c7f0a639e..63e07011f0 100644 --- a/plugins/avatica-interface/src/main/java/org/polypheny/db/avatica/DbmsMeta.java +++ b/plugins/avatica-interface/src/main/java/org/polypheny/db/avatica/DbmsMeta.java @@ -117,7 +117,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.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; @@ -125,6 +124,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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; @@ -1811,4 +1811,4 @@ public void remove() { } -} \ No newline at end of file +} diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailBatchInsertEnumerable.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailBatchInsertEnumerable.java index f2f6c7dbf3..76915a74e3 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailBatchInsertEnumerable.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailBatchInsertEnumerable.java @@ -20,8 +20,8 @@ import org.apache.calcite.linq4j.AbstractEnumerable; import org.apache.calcite.linq4j.Enumerator; import org.polypheny.db.adapter.cottontail.CottontailWrapper; -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.vitrivr.cottontail.grpc.CottontailGrpc.BatchInsertMessage; diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailDeleteEnumerable.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailDeleteEnumerable.java index 66c0b64277..64ac74c160 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailDeleteEnumerable.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailDeleteEnumerable.java @@ -30,8 +30,8 @@ import org.polypheny.db.adapter.cottontail.CottontailEntity; import org.polypheny.db.adapter.cottontail.CottontailWrapper; import org.polypheny.db.adapter.cottontail.util.CottontailTypeUtil; -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.vitrivr.cottontail.grpc.CottontailGrpc.DeleteMessage; import org.vitrivr.cottontail.grpc.CottontailGrpc.Metadata; import org.vitrivr.cottontail.grpc.CottontailGrpc.Where; diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailInsertEnumerable.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailInsertEnumerable.java index 126a7b668c..00bc0831f2 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailInsertEnumerable.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailInsertEnumerable.java @@ -19,8 +19,8 @@ import org.apache.calcite.linq4j.AbstractEnumerable; import org.apache.calcite.linq4j.Enumerator; import org.polypheny.db.adapter.cottontail.CottontailWrapper; -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.vitrivr.cottontail.grpc.CottontailGrpc.InsertMessage; diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailQueryEnumerable.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailQueryEnumerable.java index ba9b0e49b3..0fbc0b4808 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailQueryEnumerable.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailQueryEnumerable.java @@ -29,13 +29,13 @@ import org.polypheny.db.sql.language.fun.SqlArrayValueConstructor; import org.polypheny.db.type.ArrayType; import org.polypheny.db.type.entity.PolyBoolean; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; 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.vitrivr.cottontail.client.iterators.Tuple; import org.vitrivr.cottontail.client.iterators.TupleIterator; diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailUpdateEnumerable.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailUpdateEnumerable.java index 4bd190e8c5..0d7ed18886 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailUpdateEnumerable.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/enumberable/CottontailUpdateEnumerable.java @@ -21,8 +21,8 @@ import org.apache.calcite.linq4j.AbstractEnumerable; import org.apache.calcite.linq4j.Enumerator; import org.polypheny.db.adapter.cottontail.CottontailWrapper; -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.vitrivr.cottontail.grpc.CottontailGrpc.UpdateMessage; diff --git a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/util/Linq4JFixer.java b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/util/Linq4JFixer.java index 8ed4e20451..1ffd0530c4 100644 --- a/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/util/Linq4JFixer.java +++ b/plugins/cottontail-adapter/src/main/java/org/polypheny/db/adapter/cottontail/util/Linq4JFixer.java @@ -24,13 +24,13 @@ 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.PolyValue; import org.polypheny.db.type.entity.numerical.PolyBigDecimal; 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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; @@ -154,6 +154,7 @@ public static PolyDouble getDoubleData( Object data ) { return PolyDouble.of( (Double) data ); } + /** * Converts the given object and returns it as {@link Integer} object. * @@ -218,7 +219,6 @@ public static PolyBoolean getBoolData( Object data ) { } - public static PolyList getBoolVector( Object data ) { if ( data == null ) { return null; diff --git a/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvEnumerator.java b/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvEnumerator.java index 3ab4f79b00..cbcee9cf14 100644 --- a/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvEnumerator.java +++ b/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvEnumerator.java @@ -51,13 +51,13 @@ import org.polypheny.db.catalog.exceptions.GenericRuntimeException; import org.polypheny.db.type.PolyType; import org.polypheny.db.type.entity.PolyBoolean; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; 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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvFieldType.java b/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvFieldType.java index 970126384d..f7750fc2f2 100644 --- a/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvFieldType.java +++ b/plugins/csv-adapter/src/main/java/org/polypheny/db/adapter/csv/CsvFieldType.java @@ -43,12 +43,12 @@ import org.polypheny.db.type.PolyType; import org.polypheny.db.type.entity.PolyBinary; 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.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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumEnumerator.java b/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumEnumerator.java index 544f60091d..e5d44492e4 100644 --- a/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumEnumerator.java +++ b/plugins/ethereum-adapter/src/main/java/org/polypheny/db/adapter/ethereum/EthereumEnumerator.java @@ -29,13 +29,13 @@ import org.apache.commons.lang3.time.FastDateFormat; import org.polypheny.db.catalog.exceptions.GenericRuntimeException; import org.polypheny.db.type.entity.PolyBoolean; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; 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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; diff --git a/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelEnumerator.java b/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelEnumerator.java index 976d578eec..4567797a8b 100644 --- a/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelEnumerator.java +++ b/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelEnumerator.java @@ -42,13 +42,13 @@ import org.polypheny.db.catalog.exceptions.GenericRuntimeException; import org.polypheny.db.type.PolyType; import org.polypheny.db.type.entity.PolyBoolean; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; 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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelFieldType.java b/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelFieldType.java index f0e8723997..d2f111bb65 100644 --- a/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelFieldType.java +++ b/plugins/excel-adapter/src/main/java/org/polypheny/db/adapter/excel/ExcelFieldType.java @@ -26,12 +26,12 @@ import org.polypheny.db.type.PolyType; import org.polypheny.db.type.entity.PolyBinary; 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.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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/Condition.java b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/Condition.java index 3402c2b0c7..050c333aa0 100644 --- a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/Condition.java +++ b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/Condition.java @@ -37,8 +37,8 @@ import org.polypheny.db.rex.RexIndexRef; import org.polypheny.db.rex.RexLiteral; import org.polypheny.db.rex.RexNode; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyValue; +import org.polypheny.db.type.entity.numerical.PolyLong; public class Condition { diff --git a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileEnumerator.java b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileEnumerator.java index 9ccd886ad5..1c03e4480e 100644 --- a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileEnumerator.java +++ b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileEnumerator.java @@ -49,10 +49,10 @@ import org.polypheny.db.transaction.Transaction.MultimediaFlavor; import org.polypheny.db.type.PolyTypeFamily; import org.polypheny.db.type.PolyTypeUtil; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyValue; import org.polypheny.db.type.entity.category.PolyBlob; +import org.polypheny.db.type.entity.numerical.PolyLong; @Slf4j diff --git a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileModifier.java b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileModifier.java index e6a613013e..2c1e41a603 100644 --- a/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileModifier.java +++ b/plugins/file-adapter/src/main/java/org/polypheny/db/adapter/file/FileModifier.java @@ -24,9 +24,9 @@ import org.polypheny.db.adapter.DataContext; import org.polypheny.db.adapter.file.FileAlg.FileImplementor.Operation; import org.polypheny.db.catalog.exceptions.GenericRuntimeException; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyValue; +import org.polypheny.db.type.entity.numerical.PolyLong; public class FileModifier extends FileEnumerator { diff --git a/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java b/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java index 567070d06e..32ac8c962e 100644 --- a/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java +++ b/plugins/inmemory-monitoring/src/main/java/org/polypheny/db/monitoring/InMemoryRepository.java @@ -206,7 +206,6 @@ protected void initialize( String filePath, String folderName, boolean resetRepo synchronized ( this ) { File folder = PolyphenyHomeDirManager.getInstance().registerNewFolder( folderName ); - // Assume that file is locked long secondsToWait = 30; diff --git a/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java index 1d951bdad7..e11a56432c 100644 --- a/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java +++ b/plugins/inmemory-monitoring/src/test/java/org/polypheny/db/monitoring/core/MonitoringQueueImplTest.java @@ -40,6 +40,7 @@ public static void setUp() { TestHelper.getInstance(); } + @Test public void ctorValidParametersInstanceNotNull() { // arrange diff --git a/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcToEnumerableConverter.java b/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcToEnumerableConverter.java index b1674523c2..e171312dc9 100644 --- a/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcToEnumerableConverter.java +++ b/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/JdbcToEnumerableConverter.java @@ -89,7 +89,6 @@ import org.polypheny.db.type.entity.PolyBoolean; import org.polypheny.db.type.entity.PolyDefaults; 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.PolyBlob; @@ -97,6 +96,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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/ResultSetEnumerable.java b/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/ResultSetEnumerable.java index 2109206dca..45995eb139 100644 --- a/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/ResultSetEnumerable.java +++ b/plugins/jdbc-adapter-framework/src/main/java/org/polypheny/db/adapter/jdbc/ResultSetEnumerable.java @@ -63,8 +63,8 @@ import org.polypheny.db.algebra.type.AlgDataType; import org.polypheny.db.catalog.exceptions.GenericRuntimeException; import org.polypheny.db.type.PolyType; -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.type.entity.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTimestamp; import org.polypheny.db.util.Static; @@ -545,4 +545,3 @@ public interface PreparedStatementEnricher { } } - diff --git a/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEntity.java b/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEntity.java index d4da486202..93db7605b3 100644 --- a/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEntity.java +++ b/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEntity.java @@ -101,8 +101,8 @@ import org.polypheny.db.schema.types.QueryableEntity; import org.polypheny.db.schema.types.TranslatableEntity; import org.polypheny.db.transaction.PolyXid; -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.BsonUtil; import org.polypheny.db.util.Util; diff --git a/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEnumerator.java b/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEnumerator.java index 16ae76f0e2..734d7e8c04 100644 --- a/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEnumerator.java +++ b/plugins/mongodb-adapter/src/main/java/org/polypheny/db/adapter/mongodb/MongoEnumerator.java @@ -54,7 +54,6 @@ import org.polypheny.db.type.entity.PolyBoolean; import org.polypheny.db.type.entity.PolyInterval; import org.polypheny.db.type.entity.PolyList; -import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; @@ -62,6 +61,7 @@ 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.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; @@ -131,7 +131,6 @@ static Function1 mapGetter() { } - /** * */ @@ -240,4 +239,3 @@ private static PolyValue convert( BsonValue value, BsonType bsonType ) { } - diff --git a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlCollectionStatement.java b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlCollectionStatement.java index 963cc4103e..863999d54b 100644 --- a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlCollectionStatement.java +++ b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlCollectionStatement.java @@ -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. diff --git a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlDeletePlacement.java b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlDeletePlacement.java index 825a959af8..0ec27dd0ef 100644 --- a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlDeletePlacement.java +++ b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlDeletePlacement.java @@ -50,7 +50,7 @@ public void execute( Context context, Statement statement, ParsedQueryContext pa List> dataStores = stores .stream() - .map( store -> adapterManager.getStore( store ).orElseThrow() ) + .map( store -> adapterManager.getStore( store ).orElseThrow() ) .collect( Collectors.toList() ); if ( statement.getTransaction().getSnapshot().alloc().getFromLogical( collection.id ).stream().noneMatch( p -> dataStores.stream().map( Adapter::getAdapterId ).toList().contains( p.adapterId ) ) ) { diff --git a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlFindOneAndDelete.java b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlFindOneAndDelete.java index d5358a7384..95d12f3e13 100644 --- a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlFindOneAndDelete.java +++ b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlFindOneAndDelete.java @@ -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. diff --git a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlShowDatabase.java b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlShowDatabase.java index 59bd1e7172..8196dd48c6 100644 --- a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlShowDatabase.java +++ b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/MqlShowDatabase.java @@ -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. diff --git a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/parser/MqlParser.java b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/parser/MqlParser.java index cd567e0010..61e80328fb 100644 --- a/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/parser/MqlParser.java +++ b/plugins/mql-language/src/main/java/org/polypheny/db/languages/mql/parser/MqlParser.java @@ -73,8 +73,6 @@ public static MqlParser create( Reader reader, MqlParserConfig mqlParserConfig ) } - - /** * Parses a SELECT statement. * @@ -170,4 +168,3 @@ private ConfigImpl( ParserFactory parserFactory ) { } } - diff --git a/plugins/rest-interface/src/main/java/org/polypheny/db/restapi/RequestParser.java b/plugins/rest-interface/src/main/java/org/polypheny/db/restapi/RequestParser.java index ebe9a76278..7788f02cc8 100644 --- a/plugins/rest-interface/src/main/java/org/polypheny/db/restapi/RequestParser.java +++ b/plugins/rest-interface/src/main/java/org/polypheny/db/restapi/RequestParser.java @@ -60,11 +60,11 @@ import org.polypheny.db.type.PolyType; import org.polypheny.db.type.PolyTypeFamily; 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.PolyBigDecimal; import org.polypheny.db.type.entity.numerical.PolyDouble; +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; diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlIntervalQualifier.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlIntervalQualifier.java index 51597dd2ef..b83d87a357 100644 --- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlIntervalQualifier.java +++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlIntervalQualifier.java @@ -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. @@ -1297,4 +1297,3 @@ public static String intervalString( PolyInterval value, IntervalQualifier inter } } - diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlJdbcDataTypeName.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlJdbcDataTypeName.java index f26b599180..e5a13d9b61 100644 --- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlJdbcDataTypeName.java +++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/SqlJdbcDataTypeName.java @@ -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. @@ -105,4 +105,3 @@ public SqlNode createDataType( ParserPos pos ) { } } } - diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/fun/SqlDatePartFunction.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/fun/SqlDatePartFunction.java index b7fef9e3cc..19afd80d59 100644 --- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/fun/SqlDatePartFunction.java +++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/language/fun/SqlDatePartFunction.java @@ -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. @@ -88,4 +88,3 @@ public boolean checkOperandTypes( SqlCallBinding callBinding, boolean throwOnFai } } - diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/SqlToAlgConverter.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/SqlToAlgConverter.java index 086ab9f3fd..2bb335e194 100644 --- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/SqlToAlgConverter.java +++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/SqlToAlgConverter.java @@ -290,7 +290,6 @@ public class SqlToAlgConverter implements NodeToAlgConverter { /** * Mapping of non-correlated sub-queries that have been converted to their equivalent constants. Used to avoid * re-evaluating the sub-query if it's already been evaluated. - */ @Getter private final Map mapConvertedNonCorrSubqs = new HashMap<>(); @@ -4931,4 +4930,3 @@ private record CorrelationUse(CorrelationId id, ImmutableBitSet requiredColumns, } - diff --git a/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/StandardConvertletTable.java b/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/StandardConvertletTable.java index 37f187d627..240ee186b0 100644 --- a/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/StandardConvertletTable.java +++ b/plugins/sql-language/src/main/java/org/polypheny/db/sql/sql2alg/StandardConvertletTable.java @@ -1399,7 +1399,6 @@ private RexNode toInterval( RexBuilder rexBuilder, RexNode interval2Add, SqlInte } - } @@ -1457,4 +1456,3 @@ public RexNode convertCall( SqlRexContext cx, SqlCall call ) { } } - diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/DateRangeRulesTest.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/DateRangeRulesTest.java index ec6df7c2d0..f049902487 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/DateRangeRulesTest.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/DateRangeRulesTest.java @@ -49,6 +49,7 @@ public static void setUp() { TestHelper.getInstance(); } + @Test public void testExtractYearFromDateColumn() { final Fixture2 f = new Fixture2(); @@ -765,4 +766,3 @@ private static class Fixture2 extends TestFixture { } } - diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/RexExecutorTest.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/RexExecutorTest.java index f931e584d0..c4e5a4dd41 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/RexExecutorTest.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/RexExecutorTest.java @@ -60,9 +60,9 @@ import org.polypheny.db.type.PolyType; import org.polypheny.db.type.checker.OperandTypes; 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.PolyLong; import org.polypheny.db.type.inference.InferTypes; import org.polypheny.db.type.inference.ReturnTypes; import org.polypheny.db.util.DateString; @@ -399,4 +399,3 @@ public void setParameterTypes( Map types ) { } } - diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/TestFixture.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/TestFixture.java index ebe07529bd..a2bd171b52 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/TestFixture.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/TestFixture.java @@ -39,11 +39,11 @@ import org.polypheny.db.rex.RexSimplify; import org.polypheny.db.type.entity.PolyBinary; 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.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.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/FunctionsTest.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/FunctionsTest.java index f64288cdfc..dace90175e 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/FunctionsTest.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/FunctionsTest.java @@ -52,11 +52,11 @@ import org.polypheny.db.runtime.PolyphenyDbException; import org.polypheny.db.runtime.Utilities; 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.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; @@ -834,4 +834,3 @@ public void testMultiset() { } } - diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/parser/SqlParserTest.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/parser/SqlParserTest.java index 8d07bd6515..2b5d4b07da 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/parser/SqlParserTest.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/parser/SqlParserTest.java @@ -6268,7 +6268,6 @@ public void testUnparseableIntervalQualifiers() { } - @Test public void testIntervalOperators() { checkExp( "interval '1' day + interval '1' day", "(INTERVAL '1' DAY + INTERVAL '1' DAY)" ); diff --git a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/test/SqlOperatorBaseTest.java b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/test/SqlOperatorBaseTest.java index 8f2b4731b2..8975db826a 100644 --- a/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/test/SqlOperatorBaseTest.java +++ b/plugins/sql-language/src/test/java/org/polypheny/db/sql/language/test/SqlOperatorBaseTest.java @@ -260,12 +260,6 @@ public void setUp() throws Exception { tester.setFor( null ); } - - - - - - //--- Tests ----------------------------------------------------------- @@ -4448,8 +4442,6 @@ public void testLogFunc() { } - - @Test public void testRandSeedFunc() { tester.setFor( OperatorRegistry.get( OperatorName.RAND ) ); @@ -7992,4 +7984,3 @@ private String sub( String s ) { } } - diff --git a/webui/src/main/java/org/polypheny/db/webui/models/TableConstraint.java b/webui/src/main/java/org/polypheny/db/webui/models/TableConstraint.java index b14f380e8d..0189807872 100644 --- a/webui/src/main/java/org/polypheny/db/webui/models/TableConstraint.java +++ b/webui/src/main/java/org/polypheny/db/webui/models/TableConstraint.java @@ -59,4 +59,5 @@ public String[] asRow() { } return new String[]{ this.name, this.type, joiner.toString() }; } + } diff --git a/webui/src/main/java/org/polypheny/db/webui/models/UIAlgNode.java b/webui/src/main/java/org/polypheny/db/webui/models/UIAlgNode.java index c777647438..1e831b51cd 100644 --- a/webui/src/main/java/org/polypheny/db/webui/models/UIAlgNode.java +++ b/webui/src/main/java/org/polypheny/db/webui/models/UIAlgNode.java @@ -60,7 +60,6 @@ public class UIAlgNode { public int inputCount; - //join @JsonProperty public JoinAlgType join; diff --git a/webui/src/main/java/org/polypheny/db/webui/models/requests/ConstraintRequest.java b/webui/src/main/java/org/polypheny/db/webui/models/requests/ConstraintRequest.java index 2eca263d9e..612eb3061f 100644 --- a/webui/src/main/java/org/polypheny/db/webui/models/requests/ConstraintRequest.java +++ b/webui/src/main/java/org/polypheny/db/webui/models/requests/ConstraintRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 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. @@ -24,4 +24,5 @@ public class ConstraintRequest { public long entityId; public TableConstraint constraint; + } diff --git a/webui/src/main/java/org/polypheny/db/webui/models/results/GraphResult.java b/webui/src/main/java/org/polypheny/db/webui/models/results/GraphResult.java index 69665a172c..5252532eaa 100644 --- a/webui/src/main/java/org/polypheny/db/webui/models/results/GraphResult.java +++ b/webui/src/main/java/org/polypheny/db/webui/models/results/GraphResult.java @@ -61,6 +61,7 @@ public GraphResult( affectedTuples ); } + public static abstract class GraphResultBuilder> extends ResultBuilder { }