Author: chetanm
Date: Fri May 12 06:10:44 2017
New Revision: 1794926
URL: http://svn.apache.org/viewvc?rev=1794926&view=rev
Log:
OAK-6216 - Property IndexInfoProvider implementation
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
(with props)
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java
(with props)
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java?rev=1794926&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
Fri May 12 06:10:44 2017
@@ -0,0 +1,145 @@
+/*
+ * 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.property;
+
+import java.io.IOException;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
+import org.apache.jackrabbit.oak.plugins.index.IndexInfo;
+import org.apache.jackrabbit.oak.plugins.index.IndexInfoProvider;
+import org.apache.jackrabbit.oak.plugins.index.counter.ApproximateCounter;
+import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+@Component
+@Service
+public class PropertyIndexInfoProvider implements IndexInfoProvider {
+
+ @Reference
+ private NodeStore nodeStore;
+
+ @SuppressWarnings("unused")
+ public PropertyIndexInfoProvider() {
+ //For DS
+ }
+
+ public PropertyIndexInfoProvider(NodeStore nodeStore) {
+ this.nodeStore = nodeStore;
+ }
+
+ @Override
+ public String getType() {
+ return PropertyIndexEditorProvider.TYPE;
+ }
+
+ @Override
+ public IndexInfo getInfo(String indexPath) throws IOException {
+ NodeState idxState = NodeStateUtils.getNode(nodeStore.getRoot(),
indexPath);
+
+
checkArgument(PropertyIndexEditorProvider.TYPE.equals(idxState.getString(IndexConstants.TYPE_PROPERTY_NAME)),
+ "Index definition at [%s] is not of type 'property'",
indexPath);
+ PropertyIndexInfo info = new PropertyIndexInfo(indexPath);
+ computeCountEstimate(info, idxState);
+ return info;
+ }
+
+ private void computeCountEstimate(PropertyIndexInfo info, NodeState
idxState) {
+ long count = -1;
+
+ for (ChildNodeEntry cne : idxState.getChildNodeEntries()) {
+ if (NodeStateUtils.isHidden(cne.getName())) {
+ NodeState indexData = cne.getNodeState();
+ long estimate = ApproximateCounter.getCountSync(indexData);
+ if (estimate > 0) {
+ if (count < 0) {
+ count = 0;
+ }
+ count += estimate;
+
+ } else if (indexData.getChildNodeCount(1) == 0) {
+ //If we cannot get estimate then at least try to see if
any index data is there or not
+ count = 0;
+ }
+ }
+ }
+ info.estimatedCount = count;
+ }
+
+ @Override
+ public boolean isValid(String indexPath) throws IOException {
+ return true;
+ }
+
+ private static class PropertyIndexInfo implements IndexInfo {
+ private final String indexPath;
+ long estimatedCount = -1;
+
+ public PropertyIndexInfo(String indexPath) {
+ this.indexPath = indexPath;
+ }
+
+ @Override
+ public String getIndexPath() {
+ return indexPath;
+ }
+
+ @Override
+ public String getType() {
+ return PropertyIndexEditorProvider.TYPE;
+ }
+
+ @Override
+ public String getAsyncLaneName() {
+ return null;
+ }
+
+ @Override
+ public long getLastUpdatedTime() {
+ return -2;
+ }
+
+ @Override
+ public long getIndexedUpToTime() {
+ return 0;
+ }
+
+ @Override
+ public long getEstimatedEntryCount() {
+ return estimatedCount;
+ }
+
+ @Override
+ public long getSizeInBytes() {
+ return -1;
+ }
+
+ @Override
+ public boolean hasIndexDefinitionChangedWithoutReindexing() {
+ return false;
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java?rev=1794926&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java
Fri May 12 06:10:44 2017
@@ -0,0 +1,72 @@
+/*
+ * 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.property;
+
+import com.google.common.collect.ImmutableSet;
+import org.apache.jackrabbit.oak.InitialContent;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.plugins.index.IndexInfo;
+import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EditorHook;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Before;
+import org.junit.Test;
+
+import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static
org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class PropertyIndexInfoProviderTest {
+ private static final CommitHook HOOK = new EditorHook(
+ new IndexUpdateProvider(new PropertyIndexEditorProvider()));
+
+ private NodeStore store = new MemoryNodeStore();
+
+ private PropertyIndexInfoProvider infoProvider = new
PropertyIndexInfoProvider(store);
+
+ @Before
+ public void setUp() throws CommitFailedException {
+ NodeBuilder builder = store.getRoot().builder();
+ new InitialContent().initialize(builder);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ }
+
+ @Test
+ public void emptyIndexEstimate() throws Exception{
+ NodeBuilder builder = store.getRoot().builder();
+ NodeBuilder index =
createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "foo",
+ true, false, ImmutableSet.of("foo"), null);
+ store.merge(builder, HOOK, CommitInfo.EMPTY);
+
+ IndexInfo info = infoProvider.getInfo("/oak:index/foo");
+ assertNotNull(info);
+
+ assertEquals("/oak:index/foo", info.getIndexPath());
+ assertEquals("property", info.getType());
+ assertEquals(-2, info.getLastUpdatedTime());
+ assertEquals(0, info.getEstimatedEntryCount());
+ }
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProviderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
