Author: jamestaylor
Date: Thu Aug 21 21:03:41 2014
New Revision: 1619588
URL: http://svn.apache.org/r1619588
Log:
Fix markdown on tracing page
Modified:
phoenix/phoenix-docs/src/main/org/h2/Driver.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
phoenix/site/publish/tracing.html
phoenix/site/source/src/site/markdown/tracing.md
Modified: phoenix/phoenix-docs/src/main/org/h2/Driver.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/Driver.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/Driver.java Thu Aug 21 21:03:41 2014
@@ -17,7 +17,7 @@ import org.h2.message.DbException;
import org.h2.message.TraceSystem;
import org.h2.upgrade.DbUpgrade;
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.logging.Logger;
//*/
@@ -138,7 +138,7 @@ public class Driver implements java.sql.
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public Logger getParentLogger() {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Thu
Aug 21 21:03:41 2014
@@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten
* @param parameterIndex the parameter index (1, 2, ...)
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(int parameterIndex, Class<T> type) {
return null;
}
@@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten
* @param parameterName the parameter name
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(String parameterName, Class<T> type) {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Thu Aug 21
21:03:41 2014
@@ -49,7 +49,7 @@ import java.sql.SQLXML;
import java.sql.SQLClientInfoException;
//*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.concurrent.Executor;
//*/
@@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac
*
* @param schema the schema
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void setSchema(String schema) {
// not supported
}
@@ -1687,7 +1687,7 @@ public class JdbcConnection extends Trac
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public String getSchema() {
return null;
}
@@ -1698,7 +1698,7 @@ public class JdbcConnection extends Trac
*
* @param executor the executor used by this method
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void abort(Executor executor) {
// not supported
}
@@ -1710,7 +1710,7 @@ public class JdbcConnection extends Trac
* @param executor the executor used by this method
* @param milliseconds the TCP connection timeout
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void setNetworkTimeout(Executor executor, int milliseconds) {
// not supported
}
@@ -1719,7 +1719,7 @@ public class JdbcConnection extends Trac
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public int getNetworkTimeout() {
return 0;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java Thu Aug
21 21:03:41 2014
@@ -2885,7 +2885,7 @@ public class JdbcDatabaseMetaData extend
/**
* [Not supported]
*/
- //## Java 1.7 ##
+ /*## Java 1.7 ##
public boolean generatedKeyAlwaysReturned() {
return true;
}
@@ -2902,7 +2902,7 @@ public class JdbcDatabaseMetaData extend
* @param columnNamePattern null (to get all objects) or a column name
* (uppercase for unquoted names)
*/
- //## Java 1.7 ##
+ /*## Java 1.7 ##
public ResultSet getPseudoColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern) {
return null;
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java Thu Aug 21
21:03:41 2014
@@ -3431,7 +3431,7 @@ public class JdbcResultSet extends Trace
* @param columnIndex the column index (1, 2, ...)
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(int columnIndex, Class<T> type) {
return null;
}
@@ -3443,7 +3443,7 @@ public class JdbcResultSet extends Trace
* @param columnName the column name
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(String columnName, Class<T> type) {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java Thu Aug 21
21:03:41 2014
@@ -876,7 +876,7 @@ public class JdbcStatement extends Trace
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public void closeOnCompletion() {
// not supported
}
@@ -885,7 +885,7 @@ public class JdbcStatement extends Trace
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public boolean isCloseOnCompletion() {
return true;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java Thu Aug
21 21:03:41 2014
@@ -35,7 +35,7 @@ import org.h2.util.New;
import org.h2.message.DbException;
//*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.logging.Logger;
//*/
@@ -330,7 +330,7 @@ public class JdbcConnectionPool implemen
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public Logger getParentLogger() {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java Thu Aug 21
21:03:41 2014
@@ -26,7 +26,7 @@ import org.h2.jdbc.JdbcConnection;
import org.h2.message.TraceObject;
import org.h2.util.StringUtils;
-//## Java 1.7 ##
+/*## Java 1.7 ##
import java.util.logging.Logger;
//*/
@@ -381,7 +381,7 @@ public class JdbcDataSource extends Trac
/**
* [Not supported]
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public Logger getParentLogger() {
return null;
}
Modified: phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
URL:
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java Thu Aug 21
21:03:41 2014
@@ -853,7 +853,7 @@ public class SimpleResultSet implements
* @param columnIndex the column index (1, 2, ...)
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(int columnIndex, Class<T> type) {
return null;
}
@@ -865,7 +865,7 @@ public class SimpleResultSet implements
* @param columnName the column name
* @param type the class of the returned value
*/
-//## Java 1.7 ##
+/*## Java 1.7 ##
public <T> T getObject(String columnName, Class<T> type) {
return null;
}
Modified: phoenix/site/publish/tracing.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/site/publish/tracing.html (original)
+++ phoenix/site/publish/tracing.html Thu Aug 21 21:03:41 2014
@@ -147,8 +147,7 @@
<p>They are essentially the same properties as in the
hadoop-metrics2-phoenix.properties but prefixed by âhbaseâ rather than
âphoenixâ so they are loaded in the HBase metrics system.</p>
</div>
<div class="section">
- <h3 id="Disabling_Tracing">Disabling Tracing</h3>
- <p>======================</p>
+ <h3 id="Disabling_Tracing"><u>Disabling Tracing</u></h3>
<p>You can disable tracing client requests merely by creating a new
Connection that doesnât have the tracing property enabled (see below).</p>
<p>However, on the server-side once the metrics sink has been enabled you
cannot turn of trace collection and writing unless you <b>remove the Phoenix
metrics2 confgiuration and bounce the regionserver</b>. This is enforced by the
metrics2 framework as its assumed that you will always want to collect
information about the server you are running on.</p>
</div>
Modified: phoenix/site/source/src/site/markdown/tracing.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/tracing.md?rev=1619588&r1=1619587&r2=1619588&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/tracing.md (original)
+++ phoenix/site/source/src/site/markdown/tracing.md Thu Aug 21 21:03:41 2014
@@ -29,8 +29,7 @@ HBase already comes with a metrics2 conf
They are essentially the same properties as in the
hadoop-metrics2-phoenix.properties but prefixed by "hbase" rather than
"phoenix" so they are loaded in the HBase metrics system.
-### Disabling Tracing
-======================
+### <u>Disabling Tracing</u>
You can disable tracing client requests merely by creating a new Connection
that doesn't have the tracing property enabled (see below).
