svn commit: r1761003 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Fri Sep 16 07:01:22 2016
New Revision: 1761003
URL: http://svn.apache.org/viewvc?rev=1761003=rev
Log:
OAK-4806 - Remove usage of Tree in LuceneIndexEditor
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1761003=1761002=1761003=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Fri Sep 16 07:01:22 2016
@@ -568,7 +568,7 @@ public final class IndexDefinition imple
* @return the indexing rule or null if none applies.
*/
@CheckForNull
-public IndexingRule getApplicableIndexingRule(Tree state) {
+public IndexingRule getApplicableIndexingRule(NodeState state) {
//This method would be invoked for every node. So be as
//conservative as possible in object creation
List rules = null;
@@ -864,7 +864,7 @@ public final class IndexDefinition imple
* @return true the rule applies to the given node;
* false otherwise.
*/
-public boolean appliesTo(Tree state) {
+public boolean appliesTo(NodeState state) {
for (String mixinName : getMixinTypeNames(state)){
if (nodeTypeName.equals(mixinName)){
return true;
@@ -1398,15 +1398,20 @@ public final class IndexDefinition imple
};
}
-private static String getPrimaryTypeName(Tree state) {
-String primaryType = TreeUtil.getPrimaryTypeName(state);
+private static String getPrimaryTypeName(NodeState state) {
+String primaryType = state.getName(JcrConstants.JCR_PRIMARYTYPE);
+
+//To ensure compatibility with previous Tree based usage look based on
string also
+if (primaryType == null) {
+primaryType = state.getString(JcrConstants.JCR_PRIMARYTYPE);
+}
//In case not a proper JCR assume nt:base TODO return null and ignore
indexing such nodes
//at all
return primaryType != null ? primaryType : "nt:base";
}
-private static Iterable getMixinTypeNames(Tree tree) {
-PropertyState property = tree.getProperty(JcrConstants.JCR_MIXINTYPES);
+private static Iterable getMixinTypeNames(NodeState state) {
+PropertyState property =
state.getProperty(JcrConstants.JCR_MIXINTYPES);
return property != null ? property.getValue(Type.NAMES) :
Collections.emptyList();
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1761003=1761002=1761003=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
Fri Sep 16 07:01:22 2016
@@ -104,10 +104,6 @@ public class LuceneIndexEditor implement
*/
private final boolean isDeleted;
-private Tree afterTree;
-
-private Tree beforeTree;
-
private IndexDefinition.IndexingRule indexingRule;
private List currentMatchers = Collections.emptyList();
@@ -140,7 +136,6 @@ public class LuceneIndexEditor implement
}
public String getPath() {
-//TODO Use the tree instance to determine path
if (path == null) { // => parent != null
path = concat(parent.getPath(), name);
}
@@ -154,20 +149,12 @@ public class LuceneIndexEditor implement
context.enableReindexMode();
}
-if (parent == null){
-afterTree = TreeFactory.createReadOnlyTree(after);
-beforeTree = TreeFactory.createReadOnlyTree(before);
-} else {
-afterTree = parent.afterTree.getChild(name);
-beforeTree = parent.beforeTree.getChild(name);
-
svn commit: r1761018 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/ oak-core/src/test/java/or
Author: thomasm
Date: Fri Sep 16 09:58:23 2016
New Revision: 1761018
URL: http://svn.apache.org/viewvc?rev=1761018=rev
Log:
OAK-4815 ReferenceIndex slowdown due to OAK-3403
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollectorTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/FilterTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexLookupTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1761018=1761017=1761018=diff
==
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
Fri Sep 16 09:58:23 2016
@@ -111,8 +111,20 @@ public class FilterImpl implements Filte
private boolean preparing;
// TODO support "order by"
+
+/**
+ * Create a new filter instance that is used for unit testing. This method
+ * is relatively slow, because it creates a new query engine setting
object.
+ * Therefore, it is only to be used for testing. At runtime, the
+ * public constructor should be used instead.
+ *
+ * @return the filter
+ */
+public static FilterImpl newTestInstance() {
+return new FilterImpl();
+}
-public FilterImpl() {
+private FilterImpl() {
this(null, null, new QueryEngineSettings());
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1761018=1761017=1761018=diff
==
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Fri Sep 16 09:58:23 2016
@@ -87,7 +87,7 @@ public class AsyncIndexUpdateTest {
private static Set find(PropertyIndexLookup lookup, String name,
String value) {
-return Sets.newHashSet(lookup.query(new FilterImpl(), name,
+return Sets.newHashSet(lookup.query(FilterImpl.newTestInstance(), name,
PropertyValues.newString(value)));
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollectorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollectorTest.java?rev=1761018=1761017=1761018=diff
==
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollectorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollectorTest.java
Fri Sep 16 09:58:23 2016
@@ -45,7 +45,7 @@ public class DiffCollectorTest {
UUIDDiffCollector collector = new UUIDDiffCollector(root, after);
-FilterImpl f = new FilterImpl();
+FilterImpl f = FilterImpl.newTestInstance();
f.restrictProperty("jcr:uuid", Operator.EQUAL,
PropertyValues.newString("abc"));
@@ -71,7 +71,7 @@ public class DiffCollectorTest {
UUIDDiffCollector collector = new UUIDDiffCollector(before, after);
-FilterImpl f = new FilterImpl();
+FilterImpl f = FilterImpl.newTestInstance();
f.restrictProperty("jcr:uuid", Operator.EQUAL,
PropertyValues.newString("xyz"));
@@ -111,7 +111,7 @@ public class DiffCollectorTest {
UUIDDiffCollector collector = new UUIDDiffCollector(before, after);
-FilterImpl f = new FilterImpl();
+FilterImpl f =
svn commit: r1761016 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: plugins/index/reference/ReferenceIndex.java query/QueryEngineSettings.java
Author: thomasm Date: Fri Sep 16 09:55:48 2016 New Revision: 1761016 URL: http://svn.apache.org/viewvc?rev=1761016=rev Log: OAK-4815 ReferenceIndex slowdown due to OAK-3403 Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java?rev=1761016=1761015=1761016=diff == --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java Fri Sep 16 09:55:48 2016 @@ -36,7 +36,6 @@ import java.util.Set; import org.apache.jackrabbit.oak.plugins.index.property.Multiplexers; import org.apache.jackrabbit.oak.plugins.index.property.strategy.IndexStoreStrategy; -import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.Cursor; @@ -134,7 +133,7 @@ class ReferenceIndex implements QueryInd } Listiterables = Lists.newArrayList(); for (IndexStoreStrategy s : getStrategies(indexRoot, mountInfoProvider, index)) { -iterables.add(s.query(new FilterImpl(), index + "(" +iterables.add(s.query(filter, index + "(" + uuid + ")", indexRoot, ImmutableSet.of(uuid))); } Iterable paths = Iterables.concat(iterables); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java?rev=1761016=1761015=1761016=diff == --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java Fri Sep 16 09:55:48 2016 @@ -50,6 +50,12 @@ public class QueryEngineSettings extends private boolean sql2Optimisation = Boolean.parseBoolean(System.getProperty(SQL2_OPTIMISATION_FLAG, "true")); +/** + * Create a new query engine settings object. Creating the object is + * relatively slow, and at runtime, as few such objects as possible should + * be created (ideally, only one per Oak instance). Creating new instances + * also means they can not be configured using JMX, as one would expect. + */ public QueryEngineSettings() { super(QueryEngineSettingsMBean.class); }
svn commit: r1761035 - in /jackrabbit/oak/trunk: oak-doc/src/site/markdown/ oak-doc/src/site/markdown/features/ oak-doc/src/site/markdown/nodestore/ oak-doc/src/site/markdown/nodestore/segment/ oak-do
Author: reschke Date: Fri Sep 16 13:54:29 2016 New Revision: 1761035 URL: http://svn.apache.org/viewvc?rev=1761035=rev Log: fix svn:eol-style Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/attribution.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/developing-with-git.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/diagnostic-builds.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/features/atomic-counter.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/migration.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/persistent-cache.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/segment/overview.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/segment/records.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/nodestore/segment/tar.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/lucene-old.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/lucene.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/ootb-index-change.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/ordered-index-migrate.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/ordered-index.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/property-index.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/query/solr.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/release-schedule.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/defaultusersync.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/externallogin_examples.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/token/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization/composite.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authorization/cug.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/introduction.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission/permissionsandprivileges.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal/cache.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal/principalprovider.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege/mappingtoitems.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege/mappingtoprivileges.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/authorizablenodename.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/default.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/expiry.md (props changed) jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/history.md (props changed) jackrabbit/oak/trunk/oak-examples/standalone/README.md (props changed) jackrabbit/oak/trunk/oak-exercise/README.md (props changed) jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FunctionIndexProcessor.java (props changed) jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java (props changed) jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FunctionIndexProcessorTest.java (props changed) Propchange: jackrabbit/oak/trunk/oak-doc/src/site/markdown/attribution.md -- svn:eol-style = native Propchange: jackrabbit/oak/trunk/oak-doc/src/site/markdown/command_line.md -- svn:eol-style =
svn commit: r1761037 - in /jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown: ./ nodestore/ query/ security/accesscontrol/ security/authentication/external/ security/principal/ security/user/
Author: reschke Date: Fri Sep 16 14:07:02 2016 New Revision: 1761037 URL: http://svn.apache.org/viewvc?rev=1761037=rev Log: fix svn:eol-style Modified: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/attribution.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/command_line.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/nodestore/persistent-cache.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/lucene-old.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/lucene.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/ordered-index-migrate.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/ordered-index.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/solr.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/accesscontrol/cug.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/authentication/external/defaultusersync.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/authentication/external/dynamic.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/principal/cache.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/principal/principalprovider.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/user/authorizablenodename.md (props changed) jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/user/expiry.md (props changed) Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/attribution.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/command_line.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/nodestore/persistent-cache.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/lucene-old.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/lucene.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/ordered-index-migrate.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/ordered-index.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/query/solr.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/accesscontrol/cug.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/authentication/external/defaultusersync.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/authentication/external/dynamic.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/principal/cache.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/principal/principalprovider.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/user/authorizablenodename.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.2/oak-doc/src/site/markdown/security/user/expiry.md -- svn:eol-style = native
svn commit: r1761036 - in /jackrabbit/oak/branches/1.4: oak-doc/src/site/markdown/ oak-doc/src/site/markdown/features/ oak-doc/src/site/markdown/nodestore/ oak-doc/src/site/markdown/nodestore/segment/
Author: reschke Date: Fri Sep 16 13:58:17 2016 New Revision: 1761036 URL: http://svn.apache.org/viewvc?rev=1761036=rev Log: fix svn:eol-style Modified: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/attribution.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/command_line.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/developing-with-git.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/diagnostic-builds.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/features/atomic-counter.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/migration.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/nodestore/persistent-cache.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/nodestore/segment/overview.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/nodestore/segment/records.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/nodestore/segment/tar.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/lucene-old.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/lucene.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/ootb-index-change.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/ordered-index-migrate.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/ordered-index.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/property-index.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/query/solr.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/accesscontrol/default.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authentication/default.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authentication/external/defaultusersync.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authentication/external/dynamic.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authorization.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authorization/composite.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/authorization/cug.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/introduction.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/permission/default.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/principal/cache.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/principal/principalprovider.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/privilege/default.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/privilege/mappingtoitems.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/privilege/mappingtoprivileges.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/user/authorizablenodename.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/user/default.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/user/expiry.md (props changed) jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/security/user/history.md (props changed) jackrabbit/oak/branches/1.4/oak-examples/standalone/README.md (props changed) jackrabbit/oak/branches/1.4/oak-exercise/README.md (props changed) Propchange: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/attribution.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/command_line.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/developing-with-git.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/diagnostic-builds.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.4/oak-doc/src/site/markdown/features/atomic-counter.md -- svn:eol-style = native
svn commit: r1761038 - in /jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security: ./ accesscontrol/ authentication/ permission/ user/
Author: reschke Date: Fri Sep 16 14:09:51 2016 New Revision: 1761038 URL: http://svn.apache.org/viewvc?rev=1761038=rev Log: fix svn:eol-style Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol/restriction.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/externalloginmodule.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/identitymanagement.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/ldap.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/preauthentication.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/tokenmanagement.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/usersync.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission/evaluation.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/authorizableaction.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/membership.md (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/query.md (props changed) Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol/restriction.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/externalloginmodule.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/identitymanagement.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/ldap.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/preauthentication.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/tokenmanagement.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/authentication/usersync.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission/evaluation.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/authorizableaction.md -- svn:eol-style = native Propchange: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/membership.md --
svn commit: r1761025 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/ test/java/org/a
Author: thomasm
Date: Fri Sep 16 12:00:39 2016
New Revision: 1761025
URL: http://svn.apache.org/viewvc?rev=1761025=rev
Log:
OAK-3574 Query engine: support p=lowercase('x') and other function-based indexes
Added:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FunctionIndexProcessor.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/FunctionIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/FunctionIndexProcessorTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java?rev=1761025=1761024=1761025=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldNames.java
Fri Sep 16 12:00:39 2016
@@ -90,6 +90,11 @@ public final class FieldNames {
* Name of the field that contains the node name
*/
public static final String NODE_NAME = ":nodeName";
+
+/**
+ * Suffix of the fields that contains function values
+ */
+public static final String FUNCTION_PREFIX = "function*";
/**
* Used to select only the PATH field from the lucene documents
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1761025=1761024=1761025=diff
==
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Fri Sep 16 12:00:39 2016
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.PathFilter;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.ConfigUtil;
+import
org.apache.jackrabbit.oak.plugins.index.lucene.util.FunctionIndexProcessor;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.TokenizerChain;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
@@ -730,6 +731,7 @@ public final class IndexDefinition imple
private final Map propConfigs;
private final List namePatterns;
private final List nullCheckEnabledProperties;
+private final List functionRestrictions;
private final List notNullCheckEnabledProperties;
private final List nodeScopeAnalyzedProps;
private final boolean indexesAllNodesOfMatchingType;
@@ -755,17 +757,19 @@ public final class IndexDefinition imple
List namePatterns = newArrayList();
List nonExistentProperties = newArrayList();
+List functionRestrictions = newArrayList();
List existentProperties = newArrayList();
List nodeScopeAnalyzedProps = newArrayList();
List propIncludes = newArrayList();
this.propConfigs = collectPropConfigs(config, namePatterns,
propIncludes, nonExistentProperties,
-existentProperties, nodeScopeAnalyzedProps);
+existentProperties,
svn commit: r1761046 - in /jackrabbit/oak/branches/1.0: ./ oak-parent/pom.xml
Author: reschke Date: Fri Sep 16 15:08:35 2016 New Revision: 1761046 URL: http://svn.apache.org/viewvc?rev=1761046=rev Log: OAK-4794: RDBDocumentStore: update PostgresQL JDBC driver (ported to 1.0) Modified: jackrabbit/oak/branches/1.0/ (props changed) jackrabbit/oak/branches/1.0/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.0/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 16 15:08:35 2016 @@ -1,4 +1,4 @@ /jackrabbit/oak/branches/1.2:1695500,1700753,1709440,1714095,1725270,1742959,1743356,1745019,1745589,1749700,1750645,1751766,1751768 /jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512 -/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962-1585963,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231 ,1593245,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1594987,1595147,1595186,1595457,1595856,1596241,1596474,1596534,1596844,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607557,1607664,1607737,1608463,1608560,1608731,1608 783,1609064,1609081,1609165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624559,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1 627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,1629688,1629840,1629858,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633327,1633389,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635178,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,164134
svn commit: r1761043 - in /jackrabbit/oak/branches/1.2: ./ oak-parent/pom.xml
Author: reschke Date: Fri Sep 16 14:48:18 2016 New Revision: 1761043 URL: http://svn.apache.org/viewvc?rev=1761043=rev Log: OAK-4794: RDBDocumentStore: update PostgresQL JDBC driver (ported to 1.2) Modified: jackrabbit/oak/branches/1.2/ (props changed) jackrabbit/oak/branches/1.2/oak-parent/pom.xml Propchange: jackrabbit/oak/branches/1.2/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 16 14:48:18 2016 @@ -1,4 +1,4 @@ /jackrabbit/oak/branches/1.0:1665962 /jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512 -/jackrabbit/oak/trunk:1672350,1672468-1672469,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675089,1675319,1675332,1675354,1675357,1675382,167,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,164,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376 ,1684442,1684561,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685834,1685839-1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692393,1692478,1692955,1693002,1693030,1693050,1693209,1693 401,1693421,1693525-1693526,1694007,1694049,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695223,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697383,1697410,1697582,1697589,1697616,1697672,1697896,1698096,1698144,1700191,1700231,1700397,1700403,1700506,1700571,1700709,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701613,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1 705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1707753,1708049,1708105,1708307,1708315,1708401,1708546,1708592,1708738,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711209,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714174,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714827,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717393-1717394,1717410,1717462,1717632,1717768-1717769,1717784,1717789,171798
