Author: jamestaylor Date: Thu Dec 1 17:03:51 2016 New Revision: 1772240 URL: http://svn.apache.org/viewvc?rev=1772240&view=rev Log: Update docs based on 4.9 features
Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv phoenix/phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/array_type.html phoenix/site/publish/building.html phoenix/site/publish/building_website.html phoenix/site/publish/bulk_dataload.html phoenix/site/publish/contributing.html phoenix/site/publish/develop.html phoenix/site/publish/download.html phoenix/site/publish/dynamic_columns.html phoenix/site/publish/faq.html phoenix/site/publish/flume.html phoenix/site/publish/hive_storage_handler.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/joins.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/mailing_list.html phoenix/site/publish/metrics.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/paged.html phoenix/site/publish/performance.html phoenix/site/publish/pherf.html phoenix/site/publish/phoenix_mr.html phoenix/site/publish/phoenix_on_emr.html phoenix/site/publish/phoenix_orm.html phoenix/site/publish/phoenix_python.html phoenix/site/publish/phoenix_spark.html phoenix/site/publish/pig_integration.html phoenix/site/publish/recent.html phoenix/site/publish/release.html phoenix/site/publish/release_notes.html phoenix/site/publish/resources.html phoenix/site/publish/roadmap.html phoenix/site/publish/rowtimestamp.html phoenix/site/publish/salted.html phoenix/site/publish/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/skip_scan.html phoenix/site/publish/source.html phoenix/site/publish/subqueries.html phoenix/site/publish/team.html phoenix/site/publish/tracing.html phoenix/site/publish/transactions.html phoenix/site/publish/tuning.html phoenix/site/publish/udf.html phoenix/site/publish/update_statistics.html phoenix/site/publish/upgrading.html phoenix/site/publish/views.html phoenix/site/publish/who_is_using.html phoenix/site/source/src/site/markdown/update_statistics.md phoenix/site/source/src/site/site.xml Modified: phoenix/phoenix-docs/src/docsrc/help/phoenix.csv URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/docsrc/help/phoenix.csv?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/phoenix-docs/src/docsrc/help/phoenix.csv (original) +++ phoenix/phoenix-docs/src/docsrc/help/phoenix.csv Thu Dec 1 17:03:51 2016 @@ -21,14 +21,24 @@ SELECT full_name FROM SALES_PERSON WHERE " "Commands","UPSERT VALUES"," UPSERT INTO tableName [( { columnRef | columnDef } [,...] )] VALUES ( constantTerm [,...] ) +[ON DUPLICATE KEY { IGNORE | UPDATE columnRef = operand } ] "," Inserts if not present and updates otherwise the value in the table. The list of columns is optional and if not present, the values will map to the column in the order they are declared in the schema. The values must evaluate to constants. +Use the ON DUPLICATE KEY clause (available in Phoenix 4.9) if you need the UPSERT to be atomic. Performance +will be slower in this case as the row needs to be read on the server side when +the commit is done. Use IGNORE if you do not want the UPSERT performed if the +row already exists. Otherwise, with UPDATE, the expression will be evaluated and the +result used to set the column, for example to perform an atomic increment. An UPSERT +to the same row in the same commit batch will be processed in the order of execution. + "," UPSERT INTO TEST VALUES('foo','bar',3); UPSERT INTO TEST(NAME,ID) VALUES('foo',123); +UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER = COUNTER + 1; +UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE; " "Commands","UPSERT SELECT"," UPSERT [/*+ hint */] INTO tableName [( { columnRef | columnDef } [,...] )] select @@ -327,15 +337,15 @@ DROP SCHEMA my_schema { [familyName .] name= value } [,...] "," Sets a built-in Phoenix table property or an HBase table or column descriptor metadata attribute. -The name is case insensitive. Built-in Phoenix table options include SALT_BUCKETS, DISABLE_WAL, -IMMUTABLE_ROWS, MULTI_TENANT, DEFAULT_COLUMN_FAMILY, STORE_NULLS, TRANSACTIONAL, and UPDATE_CACHE_FREQUENCY. -If the name is a known HColumnDescriptor attribute, then the value is applied to the specified -column family or, if omitted, to all column families. Otherwise, the HBase metadata attribute -value is applied to the HTableDescriptor. Note that no validation is performed on the property -name or value, so unknown or misspelled options will end up as adhoc metadata attributes values -on the HBase table. +The name is case insensitive. If the name is a known HColumnDescriptor attribute, then the value +is applied to the specified column family or, if omitted, to all column families. Otherwise, the +HBase metadata attribute value is applied to the HTableDescriptor. Note that no validation is +performed on the property name or value, so unknown or misspelled options will end up as adhoc +metadata attributes values on the HBase table. + +Built-in Phoenix table options include: -The SALT_BUCKETS numeric property causes an extra byte to be transparently +SALT_BUCKETS numeric property causes an extra byte to be transparently prepended to every row key to ensure an evenly distributed read and write load across all region servers. This is especially useful when your row key is always monotonically increasing and causing hot spotting on a single region server. However, even if it's not, it often improves @@ -346,12 +356,12 @@ data table is salted (since by default a data table). If split points are not defined for the table, the table will automatically be pre-split at each possible salt bucket value. For more information, see http://phoenix.incubator.apache.org/salted.html -The DISABLE_WAL boolean option when true causes HBase not to write data to the write-ahead-log, +DISABLE_WAL boolean option when true causes HBase not to write data to the write-ahead-log, thus making updates faster at the expense of potentially losing data in the event of a region server failure. This option is useful when updating a table which is not the source-of-truth and thus making the lose of data acceptable. -The IMMUTABLE_ROWS boolean option when true declares that your table has rows which are write-once, +IMMUTABLE_ROWS boolean option when true declares that your table has rows which are write-once, append-only (i.e. the same row is never updated). With this option set, indexes added to the table are managed completely on the client-side, with no need to perform incremental index maintenance, thus improving performance. Deletes of rows in immutable tables are allowed with some @@ -359,25 +369,25 @@ restrictions if there are indexes on the not contained by every index. Upserts are expected to never update an existing row (failure to follow this will result in invalid indexes). For more information, see http://phoenix.incubator.apache.org/secondary_indexing.html -The MULTI_TENANT boolean option when true enables views to be created over the table across different +MULTI_TENANT boolean option when true enables views to be created over the table across different tenants. This option is useful to share the same physical HBase table across many different tenants. For more information, see http://phoenix.incubator.apache.org/multi-tenancy.html -The DEFAULT_COLUMN_FAMILY string option determines the column family used used when none +DEFAULT_COLUMN_FAMILY string option determines the column family used used when none is specified. The value is case sensitive. If this option is not present, a column family name of '0' is used. -The STORE_NULLS boolean option (available as of Phoenix 4.3) determines whether or not null values should be +STORE_NULLS boolean option (available as of Phoenix 4.3) determines whether or not null values should be explicitly stored in HBase. This option is generally only useful if a table is configured to store multiple versions in order to facilitate doing flashback queries (i.e. queries to look at the state of a record in the past). -The TRANSACTIONAL option (available as of Phoenix 4.7) determines whether a table (and its +TRANSACTIONAL option (available as of Phoenix 4.7) determines whether a table (and its secondary indexes) are tranactional. The default value is FALSE, but may be overriden with the phoenix.table.istransactional.default property. A table may be altered to become transactional, but it cannot be transitioned back to be non transactional. For more information on transactions, see http://phoenix.apache.org/transactions.html -The UPDATE_CACHE_FREQUENCY option (available as of Phoenix 4.7) determines how often the server +UPDATE_CACHE_FREQUENCY option (available as of Phoenix 4.7) determines how often the server will be checked for meta data updates (for example, the addition or removal of a table column or the updates of table statistics). Possible values are ALWAYS (the default), NEVER, and a millisecond numeric value. An ALWAYS value will cause the client to check with the server each time a statement @@ -385,13 +395,18 @@ is executed that references a table (or value indicates how long the client will hold on to its cached version of the metadata before checking back with the server for updates. -The APPEND_ONLY_SCHEMA boolean option (available as of Phoenix 4.8) when true declares that columns will only be added +APPEND_ONLY_SCHEMA boolean option (available as of Phoenix 4.8) when true declares that columns will only be added but never removed from a table. With this option set we can prevent the RPC from the client to the server to fetch the table metadata when the client already has all columns declared in a CREATE TABLE/VIEW IF NOT EXISTS statement. -The AUTO_PARTITION_SEQ string option (available as of Phoenix 4.8) when set on a base table determines the sequence used -to automatically generate a WHERE clause with the first PK column and the unique identifier from the sequence for child views. With this option set, we prevent allocating a sequence in the event that the view already exists. - +AUTO_PARTITION_SEQ string option (available as of Phoenix 4.8) when set on a base table determines the sequence used +to automatically generate a WHERE clause with the first PK column and the unique identifier from the sequence for child +views. With this option set, we prevent allocating a sequence in the event that the view already exists. + +The GUIDE_POSTS_WIDTH option (available as of Phoenix 4.9) enables specifying a different guidepost width per table. The guidepost width +determines the byte sized chunk of work over which a query will be parallelized. A value of 0 means that no guideposts should be collected +for the table. A value of null removes any table specific guidepost setting, causing the global server-side phoenix.stats.guidepost.width config +parameter to be used again. For more information, see the Statistics Collection page. "," IMMUTABLE_ROWS=true DEFAULT_COLUMN_FAMILY='a' @@ -399,6 +414,7 @@ SALT_BUCKETS=10 DATA_BLOCK_ENCODING='NONE',a.VERSIONS=10 MAX_FILESIZE=2000000000,MEMSTORE_FLUSHSIZE=80000000 UPDATE_CACHE_FREQUENCY=300000 +GUIDE_POSTS_WIDTH=30000000 CREATE SEQUENCE id; CREATE TABLE base_table (partition_id INTEGER, val DOUBLE) AUTO_PARTITION_SEQ=id; CREATE VIEW my_view AS SELECT * FROM base_table; @@ -534,13 +550,14 @@ SERIAL " "Other Grammar","Column Def"," -columnRef dataType [[NOT] NULL] [PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]] +columnRef dataType [[NOT] NULL] [DEFAULT constantOperand] [PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]] "," Define a new primary key column. The column name is case insensitive by default and case sensitive if double quoted. The sort order of a primary key may be ascending (ASC) -or descending. The default is ascending. Additionally, if the column is the only column -that forms the primary key, then it can be designated as ROW_TIMESTAMP column provided its data type is -one of these: BIGINT, UNSIGNED_LONG, DATE, TIME and TIMESTAMP. +or descending (DESC). The default is ascending. You may also specify a default value (Phoenix 4.9 or above) for the column +with a constant expression. If the column is the only column that forms the primary key, then it can +be designated as ROW_TIMESTAMP column provided its data type is one of these: BIGINT, UNSIGNED_LONG, +DATE, TIME and TIMESTAMP. "," id char(15) not null primary key Modified: phoenix/phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt URL: http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt (original) +++ phoenix/phoenix-docs/src/tools/org/h2/build/doc/dictionary.txt Thu Dec 1 17:03:51 2016 @@ -729,4 +729,4 @@ rpc doled paranthesis reaching satisfy c guideposts collects ilike rhs uniformly ttl reviewer ranking earth hdfs myjar myincrement defaultvalue defualtvalue mypackage raised logarithm euler cbrt transitioned overriden removal serially parallelized opposed frequency namely tranactional istransactional -guidepost compaction determination lookups currently presently whatever similarly +guidepost compaction determination lookups currently presently whatever similarly posts Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -377,6 +378,9 @@ ORDER BY sum(population) DESC; <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/array_type.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/array_type.html (original) +++ phoenix/site/publish/array_type.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -378,6 +379,9 @@ SELECT region_name FROM regions WHERE '9 <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/building.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/building.html (original) +++ phoenix/site/publish/building.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -359,6 +360,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/building_website.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/building_website.html (original) +++ phoenix/site/publish/building_website.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -319,6 +320,9 @@ python -m SimpleHTTPServer 8000 <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/bulk_dataload.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/bulk_dataload.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/bulk_dataload.html (original) +++ phoenix/site/publish/bulk_dataload.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -479,6 +480,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/contributing.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/contributing.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/contributing.html (original) +++ phoenix/site/publish/contributing.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -356,6 +357,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/develop.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/develop.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/develop.html (original) +++ phoenix/site/publish/develop.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -595,6 +596,9 @@ git remote add upstream https://github.c <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/download.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/download.html (original) +++ phoenix/site/publish/download.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -303,6 +304,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/dynamic_columns.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/dynamic_columns.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/dynamic_columns.html (original) +++ phoenix/site/publish/dynamic_columns.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -316,6 +317,9 @@ WHERE eventType = 'OOM' AND lastGCTime & <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/faq.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/faq.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/faq.html (original) +++ phoenix/site/publish/faq.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-28 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -524,6 +525,9 @@ conn.commit(); <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/flume.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/flume.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/flume.html (original) +++ phoenix/site/publish/flume.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -398,6 +399,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/hive_storage_handler.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/hive_storage_handler.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/hive_storage_handler.html (original) +++ phoenix/site/publish/hive_storage_handler.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -513,6 +514,9 @@ TBLPROPERTIES ( <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/index.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/index.html (original) +++ phoenix/site/publish/index.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -446,6 +447,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/installation.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/installation.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/installation.html (original) +++ phoenix/site/publish/installation.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -361,6 +362,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/issues.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/issues.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/issues.html (original) +++ phoenix/site/publish/issues.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -302,6 +303,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/joins.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/joins.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/joins.html (original) +++ phoenix/site/publish/joins.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -714,6 +715,9 @@ ON O.ItemID = I.ItemID; <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-11-10 + Generated by Apache Maven Doxia at 2016-12-01 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="../udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="../update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="../rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -869,6 +870,9 @@ syntax-end --> <a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-11-10 + Generated by Apache Maven Doxia at 2016-12-01 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="../udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="../update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="../rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -2044,6 +2045,9 @@ syntax-end --> <a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-11-10 + Generated by Apache Maven Doxia at 2016-12-01 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="../udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="../update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="../rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -521,20 +522,22 @@ SELECT * FROM TEST LIMIT 1000;<br />SELE <!-- railroad-start --> <pre name="bnf" style="display: none"> UPSERT INTO <a href="index.html#name">tableName</a> [( { <a href="index.html#column_ref">columnRef</a> | <a href="index.html#column_def">columnDef</a> } [,...] )] VALUES ( <a href="index.html#term">constantTerm</a> [,...] ) +[ON DUPLICATE KEY { IGNORE | UPDATE <a href="index.html#column_ref">columnRef</a> = <a href="index.html#operand">operand</a> } ] </pre> <div name="railroad"> -<table class="railroad"><tr class="railroad"><td class="d"><code class="c">UPSERT INTO <a href="index.html#name">tableName</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">(</code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"><code class="c"><a href="index.html#column_ref">columnRef</a></code></td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c"><a href="index.html#column_def">columnDef</a></code></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">, ...</code></td><td class="le "></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><code class="c">VALUES ( <a href="index.html#term">constantTerm</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">, ...</code></td><td class="le"></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table> +<table class="railroad"><tr class="railroad"><td class="d"><code class="c">UPSERT INTO <a href="index.html#name">tableName</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">(</code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"><code class="c"><a href="index.html#column_ref">columnRef</a></code></td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c"><a href="index.html#column_def">columnDef</a></code></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">, ...</code></td><td class="le "></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><code class="c">VALUES ( <a href="index.html#term">constantTerm</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">, ...</code></td><td class="le"></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table><br /><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">ON DUPLICATE KEY</code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"><code class="c">IGNORE</code></td><td class="te"></td></tr><tr class="railroad"><td class="ls"></ td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">UPDATE <a href="index.html#column_ref">columnRef</a> = <a href="index.html#operand">operand</a></code></td></tr></table></td><td class="le"></td></tr></table></td></tr></table></td><td class="le"></td></tr></table> </div> <!-- railroad-end --> <!-- syntax-start <pre> UPSERT INTO <a href="index.html#name">tableName</a> [( { <a href="index.html#column_ref">columnRef</a> | <a href="index.html#column_def">columnDef</a> } [,...] )] VALUES ( <a href="index.html#term">constantTerm</a> [,...] ) +[ON DUPLICATE KEY { IGNORE | UPDATE <a href="index.html#column_ref">columnRef</a> = <a href="index.html#operand">operand</a> } ] </pre> syntax-end --> -<p>Inserts if not present and updates otherwise the value in the table. The list of columns is optional and if not present, the values will map to the column in the order they are declared in the schema. The values must evaluate to constants.</p> +<p>Inserts if not present and updates otherwise the value in the table. The list of columns is optional and if not present, the values will map to the column in the order they are declared in the schema. The values must evaluate to constants.</p><p>Use the <code>ON DUPLICATE KEY</code> clause (available in Phoenix 4.9) if you need the <code>UPSERT</code> to be atomic. Performance will be slower in this case as the row needs to be read on the server side when the commit is done. Use <code>IGNORE</code> if you do not want the <code>UPSERT</code> performed if the row already exists. Otherwise, with <code>UPDATE</code>, the expression will be evaluated and the result used to set the column, for example to perform an atomic increment. An <code>UPSERT</code> to the same row in the same commit batch will be processed in the order of execution.</p> <p>Example:</p> <p class="notranslate"> -UPSERT INTO TEST VALUES('foo','bar',3);<br />UPSERT INTO TEST(NAME,ID) VALUES('foo',123);</p> +UPSERT INTO TEST VALUES('foo','bar',3);<br />UPSERT INTO TEST(NAME,ID) VALUES('foo',123);<br />UPSERT INTO TEST(ID, COUNTER) VALUES(123, 0) ON DUPLICATE KEY UPDATE COUNTER = COUNTER + 1;<br />UPSERT INTO TEST(ID, MY_COL) VALUES(123, 0) ON DUPLICATE KEY IGNORE;</p> <h3 id="upsert_select" class="notranslate">UPSERT SELECT</h3> <!-- railroad-start --> @@ -950,9 +953,9 @@ syntax-end --> { [<a href="index.html#name">familyName</a> .] <a href="index.html#name">name</a>= <a href="index.html#value">value</a> } [,...] </pre> syntax-end --> -<p>Sets a built-in Phoenix table property or an <code>HBase</code> table or column descriptor metadata attribute. The name is case insensitive. Built-in Phoenix table options include <code>SALT_BUCKETS, DISABLE_WAL, IMMUTABLE_ROWS, MULTI_TENANT, DEFAULT_COLUMN_FAMILY, STORE_NULLS, TRANSACTIONAL</code>, and <code>UPDATE_CACHE_FREQUENCY</code>. If the name is a known <code>HColumnDescriptor</code> attribute, then the value is applied to the specified column family or, if omitted, to all column families. Otherwise, the <code>HBase</code> metadata attribute value is applied to the <code>HTableDescriptor</code>. Note that no validation is performed on the property name or value, so unknown or misspelled options will end up as adhoc metadata attributes values on the <code>HBase</code> table.</p><p>The <code>SALT_BUCKETS</code> numeric property causes an extra byte to be transparently prepended to every row key to ensure an evenly distributed read and write load across all region servers. This is especially useful when your row key is always monotonically increasing and causing hot spotting on a single region server. However, even if it's not, it often improves performance by ensuring an even distribution of data across your cluster. The byte is determined by hashing the row key and modding it with the <code>SALT_BUCKETS</code> value. The value may be from 0 to 256, with 0 being a special means of turning salting off for an index in which the data table is salted (since by default an index has the same number of salt buckets as its data table). If split points are not defined for the table, the table will automatically be pre-split at each possible salt bucket value. For more information, see http://phoenix.incubator.apache.org/salted.html</p><p>The <code>DISABLE_WAL</code> boolean option when true causes <code>HBase</code> not to write data to the write-ahead-log, thus making updates faster at the expense of potentially losing data in the event of a region server failure. This option is useful when updating a table which is not the source-of-truth and thus making the lose of data acceptable.</p><p>The <code>IMMUTABLE_ROWS</code> boolean option when true declares that your table has rows which are write-once, append-only (i.e. the same row is never updated). With this option set, indexes added to the table are managed completely on the client-side, with no need to perform incremental index maintenance, thus improving performance. Deletes of rows in immutable tables are allowed with some restrictions if there are indexes on the table. Namely, the <code>WHERE</code> clause may not filter on columns not contained by every index. Upserts are expected to never update an existing row (failure to follow this will result in invalid indexes). For more information, see http://phoenix.incubator.apache.org/secondary_indexing.html</p><p>The <code>MULTI_TENANT</code> boolean option when true enables views to be created over the table across differe nt tenants. This option is useful to share the same physical <code>HBase</code> table across many different tenants. For more information, see http://phoenix.incubator.apache.org/multi-tenancy.html</p><p>The <code>DEFAULT_COLUMN_FAMILY</code> string option determines the column family used used when none is specified. The value is case sensitive. If this option is not present, a column family name of '0' is used.</p><p>The <code>STORE_NULLS</code> boolean option (available as of Phoenix 4.3) determines whether or not null values should be explicitly stored in <code>HBase</code>. This option is generally only useful if a table is configured to store multiple versions in order to facilitate doing flashback queries (i.e. queries to look at the state of a record in the past).</p><p>The <code>TRANSACTIONAL</code> option (available as of Phoenix 4.7) determines whether a table (and its secondary indexes) are tranactional. The default value is <code>FALSE</code>, but may be overrid en with the phoenix.table.istransactional.default property. A table may be altered to become transactional, but it cannot be transitioned back to be non transactional. For more information on transactions, see http://phoenix.apache.org/transactions.html</p><p>The <code>UPDATE_CACHE_FREQUENCY</code> option (available as of Phoenix 4.7) determines how often the server will be checked for meta data updates (for example, the addition or removal of a table column or the updates of table statistics). Possible values are <code>ALWAYS</code> (the default), <code>NEVER</code>, and a millisecond numeric value. An <code>ALWAYS</code> value will cause the client to check with the server each time a statement is executed that references a table (or once per commit for an <code>UPSERT VALUES</code> statement). A millisecond value indicates how long the client will hold on to its cached version of the metadata before checking back with the server for updates.</p><p>The <code>APPEND_ONLY_SCHE MA</code> boolean option (available as of Phoenix 4.8) when true declares that columns will only be added but never removed from a table. With this option set we can prevent the <code>RPC</code> from the client to the server to fetch the table metadata when the client already has all columns declared in a <code>CREATE TABLE</code>/<code>VIEW IF NOT EXISTS</code> statement.</p><p>The <code>AUTO_PARTITION_SEQ</code> string option (available as of Phoenix 4.8) when set on a base table determines the sequence used to automatically generate a <code>WHERE</code> clause with the first <code>PK</code> column and the unique identifier from the sequence for child views. With this option set, we prevent allocating a sequence in the event that the view already exists.</p> +<p>Sets a built-in Phoenix table property or an <code>HBase</code> table or column descriptor metadata attribute. The name is case insensitive. If the name is a known <code>HColumnDescriptor</code> attribute, then the value is applied to the specified column family or, if omitted, to all column families. Otherwise, the <code>HBase</code> metadata attribute value is applied to the <code>HTableDescriptor</code>. Note that no validation is performed on the property name or value, so unknown or misspelled options will end up as adhoc metadata attributes values on the <code>HBase</code> table.</p><p>Built-in Phoenix table options include:</p><p><code>SALT_BUCKETS</code> numeric property causes an extra byte to be transparently prepended to every row key to ensure an evenly distributed read and write load across all region servers. This is especially useful when your row key is always monotonically increasing and causing hot spotting on a single region server. However, even if it's no t, it often improves performance by ensuring an even distribution of data across your cluster. The byte is determined by hashing the row key and modding it with the <code>SALT_BUCKETS</code> value. The value may be from 0 to 256, with 0 being a special means of turning salting off for an index in which the data table is salted (since by default an index has the same number of salt buckets as its data table). If split points are not defined for the table, the table will automatically be pre-split at each possible salt bucket value. For more information, see http://phoenix.incubator.apache.org/salted.html</p><p><code>DISABLE_WAL</code> boolean option when true causes <code>HBase</code> not to write data to the write-ahead-log, thus making updates faster at the expense of potentially losing data in the event of a region server failure. This option is useful when updating a table which is not the source-of-truth and thus making the lose of data acceptable.</p><p><code>IMMUTABLE_RO WS</code> boolean option when true declares that your table has rows which are write-once, append-only (i.e. the same row is never updated). With this option set, indexes added to the table are managed completely on the client-side, with no need to perform incremental index maintenance, thus improving performance. Deletes of rows in immutable tables are allowed with some restrictions if there are indexes on the table. Namely, the <code>WHERE</code> clause may not filter on columns not contained by every index. Upserts are expected to never update an existing row (failure to follow this will result in invalid indexes). For more information, see http://phoenix.incubator.apache.org/secondary_indexing.html</p><p><code>MULTI_TENANT</code> boolean option when true enables views to be created over the table across different tenants. This option is useful to share the same physical <code>HBase</code> table across many different tenants. For more information, see http://phoenix.incubator.apa che.org/multi-tenancy.html</p><p><code>DEFAULT_COLUMN_FAMILY</code> string option determines the column family used used when none is specified. The value is case sensitive. If this option is not present, a column family name of '0' is used.</p><p><code>STORE_NULLS</code> boolean option (available as of Phoenix 4.3) determines whether or not null values should be explicitly stored in <code>HBase</code>. This option is generally only useful if a table is configured to store multiple versions in order to facilitate doing flashback queries (i.e. queries to look at the state of a record in the past).</p><p><code>TRANSACTIONAL</code> option (available as of Phoenix 4.7) determines whether a table (and its secondary indexes) are tranactional. The default value is <code>FALSE</code>, but may be overriden with the phoenix.table.istransactional.default property. A table may be altered to become transactional, but it cannot be transitioned back to be non transactional. For more inform ation on transactions, see http://phoenix.apache.org/transactions.html</p><p><code>UPDATE_CACHE_FREQUENCY</code> option (available as of Phoenix 4.7) determines how often the server will be checked for meta data updates (for example, the addition or removal of a table column or the updates of table statistics). Possible values are <code>ALWAYS</code> (the default), <code>NEVER</code>, and a millisecond numeric value. An <code>ALWAYS</code> value will cause the client to check with the server each time a statement is executed that references a table (or once per commit for an <code>UPSERT VALUES</code> statement). A millisecond value indicates how long the client will hold on to its cached version of the metadata before checking back with the server for updates.</p><p><code>APPEND_ONLY_SCHEMA</code> boolean option (available as of Phoenix 4.8) when true declares that columns will only be added but never removed from a table. With this option set we can prevent the <code>RPC</co de> from the client to the server to fetch the table metadata when the client already has all columns declared in a <code>CREATE TABLE</code>/<code>VIEW IF NOT EXISTS</code> statement.</p><p><code>AUTO_PARTITION_SEQ</code> string option (available as of Phoenix 4.8) when set on a base table determines the sequence used to automatically generate a <code>WHERE</code> clause with the first <code>PK</code> column and the unique identifier from the sequence for child views. With this option set, we prevent allocating a sequence in the event that the view already exists.</p><p>The <code>GUIDE_POSTS_WIDTH</code> option (available as of Phoenix 4.9) enables specifying a different guidepost width per table. The guidepost width determines the byte sized chunk of work over which a query will be parallelized. A value of 0 means that no guideposts should be collected for the table. A value of null removes any table specific guidepost setting, causing the global server-side phoenix.stats.guidepos t.width config parameter to be used again. For more information, see the Statistics Collection page.</p> <p>Example:</p> -<p class="notranslate">IMMUTABLE_ROWS=true<br />DEFAULT_COLUMN_FAMILY='a'<br />SALT_BUCKETS=10<br />DATA_BLOCK_ENCODING='NONE',a.VERSIONS=10<br />MAX_FILESIZE=2000000000,MEMSTORE_FLUSHSIZE=80000000<br />UPDATE_CACHE_FREQUENCY=300000<br />CREATE SEQUENCE id;<br />CREATE TABLE base_table (partition_id INTEGER, val DOUBLE) AUTO_PARTITION_SEQ=id;<br />CREATE VIEW my_view AS SELECT * FROM base_table;<br />The view statement for my_view will be : WHERE partition_id = 1</p> +<p class="notranslate">IMMUTABLE_ROWS=true<br />DEFAULT_COLUMN_FAMILY='a'<br />SALT_BUCKETS=10<br />DATA_BLOCK_ENCODING='NONE',a.VERSIONS=10<br />MAX_FILESIZE=2000000000,MEMSTORE_FLUSHSIZE=80000000<br />UPDATE_CACHE_FREQUENCY=300000<br />GUIDE_POSTS_WIDTH=30000000<br />CREATE SEQUENCE id;<br />CREATE TABLE base_table (partition_id INTEGER, val DOUBLE) AUTO_PARTITION_SEQ=id;<br />CREATE VIEW my_view AS SELECT * FROM base_table;<br />The view statement for my_view will be : WHERE partition_id = 1</p> <h3 id="hint" class="notranslate">Hint</h3> <!-- railroad-start --> @@ -1060,14 +1063,14 @@ syntax-end --> <h3 id="column_def" class="notranslate">Column Def</h3> <!-- railroad-start --> -<table class="railroad"><tr class="railroad"><td class="d"><code class="c"><a href="index.html#column_ref">columnRef</a> <a href="index.html#data_type">dataType</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">NOT</code></td><td class="le"></td></tr></table></td><td class="d"><code class="c">NULL</code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td clas s="d"><code class="c">PRIMARY KEY</code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"><code class="c">ASC</code></td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">DESC</code></td><td class="le"></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">ROW_TIMESTAMP</code></td><td class="le"></td></tr></table></td></tr></table></td><td class="le"></td></tr></table></td></tr></table> +<table class="railroad"><tr class="railroad"><td class="d"><code class="c"><a href="index.html#column_ref">columnRef</a> <a href="index.html#data_type">dataType</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">NOT</code></td><td class="le"></td></tr></table></td><td class="d"><code class="c">NULL</code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td clas s="d"><code class="c">DEFAULT <a href="index.html#operand">constantOperand</a></code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">PRIMARY KEY</code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d"><code class="c">ASC</code></td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">DESC</code></td><td class="le"></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td clas s="d"> </td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><code class="c">ROW_TIMESTAMP</code></td><td class="le"></td></tr></table></td></tr></table></td><td class="le"></td></tr></table></td></tr></table> <!-- railroad-end --> <!-- syntax-start <pre> -<a href="index.html#column_ref">columnRef</a> <a href="index.html#data_type">dataType</a> [[NOT] NULL] [PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]] +<a href="index.html#column_ref">columnRef</a> <a href="index.html#data_type">dataType</a> [[NOT] NULL] [DEFAULT <a href="index.html#operand">constantOperand</a>] [PRIMARY KEY [ASC | DESC] [ROW_TIMESTAMP]] </pre> syntax-end --> -<p>Define a new primary key column. The column name is case insensitive by default and case sensitive if double quoted. The sort order of a primary key may be ascending (<code>ASC</code>) or descending. The default is ascending. Additionally, if the column is the only column that forms the primary key, then it can be designated as <code>ROW_TIMESTAMP</code> column provided its data type is one of these: <code>BIGINT, UNSIGNED_LONG, DATE, TIME</code> and <code>TIMESTAMP</code>.</p> +<p>Define a new primary key column. The column name is case insensitive by default and case sensitive if double quoted. The sort order of a primary key may be ascending (<code>ASC</code>) or descending (<code>DESC</code>). The default is ascending. You may also specify a default value (Phoenix 4.9 or above) for the column with a constant expression. If the column is the only column that forms the primary key, then it can be designated as <code>ROW_TIMESTAMP</code> column provided its data type is one of these: <code>BIGINT, UNSIGNED_LONG, DATE, TIME</code> and <code>TIMESTAMP</code>.</p> <p>Example:</p> <p class="notranslate">id char(15) not null primary key<br />key integer null<br />m.response_time bigint<br /><br />created_date date not null primary key row_timestamp<br />key integer null<br />m.response_time bigint</p> @@ -1826,6 +1829,9 @@ syntax-end --> <a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="../atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="../namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/mailing_list.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/mailing_list.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/mailing_list.html (original) +++ phoenix/site/publish/mailing_list.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -341,6 +342,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/metrics.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/metrics.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/metrics.html (original) +++ phoenix/site/publish/metrics.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -417,6 +418,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/multi-tenancy.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/multi-tenancy.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/multi-tenancy.html (original) +++ phoenix/site/publish/multi-tenancy.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -350,6 +351,9 @@ WHERE event_type='L'; <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/namspace_mapping.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/namspace_mapping.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/namspace_mapping.html (original) +++ phoenix/site/publish/namspace_mapping.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-10-17 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li class="active"><a href="" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -429,6 +430,9 @@ <li > <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> + <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> <li class="active"> <a href="#" title="Namespace Mapping">Namespace Mapping</a> </li> Modified: phoenix/site/publish/news.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/news.html (original) +++ phoenix/site/publish/news.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -352,6 +353,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/paged.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/paged.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/paged.html (original) +++ phoenix/site/publish/paged.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -351,6 +352,9 @@ LIMIT 10 OFFSET 10 <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/performance.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/performance.html (original) +++ phoenix/site/publish/performance.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -358,6 +359,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/pherf.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/pherf.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/pherf.html (original) +++ phoenix/site/publish/pherf.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -438,6 +439,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/phoenix_mr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_mr.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/phoenix_mr.html (original) +++ phoenix/site/publish/phoenix_mr.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -468,6 +469,9 @@ job.waitForCompletion(true); <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/phoenix_on_emr.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/phoenix_on_emr.html (original) +++ phoenix/site/publish/phoenix_on_emr.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -298,6 +299,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li > Modified: phoenix/site/publish/phoenix_orm.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_orm.html?rev=1772240&r1=1772239&r2=1772240&view=diff ============================================================================== --- phoenix/site/publish/phoenix_orm.html (original) +++ phoenix/site/publish/phoenix_orm.html Thu Dec 1 17:03:51 2016 @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- - Generated by Apache Maven Doxia at 2016-09-14 + Generated by Apache Maven Doxia at 2016-11-30 Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin) --> <html xml:lang="en" lang="en"> @@ -100,6 +100,7 @@ <li ><a href="udf.html" title="User-defined Functions">User-defined Functions</a></li> <li class="divider"/> <li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li> + <li ><a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a></li> <li ><a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a></li> <li ><a href="update_statistics.html" title="Statistics Collection">Statistics Collection</a></li> <li ><a href="rowtimestamp.html" title="Row Timestamp Column">Row Timestamp Column</a></li> @@ -478,6 +479,9 @@ <a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a> </li> <li > + <a href="atomic_upsert.html" title="Atomic Upsert">Atomic Upsert</a> + </li> + <li > <a href="namspace_mapping.html" title="Namespace Mapping">Namespace Mapping</a> </li> <li >