summaryrefslogtreecommitdiffstats
path: root/predicate-search-core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-10-02 13:30:44 +0200
committerJon Bratseth <bratseth@oath.com>2018-10-02 13:30:44 +0200
commit103aa3f74fe485ebd56fc66c19dd13ad53a8309d (patch)
tree9093d41f6de9fb173e4a2775405f276838f84987 /predicate-search-core
parentb234a0daf5076d4ece4b373240883073d2b932ee (diff)
Non-functional changes only
Diffstat (limited to 'predicate-search-core')
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java2
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java1
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java1
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java5
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java1
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java1
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java3
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java2
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java1
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java2
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java2
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java3
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java3
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java6
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java2
-rw-r--r--predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java3
16 files changed, 27 insertions, 11 deletions
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java
index 8a7059c9226..8e5fdfe379f 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureConjunction.java
@@ -13,6 +13,7 @@ import java.util.List;
* @author bjorncs
*/
public class FeatureConjunction extends PredicateOperator {
+
private final List<Predicate> operands;
public FeatureConjunction(List<Predicate> operands) {
@@ -100,5 +101,4 @@ public class FeatureConjunction extends PredicateOperator {
return true;
}
-
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
index e6cf22c1d6b..e1a2d931ffd 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
@@ -187,4 +187,5 @@ public class FeatureRange extends PredicateValue {
}
return new FeatureRange(key, fromInclusive, toInclusive);
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java
index 525e9b417e1..b82cf46f2ec 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureSet.java
@@ -116,4 +116,5 @@ public class FeatureSet extends PredicateValue {
}
out.append("]");
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java
index b17abf6365e..d096c3e68c1 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateHash.java
@@ -1,13 +1,13 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.document.predicate;
-
import com.yahoo.text.Utf8;
/**
- * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
* This hash function must match the corresponding C++ hash function in 'ConvertClass',
* currently located at 'rise_platform/src/interface/cpp/api/ConvertClass.h'
+ *
+ * @author Magnar Nedland
*/
public class PredicateHash {
@SuppressWarnings("fallthrough")
@@ -108,4 +108,5 @@ public class PredicateHash {
return c;
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java
index 032b7422ac8..791324b1df4 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/PredicateOperator.java
@@ -9,4 +9,5 @@ import java.util.List;
abstract public class PredicateOperator extends Predicate {
public abstract List<Predicate> getOperands();
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java
index 55fb64376b0..7ff681e4aad 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/Predicates.java
@@ -66,4 +66,5 @@ public class Predicates {
return new Negation(new FeatureSet(key, values));
}
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java
index cae074f5397..19d74b8cc89 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangeEdgePartition.java
@@ -2,9 +2,10 @@
package com.yahoo.document.predicate;
/**
- * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
+ * @author Magnar Nedland
*/
public class RangeEdgePartition extends RangePartition {
+
private final long value;
private final int lowerBound;
private final int upperBound;
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java
index f5388fd1271..026ebfd7fbe 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/RangePartition.java
@@ -2,7 +2,7 @@
package com.yahoo.document.predicate;
/**
- * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a>
+ * @author Magnar Nedland
*/
public class RangePartition extends PredicateValue {
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java
index ed2ac725095..3f69cae13f5 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/SimplePredicates.java
@@ -66,5 +66,6 @@ public class SimplePredicates {
}
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
index 3dcaee1dec7..be871031101 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
* @author bjorncs
*/
public class PredicateQueryParser {
+
private final JsonFactory factory = new JsonFactory();
@FunctionalInterface
@@ -129,4 +130,5 @@ public class PredicateQueryParser {
private interface ValueParser<V> {
V parse(JsonParser parser) throws IOException;
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java
index 0d06ac2c073..bcb5ce1ba05 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/AndOrSimplifier.java
@@ -14,7 +14,7 @@ import java.util.List;
* - Combining child-AND/OR nodes with direct parents of the same type
* - Pushing negations down to leaf nodes by using De Morgan's law.
*
- * @author magnarn
+ * @author Magnar Nedland
* @author bjorncs
*/
public class AndOrSimplifier implements PredicateProcessor {
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java
index 4167dd0fa4a..e209aa725c1 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/BooleanSimplifier.java
@@ -16,7 +16,7 @@ import java.util.List;
* E.g. if an AND node has a FALSE child, the entire node is replaced by FALSE.
* Replaces single-child AND/OR-nodes with the child.
*
- * @author magnarn
+ * @author Magnar Nedland
* @author bjorncs
*/
public class BooleanSimplifier implements PredicateProcessor {
@@ -90,4 +90,5 @@ public class BooleanSimplifier implements PredicateProcessor {
public Predicate process(Predicate predicate, PredicateOptions options) {
return simplifySubTree(predicate);
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java
index f67bd9ab5dd..98021c71ae8 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/ComplexNodeTransformer.java
@@ -15,7 +15,7 @@ import static java.lang.Math.abs;
* partitions and edge partitions.
* This is required to be able to store a range in the PredicateIndex.
*
- * @author magnarn
+ * @author Magnar Nedland
* @author bjorncs
*/
public class ComplexNodeTransformer implements PredicateProcessor {
@@ -156,4 +156,5 @@ public class ComplexNodeTransformer implements PredicateProcessor {
return to;
}
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java
index c0f147c339e..5b4301d4b72 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/NotNodeReorderer.java
@@ -13,12 +13,13 @@ import java.util.List;
* Reorders not nodes to improve the efficiency of the z-star posting list compression.
* It puts negative children first in AND-nodes, and last in OR-nodes.
*
- * @author magnarn
+ * @author Magnar Nedland
* @author bjorncs
*/
public class NotNodeReorderer implements PredicateProcessor {
+
/**
- * @return true if the predicate ends in a negation.
+ * Returns true if the predicate ends in a negation.
*/
public boolean processSubTree(Predicate predicate) {
if (predicate == null) {
@@ -64,4 +65,5 @@ public class NotNodeReorderer implements PredicateProcessor {
processSubTree(predicate);
return predicate;
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java
index 84af44b37af..23458dfca56 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java
@@ -17,6 +17,7 @@ import static java.util.stream.Collectors.toList;
/**
* Simplifies Disjunction nodes where all children are of type FeatureSet. All FeatureSet that share the same key
* are merged into a single FeatureSet. The Disjunction is removed if all children merges into a single feature set.
+ *
* @author bjorncs
*/
public class OrSimplifier implements PredicateProcessor {
@@ -68,4 +69,5 @@ public class OrSimplifier implements PredicateProcessor {
return new Disjunction(newChildren);
}
}
+
}
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java
index 5f657dcfe99..a270b1f5122 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/PredicateOptions.java
@@ -8,10 +8,11 @@ import java.util.OptionalLong;
* The adjusted bounds are extended to the nearest power of the arity (-1)
* and are used to generate more efficient indexes.
*
- * @author magnarn
+ * @author Magnar Nedland
* @author bjorncs
*/
public class PredicateOptions {
+
public static final long DEFAULT_LOWER_BOUND = 0x8000000000000000L;
public static final long DEFAULT_UPPER_BOUND = 0x7fffffffffffffffL;