Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs [master] Reduce unnessesary try-catch

YUKI Hiroshi null+****@clear*****
Thu Oct 18 17:51:13 JST 2012

• Previous message: [Groonga-commit] groonga/gcs [master] Handle any error and return XML response
• Next message: [Groonga-commit] [Still Failing] groonga/gcs#534 (master - 19e7b4c)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

YUKI Hiroshi	2012-10-18 17:51:13 +0900 (Thu, 18 Oct 2012)

  New Revision: 19e7b4c885073cce2d9e9c4601c15f79c977a900
  https://github.com/groonga/gcs/commit/19e7b4c885073cce2d9e9c4601c15f79c977a900

  Log:
    Reduce unnessesary try-catch

  Modified files:
    lib/api/2011-02-01/configuration.js

  Modified: lib/api/2011-02-01/configuration.js (+128 -193)
===================================================================
--- lib/api/2011-02-01/configuration.js    2012-10-18 17:48:11 +0900 (fcadcf8)
+++ lib/api/2011-02-01/configuration.js    2012-10-18 17:51:13 +0900 (0b7111e)
@@ -98,38 +98,26 @@ function createDomainStatus(options) {
 
 handlers.CreateDomain = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    domain.createSync();
-    var result = createDomainStatus({
-          domain:      domain,
-          hostAndPort: getBaseHostAndPort(config, request),
-          created:     true
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('CreateDomain', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  domain.createSync();
+  var result = createDomainStatus({
+        domain:      domain,
+        hostAndPort: getBaseHostAndPort(config, request),
+        created:     true
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('CreateDomain', result));
 };
 
 handlers.DeleteDomain = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    domain.deleteSync();
-    var result = createDomainStatus({
-          domain:      domain,
-          hostAndPort: getBaseHostAndPort(config, request),
-          deleted:     true
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DeleteDomain', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  domain.deleteSync();
+  var result = createDomainStatus({
+        domain:      domain,
+        hostAndPort: getBaseHostAndPort(config, request),
+        deleted:     true
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DeleteDomain', result));
 };
 
 function createDomainStatusList(options) {
@@ -146,32 +134,26 @@ function createDomainStatusList(options) {
 }
 
 handlers.DescribeDomains = function(context, request, response, config) {
-  try {
-    var keys = Object.keys(request.query).filter(function(key) {
-          return /^DomainNames\.member\.\d+$/.test(key);
-        });
-    var domainNames = keys.sort().map(function(key) {
-          return request.query[key];
-        });
-    var domains = domainNames.length ?
-                    domainNames.map(function(name) {
-                      var domain = new Domain(name, context);
-                      return domain.exists() ? domain : null ;
-                    }).filter(function(domain) {
-                      return domain;
-                    }) :
-                    Domain.getAll(context) ;
-    var result = createDomainStatusList({
-          domains:     domains,
-          hostAndPort: getBaseHostAndPort(config, request)
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DescribeDomains', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var keys = Object.keys(request.query).filter(function(key) {
+        return /^DomainNames\.member\.\d+$/.test(key);
+      });
+  var domainNames = keys.sort().map(function(key) {
+        return request.query[key];
+      });
+  var domains = domainNames.length ?
+                  domainNames.map(function(name) {
+                    var domain = new Domain(name, context);
+                    return domain.exists() ? domain : null ;
+                  }).filter(function(domain) {
+                    return domain;
+                  }) :
+                  Domain.getAll(context) ;
+  var result = createDomainStatusList({
+        domains:     domains,
+        hostAndPort: getBaseHostAndPort(config, request)
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DescribeDomains', result));
 };
 
 function createIndexFieldOptionStatus(options) {
@@ -244,39 +226,34 @@ handlers.DefineIndexField = function(context, request, response, config) {
   var field = domain.getIndexField(fieldName);
 
   var createdAt = new Date();
-  try {
-    if (!field.exists())
-      field.type = fieldType;
-
-    var facetEnabled = getFieldOption('FacetEnabled', request, fieldType);
-    if (facetEnabled !== undefined)
-      field.facetEnabled = facetEnabled.toLowerCase() == 'true';
-
-    var resultEnabled = getFieldOption('ResultEnabled', request, fieldType);
-    if (resultEnabled !== undefined)
-      field.resultEnabled = resultEnabled.toLowerCase() == 'true';
-
-    var searchEnabled = getFieldOption('SearchEnabled', request, fieldType);
-    if (searchEnabled !== undefined)
-      field.searchEnabled = searchEnabled.toLowerCase() == 'true';
-
-    if (!field.exists())
-      field.createSync();
-    else
-      field.saveOptionsSync();
-
-    var result = createIndexFieldStatus({
-          field: field,
-          createdAt: createdAt,
-          updatedAt: createdAt
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DefineIndexField', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+
+  if (!field.exists())
+    field.type = fieldType;
+
+  var facetEnabled = getFieldOption('FacetEnabled', request, fieldType);
+  if (facetEnabled !== undefined)
+    field.facetEnabled = facetEnabled.toLowerCase() == 'true';
+
+  var resultEnabled = getFieldOption('ResultEnabled', request, fieldType);
+  if (resultEnabled !== undefined)
+    field.resultEnabled = resultEnabled.toLowerCase() == 'true';
+
+  var searchEnabled = getFieldOption('SearchEnabled', request, fieldType);
+  if (searchEnabled !== undefined)
+    field.searchEnabled = searchEnabled.toLowerCase() == 'true';
+
+  if (!field.exists())
+    field.createSync();
+  else
+    field.saveOptionsSync();
+
+  var result = createIndexFieldStatus({
+        field: field,
+        createdAt: createdAt,
+        updatedAt: createdAt
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DefineIndexField', result));
 };
 
 handlers.DeleteIndexField = function(context, request, response, config) {
@@ -284,15 +261,9 @@ handlers.DeleteIndexField = function(context, request, response, config) {
 
   var fieldName = request.query['IndexFieldName'] || '';
   var field = domain.getIndexField(fieldName);
-  try {
-    field.deleteSync();
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DeleteIndexField'));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  field.deleteSync();
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DeleteIndexField'));
 };
 
 function createIndexFields(fields) {
@@ -310,29 +281,23 @@ function createIndexFields(fields) {
 handlers.DescribeIndexFields = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
 
-  try {
-    var keys = Object.keys(request.query).filter(function(key) {
-          return /^FieldNames\.member\.\d+$/.test(key);
-        });
-    var fieldNames = keys.sort().map(function(key) {
-          return request.query[key];
-        });
-    var fields = fieldNames.length ?
-                    fieldNames.map(function(name) {
-                      var field = domain.getIndexField(name);
-                      return field.exists() ? field : null ;
-                    }).filter(function(field) {
-                      return field;
-                    }) :
-                    domain.indexFields ;
-    var result = createIndexFields(fields);
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DescribeIndexFields', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var keys = Object.keys(request.query).filter(function(key) {
+        return /^FieldNames\.member\.\d+$/.test(key);
+      });
+  var fieldNames = keys.sort().map(function(key) {
+        return request.query[key];
+      });
+  var fields = fieldNames.length ?
+                  fieldNames.map(function(name) {
+                    var field = domain.getIndexField(name);
+                    return field.exists() ? field : null ;
+                  }).filter(function(field) {
+                    return field;
+                  }) :
+                  domain.indexFields ;
+  var result = createIndexFields(fields);
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DescribeIndexFields', result));
 };
 
 function createFieldNames(domain) {
@@ -354,16 +319,10 @@ function createFieldNames(domain) {
 
 handlers.IndexDocuments = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    domain.reindexSync();
-    var result = createFieldNames(domain);
-    response.contentType('application/xml');
-    response.send(createGenericResponse('IndexDocuments', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  domain.reindexSync();
+  var result = createFieldNames(domain);
+  response.contentType('application/xml');
+  response.send(createGenericResponse('IndexDocuments', result));
 };
 
 function createSynonymOptionsStatus(options) {
@@ -385,42 +344,30 @@ function createSynonymOptionsStatus(options) {
 
 handlers.UpdateSynonymOptions = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    var synonymOptionsJson = request.query.Synonyms;
-    var synonymOptions = JSON.parse(synonymOptionsJson);
-    domain.updateSynonymsSync(synonymOptions.synonyms);
-
-    var updatedAt = new Date();
-    var result = createSynonymOptionsStatus({
-          domain:    domain,
-          updatedAt: updatedAt,
-          createdAt: updatedAt
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('UpdateSynonymOptions', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var synonymOptionsJson = request.query.Synonyms;
+  var synonymOptions = JSON.parse(synonymOptionsJson);
+  domain.updateSynonymsSync(synonymOptions.synonyms);
+
+  var updatedAt = new Date();
+  var result = createSynonymOptionsStatus({
+        domain:    domain,
+        updatedAt: updatedAt,
+        createdAt: updatedAt
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('UpdateSynonymOptions', result));
 };
 
 handlers.DescribeSynonymOptions = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    var updatedAt = new Date();
-    var result = createSynonymOptionsStatus({
-          domain:    domain,
-          updatedAt: updatedAt,
-          createdAt: updatedAt
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DescribeSynonymOptions', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var updatedAt = new Date();
+  var result = createSynonymOptionsStatus({
+        domain:    domain,
+        updatedAt: updatedAt,
+        createdAt: updatedAt
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DescribeSynonymOptions', result));
 };
 
 function createDefaultSearchFieldStatus(options) {
@@ -439,42 +386,30 @@ function createDefaultSearchFieldStatus(options) {
 
 handlers.UpdateDefaultSearchField = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    var fieldName = request.query.DefaultSearchField;
-    domain.defaultSearchField = fieldName;
-
-    var updatedAt = new Date();
-    var result = createDefaultSearchFieldStatus({
-          fieldName: fieldName,
-          createdAt: updatedAt,
-          updatedAt: updatedAt
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('UpdateDefaultSearchField', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var fieldName = request.query.DefaultSearchField;
+  domain.defaultSearchField = fieldName;
+
+  var updatedAt = new Date();
+  var result = createDefaultSearchFieldStatus({
+        fieldName: fieldName,
+        createdAt: updatedAt,
+        updatedAt: updatedAt
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('UpdateDefaultSearchField', result));
 };
 
 handlers.DescribeDefaultSearchField = function(context, request, response, config) {
   var domain = new Domain(request.query.DomainName, context);
-  try {
-    var field = domain.defaultSearchField;
-    var updatedAt = new Date();
-    var result = createDefaultSearchFieldStatus({
-          fieldName: field ? field.name : '',
-          createdAt: updatedAt,
-          updatedAt: updatedAt
-        });
-    response.contentType('application/xml');
-    response.send(createGenericResponse('DescribeDefaultSearchField', result));
-  } catch (error) {
-    var body = createCommonErrorResponse('InternalFailure', error);
-    response.contentType('application/xml');
-    response.send(body, 400);
-  }
+  var field = domain.defaultSearchField;
+  var updatedAt = new Date();
+  var result = createDefaultSearchFieldStatus({
+        fieldName: field ? field.name : '',
+        createdAt: updatedAt,
+        updatedAt: updatedAt
+      });
+  response.contentType('application/xml');
+  response.send(createGenericResponse('DescribeDefaultSearchField', result));
 };
 
 function getClientIp(request) {
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/gcs [master] Handle any error and return XML response
• Next message: [Groonga-commit] [Still Failing] groonga/gcs#534 (master - 19e7b4c)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]