From 5f916f5812e7c3920d0cb968470280d1198e1fff Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Tue, 5 Feb 2013 10:46:47 -0800
Subject: [PATCH] Remove unused QueryController.

This was part of the obsolete query queue system.
---
 r2/example.ini                       |  1 -
 r2/r2/controllers/__init__.py        |  2 --
 r2/r2/controllers/querycontroller.py | 39 ----------------------------
 r2/r2/lib/app_globals.py             |  1 -
 4 files changed, 43 deletions(-)
 delete mode 100644 r2/r2/controllers/querycontroller.py

diff --git a/r2/example.ini b/r2/example.ini
index dbddd6f17..d34210450 100644
--- a/r2/example.ini
+++ b/r2/example.ini
@@ -358,7 +358,6 @@ authorized_cnames =
 # -- query cache settings --
 num_query_queue_workers = 5
 query_queue_worker = http://cslowe.local:8000
-enable_doquery = True
 use_query_cache = True
 write_query_queue = True
 querycache_prune_chance = 0.05
diff --git a/r2/r2/controllers/__init__.py b/r2/r2/controllers/__init__.py
index eb4ace3c7..9cba47b1c 100644
--- a/r2/r2/controllers/__init__.py
+++ b/r2/r2/controllers/__init__.py
@@ -73,8 +73,6 @@ def load_controllers():
     from wiki import WikiController
     from wiki import WikiApiController
 
-    from querycontroller import QueryController
-
     from api import ApiController
     from api import ApiminimalController
     from api_docs import ApidocsController
diff --git a/r2/r2/controllers/querycontroller.py b/r2/r2/controllers/querycontroller.py
deleted file mode 100644
index b35b7492c..000000000
--- a/r2/r2/controllers/querycontroller.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# The contents of this file are subject to the Common Public Attribution
-# License Version 1.0. (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
-# License Version 1.1, but Sections 14 and 15 have been added to cover use of
-# software over a computer network and provide for limited attribution for the
-# Original Developer. In addition, Exhibit A has been modified to be consistent
-# with Exhibit B.
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
-# the specific language governing rights and limitations under the License.
-#
-# The Original Code is reddit.
-#
-# The Original Developer is the Initial Developer.  The Initial Developer of
-# the Original Code is reddit Inc.
-#
-# All portions of the code written by reddit are Copyright (c) 2006-2012 reddit
-# Inc. All Rights Reserved.
-###############################################################################
-from pylons import g
-from pylons.controllers.util import abort
-
-from reddit_base import RedditController
-from r2.lib.validator import nop, validate
-from r2.lib.db.queries import CachedResults
-
-import cPickle as pickle
-from urllib import unquote
-
-class QueryController(RedditController):
-    @validate(query = nop('query'))
-    def POST_doquery(self, query):
-        if g.enable_doquery:
-            cr = pickle.loads(query)
-            cr.update()
-        else:
-            abort(403, 'forbidden')
diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
index b266a4794..4714f38f6 100755
--- a/r2/r2/lib/app_globals.py
+++ b/r2/r2/lib/app_globals.py
@@ -142,7 +142,6 @@ class Globals(object):
             'template_debug',
             'reload_templates',
             'uncompressedJS',
-            'enable_doquery',
             'use_query_cache',
             'write_query_queue',
             'css_killswitch',