You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/06/16 11:40:39 UTC
svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: romseygeek
Date: Mon Jun 16 09:40:39 2014
New Revision: 1602830
URL: http://svn.apache.org/r1602830
Log:
SOLR-6169: Remove broken CoreAdminHandler handleAlias action
Modified:
lucene/dev/branches/branch_4x/solr/CHANGES.txt
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1602830&r1=1602829&r2=1602830&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jun 16 09:40:39 2014
@@ -160,6 +160,9 @@ Other Changes
* SOLR-6153: ReplicationHandler backup response format should contain backup name.
(Varun Thacker via shalin)
+* SOLR-6169: Remove broken handleAlias action in CoreAdminHandler (Alan
+ Woodward)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1602830&r1=1602829&r2=1602830&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Jun 16 09:40:39 2014
@@ -629,20 +629,7 @@ public class CoreAdminHandler extends Re
*/
@Deprecated
protected void handleAliasAction(SolrQueryRequest req, SolrQueryResponse rsp) {
- SolrParams params = req.getParams();
-
- String name = params.get(CoreAdminParams.OTHER);
- String cname = params.get(CoreAdminParams.CORE);
- boolean doPersist = false;
- if (cname.equals(name)) return;
-
- SolrCore core = coreContainer.getCore(cname);
- if (core != null) {
- doPersist = coreContainer.isPersistent();
- coreContainer.register(name, core, false);
- // no core.close() since each entry in the cores map should increase the ref
- }
- return;
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "The ALIAS action is no longer supported");
}
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Alan Woodward <al...@flax.co.uk>.
Thanks Hoss
On 18 Jun 2014, at 23:26, Chris Hostetter wrote:
>
> : : It's above 4.10.0 in trunk, isn't it? I should be in bed, it's
>
> ....
>
> : I'll move it for you.
>
> Part of the confusion is that i missunderstood what you were trying to do
> -- you deliberately wanted 2 diff CHANGES.txt messages (one for 4.9 and
> one for 5.0) relating to the 2 differnet "phases" of the change you made
> -- so my comment about "move"ing it was wrong.
>
>
> My point was that the 4.9 work needed to be in the 4.9 section of
> trunk's copy of CHANGES.txt so we have a full record of everything
> (even if that's in addition to *another* entry fo the same issue in the
> 5.0 section of the trunk file)...
>
> https://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?r1=1603656&r2=1603655&pathrev=1603656
>
>
> -Hoss
> http://www.lucidworks.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Chris Hostetter <ho...@fucit.org>.
: : It's above 4.10.0 in trunk, isn't it? I should be in bed, it's
....
: I'll move it for you.
Part of the confusion is that i missunderstood what you were trying to do
-- you deliberately wanted 2 diff CHANGES.txt messages (one for 4.9 and
one for 5.0) relating to the 2 differnet "phases" of the change you made
-- so my comment about "move"ing it was wrong.
My point was that the 4.9 work needed to be in the 4.9 section of
trunk's copy of CHANGES.txt so we have a full record of everything
(even if that's in addition to *another* entry fo the same issue in the
5.0 section of the trunk file)...
https://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?r1=1603656&r2=1603655&pathrev=1603656
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Chris Hostetter <ho...@fucit.org>.
: It's above 4.10.0 in trunk, isn't it? I should be in bed, it's possible that I'm just not seeing what I've buggered up here…
if we are shipping the change in 4.9, then in all versions of CAHNGES.txt,
it should say that 4.9 contains the change.
right now, if i read CHANGES.txt on trunk (ie: when 5.0 comes out and look
at CHANGES.txt) it will say this change happened in 4.10)
I'll move it for you.
-Hoss
http://www.lucidworks.com/
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Alan Woodward <al...@flax.co.uk>.
It's above 4.10.0 in trunk, isn't it? I should be in bed, it's possible that I'm just not seeing what I've buggered up here…
Alan Woodward
www.flax.co.uk
On 18 Jun 2014, at 23:05, Chris Hostetter wrote:
>
> : I deprecated it in 4.9 and removed it in trunk, so it has slightly
> : different CHANGES entries. Is it messing up merging?
>
> but look at *where* it's listed in each copy of CHANGES.txt...
>
> : > Alan: somethings not right here with CHANGES.txt... it's in the 4.10
> : > section on trunk, but it's in the 4.9 section on branch_4x
>
> : It's in 4.9 - I committed it before Robert cut the branch.
>
> Ok ... but then it's still in the wrong section of CHANGES.txt on trunk.
>
> https://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?r1=1602825&r2=1602824&pathrev=1602825
>
>
> -Hoss
> http://www.lucidworks.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Chris Hostetter <ho...@fucit.org>.
: I deprecated it in 4.9 and removed it in trunk, so it has slightly
: different CHANGES entries. Is it messing up merging?
but look at *where* it's listed in each copy of CHANGES.txt...
: > Alan: somethings not right here with CHANGES.txt... it's in the 4.10
: > section on trunk, but it's in the 4.9 section on branch_4x
: It's in 4.9 - I committed it before Robert cut the branch.
Ok ... but then it's still in the wrong section of CHANGES.txt on trunk.
https://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?r1=1602825&r2=1602824&pathrev=1602825
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr: CHANGES.txt core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Alan Woodward <al...@flax.co.uk>.
I deprecated it in 4.9 and removed it in trunk, so it has slightly different CHANGES entries. Is it messing up merging?
It's in 4.9 - I committed it before Robert cut the branch.
Alan Woodward
www.flax.co.uk
On 18 Jun 2014, at 22:57, Chris Hostetter wrote:
>
> Alan: somethings not right here with CHANGES.txt... it's in the 4.10
> section on trunk, but it's in the 4.9 section on branch_4x
>
> (but it was never actually backported to the 4.9 branch i don't think,
> correct?)
>
>
>
> : Date: Mon, 16 Jun 2014 09:40:39 -0000
> : From: romseygeek@apache.org
> : Reply-To: dev@lucene.apache.org
> : To: commits@lucene.apache.org
> : Subject: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
> : CHANGES.txt
> : core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
> :
> : Author: romseygeek
> : Date: Mon Jun 16 09:40:39 2014
> : New Revision: 1602830
> :
> : URL: http://svn.apache.org/r1602830
> : Log:
> : SOLR-6169: Remove broken CoreAdminHandler handleAlias action
> :
> : Modified:
> : lucene/dev/branches/branch_4x/solr/CHANGES.txt
> : lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
> :
> : Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
> : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1602830&r1=1602829&r2=1602830&view=diff
> : ==============================================================================
> : --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
> : +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jun 16 09:40:39 2014
> : @@ -160,6 +160,9 @@ Other Changes
> : * SOLR-6153: ReplicationHandler backup response format should contain backup name.
> : (Varun Thacker via shalin)
> :
> : +* SOLR-6169: Remove broken handleAlias action in CoreAdminHandler (Alan
> : + Woodward)
> : +
> : Optimizations
> : ----------------------
> :
> :
> : Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
> : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1602830&r1=1602829&r2=1602830&view=diff
> : ==============================================================================
> : --- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
> : +++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Jun 16 09:40:39 2014
> : @@ -629,20 +629,7 @@ public class CoreAdminHandler extends Re
> : */
> : @Deprecated
> : protected void handleAliasAction(SolrQueryRequest req, SolrQueryResponse rsp) {
> : - SolrParams params = req.getParams();
> : -
> : - String name = params.get(CoreAdminParams.OTHER);
> : - String cname = params.get(CoreAdminParams.CORE);
> : - boolean doPersist = false;
> : - if (cname.equals(name)) return;
> : -
> : - SolrCore core = coreContainer.getCore(cname);
> : - if (core != null) {
> : - doPersist = coreContainer.isPersistent();
> : - coreContainer.register(name, core, false);
> : - // no core.close() since each entry in the cores map should increase the ref
> : - }
> : - return;
> : + throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "The ALIAS action is no longer supported");
> : }
> :
> :
> :
> :
> :
>
> -Hoss
> http://www.lucidworks.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
Re: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
CHANGES.txt
core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Posted by Chris Hostetter <ho...@fucit.org>.
Alan: somethings not right here with CHANGES.txt... it's in the 4.10
section on trunk, but it's in the 4.9 section on branch_4x
(but it was never actually backported to the 4.9 branch i don't think,
correct?)
: Date: Mon, 16 Jun 2014 09:40:39 -0000
: From: romseygeek@apache.org
: Reply-To: dev@lucene.apache.org
: To: commits@lucene.apache.org
: Subject: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr:
: CHANGES.txt
: core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
:
: Author: romseygeek
: Date: Mon Jun 16 09:40:39 2014
: New Revision: 1602830
:
: URL: http://svn.apache.org/r1602830
: Log:
: SOLR-6169: Remove broken CoreAdminHandler handleAlias action
:
: Modified:
: lucene/dev/branches/branch_4x/solr/CHANGES.txt
: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
:
: Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1602830&r1=1602829&r2=1602830&view=diff
: ==============================================================================
: --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
: +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jun 16 09:40:39 2014
: @@ -160,6 +160,9 @@ Other Changes
: * SOLR-6153: ReplicationHandler backup response format should contain backup name.
: (Varun Thacker via shalin)
:
: +* SOLR-6169: Remove broken handleAlias action in CoreAdminHandler (Alan
: + Woodward)
: +
: Optimizations
: ----------------------
:
:
: Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1602830&r1=1602829&r2=1602830&view=diff
: ==============================================================================
: --- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
: +++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Mon Jun 16 09:40:39 2014
: @@ -629,20 +629,7 @@ public class CoreAdminHandler extends Re
: */
: @Deprecated
: protected void handleAliasAction(SolrQueryRequest req, SolrQueryResponse rsp) {
: - SolrParams params = req.getParams();
: -
: - String name = params.get(CoreAdminParams.OTHER);
: - String cname = params.get(CoreAdminParams.CORE);
: - boolean doPersist = false;
: - if (cname.equals(name)) return;
: -
: - SolrCore core = coreContainer.getCore(cname);
: - if (core != null) {
: - doPersist = coreContainer.isPersistent();
: - coreContainer.register(name, core, false);
: - // no core.close() since each entry in the cores map should increase the ref
: - }
: - return;
: + throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "The ALIAS action is no longer supported");
: }
:
:
:
:
:
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org