fabriziofortino commented on code in PR #595:
URL: https://github.com/apache/jackrabbit-oak/pull/595#discussion_r898795752
##########
oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexEditorProvider.java:
##########
@@ -50,7 +54,7 @@ public ElasticIndexEditorProvider(@NotNull
ElasticIndexTracker indexTracker,
public @Nullable Editor getIndexEditor(@NotNull String type,
@NotNull NodeBuilder definition,
@NotNull NodeState root,
@NotNull IndexUpdateCallback
callback) {
- if (TYPE_ELASTICSEARCH.equals(type)) {
+ if (TYPE_ELASTICSEARCH.equals(type) &&
OAK_INDEX_ELASTIC_WRITER_DISABLE == false) {
Review Comment:
```suggestion
if (TYPE_ELASTICSEARCH.equals(type) &&
!OAK_INDEX_ELASTIC_WRITER_DISABLE) {
```
##########
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticWritesDisabledTest.java:
##########
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.index.elastic;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.index.TestUtils;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.Row;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.UUID;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
+
+public class ElasticWritesDisabledTest {
Review Comment:
```suggestion
public class ElasticWriterDisabledTest {
```
##########
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticWritesDisabledTest.java:
##########
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.index.elastic;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.index.TestUtils;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.Row;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.UUID;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
+
+public class ElasticWritesDisabledTest {
+
+ protected int DEFAULT_ASYNC_INDEXING_TIME_IN_SECONDS = 5;
+
+ @ClassRule
+ public static final ElasticConnectionRule elasticRule =
+ new
ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+
+ @Rule
+ public final ProvideSystemProperty updateSystemProperties
+ = new
ProvideSystemProperty(ElasticIndexEditorProvider.OAK_INDEX_ELASTIC_WRITER_DISABLE_KEY,
"true");
+
+ @Rule
+ public final RestoreSystemProperties restoreSystemProperties
+ = new RestoreSystemProperties();
+
+
+ private Session adminSession;
+ private QueryManager qe;
+
+ @Before
+ public void setup() throws Exception {
+ createRepository();
+ }
+
+ private void createRepository() throws RepositoryException {
+ ElasticConnection connection = elasticRule.useDocker() ?
elasticRule.getElasticConnectionForDocker() :
+ elasticRule.getElasticConnectionFromString();
+ ElasticIndexTracker indexTracker = new ElasticIndexTracker(connection,
+ new ElasticMetricHandler(StatisticsProvider.NOOP));
+ ElasticIndexEditorProvider editorProvider = new
ElasticIndexEditorProvider(indexTracker, connection,
+ new ExtractedTextCache(10 * FileUtils.ONE_MB, 100));
+ ElasticIndexProvider indexProvider = new
ElasticIndexProvider(indexTracker);
+
+ NodeStore nodeStore = new MemoryNodeStore(INITIAL_CONTENT);
+
+ Oak oak = new Oak(nodeStore)
+ .with(new OpenSecurityProvider())
+ .with(editorProvider)
+ .with(indexTracker)
+ .with(indexProvider)
+ .with(new PropertyIndexEditorProvider())
+ .with(new NodeTypeIndexProvider());
+
+ Jcr jcr = new Jcr(oak);
+ Repository repository = jcr.createRepository();
+
+ adminSession = repository.login(new SimpleCredentials("admin",
"admin".toCharArray()), null);
+
+ qe = adminSession.getWorkspace().getQueryManager();
+ }
+
+ @Test
+ public void elasticDonotIndexDocuments() throws Exception {
Review Comment:
```suggestion
public void elasticDoNotIndexDocuments() throws Exception {
```
##########
oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticWritesDisabledTest.java:
##########
@@ -0,0 +1,204 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.index.elastic;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.index.TestUtils;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.index.ElasticIndexEditorProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.query.ElasticIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.elastic.util.ElasticIndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
+import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.search.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
+import
org.apache.jackrabbit.oak.plugins.index.search.util.IndexDefinitionBuilder;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.Row;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.UUID;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static org.apache.jackrabbit.oak.InitialContentHelper.INITIAL_CONTENT;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.elastic.ElasticIndexDefinition.BULK_FLUSH_INTERVAL_MS_DEFAULT;
+
+public class ElasticWritesDisabledTest {
+
+ protected int DEFAULT_ASYNC_INDEXING_TIME_IN_SECONDS = 5;
+
+ @ClassRule
+ public static final ElasticConnectionRule elasticRule =
+ new
ElasticConnectionRule(ElasticTestUtils.ELASTIC_CONNECTION_STRING);
+
+ @Rule
+ public final ProvideSystemProperty updateSystemProperties
+ = new
ProvideSystemProperty(ElasticIndexEditorProvider.OAK_INDEX_ELASTIC_WRITER_DISABLE_KEY,
"true");
+
+ @Rule
+ public final RestoreSystemProperties restoreSystemProperties
+ = new RestoreSystemProperties();
+
+
+ private Session adminSession;
+ private QueryManager qe;
+
+ @Before
+ public void setup() throws Exception {
+ createRepository();
+ }
+
+ private void createRepository() throws RepositoryException {
+ ElasticConnection connection = elasticRule.useDocker() ?
elasticRule.getElasticConnectionForDocker() :
+ elasticRule.getElasticConnectionFromString();
+ ElasticIndexTracker indexTracker = new ElasticIndexTracker(connection,
+ new ElasticMetricHandler(StatisticsProvider.NOOP));
+ ElasticIndexEditorProvider editorProvider = new
ElasticIndexEditorProvider(indexTracker, connection,
+ new ExtractedTextCache(10 * FileUtils.ONE_MB, 100));
+ ElasticIndexProvider indexProvider = new
ElasticIndexProvider(indexTracker);
+
+ NodeStore nodeStore = new MemoryNodeStore(INITIAL_CONTENT);
+
+ Oak oak = new Oak(nodeStore)
+ .with(new OpenSecurityProvider())
+ .with(editorProvider)
+ .with(indexTracker)
+ .with(indexProvider)
+ .with(new PropertyIndexEditorProvider())
+ .with(new NodeTypeIndexProvider());
+
+ Jcr jcr = new Jcr(oak);
+ Repository repository = jcr.createRepository();
+
+ adminSession = repository.login(new SimpleCredentials("admin",
"admin".toCharArray()), null);
+
+ qe = adminSession.getWorkspace().getQueryManager();
+ }
+
+ @Test
+ public void elasticDonotIndexDocuments() throws Exception {
+ IndexDefinitionBuilder indexDefinitionBuilder = new
ElasticIndexDefinitionBuilder();
+ indexDefinitionBuilder.noAsync();
+ IndexDefinitionBuilder.IndexRule indexRule =
indexDefinitionBuilder.indexRule("nt:base");
+ indexRule.property("a").propertyIndex().analyzed();
+
+ String indexName = UUID.randomUUID().toString();
+
indexDefinitionBuilder.build(adminSession.getRootNode().getNode(INDEX_DEFINITIONS_NAME).addNode(indexName,
INDEX_DEFINITIONS_NODE_TYPE));
+ adminSession.save();
+
+ Node content = adminSession.getRootNode().addNode("content");
+ for (int i = 0; i < 100; i++) {
+ Node c = content.addNode("c_" + i);
+ c.setProperty("a", "foo");
+ c.setProperty("b", "bar");
+ }
+ adminSession.save();
+ try {
+ assertQuery("select [jcr:path] from [nt:base] where contains(a,
'foo')", 100);
+ Assert.fail("documents should not be indexed");
+ } catch (AssertionError e) {
+ Assert.assertEquals(e.getCause().getMessage(), "expected:<100> but
was:<0>");
+ }
+ }
+
+ @Test
+ public void elasticDonotIndexOnReindex() throws Exception {
Review Comment:
```suggestion
public void elasticDoNotIndexOnReindex() throws Exception {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
