accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1227220 - in /incubator/accumulo/trunk: ./ src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
Date Wed, 04 Jan 2012 16:45:47 GMT
Author: billie
Date: Wed Jan  4 16:45:47 2012
New Revision: 1227220

URL: http://svn.apache.org/viewvc?rev=1227220&view=rev
Log:
ACCUMULO-223 fixed Connector javadocs - merged to trunk

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 16:45:47 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1222706,1225007,1227202
+/incubator/accumulo/branches/1.4:1201902-1222706,1225007,1227202,1227216

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1227220&r1=1227219&r2=1227220&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
Wed Jan  4 16:45:47 2012
@@ -66,9 +66,9 @@ public class Connector {
    * @param tableName
    *          the name of the table to query
    * @param authorizations
-   *          A set of authorization labels that will be checked against the column visibility
of each key inorder to filter data. The authorizations passed in
-   *          for scanning are intersected with the accumulo users set of authorizations.
So if the accumulo user has authorizations (A1, A2) and authorizations
-   *          (A2,A3) are passed, then (A2) will be used for the scan.
+   *          A set of authorization labels that will be checked against the column visibility
of each key in order to filter data. The authorizations passed in
+   *          must be a subset of the accumulo user's set of authorizations. If the accumulo
user has authorizations (A1, A2) and authorizations (A2, A3) are
+   *          passed, then an exception will be thrown.
    * @param numQueryThreads
    *          the number of concurrent threads to spawn for querying
    * 
@@ -86,9 +86,9 @@ public class Connector {
    * @param tableName
    *          the name of the table to query and delete from
    * @param authorizations
-   *          A set of authorization labels that will be checked against the column visibility
of each key inorder to filter data. The authorizations passed in
-   *          for scanning are intersected with the accumulo users set of authorizations.
So if the accumulo user has authorizations (A1, A2) and authorizations
-   *          (A2,A3) are passed, then (A2) will be used for the scan.
+   *          A set of authorization labels that will be checked against the column visibility
of each key in order to filter data. The authorizations passed in
+   *          must be a subset of the accumulo user's set of authorizations. If the accumulo
user has authorizations (A1, A2) and authorizations (A2, A3) are
+   *          passed, then an exception will be thrown.
    * @param numQueryThreads
    *          the number of concurrent threads to spawn for querying
    * @param maxMemory
@@ -150,9 +150,9 @@ public class Connector {
    * @param tableName
    *          the name of the table to query data from
    * @param authorizations
-   *          A set of authorization labels that will be checked against the column visibility
of each key inorder to filter data. The authorizations passed in
-   *          for scanning are intersected with the accumulo users set of authorizations.
So if the accumulo user has authorizations (A1, A2) and authorizations
-   *          (A2,A3) are passed, then (A2) will be used for the scan.
+   *          A set of authorization labels that will be checked against the column visibility
of each key in order to filter data. The authorizations passed in
+   *          must be a subset of the accumulo user's set of authorizations. If the accumulo
user has authorizations (A1, A2) and authorizations (A2, A3) are
+   *          passed, then an exception will be thrown.
    * 
    * @return Scanner object for configuring and querying data with
    * @throws TableNotFoundException



Mime
View raw message