Skip to content

Commit 4f995b8

Browse files
AnggaSuhermanAnggaSuherman
authored
Merge pull request #3 from griddb/0.8.0-rc
Update for 0.8
2 parents d8b4ee1 + 9e605a1 commit 4f995b8

File tree

99 files changed

+73203
-4766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+73203
-4766
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ CPPFLAGS_PHP = $(CPPFLAGS) $(INCLUDES_PHP)
2020

2121
PROGRAM = griddb_php_client.so
2222

23-
SOURCES = src/Resource.cpp \
24-
src/TimeSeriesProperties.cpp \
25-
src/AggregationResult.cpp \
23+
SOURCES = src/TimeSeriesProperties.cpp \
2624
src/ContainerInfo.cpp \
25+
src/AggregationResult.cpp \
2726
src/Container.cpp \
2827
src/Store.cpp \
2928
src/StoreFactory.cpp \
3029
src/PartitionController.cpp \
3130
src/Query.cpp \
32-
src/Row.cpp \
31+
src/QueryAnalysisEntry.cpp \
3332
src/RowKeyPredicate.cpp \
3433
src/RowSet.cpp \
3534
src/TimestampUtils.cpp \
36-
35+
src/Field.cpp \
36+
src/Util.cpp
3737

3838
all: $(PROGRAM)
3939

‎README.md‎

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@ GridDB PHP Client
22

33
## Overview
44

5-
GridDB PHP Client is developed using GridDB C Client and [SWIG](http://www.swig.org/) (Simplified Wrapper and Interface Generator).
5+
GridDB PHP Client is developed using GridDB C Client and [SWIG](http://www.swig.org/) (Simplified Wrapper and Interface Generator).
66

7-
(Additional information)
8-
There is [PHP Client package on Packagist repository](https://packagist.org/packages/griddb/php-client) .
97

108
## Operating environment
119

1210
Building of the library and execution of the sample programs have been checked in the following environment.
1311

14-
OS: CentOS 7.4(x64)
12+
OS: CentOS 7.8(x64)
1513
SWIG: 4.0.0
1614
GCC: 4.8.5
17-
PHP: 7
18-
GridDB Server: 4.2 (CE)
19-
GridDB C Client: 4.2 (CE)
15+
PHP: 7.4.7
16+
GridDB Server: 4.5 (CE)
17+
GridDB C Client: 4.5 (CE)
2018

2119
## QuickStart
2220
### Preparations
@@ -29,17 +27,17 @@ Install SWIG as below.
2927
$ ./configure
3028
$ make
3129
$ sudo make install
32-
30+
3331
Note: If CentOS, you might need to install pcre in advance.
3432
$ sudo yum install pcre2-devel.x86_64
3533

36-
Install PHP7 and GridDB C Client.
34+
Install PHP7.4.7 and GridDB C Client.
3735

38-
Set LIBRARY_PATH.
36+
Set LIBRARY_PATH.
3937

4038
export LIBRARY_PATH=$LIBRARY_PATH:<C client library file directory path>
4139

42-
### Build and Run
40+
### Build and Run
4341

4442
1. Execute the command on project directory.
4543

@@ -69,22 +67,21 @@ GridDB Server need to be started in advance.
6967

7068
GridDB Server need to be started in advance.
7169

72-
In the case of Web Server: Apache/2.2.15, please use the following steps.
73-
70+
In the case of Web Server: Apache/2.4.6, please use the following steps.
71+
7472
1. Store griddb_php_client.php and sample/sample1_web.php in /var/www/html.
7573

7674
2. Store griddb_php_client.so in /usr/lib64/php/modules.
7775

78-
3. Add extension for griddb_php_client.so in /etc/php.ini.rpmsave or /etc/php/7.2/apache2/php.ini.
79-
extension=griddb_php_client.so
76+
3. Add extension for griddb_php_client.so in /etc/php.ini
8077

8178
4. Set LD_LIBRARY_PATH.
8279

8380
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:<C client library file directory path>
8481

8582
5. Restart httpd/apache.
8683

87-
6. In web browser, run : http://localhost:8000/sample1_web.php.
84+
6. In web browser, run : http://localhost/sample1_web.php.
8885

8986
7. Click submit button after entering address, port, cluster, user and password.
9087

@@ -102,37 +99,21 @@ In the case of Web Server: Apache/2.2.15, please use the following steps.
10299
- timeseries-specific function like gsAggregateTimeSeries, gsQueryByTimeSeriesSampling in C client
103100
- trigger, affinity
104101

105-
Please refer to the following files for more detailed information.
102+
Please refer to the following files for more detailed information.
106103
- [PHP Client API Reference](https://griddb.github.io/php_client/PHPAPIReference.htm)
107104

108105
About API:
109106
- When an error occurs, an exception GSException is thrown.
110-
- Based on C Client API. Please refer to C Client API Reference for the detailed information.
111-
* [API Reference](https://griddb.github.io/griddb_nosql/manual/GridDB_API_Reference.html)
112-
* [API Reference(Japanese)](https://griddb.github.io/griddb_nosql/manual/GridDB_API_Reference_ja.html)
113-
114-
Note:
115-
1. The current API might be changed in the next version. e.g. ContainerInfo()
116-
2. References to objects obtained using the get method described below must be referenced prior to executing the methods. When referencing after the execution of the get methods, please copy the basic data type such as string from the object and reference it to the copied data.
117-
- get_row_xxx
118-
- get_partition_xxx
119-
- get_container_info
120-
121-
Please refer to the following note from C Client API Reference document for detailed information of the reason behind the implementation:
122-
123-
"In order to store the variable-length data such as string or array, it uses a temporary memory area.
124-
This area is valid until this function or similar functions which use a temporary memory area.
125-
The behavior is undefined when the area which has been invalidated is accessed."
126107

127108
## Community
128109

129-
* Issues
130-
Use the GitHub issue function if you have any requests, questions, or bug reports.
131-
* PullRequest
110+
* Issues
111+
Use the GitHub issue function if you have any requests, questions, or bug reports.
112+
* PullRequest
132113
Use the GitHub pull request function if you want to contribute code.
133114
You'll need to agree GridDB Contributor License Agreement(CLA_rev1.1.pdf).
134115
By using the GitHub pull request function, you shall be deemed to have agreed to GridDB Contributor License Agreement.
135116

136117
## License
137-
118+
138119
GridDB PHP Client source license is Apache License, version 2.0.

‎docs/PHPAPIReference.files/sheet001.htm‎

Lines changed: 69 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
mso-displayed-thousand-separator:"\,";}
1717
@page
1818
{margin:.75in .7in .75in .7in;
19-
mso-header-margin:.3in;
20-
mso-footer-margin:.3in;}
19+
mso-header-margin:.51in;
20+
mso-footer-margin:.51in;}
2121
ruby
2222
{ruby-align:left;}
2323
rt
@@ -26,8 +26,8 @@
2626
font-weight:400;
2727
font-style:normal;
2828
text-decoration:none;
29-
font-family:"ＭＳ Ｐゴシック", monospace;
30-
mso-font-charset:128;
29+
font-family:Calibri, sans-serif;
30+
mso-font-charset:0;
3131
mso-char-type:katakana;
3232
display:none;}
3333
-->
@@ -56,100 +56,87 @@
5656

5757
<body link="#0563C1" vlink="#954F72">
5858

59-
<table border=0 cellpadding=0 cellspacing=0 width=1043 style='border-collapse:
60-
collapse;table-layout:fixed;width:783pt'>
61-
<col width=229 style='mso-width-source:userset;mso-width-alt:7328;width:172pt'>
62-
<col width=489 style='mso-width-source:userset;mso-width-alt:15648;width:367pt'>
63-
<col width=325 style='mso-width-source:userset;mso-width-alt:10400;width:244pt'>
64-
<tr height=18 style='height:13.5pt'>
65-
<td height=18 class=xl67 width=229 style='height:13.5pt;width:172pt'>class</td>
66-
<td class=xl76 width=489 style='border-left:none;width:367pt'>description</td>
67-
<td class=xl67 width=325 style='border-left:none;width:244pt'>　</td>
59+
<table border=0 cellpadding=0 cellspacing=0 width=849 style='border-collapse:
60+
collapse;table-layout:fixed;width:637pt'>
61+
<col width=200 style='width:150pt'>
62+
<col width=649 style='mso-width-source:userset;mso-width-alt:23734;width:487pt'>
63+
<tr height=20 style='height:15.0pt'>
64+
<td height=20 class=xl96 width=200 style='height:15.0pt;width:150pt'>Class</td>
65+
<td class=xl96 width=649 style='border-left:none;width:487pt'>Description</td>
6866
</tr>
69-
<tr height=18 style='height:13.5pt'>
70-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>AggregationResult</td>
71-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Stores
72-
the result of an aggregation operation</td>
73-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
67+
<tr height=20 style='height:15.0pt'>
68+
<td height=20 class=xl69 style='height:15.0pt;border-top:none'>AggregationResult</td>
69+
<td class=xl95 width=649 style='width:487pt'>Stores the result of an
70+
aggregation operation<ruby><font class="font8"><rt class=font8></rt></font></ruby></td>
7471
</tr>
75-
<tr height=18 style='height:13.5pt'>
76-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>Container</td>
77-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Provides
78-
management functions for sets of row having same type</td>
79-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
80-
class</td>
72+
<tr height=20 style='height:15.0pt'>
73+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>Container</td>
74+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Provides
75+
management functions for sets of row having same type<ruby><font class="font8"><rt
76+
class=font8></rt></font></ruby></td>
8177
</tr>
82-
<tr height=18 style='height:13.5pt'>
83-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>ContainerInfo</td>
84-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Represents
85-
the information about a specific Container</td>
86-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
78+
<tr height=40 style='height:30.0pt'>
79+
<td height=40 class=xl85 style='height:30.0pt;border-top:none'>QueryAnalysisEntry</td>
80+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Represents one
81+
of information entries composing a query plan and the results of analyzing a
82+
query operation.</td>
8783
</tr>
88-
<tr height=18 style='height:13.5pt'>
89-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>GSException</td>
90-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Exception
91-
for GridDB</td>
92-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
84+
<tr height=20 style='height:15.0pt'>
85+
<td height=20 class=xl85 style='height:15.0pt;border-top:none'>GSException</td>
86+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Represents the
87+
exception for GridDB<ruby><font class="font8"><rt class=font8></rt></font></ruby></td>
9388
</tr>
94-
<tr height=18 style='height:13.5pt'>
95-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>PartitionController</td>
96-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Controller
97-
for acquiring and processing the partition status</td>
98-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
89+
<tr height=20 style='height:15.0pt'>
90+
<td height=20 class=xl85 style='height:15.0pt;border-top:none'>PartitionController</td>
91+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Controller for
92+
acquiring and processing the partition status</td>
9993
</tr>
100-
<tr height=54 style='height:40.5pt'>
101-
<td height=54 class=xl66 style='height:40.5pt;border-top:none'>Query</td>
102-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Provides
103-
the functions of holding the information about a query related to a specific
94+
<tr height=40 style='height:30.0pt'>
95+
<td height=40 class=xl85 style='height:30.0pt;border-top:none'>Query</td>
96+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Provides the
97+
functions of holding the information about a query related to a specific
10498
Container, specifying the options for fetching and retrieving the result</td>
105-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
106-
class</td>
10799
</tr>
108-
<tr height=18 style='height:13.5pt'>
109-
<td height=18 class=xl75 style='height:13.5pt;border-top:none'>Resource</td>
110-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Error
111-
handling</td>
112-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
100+
<tr height=20 style='height:15.0pt'>
101+
<td height=20 class=xl85 style='height:15.0pt;border-top:none'>RowKeyPredicate</td>
102+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Represents the
103+
condition that a row key satisfies</td>
113104
</tr>
114-
<tr height=18 style='height:13.5pt'>
115-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>Row</td>
116-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>A
117-
general-purpose Row for managing fields in any schema</td>
118-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
119-
class</td>
105+
<tr height=20 style='height:15.0pt'>
106+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>RowSet</td>
107+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Manages a set of
108+
Rows obtained by a query</td>
120109
</tr>
121-
<tr height=18 style='height:13.5pt'>
122-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>RowSet</td>
123-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Manages
124-
a set of Rows obtained by a query</td>
125-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
126-
class</td>
127-
</tr>
128-
<tr height=36 style='height:27.0pt'>
129-
<td height=36 class=xl66 style='height:27.0pt;border-top:none'>Store</td>
130-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Provides
110+
<tr height=20 style='height:15.0pt'>
111+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>Store</td>
112+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Provides
131113
functions to manipulate the entire data managed in one GridDB system</td>
132-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
133-
class</td>
134114
</tr>
135-
<tr height=18 style='height:13.5pt'>
136-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>StoreFactory</td>
137-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Manages
138-
a Store instance</td>
139-
<td class=xl66 style='border-top:none;border-left:none'>Inherits Resource
140-
class</td>
115+
<tr height=20 style='height:15.0pt'>
116+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>StoreFactory</td>
117+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Manages a Store
118+
instance<ruby><font class="font8"><rt class=font8></rt></font></ruby></td>
119+
</tr>
120+
<tr height=20 style='height:15.0pt'>
121+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>ContainerInfo</td>
122+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Represents the
123+
information about a Container<ruby><font class="font8"><rt class=font8></rt></font></ruby></td>
124+
</tr>
125+
<tr height=20 style='height:15.0pt'>
126+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>ExpirationInfo</td>
127+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Represents the
128+
information about a expiration<ruby><font class="font8"><rt class=font8></rt></font></ruby></td>
141129
</tr>
142-
<tr height=18 style='height:13.5pt'>
143-
<td height=18 class=xl66 style='height:13.5pt;border-top:none'>Timestamp</td>
144-
<td class=xl77 width=489 style='border-top:none;border-left:none;width:367pt'>Provides
145-
the utilities for manipulating time data</td>
146-
<td class=xl66 style='border-top:none;border-left:none'>　</td>
130+
<tr height=20 style='height:15.0pt'>
131+
<td height=20 class=xl70 style='height:15.0pt;border-top:none'>TimestampUtils</td>
132+
<td class=xl95 width=649 style='border-top:none;width:487pt'>Provides the
133+
utilities for manipulating time data<ruby><font class="font8"><rt
134+
class=font8></rt></font></ruby></td>
147135
</tr>
148136
<![if supportMisalignedColumns]>
149137
<tr height=0 style='display:none'>
150-
<td width=229 style='width:172pt'></td>
151-
<td width=489 style='width:367pt'></td>
152-
<td width=325 style='width:244pt'></td>
138+
<td width=200 style='width:150pt'></td>
139+
<td width=649 style='width:487pt'></td>
153140
</tr>
154141
<![endif]>
155142
</table>

0 commit comments

Comments
 (0)