http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/blur-query/src/test/java/org/apache/blur/lucene/search/TestingPagingCollector.java ---------------------------------------------------------------------- diff --git a/blur-query/src/test/java/org/apache/blur/lucene/search/TestingPagingCollector.java b/blur-query/src/test/java/org/apache/blur/lucene/search/TestingPagingCollector.java index ccdec7e..a7b59b2 100644 --- a/blur-query/src/test/java/org/apache/blur/lucene/search/TestingPagingCollector.java +++ b/blur-query/src/test/java/org/apache/blur/lucene/search/TestingPagingCollector.java @@ -58,7 +58,7 @@ public class TestingPagingCollector { @Test public void testSimpleSearchPaging() throws Exception { IndexReader reader = getReaderFlatScore(13245); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcherCloseable searcher = IndexSearcherCloseableUtil.wrap(new IndexSearcher(reader)); TotalHitsRef totalHitsRef = new TotalHitsRef(); ProgressRef progressRef = new ProgressRef(); @@ -88,7 +88,7 @@ public class TestingPagingCollector { public void testSimpleSearchPagingThroughAll() throws Exception { int length = 13245; IndexReader reader = getReaderFlatScore(length); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcherCloseable searcher = IndexSearcherCloseableUtil.wrap(new IndexSearcher(reader)); TotalHitsRef totalHitsRef = new TotalHitsRef(); ProgressRef progressRef = new ProgressRef(); @@ -124,7 +124,7 @@ public class TestingPagingCollector { @Test public void testSimpleSearchPagingWithSorting() throws Exception { IndexReader reader = getReaderFlatScore(13245); - IndexSearcher searcher = new IndexSearcher(reader); + IndexSearcherCloseable searcher = IndexSearcherCloseableUtil.wrap(new IndexSearcher(reader)); TotalHitsRef totalHitsRef = new TotalHitsRef(); ProgressRef progressRef = new ProgressRef();
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/blur-store/pom.xml ---------------------------------------------------------------------- diff --git a/blur-store/pom.xml b/blur-store/pom.xml index aef60ed..b4ccfb4 100644 --- a/blur-store/pom.xml +++ b/blur-store/pom.xml @@ -1,22 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- -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. ---> +<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -24,7 +16,7 @@ under the License. <groupId>org.apache.blur</groupId> <artifactId>blur</artifactId> <version>0.2.4-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.blur</groupId> <artifactId>blur-store</artifactId> @@ -70,6 +62,11 @@ under the License. <version>${lucene.version}</version> </dependency> <dependency> + <groupId>com.github.amccurry</groupId> + <artifactId>lucene-document-security</artifactId> + <version>0.1.1</version> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons-cli.version}</version> @@ -130,7 +127,7 @@ under the License. </plugin> </plugins> </build> - + <profiles> <profile> <id>hadoop1</id> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/blur-store/src/main/java/org/apache/blur/index/AtomicReaderUtil.java ---------------------------------------------------------------------- diff --git a/blur-store/src/main/java/org/apache/blur/index/AtomicReaderUtil.java b/blur-store/src/main/java/org/apache/blur/index/AtomicReaderUtil.java index 3f88e4f..e10403e 100644 --- a/blur-store/src/main/java/org/apache/blur/index/AtomicReaderUtil.java +++ b/blur-store/src/main/java/org/apache/blur/index/AtomicReaderUtil.java @@ -18,6 +18,8 @@ package org.apache.blur.index; import java.io.IOException; +import lucene.security.index.SecureAtomicReader; + import org.apache.blur.index.ExitableReader.ExitableFilterAtomicReader; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.IndexReader; @@ -33,6 +35,11 @@ public class AtomicReaderUtil { AtomicReader originalReader = exitableFilterAtomicReader.getOriginalReader(); return getSegmentReader(originalReader); } + if (indexReader instanceof SecureAtomicReader) { + SecureAtomicReader secureAtomicReader = (SecureAtomicReader) indexReader; + AtomicReader originalReader = secureAtomicReader.getOriginalReader(); + return getSegmentReader(originalReader); + } throw new IOException("SegmentReader could not be found."); } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java ---------------------------------------------------------------------- diff --git a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java index cb807cb..7034200 100644 --- a/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java +++ b/blur-util/src/main/java/org/apache/blur/utils/BlurConstants.java @@ -49,6 +49,11 @@ public class BlurConstants { // public static final String BLUR_TABLE_INDEX_QUEUE_READER_MAX = // "blur.table.index.queue.reader.max"; + public static final String BLUR_RECORD_SECURITY = "blur.record.security"; + public static final String ACL_DISCOVER = "acl-discover"; + public static final String ACL_READ = "acl-read"; + + public static final String FAST_DECOMPRESSION = "FAST_DECOMPRESSION"; public static final String FAST = "FAST"; public static final String HIGH_COMPRESSION = "HIGH_COMPRESSION"; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0-tests.jar ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0-tests.jar b/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0-tests.jar deleted file mode 100644 index 81d57e0..0000000 Binary files a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0-tests.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.jar ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.jar b/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.jar deleted file mode 100644 index 0315c44..0000000 Binary files a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.pom ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.pom b/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.pom deleted file mode 100644 index fc6bd6f..0000000 --- a/lib/com/github/amccurry/lucene-document-security/0.1.0/lucene-document-security-0.1.0.pom +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- -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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <groupId>com.github.amccurry</groupId> - <artifactId>lucene-document-security</artifactId> - <version>0.1.0</version> - <packaging>jar</packaging> - <name>Lucene Document Security</name> - <description>Provides an API for Document level security in Lucene.</description> - - <dependencies> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>4.3.0</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analyzers-common</artifactId> - <version>4.3.0</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - <version>4.3.0</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.3</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>14.0</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.9</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.9</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.googlecode.concurrentlinkedhashmap</groupId> - <artifactId>concurrentlinkedhashmap-lru</artifactId> - <version>1.3.2</version> - </dependency> - </dependencies> - - <repositories> - <repository> - <id>libdir</id> - <url>file://${basedir}/../lib</url> - </repository> - </repositories> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> - <forkCount>2</forkCount> - <forkMode>always</forkMode> - <reuseForks>false</reuseForks> - <systemPropertyVariables> - <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1-tests.jar ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1-tests.jar b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1-tests.jar new file mode 100644 index 0000000..fb75545 Binary files /dev/null and b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1-tests.jar differ http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.jar ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.jar b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.jar new file mode 100644 index 0000000..dc4cad6 Binary files /dev/null and b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.jar differ http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/0b065b16/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.pom ---------------------------------------------------------------------- diff --git a/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.pom b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.pom new file mode 100644 index 0000000..64eb663 --- /dev/null +++ b/lib/com/github/amccurry/lucene-document-security/0.1.1/lucene-document-security-0.1.1.pom @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- +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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>com.github.amccurry</groupId> + <artifactId>lucene-document-security</artifactId> + <version>0.1.1</version> + <packaging>jar</packaging> + <name>Lucene Document Security</name> + <description>Provides an API for Document level security in Lucene.</description> + + <dependencies> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>4.3.0</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers-common</artifactId> + <version>4.3.0</version> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-queryparser</artifactId> + <version>4.3.0</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.3</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>14.0</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.9</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.9</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.googlecode.concurrentlinkedhashmap</groupId> + <artifactId>concurrentlinkedhashmap-lru</artifactId> + <version>1.3.2</version> + </dependency> + </dependencies> + + <repositories> + <repository> + <id>libdir</id> + <url>file://${basedir}/../lib</url> + </repository> + </repositories> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-XX:+UseConcMarkSweepGC -Xmx1g -Xms1g</argLine> + <forkCount>2</forkCount> + <forkMode>always</forkMode> + <reuseForks>false</reuseForks> + <systemPropertyVariables> + <blur.tmp.dir>${project.build.directory}/target/tmp</blur.tmp.dir> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
