Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0282200B82 for ; Fri, 2 Sep 2016 03:05:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE8EE160AB7; Fri, 2 Sep 2016 01:05:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CFC81160AB5 for ; Fri, 2 Sep 2016 03:05:29 +0200 (CEST) Received: (qmail 61867 invoked by uid 500); 2 Sep 2016 01:05:29 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 61858 invoked by uid 99); 2 Sep 2016 01:05:29 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2016 01:05:29 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 9BABACB8AA for ; Fri, 2 Sep 2016 01:05:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.739 X-Spam-Level: X-Spam-Status: No, score=-3.739 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.519] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7NrlwxkCJyrV for ; Fri, 2 Sep 2016 01:05:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 6885960D39 for ; Fri, 2 Sep 2016 01:05:25 +0000 (UTC) Received: (qmail 61832 invoked by uid 99); 2 Sep 2016 01:05:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2016 01:05:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94EBBDFCC0; Fri, 2 Sep 2016 01:05:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhouxj@apache.org To: commits@geode.incubator.apache.org Message-Id: <2daf199002cf4e8190188502d15fdff3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-11: let profile's getId() return unique name Date: Fri, 2 Sep 2016 01:05:24 +0000 (UTC) archived-at: Fri, 02 Sep 2016 01:05:30 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop f497c596c -> 426f1ae22 GEODE-11: let profile's getId() return unique name Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/426f1ae2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/426f1ae2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/426f1ae2 Branch: refs/heads/develop Commit: 426f1ae22f1c5933dd14c08c29c7afbfdef60f4f Parents: f497c59 Author: zhouxh Authored: Thu Sep 1 18:04:14 2016 -0700 Committer: zhouxh Committed: Thu Sep 1 18:05:06 2016 -0700 ---------------------------------------------------------------------- .../lucene/internal/LuceneIndexCreationProfile.java | 12 +++--------- .../cache/lucene/internal/LuceneServiceImpl.java | 2 +- .../internal/LuceneIndexCreationProfileJUnitTest.java | 12 ++++++------ 3 files changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java index 720d20d..de331ea 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java @@ -44,14 +44,6 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSeri /* Used by DataSerializer */ public LuceneIndexCreationProfile() {} - public LuceneIndexCreationProfile(String indexName, String[] fieldNames, Analyzer analyzer, - Map fieldAnalyzers) { - this.indexName = indexName; - this.fieldNames = fieldNames; - this.analyzerClass = analyzer.getClass().getSimpleName(); - initializeFieldAnalyzers(fieldAnalyzers); - } - public LuceneIndexCreationProfile(String indexName, String regionPath, String[] fieldNames, Analyzer analyzer, Map fieldAnalyzers) { this.indexName = indexName; @@ -90,7 +82,7 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSeri @Override public String getId() { - return this.indexName; + return "lucene_"+LuceneServiceImpl.getUniqueIndexName(indexName, regionPath); } @Override @@ -143,6 +135,7 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSeri @Override public void toData(DataOutput out) throws IOException { DataSerializer.writeString(this.indexName, out); + DataSerializer.writeString(this.regionPath, out); DataSerializer.writeStringArray(this.fieldNames, out); DataSerializer.writeString(this.analyzerClass, out); DataSerializer.writeHashMap(this.fieldAnalyzers, out); @@ -151,6 +144,7 @@ public class LuceneIndexCreationProfile implements CacheServiceProfile, DataSeri @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { this.indexName = DataSerializer.readString(in); + this.regionPath = DataSerializer.readString(in); this.fieldNames = DataSerializer.readStringArray(in); this.analyzerClass = DataSerializer.readString(in); this.fieldAnalyzers = DataSerializer.readHashMap(in); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java index 29a8e62..81a62b8 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java @@ -183,7 +183,7 @@ public class LuceneServiceImpl implements InternalLuceneService { } // Add index creation profile - internalRegionArgs.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, fields, analyzer, fieldAnalyzers)); + internalRegionArgs.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, dataRegionPath, fields, analyzer, fieldAnalyzers)); } return updatedRA; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java index c64dd3d..7fbe806 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java @@ -105,38 +105,38 @@ public class LuceneIndexCreationProfileJUnitTest { } private LuceneIndexCreationProfile getOneFieldLuceneIndexCreationProfile() { - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1" }, new StandardAnalyzer(), null); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1" }, new StandardAnalyzer(), null); } private LuceneIndexCreationProfile getTwoFieldLuceneIndexCreationProfile() { - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, new StandardAnalyzer(), null); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1", "field2" }, new StandardAnalyzer(), null); } private LuceneIndexCreationProfile getOneAnalyzerLuceneIndexCreationProfile(Analyzer analyzer) { Map fieldAnalyzers = new HashMap<>(); fieldAnalyzers.put("field1", analyzer); - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); } private LuceneIndexCreationProfile getTwoAnalyzersLuceneIndexCreationProfile() { Map fieldAnalyzers = new HashMap<>(); fieldAnalyzers.put("field1", new KeywordAnalyzer()); fieldAnalyzers.put("field2", new KeywordAnalyzer()); - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); } private LuceneIndexCreationProfile getNullField1AnalyzerLuceneIndexCreationProfile() { Map fieldAnalyzers = new HashMap<>(); fieldAnalyzers.put("field1", null); fieldAnalyzers.put("field2", new KeywordAnalyzer()); - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); } private LuceneIndexCreationProfile getNullField2AnalyzerLuceneIndexCreationProfile() { Map fieldAnalyzers = new HashMap<>(); fieldAnalyzers.put("field1", new KeywordAnalyzer()); fieldAnalyzers.put("field2", null); - return new LuceneIndexCreationProfile(INDEX_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); + return new LuceneIndexCreationProfile(INDEX_NAME, REGION_NAME, new String[] { "field1", "field2" }, getPerFieldAnalyzerWrapper(fieldAnalyzers), fieldAnalyzers); } private Analyzer getPerFieldAnalyzerWrapper(Map fieldAnalyzers) {