cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [06/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 11 Nov 2016 11:35:50 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d81a4907
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d81a4907
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d81a4907

Branch: refs/heads/cassandra-3.0
Commit: d81a49076b694301fdc385af69b57f39a86a22d2
Parents: 14b52bc 5e4198f
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Nov 11 11:28:33 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Nov 11 11:28:33 2016 +0000

----------------------------------------------------------------------
 .../cassandra/auth/CassandraRoleManager.java    | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d81a4907/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 5e3b92d,a90b297..c3e2626
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -163,12 -163,15 +163,11 @@@ public class CassandraRoleManager imple
          // to be added.
          if (Schema.instance.getCFMetaData(AuthKeyspace.NAME, "users") != null)
          {
-              legacySelectUserStatement = (SelectStatement) prepare("SELECT * FROM %s.%s
WHERE name = ?",
-                                                                    AuthKeyspace.NAME,
-                                                                    LEGACY_USERS_TABLE);
+             legacySelectUserStatement = prepareLegacySelectUserStatement();
+ 
 -            scheduleSetupTask(new Callable<Void>()
 -            {
 -                public Void call() throws Exception
 -                {
 -                    convertLegacyData();
 -                    return null;
 -                }
 +            scheduleSetupTask(() -> {
 +                convertLegacyData();
 +                return null;
              });
          }
          else


Mime
View raw message