From 20b4c63e422e9ccac1a1124e9044e276dbca47ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Jun 2014 20:37:29 +0200 Subject: php-pecl-solr: 1.1.0 (stable) --- REFLECTION | 111 ++++++++++++++++++++++++++++++++------ bootstrap.inc | 5 ++ php-pecl-solr.spec | 21 ++++++-- response_xml.1.xml | 5 ++ skip.if.server_not_configured.inc | 7 +++ test.config.inc | 49 +++++++++++++++++ 6 files changed, 177 insertions(+), 21 deletions(-) create mode 100644 bootstrap.inc create mode 100644 response_xml.1.xml create mode 100644 skip.if.server_not_configured.inc create mode 100644 test.config.inc diff --git a/REFLECTION b/REFLECTION index 4745960..cd88db0 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,15 +1,15 @@ -Extension [ extension #162 solr version 1.0.2 ] { +Extension [ extension #162 solr version 1.1.0 ] { - Dependencies { - Dependency [ curl (Required) ] Dependency [ libxml (Required) ] + Dependency [ json (Required) ] } - Constants [4] { Constant [ integer SOLR_MAJOR_VERSION ] { 1 } - Constant [ integer SOLR_MINOR_VERSION ] { 0 } - Constant [ integer SOLR_PATCH_VERSION ] { 1 } - Constant [ string SOLR_EXTENSION_VERSION ] { 1.0.2 } + Constant [ integer SOLR_MINOR_VERSION ] { 1 } + Constant [ integer SOLR_PATCH_VERSION ] { 0 } + Constant [ string SOLR_EXTENSION_VERSION ] { 1.1.0 } } - Functions { @@ -20,7 +20,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - - Classes [18] { + - Classes [19] { Class [ final class SolrObject implements ArrayAccess ] { - Constants [0] { @@ -85,7 +85,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrDocument implements ArrayAccess, Iterator, Traversable, Serializable ] { + Class [ final class SolrDocument implements ArrayAccess, Iterator, Traversable, Serializable ] { - Constants [6] { Constant [ integer SORT_DEFAULT ] { 1 } @@ -335,7 +335,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrInputDocument ] { + Class [ final class SolrInputDocument ] { - Constants [6] { Constant [ integer SORT_DEFAULT ] { 1 } @@ -489,17 +489,19 @@ Extension [ extension #162 solr version 1.0.2 ] { Class [ class SolrClient ] { - - Constants [10] { + - Constants [12] { Constant [ integer SEARCH_SERVLET_TYPE ] { 1 } Constant [ integer UPDATE_SERVLET_TYPE ] { 2 } Constant [ integer THREADS_SERVLET_TYPE ] { 4 } Constant [ integer PING_SERVLET_TYPE ] { 8 } Constant [ integer TERMS_SERVLET_TYPE ] { 16 } + Constant [ integer SYSTEM_SERVLET_TYPE ] { 32 } Constant [ string DEFAULT_SEARCH_SERVLET ] { select } Constant [ string DEFAULT_UPDATE_SERVLET ] { update } Constant [ string DEFAULT_THREADS_SERVLET ] { admin/threads } Constant [ string DEFAULT_PING_SERVLET ] { admin/ping } Constant [ string DEFAULT_TERMS_SERVLET ] { terms } + Constant [ string DEFAULT_SYSTEM_SERVLET ] { admin/system } } - Static properties [0] { @@ -512,7 +514,7 @@ Extension [ extension #162 solr version 1.0.2 ] { Property [ private $_hashtable_index ] } - - Methods [22] { + - Methods [23] { Method [ public method __construct ] { - Parameters [1] { @@ -627,10 +629,11 @@ Extension [ extension #162 solr version 1.0.2 ] { Method [ public method &commit ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ $maxSegments ] Parameter #1 [ $waitFlush ] Parameter #2 [ $waitSearcher ] + Parameter #3 [ $expungeDeletes ] } } @@ -655,6 +658,12 @@ Extension [ extension #162 solr version 1.0.2 ] { } } + Method [ public method &system ] { + + - Parameters [0] { + } + } + Method [ public method &threads ] { - Parameters [0] { @@ -2140,7 +2149,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrQueryResponse extends SolrResponse ] { + Class [ final class SolrQueryResponse extends SolrResponse ] { - Constants [2] { Constant [ integer PARSE_SOLR_OBJ ] { 0 } @@ -2249,7 +2258,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrUpdateResponse extends SolrResponse ] { + Class [ final class SolrUpdateResponse extends SolrResponse ] { - Constants [2] { Constant [ integer PARSE_SOLR_OBJ ] { 0 } @@ -2358,7 +2367,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrPingResponse extends SolrResponse ] { + Class [ final class SolrPingResponse extends SolrResponse ] { - Constants [2] { Constant [ integer PARSE_SOLR_OBJ ] { 0 } @@ -2467,7 +2476,7 @@ Extension [ extension #162 solr version 1.0.2 ] { } } - Class [ class SolrGenericResponse extends SolrResponse ] { + Class [ final class SolrGenericResponse extends SolrResponse ] { - Constants [2] { Constant [ integer PARSE_SOLR_OBJ ] { 0 } @@ -2584,7 +2593,7 @@ Extension [ extension #162 solr version 1.0.2 ] { - Static properties [0] { } - - Static methods [4] { + - Static methods [5] { Method [ static public method escapeQueryChars ] { - Parameters [1] { @@ -2607,6 +2616,13 @@ Extension [ extension #162 solr version 1.0.2 ] { } } + Method [ static public method digestJsonResponse ] { + + - Parameters [1] { + Parameter #0 [ $jsonResponse ] + } + } + Method [ static public method getSolrVersion ] { - Parameters [0] { @@ -2872,6 +2888,69 @@ Extension [ extension #162 solr version 1.0.2 ] { } } } + + Class [ class SolrServerException extends SolrException ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [7] { + Property [ protected $message ] + Property [ protected $code ] + Property [ protected $file ] + Property [ protected $line ] + Property [ protected $sourceline ] + Property [ protected $sourcefile ] + Property [ protected $zif_name ] + } + + - Methods [10] { + Method [ public method getInternalInfo ] { + + - Parameters [0] { + } + } + + Method [ method __construct ] { + + - Parameters [3] { + Parameter #0 [ $message ] + Parameter #1 [ $code ] + Parameter #2 [ $previous ] + } + } + + Method [ final public method getMessage ] { + } + + Method [ final public method getCode ] { + } + + Method [ final public method getFile ] { + } + + Method [ final public method getLine ] { + } + + Method [ final public method getTrace ] { + } + + Method [ final public method getPrevious ] { + } + + Method [ final public method getTraceAsString ] { + } + + Method [ public method __toString ] { + } + } + } } } diff --git a/bootstrap.inc b/bootstrap.inc new file mode 100644 index 0000000..0a3912d --- /dev/null +++ b/bootstrap.inc @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec index 6442ae6..b757476 100644 --- a/php-pecl-solr.spec +++ b/php-pecl-solr.spec @@ -26,13 +26,22 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr Version: 1.1.0 -Release: 9%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/solr Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/bootstrap.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c +Source1: bootstrap.inc +# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/test.config.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c +Source2: test.config.inc +# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/skip.if.server_not_configured.inc;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c +Source3: skip.if.server_not_configured.inc +# http://git.php.net/?p=pecl/search_engine/solr.git;a=blob_plain;f=tests/files/response_xml.1.xml;hb=333d932e89f7032260be8069dbf3c26a2fd34a9c +Source4: response_xml.1.xml + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -135,11 +144,13 @@ PECL Solr 2 est disponible dans le paquet php-pecl-solr2. mv %{pecl_name}-%{version}%{?prever} NTS cd NTS -# Fix version -sed -i -e '/PHP_SOLR_DOTTED_VERSION/s/1.0.1/1.0.2/' php_solr_version.h +# Restore missing file in archive +cp %{SOURCE1} %{SOURCE2} %{SOURCE3} tests/ +mkdir tests/files +cp %{SOURCE4} tests/files/ # Check version -extver=$(sed -n '/#define PHP_SOLR_DOTTED_VERSION/{s/.* "//;s/".*$//;p}' php_solr_version.h) +extver=$(sed -n '/#define PHP_SOLR_VERSION /{s/.* "//;s/".*$//;p}' php_solr_version.h) if test "x${extver}" != "x%{version}"; then : Error: Upstream version is ${extver}, expecting %{version}. exit 1 @@ -270,7 +281,7 @@ rm -rf %{buildroot} %changelog * Thu Jun 19 2014 Remi Collet - 1.1.0-1 -- Update to 1.1.0 +- Update to 1.1.0 (stable) * Thu Apr 17 2014 Remi Collet - 1.0.2-9 - add numerical prefix to extension configuration file (php 5.6) diff --git a/response_xml.1.xml b/response_xml.1.xml new file mode 100644 index 0000000..9a24708 --- /dev/null +++ b/response_xml.1.xml @@ -0,0 +1,5 @@ + + +07215151321http-8983-3WAITINGorg.apache.tomcat.util.net.JIoEndpoint$Worker@1bf68a960.0000ms40.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:416)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:442)java.lang.Thread.run(Thread.java:595)20http-8983-2WAITINGorg.apache.tomcat.util.net.JIoEndpoint$Worker@1706eb70.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.net.JIoEndpoint$Worker.await(JIoEndpoint.java:416)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:442)java.lang.Thread.run(Thread.java:595)19http-8983-1RUNNABLE160.0000ms160.0000mssun.management.ThreadImpl.getThreadInfo0(Native Method)sun.management.ThreadImpl.getThreadInfo(ThreadImpl.java:142)org.apache.solr.handler.admin.ThreadDumpHandler.handleRequestBody(ThreadDumpHandler.java:73)org.apache.solr.handler.RequestHandlerBase.handleRequest(RequestHandlerBase.java:131)org.apache.solr.core.SolrCore.execute(SolrCore.java:1299)org.apache.solr.servlet.SolrDispatchFilter.execute(SolrDispatchFilter.java:338)org.apache.solr.servlet.SolrDispatchFilter.doFilter(SolrDispatchFilter.java:241)org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:286)org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:845)org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:583)org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:447)java.lang.Thread.run(Thread.java:595)17TP-MonitorTIMED_WAITINGorg.apache.tomcat.util.threads.ThreadPool$MonitorRunnable@74db2c0.0000ms0.0000msjava.lang.Object.wait(Native Method)org.apache.tomcat.util.threads.ThreadPool$MonitorRunnable.run(ThreadPool.java:565)java.lang.Thread.run(Thread.java:595)16TP-Processor4RUNNABLEtrue0.0000ms0.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.jk.common.ChannelSocket.accept(ChannelSocket.java:306)org.apache.jk.common.ChannelSocket.acceptConnections(ChannelSocket.java:660)org.apache.jk.common.ChannelSocket$SocketAcceptor.runIt(ChannelSocket.java:870)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)java.lang.Thread.run(Thread.java:595)15TP-Processor3WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@1e164830.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)14TP-Processor2WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@8ddb930.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)13TP-Processor1WAITINGorg.apache.tomcat.util.threads.ThreadPool$ControlRunnable@14ab51b0.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:662)java.lang.Thread.run(Thread.java:595)12http-8983-Acceptor-0RUNNABLEtrue0.0000ms0.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.tomcat.util.net.DefaultServerSocketFactory.acceptSocket(DefaultServerSocketFactory.java:61)org.apache.tomcat.util.net.JIoEndpoint$Acceptor.run(JIoEndpoint.java:310)java.lang.Thread.run(Thread.java:595)11ContainerBackgroundProcessor[StandardEngine[Catalina]]TIMED_WAITING1400.0000ms920.0000msjava.lang.Thread.sleep(Native Method)org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1579)java.lang.Thread.run(Thread.java:595)10pool-1-thread-1WAITING100.0000ms100.0000mssun.misc.Unsafe.park(Native Method)java.util.concurrent.locks.LockSupport.park(LockSupport.java:118)java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(AbstractQueuedSynchronizer.java:1841)java.util.concurrent.LinkedBlockingQueue.take(LinkedBlockingQueue.java:359)java.util.concurrent.ThreadPoolExecutor.getTask(ThreadPoolExecutor.java:470)java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:674)java.lang.Thread.run(Thread.java:595)4Signal DispatcherRUNNABLE0.0000ms0.0000ms3FinalizerWAITINGjava.lang.ref.ReferenceQueue$Lock@1b82d690.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:120)java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:136)java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159)2Reference HandlerWAITINGjava.lang.ref.Reference$Lock@ad65130.0000ms0.0000msjava.lang.Object.wait(Native Method)java.lang.Object.wait(Object.java:474)java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116)1mainRUNNABLEtrue3340.0000ms3180.0000msjava.net.PlainSocketImpl.socketAccept(Native Method)java.net.PlainSocketImpl.accept(PlainSocketImpl.java:384)java.net.ServerSocket.implAccept(ServerSocket.java:450)java.net.ServerSocket.accept(ServerSocket.java:421)org.apache.catalina.core.StandardServer.await(StandardServer.java:389)org.apache.catalina.startup.Catalina.await(Catalina.java:642)org.apache.catalina.startup.Catalina.start(Catalina.java:602)sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)java.lang.reflect.Method.invoke(Method.java:585)org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288)org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) + + \ No newline at end of file diff --git a/skip.if.server_not_configured.inc b/skip.if.server_not_configured.inc new file mode 100644 index 0000000..583a72e --- /dev/null +++ b/skip.if.server_not_configured.inc @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/test.config.inc b/test.config.inc new file mode 100644 index 0000000..4fba603 --- /dev/null +++ b/test.config.inc @@ -0,0 +1,49 @@ + -- cgit