You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/10/04 13:52:19 UTC
[1/3] lucene-solr:master: SOLR-9520: Kerberos delegation support in
SolrJ
Repository: lucene-solr
Updated Branches:
refs/heads/master 58031fd44 -> 221a6870b
SOLR-9520: Kerberos delegation support in SolrJ
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fb33980f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fb33980f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fb33980f
Branch: refs/heads/master
Commit: fb33980f24078f64cb68d9489cdd89203c432bdb
Parents: 3a76ef1
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 4 01:29:32 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 4 01:29:32 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/impl/CloudSolrClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb33980f/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 6a186ce..9bc4529 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -386,6 +386,7 @@ public class CloudSolrClient extends SolrClient {
LBHttpSolrClient.Builder lbHttpSolrClientBuilder,
boolean updatesToLeaders,
boolean directUpdatesToLeadersOnly) {
+ this.zkHost = buildZkHostString(zkHosts, chroot);
this.clientIsInternal = httpClient == null;
this.shutdownLBHttpSolrServer = lbSolrClient == null;
if(lbHttpSolrClientBuilder != null) lbSolrClient = lbHttpSolrClientBuilder.build();
@@ -393,7 +394,6 @@ public class CloudSolrClient extends SolrClient {
this.myClient = httpClient == null ? HttpClientUtil.createClient(null) : httpClient;
if (lbSolrClient == null) lbSolrClient = createLBHttpSolrClient(myClient);
this.lbClient = lbSolrClient;
- this.zkHost = buildZkHostString(zkHosts, chroot);
this.updatesToLeaders = updatesToLeaders;
this.directUpdatesToLeadersOnly = directUpdatesToLeadersOnly;
}
[2/3] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by no...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
SOLR-9589: Remove jackson dependency from SolrJ
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5fbf135b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5fbf135b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5fbf135b
Branch: refs/heads/master
Commit: 5fbf135b8058e773275febba4baa8fa4a42e6ffc
Parents: fb33980 58031fd
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 4 19:15:50 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 4 19:15:50 2016 +0530
----------------------------------------------------------------------
.../benchmark/byTask/tasks/CreateIndexTask.java | 4 +-
.../java/org/apache/lucene/codecs/Codec.java | 2 +-
.../lucene54/Lucene54DocValuesFormat.java | 3 +
.../lucene/codecs/lucene70/Lucene70Codec.java | 177 ++
.../lucene70/Lucene70DocValuesConsumer.java | 797 ++++++++
.../lucene70/Lucene70DocValuesFormat.java | 183 ++
.../lucene70/Lucene70DocValuesProducer.java | 1816 ++++++++++++++++++
.../lucene/codecs/lucene70/package-info.java | 392 ++++
.../lucene/index/DefaultIndexingChain.java | 4 +-
.../services/org.apache.lucene.codecs.Codec | 1 +
.../org.apache.lucene.codecs.DocValuesFormat | 1 +
...cene50StoredFieldsFormatHighCompression.java | 8 +-
.../lucene53/TestLucene53NormsFormat.java | 4 +-
.../lucene70/TestLucene70DocValuesFormat.java | 613 ++++++
.../org/apache/lucene/index/Test2BPoints.java | 2 +-
.../apache/lucene/index/TestPointValues.java | 8 +-
.../org/apache/lucene/search/TestBoolean2.java | 8 +-
.../apache/lucene/search/TestPointQueries.java | 4 +-
.../org/apache/lucene/document/TestNearest.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 4 +-
.../suggest/document/TestSuggestField.java | 4 +-
.../apache/lucene/geo/BaseGeoPointTestCase.java | 2 +-
.../util/TestRuleSetupAndRestoreClassEnv.java | 6 +-
.../java/org/apache/lucene/util/TestUtil.java | 8 +-
solr/CHANGES.txt | 4 +
solr/bin/install_solr_service.sh | 52 +-
.../org/apache/solr/cloud/ZkController.java | 52 +-
.../apache/solr/core/SchemaCodecFactory.java | 4 +-
.../solr/collection1/conf/schema_codec.xml | 2 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 251 +--
.../AsyncCallRequestStatusResponseTest.java | 44 +-
.../solr/cloud/AsyncMigrateRouteKeyTest.java | 121 --
.../apache/solr/cloud/CollectionReloadTest.java | 81 +-
.../solr/cloud/CollectionStateFormat2Test.java | 73 +-
.../solr/cloud/DeleteInactiveReplicaTest.java | 2 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 160 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 233 +--
.../solrj/request/CollectionAdminRequest.java | 52 +-
.../solr/client/solrj/request/CoreStatus.java | 6 +
.../org/apache/solr/common/util/RetryUtil.java | 11 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 22 +
.../apache/solr/cloud/SolrCloudTestCase.java | 12 +-
42 files changed, 4486 insertions(+), 749 deletions(-)
----------------------------------------------------------------------
[3/3] lucene-solr:master: SOLR-9589: Remove jackson dependency from
SolrJ
Posted by no...@apache.org.
SOLR-9589: Remove jackson dependency from SolrJ
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/221a6870
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/221a6870
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/221a6870
Branch: refs/heads/master
Commit: 221a6870b8fc98ea85622130ce8b031f0d7b112b
Parents: 5fbf135
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 4 19:14:58 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 4 19:20:44 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/solrj/ivy.xml | 3 ---
.../client/solrj/response/DelegationTokenResponse.java | 13 +++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/221a6870/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 47e78cf..4c3ad96 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -243,6 +243,9 @@ Other Changes
* SOLR-8140: Remove mentions of unimplemented admin-extra from the new Admin UI (Alexandre Rafalovitch)
+* SOLR-9589: Remove jackson dependency from SolrJ (Ishan Chattopadhyaya, noble)
+
+
================== 6.2.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/221a6870/solr/solrj/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml
index 553e81f..c9995f3 100644
--- a/solr/solrj/ivy.xml
+++ b/solr/solrj/ivy.xml
@@ -41,9 +41,6 @@
<dependency org="org.slf4j" name="slf4j-log4j12" rev="${/org.slf4j/slf4j-log4j12}" conf="test"/>
- <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="${/com.fasterxml.jackson.core/jackson-annotations}" conf="compile"/>
- <dependency org="com.fasterxml.jackson.core" name="jackson-core" rev="${/com.fasterxml.jackson.core/jackson-core}" conf="compile"/>
- <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="${/com.fasterxml.jackson.core/jackson-databind}" conf="compile"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/221a6870/solr/solrj/src/java/org/apache/solr/client/solrj/response/DelegationTokenResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DelegationTokenResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DelegationTokenResponse.java
index c80e2eb..f6281a0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DelegationTokenResponse.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DelegationTokenResponse.java
@@ -20,11 +20,11 @@ package org.apache.solr.client.solrj.response;
import org.apache.solr.client.solrj.ResponseParser;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
+import org.noggit.JSONParser;
+import org.noggit.ObjectBuilder;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Map;
@@ -77,11 +77,12 @@ public abstract class DelegationTokenResponse extends SolrResponseBase {
@Override
public NamedList<Object> processResponse(InputStream body, String encoding) {
- ObjectMapper mapper = new ObjectMapper();
Map map = null;
try {
- map = mapper.readValue(body, Map.class);
- } catch (IOException e) {
+ ObjectBuilder builder = new ObjectBuilder(
+ new JSONParser(new InputStreamReader(body, encoding == null? "UTF-8": encoding)));
+ map = (Map)builder.getObject();
+ } catch (IOException | JSONParser.ParseException e) {
throw new SolrException (SolrException.ErrorCode.SERVER_ERROR,
"parsing error", e);
}