From e408affd6ab805385f8ab7b987aa011553e8bf81 Mon Sep 17 00:00:00 2001
From: Han Jiang <han@apache.org>
Date: Wed, 9 Oct 2013 08:15:36 +0000
Subject: [PATCH] LUCENE-3069: add CHANGES, move new postingsformats to
 oal.codecs

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1530520 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/CHANGES.txt                            |  6 +++++
 .../codecs/memory/FSTOrdPostingsFormat.java   |  0
 .../memory/FSTOrdPulsing41PostingsFormat.java |  0
 .../codecs/memory/FSTPostingsFormat.java      |  0
 .../memory/FSTPulsing41PostingsFormat.java    |  0
 .../org.apache.lucene.codecs.PostingsFormat   |  4 +++
 .../apache/lucene/codecs/memory/package.html  | 25 -------------------
 .../org.apache.lucene.codecs.PostingsFormat   |  4 ---
 8 files changed, 10 insertions(+), 29 deletions(-)
 rename lucene/{test-framework => codecs}/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java (100%)
 rename lucene/{test-framework => codecs}/src/java/org/apache/lucene/codecs/memory/FSTOrdPulsing41PostingsFormat.java (100%)
 rename lucene/{test-framework => codecs}/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java (100%)
 rename lucene/{test-framework => codecs}/src/java/org/apache/lucene/codecs/memory/FSTPulsing41PostingsFormat.java (100%)
 delete mode 100644 lucene/test-framework/src/java/org/apache/lucene/codecs/memory/package.html

diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6dc06dd0a77..6a72b63514c 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -43,6 +43,12 @@ New Features
   responsible for iterating through all fields, terms, documents and
   positions.  (Robert Muir, Mike McCandless)
 
+* LUCENE-3069: Add two memory resident dictionaries (FST terms dictionary and 
+  FSTOrd terms dictionary) to improve primary key lookups. The PostingsBaseFormat 
+  API is also changed so that term dictionaries get the ability to block 
+  encode term metadata, and all dictionary implementations can now plug in any 
+  PostingsBaseFormat. (Han Jiang, Mike McCandless)
+
 Optimizations
 
 * LUCENE-4848: Use Java 7 NIO2-FileChannel instead of RandomAccessFile
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java
similarity index 100%
rename from lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java
rename to lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTOrdPulsing41PostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPulsing41PostingsFormat.java
similarity index 100%
rename from lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTOrdPulsing41PostingsFormat.java
rename to lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPulsing41PostingsFormat.java
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java
similarity index 100%
rename from lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java
rename to lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTPulsing41PostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPulsing41PostingsFormat.java
similarity index 100%
rename from lucene/test-framework/src/java/org/apache/lucene/codecs/memory/FSTPulsing41PostingsFormat.java
rename to lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPulsing41PostingsFormat.java
diff --git a/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
index 22062983d91..40a0c3550e8 100644
--- a/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
+++ b/lucene/codecs/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
@@ -18,3 +18,7 @@ org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat
 org.apache.lucene.codecs.memory.MemoryPostingsFormat
 org.apache.lucene.codecs.bloom.BloomFilteringPostingsFormat
 org.apache.lucene.codecs.memory.DirectPostingsFormat
+org.apache.lucene.codecs.memory.FSTPulsing41PostingsFormat
+org.apache.lucene.codecs.memory.FSTOrdPulsing41PostingsFormat
+org.apache.lucene.codecs.memory.FSTPostingsFormat
+org.apache.lucene.codecs.memory.FSTOrdPostingsFormat
diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/package.html b/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/package.html
deleted file mode 100644
index fdf13f4e48b..00000000000
--- a/lucene/test-framework/src/java/org/apache/lucene/codecs/memory/package.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--
- 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.
--->
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body>
-Codec to test FST-based term dictionary with some postings base format.
-</body>
-</html>
diff --git a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
index ca9b6f54baf..59d0dd3f33f 100644
--- a/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
+++ b/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
@@ -25,7 +25,3 @@ org.apache.lucene.codecs.lucene41vargap.Lucene41VarGapDocFreqInterval
 org.apache.lucene.codecs.bloom.TestBloomFilteredLucene41Postings
 org.apache.lucene.codecs.asserting.AssertingPostingsFormat
 org.apache.lucene.codecs.lucene40.Lucene40RWPostingsFormat
-org.apache.lucene.codecs.memory.FSTPulsing41PostingsFormat
-org.apache.lucene.codecs.memory.FSTOrdPulsing41PostingsFormat
-org.apache.lucene.codecs.memory.FSTPostingsFormat
-org.apache.lucene.codecs.memory.FSTOrdPostingsFormat