You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/12/01 10:42:03 UTC
[2/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
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/1cbd8278
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cbd8278
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cbd8278
Branch: refs/heads/trunk
Commit: 1cbd82782e14f097af600f2334ee4031fc7e2706
Parents: 4378b58 8738087
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Dec 1 10:40:07 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Dec 1 10:40:07 2015 +0100
----------------------------------------------------------------------
bin/cqlsh.py | 11 ++++++++---
pylib/cqlshlib/helptopics.py | 25 ++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cbd8278/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index 6b87d9f,027a45e..7435f00
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -71,8 -71,8 +71,9 @@@ except ImportError
CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')
-CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/cql3/CQL-2.2.html'
++CASSANDRA_CQL_HTML_FALLBACK = 'https://cassandra.apache.org/doc/cql3/CQL-3.0.html'
+# default location of local CQL.html
if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):
# default location of local CQL.html
CASSANDRA_CQL_HTML = 'file://' + CASSANDRA_PATH + '/doc/cql3/CQL.html'
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cbd8278/pylib/cqlshlib/helptopics.py
----------------------------------------------------------------------
diff --cc pylib/cqlshlib/helptopics.py
index 347b17d,279063b..46cd156
--- a/pylib/cqlshlib/helptopics.py
+++ b/pylib/cqlshlib/helptopics.py
@@@ -14,9 -14,9 +14,8 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
- from .cql3handling import simple_cql_types
class CQL3HelpTopics(object):
-
def get_help_topics(self):
return [t[5:] for t in dir(self) if t.startswith('help_')]
@@@ -130,13 -145,6 +144,15 @@@
def help_drop_trigger(self):
return 'dropTriggerStmt'
+ def help_create_materialized_view(self):
+ return 'createMVStmt'
++
+ def help_alter_materialized_view(self):
+ return 'alterMVStmt'
++
+ def help_drop_materialized_view(self):
+ return 'dropMVStmt'
+
def help_keywords(self):
return 'appendixA'
@@@ -149,15 -160,9 +168,18 @@@
def help_list_users(self):
return 'listUsersStmt'
+ def help_create_role(self):
+ return 'createRoleStmt'
++
+ def help_drop_role(self):
+ return 'dropRoleStmt'
++
+ def help_list_roles(self):
+ return 'listRolesStmt'
+
def help_permissions(self):
return 'permissions'
+
def help_list_permissions(self):
return 'listPermissionsStmt'